From 075646cea07b0b7b3630c9dc5fc2e58b56b4b72f Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 10:42:01 +0000
Subject: [PATCH 001/241] remove quiet_assets gem; Deprecated gem and not work
 with Rails 5.

---
 Gemfile      | 1 -
 Gemfile.lock | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1237c5559..2a757f960 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,6 @@ group :development do
   gem 'slackistrano', '0.1.9', require: false
   gem 'brightbox', '2.3.9'
   gem 'rack-cors', '0.3.0' ,:require => 'rack/cors' # TODO: remove when upgrade Rails.
-  gem 'quiet_assets', '1.1.0'
   gem 'webrick', '1.3.1'
   gem 'jslint_on_rails', '1.1.1'
   gem 'rubocop', '0.40.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 49f95f034..335a535c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -345,8 +345,6 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.7)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
     racc (1.7.3)
     rack (1.6.13)
     rack-attack (5.4.2)
@@ -614,7 +612,6 @@ DEPENDENCIES
   pg_search (= 1.0.6)
   prawn (= 0.13.2)
   protected_attributes (= 1.1.4)
-  quiet_assets (= 1.1.0)
   rack-cors (= 0.3.0)
   rack-livereload (= 0.3.11)
   rails (= 4.2.11.3)

From df9b841e9d9a2a35f2b9969781b1542e4697419e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 11:00:04 +0000
Subject: [PATCH 002/241] replace protected_attributes with
 protected_attributes_continued for Rails 5+

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2a757f960..3fb3f5e8d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New ver
 gem 'inherited_resources', '1.7.2' # TODO: need upgrade when upgrade to Rails 5
 gem 'traco', '~> 5.3', '>= 5.3.3' # TODO: latest version @ 2021. Suggest migrate to Mobility gem.
 # gem 'strong_parameters'
-gem 'protected_attributes', '1.1.4' # TODO: Only support Rails version < 5 (https://github.com/rails/protected_attributes)
+gem 'protected_attributes_continued', '1.2.4' # TODO: upgrade to latest after we successfully upgrade Rails to 5.
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
 gem 'cancancan', '1.17.0' # TODO, need upgrade to 2.0 for Rails 5
 gem 'ahoy_matey', '1.6.1' # TODO: latest 5.0.2. Can't upgrade to 2.0 until upgrade to Rails 5
diff --git a/Gemfile.lock b/Gemfile.lock
index 335a535c3..1c2083a88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -339,8 +339,8 @@ GEM
       pdf-reader (~> 1.2)
       ruby-rc4
       ttfunk (~> 1.0.3)
-    protected_attributes (1.1.4)
-      activemodel (>= 4.0.1, < 5.0)
+    protected_attributes_continued (1.2.4)
+      activemodel (>= 4.0.1, < 6.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -611,7 +611,7 @@ DEPENDENCIES
   pg_array_parser (= 0.0.9)
   pg_search (= 1.0.6)
   prawn (= 0.13.2)
-  protected_attributes (= 1.1.4)
+  protected_attributes_continued (= 1.2.4)
   rack-cors (= 0.3.0)
   rack-livereload (= 0.3.11)
   rails (= 4.2.11.3)

From 375cbd91ad4caab1447b3dd5632cb4193921642a Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 11:20:29 +0000
Subject: [PATCH 003/241] upgrade gem inherited_resources

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3fb3f5e8d..6931863f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'nested-hstore', '0.1.2' # TODO: latest 0.1.2 @ 2015
 gem 'pg_search', '1.0.6' # TODO: update to newer version when upgrade to Rails 5
 gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
-gem 'inherited_resources', '1.7.2' # TODO: need upgrade when upgrade to Rails 5
+gem 'inherited_resources', '1.9.0' # TODO: need upgrade when upgrade to Rails 6
 gem 'traco', '~> 5.3', '>= 5.3.3' # TODO: latest version @ 2021. Suggest migrate to Mobility gem.
 # gem 'strong_parameters'
 gem 'protected_attributes_continued', '1.2.4' # TODO: upgrade to latest after we successfully upgrade Rails to 5.
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c2083a88..c08325e82 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -234,10 +234,10 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    inherited_resources (1.7.2)
-      actionpack (>= 3.2, < 5.2.x)
+    inherited_resources (1.9.0)
+      actionpack (>= 4.2, < 5.3)
       has_scope (~> 0.6)
-      railties (>= 3.2, < 5.2.x)
+      railties (>= 4.2, < 5.3)
       responders
     io-wait (0.3.1)
     jmespath (1.6.2)
@@ -596,7 +596,7 @@ DEPENDENCIES
   guard-livereload (= 1.1.3)
   handlebars-source (= 1.0.12)
   httparty (~> 0.21.0)
-  inherited_resources (= 1.7.2)
+  inherited_resources (= 1.9.0)
   jslint_on_rails (= 1.1.1)
   json_spec (= 1.1.5)
   kaminari (= 1.2.2)

From a2434fff21c2959e6011e91dfc1a917aa3a13576 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 14:24:23 +0000
Subject: [PATCH 004/241] upgrade ahoy to 2.2.1 from 1.6.1

---
 Gemfile                                       |  6 +-
 Gemfile.lock                                  | 19 +++--
 config/initializers/ahoy.rb                   | 76 ++++++++-----------
 ...0240115115459_ahoy_1_4_0_upgrade_step_2.rb |  2 +-
 4 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6931863f2..a6a2bd073 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 ruby '2.5.9'
 
 gem 'rails', '4.2.11.3'
+# gem 'rails', '5.0.7.2'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -22,8 +23,9 @@ gem 'traco', '~> 5.3', '>= 5.3.3' # TODO: latest version @ 2021. Suggest migrate
 # gem 'strong_parameters'
 gem 'protected_attributes_continued', '1.2.4' # TODO: upgrade to latest after we successfully upgrade Rails to 5.
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
-gem 'cancancan', '1.17.0' # TODO, need upgrade to 2.0 for Rails 5
-gem 'ahoy_matey', '1.6.1' # TODO: latest 5.0.2. Can't upgrade to 2.0 until upgrade to Rails 5
+gem 'cancancan', '1.17.0' # TODO, can upgrade to 2.0 after Rails 5
+gem 'ahoy_matey', '2.2.1' # TODO: latest 5.0.2. Can't upgrade to 3.0 until upgrade to Rails 5
+gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
 gem 'browser', '2.5.3' # Latest 5.3.1 @ 2021, doesn't work with this project, maybe try again after upgrade ruby > 2.5 and rails >= 5
 
 # TODO: starting from v1.4, it break our test due to redirection changes:
diff --git a/Gemfile.lock b/Gemfile.lock
index c08325e82..87baa1145 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,17 +47,16 @@ GEM
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
-    ahoy_matey (1.6.1)
+    ahoy_matey (2.2.1)
       addressable
       browser (~> 2.0)
-      geocoder
-      rack-attack (< 6)
-      railties
-      referer-parser (>= 0.3.0)
+      device_detector
+      geocoder (>= 1.4.5)
+      railties (>= 4.2)
+      referer-parser (>= 0.3)
       request_store
-      safely_block (>= 0.1.1)
+      safely_block (>= 0.2.1)
       user_agent_parser
-      uuidtools
     airbrussh (1.5.1)
       sshkit (>= 1.6.1, != 1.7.0)
     annotate (2.5.0)
@@ -154,6 +153,7 @@ GEM
     dalli (2.7.10)
     database_cleaner (1.2.0)
     debug_inspector (1.2.0)
+    device_detector (1.0.7)
     devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -347,8 +347,6 @@ GEM
     public_suffix (4.0.7)
     racc (1.7.3)
     rack (1.6.13)
-    rack-attack (5.4.2)
-      rack (>= 1.0, < 3)
     rack-cors (0.3.0)
     rack-livereload (0.3.11)
       rack
@@ -555,7 +553,7 @@ DEPENDENCIES
   actionpack-page_caching (= 1.1.1)
   active_model_serializers (= 0.8.4)
   acts-as-taggable-on (= 5.0.0)
-  ahoy_matey (= 1.6.1)
+  ahoy_matey (= 2.2.1)
   annotate (= 2.5.0)
   appsignal (= 1.3.3)
   aws-sdk (~> 2)
@@ -639,6 +637,7 @@ DEPENDENCIES
   test-unit (= 3.1.5)
   traco (~> 5.3, >= 5.3.3)
   uglifier (= 2.7.2)
+  uuidtools (~> 2.2)
   web-console (~> 2.0)
   webrick (= 1.3.1)
   whenever (= 0.11.0)
diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb
index 9145c6926..168640987 100644
--- a/config/initializers/ahoy.rb
+++ b/config/initializers/ahoy.rb
@@ -1,56 +1,44 @@
 require 'sapi/geoip'
-class Ahoy::Store < Ahoy::Stores::ActiveRecordStore
-  def report_exception(exception)
-    Appsignal.add_exception(exception) if defined? Appsignal
-  end
+class Ahoy::Store < Ahoy::DatabaseStore
+  UUID_NAMESPACE = UUIDTools::UUID.parse("dcd74c26-8fc9-453a-a9c2-afc445c3258d")
 
   def visit_model
     Ahoy::Visit
   end
 
-  def track_visit(options)
-    visit = visit_model.new(
-      {
-        id: ahoy.visit_id,
-        visitor_id: ahoy.visitor_id,
-        user: user,
-        started_at: options[:started_at]
-      },
-      :without_protection => true
-    )
-    visit_properties.keys.each do |key|
-      visit.send(:"#{key}=", visit_properties[key]) if visit.respond_to?(:"#{key}=")
-    end
+  def visit
+    @visit ||= visit_model.find_by(id: ensure_uuid(ahoy.visit_token)) if ahoy.visit_token
+  end
+
+  def track_visit(data)
+    data[:id] = ensure_uuid(data.delete(:visit_token))
+    data[:visitor_id] = ensure_uuid(data.delete(:visitor_token))
+
     geo_ip_data = Sapi::GeoIP.instance.resolve(request.ip)
-    visit.country = geo_ip_data[:country]
-    visit.city = geo_ip_data[:city]
-    visit.organization = geo_ip_data[:organization]
-
-    begin
-      visit.save!
-    rescue ActiveRecord::RecordNotUnique
-      # do nothing
-    end
+    data[:country] = geo_ip_data[:country]
+    data[:city] = geo_ip_data[:city]
+    data[:organization] = geo_ip_data[:organization]
+
+    super(data)
+  end
+
+  def track_event(data)
+    data[:id] = ensure_uuid(data.delete(:event_id))
+    super(data)
   end
 
-  def track_event(name, properties, options)
-    event = event_model.new(
-      {
-        id: options[:id],
-        visit_id: ahoy.visit_id,
-        user: user,
-        name: name,
-        properties: properties,
-        time: options[:time]
-      },
-      :without_protection => true
-    )
-
-    begin
-      event.save!
-    rescue ActiveRecord::RecordNotUnique
-      # do nothing
-    end
+  def ensure_uuid(id)
+    UUIDTools::UUID.parse(id).to_s
+  rescue
+    UUIDTools::UUID.sha1_create(UUID_NAMESPACE, id).to_s
   end
 end
 Ahoy.quiet = false
+Ahoy.api = true
+Ahoy.server_side_visits = :when_needed
+Ahoy.user_agent_parser = :device_detector
+Ahoy.bot_detection_version = 2
+Ahoy.track_bots = Rails.env.test?
+
+# https://github.com/ankane/ahoy/tree/v2.2.1#exceptions
+Safely.report_exception_method = ->(e) { Appsignal.add_exception(exception) if defined? Appsignal }
diff --git a/db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb b/db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb
index f7060fc32..2848f2dc3 100644
--- a/db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb
+++ b/db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb
@@ -2,7 +2,7 @@
 # https://stackoverflow.com/a/31672314/556780
 class Ahoy140UpgradeStep2 < ActiveRecord::Migration
   disable_ddl_transaction!
-  def change
+  def up
     Ahoy::Event.where(properties: nil).select(:id).find_in_batches do |events|
       Ahoy::Event.where(id: events.map(&:id)).update_all("properties = (regexp_replace(properties_json::text, '\\\\u0000', '', 'g'))::json::jsonb")
     end

From 1e1a8e0875c81a6adfb1ced91f47a1caa2552904 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 14:50:01 +0000
Subject: [PATCH 005/241] release sprockets version lock. Rails 5 need
 sprockets 3+

---
 Gemfile      |  7 +++----
 Gemfile.lock | 20 ++++++++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index a6a2bd073..d8c5873ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,6 @@ gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
 gem 'inherited_resources', '1.9.0' # TODO: need upgrade when upgrade to Rails 6
 gem 'traco', '~> 5.3', '>= 5.3.3' # TODO: latest version @ 2021. Suggest migrate to Mobility gem.
-# gem 'strong_parameters'
 gem 'protected_attributes_continued', '1.2.4' # TODO: upgrade to latest after we successfully upgrade Rails to 5.
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
 gem 'cancancan', '1.17.0' # TODO, can upgrade to 2.0 after Rails 5
@@ -46,11 +45,11 @@ gem 'redis-rails', '5.0.2' # TODO: latest, may remove this Gem when upgrade to R
 gem 'whenever', '0.11.0', :require => false # TODO: latest version 1.0 @ 2019. Should migrate to sidekiq-cron.
 gem 'httparty', '~> 0.21.0' # TODO: latest.
 
-gem 'sprockets', '2.12.5' # upgrading to 3 breaks handlebars/tilt
+# gem 'sprockets', '2.12.5' # upgrading to 3 breaks handlebars/tilt
 gem 'kaminari', '1.2.2' # TODO: latest @ 2021. Suggest migrate to pagy gem.
 
-gem 'acts-as-taggable-on', '5.0.0' # TODO: latest v10 @ 2023. Need upgrade when upgrade to Rails 5.
-gem 'carrierwave', '1.3.1' # TODO: latest is 3.0.5 @ 2023. v2 support Rails 5
+gem 'acts-as-taggable-on', '5.0.0' # TODO: latest v10 @ 2023. Need upgrade after upgrade to Rails 5.
+gem 'carrierwave', '1.3.1' # TODO: latest is 3.0.5 @ 2023. can upgrade to v2 after Rails 5
 
 # PDF
 gem 'prawn', '0.13.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 87baa1145..53153177a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -225,7 +225,6 @@ GEM
       actionpack (>= 4.1)
       activesupport (>= 4.1)
     hashery (2.1.2)
-    hike (1.2.3)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http_parser.rb (0.8.0)
@@ -485,15 +484,13 @@ GEM
       capistrano (>= 3.0.1)
       json
     spring (3.1.1)
-    sprockets (2.12.5)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sshkit (1.22.0)
       mutex_m
       net-scp (>= 1.1.2)
@@ -511,7 +508,7 @@ GEM
       power_assert
     thor (1.2.2)
     thread_safe (0.3.6)
-    tilt (1.4.1)
+    tilt (2.3.0)
     timeout (0.4.0)
     tins (1.32.1)
       sync
@@ -631,7 +628,6 @@ DEPENDENCIES
   sitemap_generator (~> 6.3)
   slackistrano (= 0.1.9)
   spring
-  sprockets (= 2.12.5)
   strong_migrations (~> 0.3.1)
   susy (= 2.2.14)
   test-unit (= 3.1.5)

From 11e1019f8c9732ee13ab7def774195f64f26c740 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 16:13:20 +0000
Subject: [PATCH 006/241] upgrade ember (broken)

---
 Gemfile      | 14 +++++++++++---
 Gemfile.lock | 40 +++++++++++++++++++++++++++-------------
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index d8c5873ec..0a7406024 100644
--- a/Gemfile
+++ b/Gemfile
@@ -168,8 +168,16 @@ gem 'gon', '~> 6.4' # TODO: latest
 gem "chartkick", '2.3.5' # TODO: latest 5.0.5 @ 2023. Should upgrade to v4 once we upgrade to Rails 5.2+ and Ruby 2.6+
 gem 'nested_form', '0.3.2' # TODO: latest @ 2013. Project is public archived on github. No longer maintained.
 gem 'bootstrap-sass', '2.3.2.2' # TODO: latest 3.4.1 @ 2019. Can't upgrade unless we sure bootstrap v3 backward compatible with boostrap v2
+
 # Ember
-gem 'ember-rails', '0.14.1' # Not support Sprockets 3+ unless upgrade. Latest version support Rails 5.1
-gem 'ember-source', '1.6.1' # TODO: just a wrapwrapper. Any update will change the ember.js version.
-gem 'ember-data-source', '0.14' # TODO: just a wrapwrapper. Any update will change the JS ember-data version.
+gem 'ember-rails', '~> 0.21.0' # Latest @ 2017
+# gem 'ember-rails', '0.14.1' # TODO: upgrade to latest after Rails 5
+
+gem 'ember-source', '1.8.0' # TODO: just a wrapwrapper. Any update will change the ember.js version.
+# gem 'ember-source', '1.6.1' # TODO: just a wrapwrapper. Any update will change the ember.js version.
+
+gem 'ember-data-source', '1.13.0' # TODO: just a wrapwrapper. Any update will change the JS ember-data version.
+# gem 'ember-data-source', '0.14' # TODO: just a wrapwrapper. Any update will change the JS ember-data version.
+
 gem 'handlebars-source', '1.0.12' # TODO: just a wrapwrapper. Any update will change the handlebars.js version.
+# gem 'handlebars-source', '1.0.12' # TODO: just a wrapwrapper. Any update will change the handlebars.js version.
diff --git a/Gemfile.lock b/Gemfile.lock
index 53153177a..0b6f2a129 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,6 +25,8 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    active-model-adapter-source (2.1.1)
+      ember-data-source (>= 1.13, < 3.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
     activejob (4.2.11.3)
@@ -76,6 +78,10 @@ GEM
       aws-sdk-core (= 2.11.632)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    babel-source (5.8.35)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
@@ -172,18 +178,26 @@ GEM
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ember-data-source (0.14)
-      ember-source
-    ember-rails (0.14.1)
+    ember-cli-assets (0.0.37)
+    ember-data-source (1.13.0)
+      ember-source (>= 1.8, < 3.0)
+    ember-es6_template (0.6.0)
+      babel-transpiler (>= 0.6.0, < 0.8)
+      sprockets (>= 2.2, < 4.1)
+    ember-handlebars-template (0.8.0)
+      barber (>= 0.11.0)
+      sprockets (>= 3.3, < 4.1)
+    ember-rails (0.21.0)
+      active-model-adapter-source (>= 1.13.0)
       active_model_serializers
-      barber (>= 0.4.1)
-      ember-data-source
-      ember-source
-      execjs (>= 1.2)
-      handlebars-source
+      ember-cli-assets (~> 0.0.1)
+      ember-data-source (>= 1.13.0)
+      ember-es6_template (>= 0.4.0, < 0.7)
+      ember-handlebars-template (>= 0.1.1, < 1.0)
+      ember-source (>= 1.8.0)
       jquery-rails (>= 1.0.17)
-      railties (>= 3.1)
-    ember-source (1.6.1)
+      railties (>= 4.2)
+    ember-source (1.8.0)
       handlebars-source (~> 1.0)
     errbase (0.2.2)
     erubis (2.7.0)
@@ -580,9 +594,9 @@ DEPENDENCIES
   devise (= 4.4.3)
   dotenv-rails (= 2.0.1)
   ed25519 (= 1.2.4)
-  ember-data-source (= 0.14)
-  ember-rails (= 0.14.1)
-  ember-source (= 1.6.1)
+  ember-data-source (= 1.13.0)
+  ember-rails (~> 0.21.0)
+  ember-source (= 1.8.0)
   factory_girl_rails (= 4.2.1)
   geoip (= 1.3.5)
   gon (~> 6.4)

From 57fb3024f1faf3c513c41463d7d190e77ce4feb8 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 16:50:36 +0000
Subject: [PATCH 007/241] upgrade pg_search

---
 Gemfile      | 4 ++--
 Gemfile.lock | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0a7406024..a8a9a8477 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,13 +9,13 @@ gem 'rails', '4.2.11.3'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'actionpack-action_caching', '~> 1.2', '>= 1.2.2' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
-gem 'actionpack-page_caching', '1.1.1' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this. # TODO, need update when upgrade to rails 5
+gem 'actionpack-page_caching', '1.1.1' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this. # TODO, can update after upgrade to rails 5
 gem 'active_model_serializers', '0.8.4' # Deprecated
 gem 'dalli', '2.7.10' # TODO: latest is 3.2.6. I believe should be fine to upgrade but we have no way to test.
 gem 'pg', '0.21.0' # TODO: latest 1.5.4, need Rails 5 to upgrade to 1.0.0
 gem 'pg_array_parser', '0.0.9' # TODO: latest 0.0.9
 gem 'nested-hstore', '0.1.2' # TODO: latest 0.1.2 @ 2015
-gem 'pg_search', '1.0.6' # TODO: update to newer version when upgrade to Rails 5
+gem 'pg_search', '2.3.0' # TODO: can upgrade to newer version after Rails 5
 gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
 gem 'inherited_resources', '1.9.0' # TODO: need upgrade when upgrade to Rails 6
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b6f2a129..bb2db1fd9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -342,10 +342,9 @@ GEM
     pdfkit (0.8.7.3)
     pg (0.21.0)
     pg_array_parser (0.0.9)
-    pg_search (1.0.6)
-      activerecord (>= 3.1)
-      activesupport (>= 3.1)
-      arel
+    pg_search (2.3.0)
+      activerecord (>= 4.2)
+      activesupport (>= 4.2)
     power_assert (2.0.3)
     powerpack (0.1.3)
     prawn (0.13.2)
@@ -618,7 +617,7 @@ DEPENDENCIES
   pdfkit (~> 0.8.7.3)
   pg (= 0.21.0)
   pg_array_parser (= 0.0.9)
-  pg_search (= 1.0.6)
+  pg_search (= 2.3.0)
   prawn (= 0.13.2)
   protected_attributes_continued (= 1.2.4)
   rack-cors (= 0.3.0)

From 995f592adda1d8fc70ef92b9aa57039527cf6f0c Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 16:55:37 +0000
Subject: [PATCH 008/241] upgrade groupdate gem

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index a8a9a8477..307529374 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem 'browser', '2.5.3' # Latest 5.3.1 @ 2021, doesn't work with this project, ma
 #   rspec ./spec/controllers/admin/nomenclature_changes/split_controller_spec.rb:191
 gem 'wicked', '1.3.4'
 
-gem 'groupdate', '2.4.0' # TODO: seems only ApiRequest#recent_requests using this. Suggest rewrite and remove dependencies.
+gem 'groupdate', '4.1.2' # TODO: can upgrade after rails 5 and newer ruby
 
 gem 'rubyzip', '~> 2.3', '>= 2.3.2' # TODO: latest
 gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
diff --git a/Gemfile.lock b/Gemfile.lock
index bb2db1fd9..09bdc1d50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -219,8 +219,8 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    groupdate (2.4.0)
-      activesupport (>= 3)
+    groupdate (4.1.2)
+      activesupport (>= 4.2)
     guard (1.8.3)
       formatador (>= 0.2.4)
       listen (~> 1.3)
@@ -599,7 +599,7 @@ DEPENDENCIES
   factory_girl_rails (= 4.2.1)
   geoip (= 1.3.5)
   gon (~> 6.4)
-  groupdate (= 2.4.0)
+  groupdate (= 4.1.2)
   guard-bundler (= 1.0.0)
   guard-livereload (= 1.1.3)
   handlebars-source (= 1.0.12)

From 14ff1f40c10e19ca08b083542ef95b45c4411d87 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 17:49:49 +0000
Subject: [PATCH 009/241] clean up gemfile

---
 Gemfile      | 32 +++++++++++++++++---------------
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Gemfile b/Gemfile
index 307529374..a3ac9a727 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,8 +13,8 @@ gem 'actionpack-page_caching', '1.1.1' # A feature that removed from core in Rai
 gem 'active_model_serializers', '0.8.4' # Deprecated
 gem 'dalli', '2.7.10' # TODO: latest is 3.2.6. I believe should be fine to upgrade but we have no way to test.
 gem 'pg', '0.21.0' # TODO: latest 1.5.4, need Rails 5 to upgrade to 1.0.0
-gem 'pg_array_parser', '0.0.9' # TODO: latest 0.0.9
-gem 'nested-hstore', '0.1.2' # TODO: latest 0.1.2 @ 2015
+gem 'pg_array_parser', '~> 0.0.9'
+gem 'nested-hstore', '~> 0.1.2'
 gem 'pg_search', '2.3.0' # TODO: can upgrade to newer version after Rails 5
 gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
@@ -34,7 +34,7 @@ gem 'wicked', '1.3.4'
 
 gem 'groupdate', '4.1.2' # TODO: can upgrade after rails 5 and newer ruby
 
-gem 'rubyzip', '~> 2.3', '>= 2.3.2' # TODO: latest
+gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
 
 gem 'sidekiq', '4.2.10' # TODO, Ruby 2.7 need version 6.0.5 sidekiq
@@ -43,10 +43,10 @@ gem 'sidekiq-unique-jobs', '4.0.18' # TODO: latest is 8.0.5 @ 2023
 gem 'redis-rails', '5.0.2' # TODO: latest, may remove this Gem when upgrade to Rails 5.2. (https://github.com/redis-store/redis-rails/tree/master#a-quick-note-about-rails-52)
 
 gem 'whenever', '0.11.0', :require => false # TODO: latest version 1.0 @ 2019. Should migrate to sidekiq-cron.
-gem 'httparty', '~> 0.21.0' # TODO: latest.
+gem 'httparty', '~> 0.21.0'
 
 # gem 'sprockets', '2.12.5' # upgrading to 3 breaks handlebars/tilt
-gem 'kaminari', '1.2.2' # TODO: latest @ 2021. Suggest migrate to pagy gem.
+gem 'kaminari', '~> 1.2', '>= 1.2.2' # TODO: Suggest migrate to pagy gem.
 
 gem 'acts-as-taggable-on', '5.0.0' # TODO: latest v10 @ 2023. Need upgrade after upgrade to Rails 5.
 gem 'carrierwave', '1.3.1' # TODO: latest is 3.0.5 @ 2023. can upgrade to v2 after Rails 5
@@ -59,14 +59,16 @@ gem 'wkhtmltopdf-binary', '~> 0.12.6.6'
 gem 'aws-sdk', '~> 2' # TODO: v2 Deprecated, need to upgrade to v3
 gem 'rails-observers', '~> 0.1.5' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
 
-# Gems used for assets
-gem 'sass-rails',   '5.0.7' # TODO: may need to upgrade when upgrade to Rails 5 or 6 (https://github.com/rails/sass-rails/releases)
-gem 'coffee-rails', '4.2.2' # TODO: v5 support Rails 6
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', :platforms => :ruby
 
-gem 'uglifier', '2.7.2' # TODO: Only works with ES5. Latest version 4.2.0 @ 2019
 gem 'strong_migrations', '~> 0.3.1' # TODO: should upgrade when we upgrade to rails 5
 
 
@@ -138,13 +140,13 @@ gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest v
 
 # track who created or edited a given object
 gem 'clerk', '0.2.3' # TODO: Need update to 1.0.0 when upgrade to Rails 5. I would say should update our code and just use paper_trail. This gem last update at 2018.
-gem 'paper_trail', '4.2.0' # TODO: latest is 15.1.0. Need upgrade to v5 for Rails 5.
+gem 'paper_trail', '4.2.0' # TODO: latest is 15.1.0. Need upgrade to v6 for Rails 5.1; v9 for Rails 5.2
 
 gem 'dotenv-rails', '2.0.1'
 
-gem 'sitemap_generator', '~> 6.3' # TODO: latest
+gem 'sitemap_generator', '~> 6.3'
 
-gem 'appsignal', '1.3.3'
+gem 'appsignal', '1.3.3' # TODO: should upgrade to latest after all upgrade.
 gem 'test-unit', '3.1.5' # annoyingly, rails console won't start without it in staging / production
 
 ### GEM for frontend ###
@@ -163,10 +165,10 @@ gem 'test-unit', '3.1.5' # annoyingly, rails console won't start without it in s
 # gem 'jquery-mousewheel-rails', '~> 0.0.9'
 # gem "font-awesome-rails", '4.5.0.1'
 
-gem 'susy', '2.2.14' # TODO: Deprecated. 2.2.14 is the latest version @ 2018
-gem 'gon', '~> 6.4' # TODO: latest
+gem 'susy', '~> 2.2', '>= 2.2.14' # TODO: Deprecated. (https://github.com/oddbird/susy#power-tools-for-the-web-deprecated)
+gem 'gon', '~> 6.4'
 gem "chartkick", '2.3.5' # TODO: latest 5.0.5 @ 2023. Should upgrade to v4 once we upgrade to Rails 5.2+ and Ruby 2.6+
-gem 'nested_form', '0.3.2' # TODO: latest @ 2013. Project is public archived on github. No longer maintained.
+gem 'nested_form', '~> 0.3.2' # TODO: Deprecated. (https://github.com/ryanb/nested_form#unmaintained)
 gem 'bootstrap-sass', '2.3.2.2' # TODO: latest 3.4.1 @ 2019. Can't upgrade unless we sure bootstrap v3 backward compatible with boostrap v2
 
 # Ember
diff --git a/Gemfile.lock b/Gemfile.lock
index 09bdc1d50..3bd8caf4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -586,7 +586,7 @@ DEPENDENCIES
   chartkick (= 2.3.5)
   clerk (= 0.2.3)
   codeclimate-test-reporter (= 0.1.1)
-  coffee-rails (= 4.2.2)
+  coffee-rails (~> 4.2)
   coveralls (= 0.7.1)
   dalli (= 2.7.10)
   database_cleaner (= 1.2.0)
@@ -607,16 +607,16 @@ DEPENDENCIES
   inherited_resources (= 1.9.0)
   jslint_on_rails (= 1.1.1)
   json_spec (= 1.1.5)
-  kaminari (= 1.2.2)
+  kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
-  nested-hstore (= 0.1.2)
-  nested_form (= 0.3.2)
+  nested-hstore (~> 0.1.2)
+  nested_form (~> 0.3.2)
   nokogiri (= 1.12.5)
   oj (= 3.14.2)
   paper_trail (= 4.2.0)
   pdfkit (~> 0.8.7.3)
   pg (= 0.21.0)
-  pg_array_parser (= 0.0.9)
+  pg_array_parser (~> 0.0.9)
   pg_search (= 2.3.0)
   prawn (= 0.13.2)
   protected_attributes_continued (= 1.2.4)
@@ -633,7 +633,7 @@ DEPENDENCIES
   rspec-rails (= 3.9.1)
   rubocop (= 0.40.0)
   rubyzip (~> 2.3, >= 2.3.2)
-  sass-rails (= 5.0.7)
+  sass-rails (~> 5.0)
   sidekiq (= 4.2.10)
   sidekiq-status (= 1.1.4)
   sidekiq-unique-jobs (= 4.0.18)
@@ -642,10 +642,10 @@ DEPENDENCIES
   slackistrano (= 0.1.9)
   spring
   strong_migrations (~> 0.3.1)
-  susy (= 2.2.14)
+  susy (~> 2.2, >= 2.2.14)
   test-unit (= 3.1.5)
   traco (~> 5.3, >= 5.3.3)
-  uglifier (= 2.7.2)
+  uglifier (>= 1.3.0)
   uuidtools (~> 2.2)
   web-console (~> 2.0)
   webrick (= 1.3.1)

From 7774b25a7e45a8d716290e60566830c90a1e95f4 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 20:10:21 +0000
Subject: [PATCH 010/241] upgrade paper_trail to v5 latest

---
 Gemfile                                   | 2 +-
 Gemfile.lock                              | 5 ++---
 app/controllers/application_controller.rb | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index a3ac9a727..96b5b9c61 100644
--- a/Gemfile
+++ b/Gemfile
@@ -140,7 +140,7 @@ gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest v
 
 # track who created or edited a given object
 gem 'clerk', '0.2.3' # TODO: Need update to 1.0.0 when upgrade to Rails 5. I would say should update our code and just use paper_trail. This gem last update at 2018.
-gem 'paper_trail', '4.2.0' # TODO: latest is 15.1.0. Need upgrade to v6 for Rails 5.1; v9 for Rails 5.2
+gem 'paper_trail', '5.2.3' # TODO: latest is 15.1.0. Need upgrade to v6 for Rails 5.1; v9 for Rails 5.2
 
 gem 'dotenv-rails', '2.0.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3bd8caf4c..85978d3cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,9 +327,8 @@ GEM
     numerizer (0.1.1)
     oj (3.14.2)
     orm_adapter (0.5.0)
-    paper_trail (4.2.0)
+    paper_trail (5.2.3)
       activerecord (>= 3.0, < 6.0)
-      activesupport (>= 3.0, < 6.0)
       request_store (~> 1.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -613,7 +612,7 @@ DEPENDENCIES
   nested_form (~> 0.3.2)
   nokogiri (= 1.12.5)
   oj (= 3.14.2)
-  paper_trail (= 4.2.0)
+  paper_trail (= 5.2.3)
   pdfkit (~> 0.8.7.3)
   pg (= 0.21.0)
   pg_array_parser (~> 0.0.9)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 204d41073..977700ac7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,7 @@ class ApplicationController < ActionController::Base
   include SentientController
   before_filter :set_locale
   before_filter :configure_permitted_parameters, if: :devise_controller?
+  before_filter :set_paper_trail_whodunnit
 
   rescue_from CanCan::AccessDenied, with: :access_denied_error
 

From 1916ae27c80868c80901f8b812913176a572347f Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 15 Jan 2024 20:27:48 +0000
Subject: [PATCH 011/241] upgrade pg_search

---
 app/models/document.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/document.rb b/app/models/document.rb
index 92a571a97..31de6644b 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -25,7 +25,7 @@
 #
 
 class Document < ActiveRecord::Base
-  include PgSearch
+  include PgSearch::Model
   pg_search_scope :search_by_title, :against => :title,
     :using => { :tsearch => { :prefix => true } },
     :order_within_rank => "documents.date, documents.title, documents.id"

From a30061ade811e7e237d94bfb0425dd33beb9e07e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 16 Jan 2024 15:23:59 +0000
Subject: [PATCH 012/241] We use Sentient in User model, so don't relay on
 clerk's dependencies, we should add this to our Gemfile.

---
 Gemfile      | 3 ++-
 Gemfile.lock | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 96b5b9c61..a96eebd19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'nested-hstore', '~> 0.1.2'
 gem 'pg_search', '2.3.0' # TODO: can upgrade to newer version after Rails 5
 gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
-gem 'inherited_resources', '1.9.0' # TODO: need upgrade when upgrade to Rails 6
+gem 'inherited_resources', '1.9.0' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
 gem 'traco', '~> 5.3', '>= 5.3.3' # TODO: latest version @ 2021. Suggest migrate to Mobility gem.
 gem 'protected_attributes_continued', '1.2.4' # TODO: upgrade to latest after we successfully upgrade Rails to 5.
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
@@ -140,6 +140,7 @@ gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest v
 
 # track who created or edited a given object
 gem 'clerk', '0.2.3' # TODO: Need update to 1.0.0 when upgrade to Rails 5. I would say should update our code and just use paper_trail. This gem last update at 2018.
+gem 'sentient_user', '0.4.0'
 gem 'paper_trail', '5.2.3' # TODO: latest is 15.1.0. Need upgrade to v6 for Rails 5.1; v9 for Rails 5.2
 
 gem 'dotenv-rails', '2.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 85978d3cc..fefa655c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -633,6 +633,7 @@ DEPENDENCIES
   rubocop (= 0.40.0)
   rubyzip (~> 2.3, >= 2.3.2)
   sass-rails (~> 5.0)
+  sentient_user (= 0.4.0)
   sidekiq (= 4.2.10)
   sidekiq-status (= 1.1.4)
   sidekiq-unique-jobs (= 4.0.18)

From 736ae76028d53e8c39ad842c91081036769ffd27 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 16 Jan 2024 15:26:51 +0000
Subject: [PATCH 013/241] add deprecated message for `update_attributes`

---
 .../admin/taxon_concept_comments_controller.rb            | 2 +-
 app/controllers/admin/users_controller.rb                 | 2 +-
 app/controllers/trade/sandbox_shipments_controller.rb     | 2 +-
 app/controllers/trade/shipments_controller.rb             | 2 +-
 app/controllers/trade/validation_errors_controller.rb     | 2 +-
 app/models/event.rb                                       | 4 ++--
 app/models/iucn_mapping_manager.rb                        | 2 +-
 app/models/nomenclature_change/full_reassignment.rb       | 6 +++---
 .../nomenclature_change/input_taxon_concept_processor.rb  | 2 +-
 .../to_accepted_name_transformation.rb                    | 2 +-
 .../nomenclature_change/to_synonym_transformation.rb      | 2 +-
 app/models/trade/annual_report_upload.rb                  | 2 +-
 app/models/trade/validation_rule.rb                       | 2 +-
 app/workers/changes_history_generator_worker.rb           | 2 +-
 app/workers/submission_worker.rb                          | 4 ++--
 lib/tasks/import_countries.rake                           | 2 +-
 lib/tasks/import_orchids_T_to_A.rake                      | 2 +-
 lib/tasks/import_trade_codes.rake                         | 2 +-
 lib/tasks/import_trade_names.rake                         | 4 ++--
 lib/tasks/trade_db_resolve_ip_to_country.rake             | 2 +-
 .../trade/annual_report_uploads_controller_spec.rb        | 2 +-
 spec/models/designation_spec.rb                           | 8 ++++----
 spec/models/document_search_spec.rb                       | 4 ++--
 spec/models/document_spec.rb                              | 4 ++--
 spec/models/geo_entity_search_spec.rb                     | 2 +-
 spec/models/taxonomy_spec.rb                              | 4 ++--
 spec/models/trade/inclusion_validation_rule_spec.rb       | 6 +++---
 spec/models/trade/sandbox_template_spec.rb                | 2 +-
 spec/models/trade/validation_rule_spec.rb                 | 6 +++---
 29 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/app/controllers/admin/taxon_concept_comments_controller.rb b/app/controllers/admin/taxon_concept_comments_controller.rb
index e9a5aab1d..fd925381f 100644
--- a/app/controllers/admin/taxon_concept_comments_controller.rb
+++ b/app/controllers/admin/taxon_concept_comments_controller.rb
@@ -23,7 +23,7 @@ def create
   def update
     @taxon_concept = TaxonConcept.find(params[:taxon_concept_id])
     @comment = @taxon_concept.comments.find(params[:id])
-    @comment.update_attributes(params[:comment])
+    @comment.update_attributes(params[:comment]) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     redirect_to admin_taxon_concept_comments_url(@taxon_concept),
       notice: 'Operation succeeded'
   end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 899ac1cee..a5de1871c 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -21,7 +21,7 @@ def update
       if params[:user][:password].blank?
         @user.update_without_password(params[:user])
       else
-        @user.update_attributes(params[:user])
+        @user.update_attributes(params[:user]) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       end
     respond_to do |format|
       format.js {
diff --git a/app/controllers/trade/sandbox_shipments_controller.rb b/app/controllers/trade/sandbox_shipments_controller.rb
index ecbd3d865..1620fd683 100644
--- a/app/controllers/trade/sandbox_shipments_controller.rb
+++ b/app/controllers/trade/sandbox_shipments_controller.rb
@@ -16,7 +16,7 @@ def update
     aru = Trade::AnnualReportUpload.find(params[:annual_report_upload_id])
     sandbox_klass = Trade::SandboxTemplate.ar_klass(aru.sandbox.table_name)
     @sandbox_shipment = sandbox_klass.find(params[:id])
-    @sandbox_shipment.update_attributes(sandbox_shipment_params)
+    @sandbox_shipment.update_attributes(sandbox_shipment_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     head :no_content
   end
 
diff --git a/app/controllers/trade/shipments_controller.rb b/app/controllers/trade/shipments_controller.rb
index 2aa8d485f..818678ce1 100644
--- a/app/controllers/trade/shipments_controller.rb
+++ b/app/controllers/trade/shipments_controller.rb
@@ -20,7 +20,7 @@ def create
   def update
     @shipment = Trade::Shipment.find(params[:id])
     update_params = populate_accepted_taxon_concept(shipment_params)
-    if @shipment.update_attributes(update_params)
+    if @shipment.update_attributes(update_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       render :json => @shipment, :status => :ok
     else
       render :json => { "errors" => @shipment.errors }, :status => :unprocessable_entity
diff --git a/app/controllers/trade/validation_errors_controller.rb b/app/controllers/trade/validation_errors_controller.rb
index 5ec095a5b..6a14e82e1 100644
--- a/app/controllers/trade/validation_errors_controller.rb
+++ b/app/controllers/trade/validation_errors_controller.rb
@@ -8,7 +8,7 @@ def show
 
   def update
     @validation_error = Trade::ValidationError.find(params[:id])
-    if @validation_error.update_attributes(validation_error_params)
+    if @validation_error.update_attributes(validation_error_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       render json: @validation_error, status: :ok
     else
       render json: { 'errors' => @validation_error.errors },
diff --git a/app/models/event.rb b/app/models/event.rb
index 5d0bd51eb..6cc8c9b46 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -106,11 +106,11 @@ def self.search(query)
   end
 
   def activate!
-    update_attributes(:is_current => true)
+    update_attributes(:is_current => true) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
   end
 
   def deactivate!
-    update_attributes(:is_current => false)
+    update_attributes(:is_current => false) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
   end
 
   protected
diff --git a/app/models/iucn_mapping_manager.rb b/app/models/iucn_mapping_manager.rb
index ba6aaeab8..c847d1d5a 100644
--- a/app/models/iucn_mapping_manager.rb
+++ b/app/models/iucn_mapping_manager.rb
@@ -42,7 +42,7 @@ def map_taxon_concept(taxon_concept, map, data)
       begin
         match = data["result"].first
         puts "#{taxon_concept.full_name} #{taxon_concept.author_year} <=>  #{match["scientific_name"]} #{match["authority"]}"
-        map.update_attributes(
+        map.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           :iucn_taxon_name => match['scientific_name'],
           :iucn_taxon_id => match['taxonid'],
           :iucn_author => match['authority'],
diff --git a/app/models/nomenclature_change/full_reassignment.rb b/app/models/nomenclature_change/full_reassignment.rb
index b03e1cc67..88ea5aa7e 100644
--- a/app/models/nomenclature_change/full_reassignment.rb
+++ b/app/models/nomenclature_change/full_reassignment.rb
@@ -41,14 +41,14 @@ def process
     Rails.logger.debug "FULL REASSIGNMENT Document Citations (#{@old_taxon_concept.document_citation_taxon_concepts.count})"
     # need validations to be applied to avoid duplicates exception
     @old_taxon_concept.document_citation_taxon_concepts.each do |dctc|
-      dctc.update_attributes(update_attrs)
+      dctc.update_attributes(update_attrs) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     end
     # shipments
     Rails.logger.debug "FULL REASSIGNMENT Shipments"
     Trade::Shipment.where(taxon_concept_id: @old_taxon_concept.id).update_all(update_attrs)
-    @old_taxon_concept.update_attributes(dependents_updated_at: update_timestamp)
+    @old_taxon_concept.update_attributes(dependents_updated_at: update_timestamp) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     @old_taxon_concept.reload
-    @new_taxon_concept.update_attributes(dependents_updated_at: update_timestamp)
+    @new_taxon_concept.update_attributes(dependents_updated_at: update_timestamp) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
   end
 
 end
diff --git a/app/models/nomenclature_change/input_taxon_concept_processor.rb b/app/models/nomenclature_change/input_taxon_concept_processor.rb
index ef0616ecf..c23e1c10a 100644
--- a/app/models/nomenclature_change/input_taxon_concept_processor.rb
+++ b/app/models/nomenclature_change/input_taxon_concept_processor.rb
@@ -8,7 +8,7 @@ def run
     return false unless @input.taxon_concept
     Rails.logger.debug("Processing input #{@input.taxon_concept.full_name}")
     tc = @input.taxon_concept
-    tc.update_attributes(
+    tc.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       nomenclature_note_en: "#{tc.nomenclature_note_en} #{@input.note_en}",
       nomenclature_note_es: "#{tc.nomenclature_note_es} #{@input.note_es}",
       nomenclature_note_fr: "#{tc.nomenclature_note_fr} #{@input.note_fr}"
diff --git a/app/models/nomenclature_change/to_accepted_name_transformation.rb b/app/models/nomenclature_change/to_accepted_name_transformation.rb
index f6a195573..716392896 100644
--- a/app/models/nomenclature_change/to_accepted_name_transformation.rb
+++ b/app/models/nomenclature_change/to_accepted_name_transformation.rb
@@ -13,7 +13,7 @@ def process
       @non_accepted_taxon_concept.inverse_trade_name_relationships
     )
 
-    @non_accepted_taxon_concept.update_attributes(
+    @non_accepted_taxon_concept.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       parent_id: @new_parent.id,
       name_status: 'A'
     )
diff --git a/app/models/nomenclature_change/to_synonym_transformation.rb b/app/models/nomenclature_change/to_synonym_transformation.rb
index 5ce40788a..4edc3da2f 100644
--- a/app/models/nomenclature_change/to_synonym_transformation.rb
+++ b/app/models/nomenclature_change/to_synonym_transformation.rb
@@ -27,7 +27,7 @@ def process
   def relink_relationships(relationships, new_taxon_concept)
     relationships.includes(:taxon_concept, :taxon_relationship_type).each do |rel|
       Rails.logger.debug "Relinking #{rel.taxon_relationship_type.name} relationship from #{rel.taxon_concept.full_name} to #{new_taxon_concept.full_name}"
-      rel.update_attributes(taxon_concept_id: new_taxon_concept.id)
+      rel.update_attributes(taxon_concept_id: new_taxon_concept.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     end
   end
 
diff --git a/app/models/trade/annual_report_upload.rb b/app/models/trade/annual_report_upload.rb
index 5a7f3f6a7..456a1c910 100644
--- a/app/models/trade/annual_report_upload.rb
+++ b/app/models/trade/annual_report_upload.rb
@@ -94,7 +94,7 @@ def submit(submitter)
     DownloadsCacheCleanupWorker.perform_async(:shipments)
 
     # flag as submitted
-    update_attributes({
+    update_attributes({ # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       submitted_at: DateTime.now,
       submitted_by_id: submitter.id,
       number_of_records_submitted: records_submitted
diff --git a/app/models/trade/validation_rule.rb b/app/models/trade/validation_rule.rb
index 7b8d5d52c..957b8aec9 100644
--- a/app/models/trade/validation_rule.rb
+++ b/app/models/trade/validation_rule.rb
@@ -105,7 +105,7 @@ def update_or_create_error_record(annual_report_upload, existing_record, error_c
       if error_count == 0
         existing_record.destroy
       else
-        existing_record.update_attributes(
+        existing_record.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           error_count: error_count
         )
       end
diff --git a/app/workers/changes_history_generator_worker.rb b/app/workers/changes_history_generator_worker.rb
index c26e72d57..426bd039f 100644
--- a/app/workers/changes_history_generator_worker.rb
+++ b/app/workers/changes_history_generator_worker.rb
@@ -23,7 +23,7 @@ def perform(aru_id, user_id)
       obj = s3.bucket(bucket_name).object(filename)
       obj.upload_file(tempfile.path)
 
-      aru.update_attributes(aws_storage_path: obj.public_url)
+      aru.update_attributes(aws_storage_path: obj.public_url) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     rescue Aws::S3::Errors::ServiceError => e
       Rails.logger.warn "Something went wrong while uploading #{aru.id} to S3"
       Appsignal.add_exception(e) if defined? Appsignal
diff --git a/app/workers/submission_worker.rb b/app/workers/submission_worker.rb
index ee3e38374..e1503d0d4 100644
--- a/app/workers/submission_worker.rb
+++ b/app/workers/submission_worker.rb
@@ -41,7 +41,7 @@ def perform(aru_id, submitter_id)
     aru.sandbox.destroy
 
     # flag as submitted
-    aru.update_attributes({
+    aru.update_attributes({ # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       submitted_at: DateTime.now,
       submitted_by_id: submitter.id,
       number_of_records_submitted: records_submitted
@@ -62,7 +62,7 @@ def upload_on_S3(aru, tempfile)
       obj = s3.bucket(bucket_name).object(filename)
       obj.upload_file(tempfile.path)
 
-      aru.update_attributes(aws_storage_path: obj.public_url)
+      aru.update_attributes(aws_storage_path: obj.public_url) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     rescue Aws::S3::Errors::ServiceError => e
       Rails.logger.warn "Something went wrong while uploading #{aru.id} to S3"
       Appsignal.add_exception(e) if defined? Appsignal
diff --git a/lib/tasks/import_countries.rake b/lib/tasks/import_countries.rake
index dfbd0e552..835c31d7a 100644
--- a/lib/tasks/import_countries.rake
+++ b/lib/tasks/import_countries.rake
@@ -44,7 +44,7 @@ namespace :import do
     CSV.foreach("lib/files/country_codes_en_es_fr_utf8.csv") do |row|
       country = GeoEntity.find_or_initialize_by(iso_code2: row[0].strip.upcase)
       unless country.id.nil?
-        country.update_attributes(
+        country.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           :name_fr => row[1].strip, :name_es => row[2].strip
         )
       end
diff --git a/lib/tasks/import_orchids_T_to_A.rake b/lib/tasks/import_orchids_T_to_A.rake
index b02a56a56..babb04cbc 100644
--- a/lib/tasks/import_orchids_T_to_A.rake
+++ b/lib/tasks/import_orchids_T_to_A.rake
@@ -12,7 +12,7 @@ namespace :import do
         puts "There was a problem with this Taxon Concept #{row['ID'].strip}"
         next
       end
-      @nomenclature_change.update_attributes(:status => NomenclatureChange::SUBMITTED)
+      @nomenclature_change.update_attributes(:status => NomenclatureChange::SUBMITTED) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     end
   end
 end
diff --git a/lib/tasks/import_trade_codes.rake b/lib/tasks/import_trade_codes.rake
index 727600541..4abf22e0a 100644
--- a/lib/tasks/import_trade_codes.rake
+++ b/lib/tasks/import_trade_codes.rake
@@ -6,7 +6,7 @@ namespace :import do
       current_count = klass.count
       CSV.foreach("lib/files/#{klass.to_s.downcase}_codes_utf8.csv") do |row|
         code = klass.find_or_initialize_by(code: row[0].strip.upcase)
-        code.update_attributes(:name_en => row[1].strip,
+        code.update_attributes(:name_en => row[1].strip, # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
                                :name_fr => row[2].strip,
                                :name_es => row[3].strip)
       end
diff --git a/lib/tasks/import_trade_names.rake b/lib/tasks/import_trade_names.rake
index 669683a2c..ca068f11b 100644
--- a/lib/tasks/import_trade_names.rake
+++ b/lib/tasks/import_trade_names.rake
@@ -146,7 +146,7 @@ namespace :import do
       puts "Updating #{tc.full_name}"
       unless tc.accepted_names.any?
         puts "from synonym to trade_name"
-        tc.update_attributes(:name_status => "T", :parent_id => nil,
+        tc.update_attributes(:name_status => "T", :parent_id => nil, # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
                             :legacy_trade_code => cites_code)
       end
       puts "Update its children's taxon_name_id"
@@ -154,7 +154,7 @@ namespace :import do
         if child.accepted_names.any?
           puts "looking at #{child.full_name} scientific_name"
           taxon_name = TaxonName.find_or_create_by(scientific_name: child.full_name)
-          child.update_attributes(:parent_id => nil, :taxon_name_id => taxon_name.id)
+          child.update_attributes(:parent_id => nil, :taxon_name_id => taxon_name.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
         end
       end
     end
diff --git a/lib/tasks/trade_db_resolve_ip_to_country.rake b/lib/tasks/trade_db_resolve_ip_to_country.rake
index c5dec65c8..66b61d885 100644
--- a/lib/tasks/trade_db_resolve_ip_to_country.rake
+++ b/lib/tasks/trade_db_resolve_ip_to_country.rake
@@ -5,6 +5,6 @@ task :trade_db_resolve_ip_to_country => :environment do
   trade_downloads.each do |td|
     puts "Updating Trade download #{td.id}"
     geo_ip_data = Sapi::GeoIP.instance.resolve(td.user_ip)
-    td.update_attributes!(geo_ip_data)
+    td.update_attributes!(geo_ip_data) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
   end
 end
diff --git a/spec/controllers/trade/annual_report_uploads_controller_spec.rb b/spec/controllers/trade/annual_report_uploads_controller_spec.rb
index 2572de7de..ac6896cb3 100644
--- a/spec/controllers/trade/annual_report_uploads_controller_spec.rb
+++ b/spec/controllers/trade/annual_report_uploads_controller_spec.rb
@@ -30,7 +30,7 @@ def exporter_csv
       @aru.save(:validate => false)
       @completed_aru = build(:annual_report_upload)
       @completed_aru.save(:validate => false)
-      @completed_aru.update_attributes(submitted_at: Time.now)
+      @completed_aru.update_attributes(submitted_at: Time.now) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     end
     it "should return all annual report uploads" do
       get :index, format: :json
diff --git a/spec/models/designation_spec.rb b/spec/models/designation_spec.rb
index 2c881229e..5c001216c 100644
--- a/spec/models/designation_spec.rb
+++ b/spec/models/designation_spec.rb
@@ -33,14 +33,14 @@
     context "when updating a non-protected name" do
       let(:designation) { create(:designation) }
       specify {
-        expect(designation.update_attributes(
+        expect(designation.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           { :name => 'RULES OF INTERGALACTIC TRADE' }
         )).to be_truthy
       }
     end
     context "when updating a protected name" do
       specify {
-        expect(cites.update_attributes(
+        expect(cites.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           { :name => 'RULES OF INTERGALACTIC TRADE' }
         )).to be_falsey
       }
@@ -48,13 +48,13 @@
     context "when updating taxonomy with no dependent objects attached" do
       let(:designation) { create(:designation) }
       let(:taxonomy) { create(:taxonomy) }
-      specify { expect(designation.update_attributes(:taxonomy_id => taxonomy.id)).to be_truthy }
+      specify { expect(designation.update_attributes(:taxonomy_id => taxonomy.id)).to be_truthy } # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     end
     context "when updating taxonomy with dependent objects attached" do
       let(:designation) { create(:designation) }
       let!(:change_type) { create(:change_type, :designation => designation) }
       let(:taxonomy) { create(:taxonomy) }
-      specify { expect(designation.update_attributes(:taxonomy_id => taxonomy.id)).to be_falsey }
+      specify { expect(designation.update_attributes(:taxonomy_id => taxonomy.id)).to be_falsey } # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     end
   end
   describe :destroy do
diff --git a/spec/models/document_search_spec.rb b/spec/models/document_search_spec.rb
index 87ae859b4..244dfb2ad 100644
--- a/spec/models/document_search_spec.rb
+++ b/spec/models/document_search_spec.rb
@@ -318,7 +318,7 @@
     context "when document updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
       specify do
         travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
-          @d.update_attributes(is_public: true)
+          @d.update_attributes(is_public: true) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
         end
         expect(DocumentSearch.documents_need_refreshing?).to be_truthy
       end
@@ -357,7 +357,7 @@
     context "when citation updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
       specify do
         travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
-          @c_tc.update_attributes(taxon_concept_id: create_cites_eu_species.id)
+          @c_tc.update_attributes(taxon_concept_id: create_cites_eu_species.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
         end
         expect(DocumentSearch.citations_need_refreshing?).to be_truthy
       end
diff --git a/spec/models/document_spec.rb b/spec/models/document_spec.rb
index 01e612542..9c7a9b099 100644
--- a/spec/models/document_spec.rb
+++ b/spec/models/document_spec.rb
@@ -81,13 +81,13 @@
     }
     context "when primary document sort_index_updated" do
       specify "secondary document sort_index is in sync" do
-        primary_document.update_attributes(sort_index: 3)
+        primary_document.update_attributes(sort_index: 3) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
         expect(secondary_document.reload.sort_index).to eq(3)
       end
     end
     context "when secondary document sort_index_updated" do
       specify "primary document sort_index is in sync" do
-        secondary_document.update_attributes(sort_index: 3)
+        secondary_document.update_attributes(sort_index: 3) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
         expect(primary_document.reload.sort_index).to eq(3)
       end
     end
diff --git a/spec/models/geo_entity_search_spec.rb b/spec/models/geo_entity_search_spec.rb
index 61c4a8419..9ab78db4b 100644
--- a/spec/models/geo_entity_search_spec.rb
+++ b/spec/models/geo_entity_search_spec.rb
@@ -108,7 +108,7 @@
     subject { GeoEntitySearch.new({ geo_entity_types_set: '3' }) }
     specify do
       subject.cached_results
-      @burma.update_attributes({ is_current: false })
+      @burma.update_attributes({ is_current: false }) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       expect(subject.cached_results).not_to include(@burma)
     end
   end
diff --git a/spec/models/taxonomy_spec.rb b/spec/models/taxonomy_spec.rb
index f2fd94008..8d55efc45 100644
--- a/spec/models/taxonomy_spec.rb
+++ b/spec/models/taxonomy_spec.rb
@@ -31,10 +31,10 @@
   describe :update do
     context "when updating a non-protected name" do
       let(:taxonomy) { create(:taxonomy) }
-      specify { expect(taxonomy.update_attributes({ :name => 'WORLD OF LOLCATS' })).to be_truthy }
+      specify { expect(taxonomy.update_attributes({ :name => 'WORLD OF LOLCATS' })).to be_truthy } # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     end
     context "when updating a protected name" do
-      specify { expect(cites_eu.update_attributes({ :name => 'WORLD OF LOLCATS' })).to be_falsey }
+      specify { expect(cites_eu.update_attributes({ :name => 'WORLD OF LOLCATS' })).to be_falsey } # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     end
   end
   describe :destroy do
diff --git a/spec/models/trade/inclusion_validation_rule_spec.rb b/spec/models/trade/inclusion_validation_rule_spec.rb
index e7612dc86..f7c4676a1 100644
--- a/spec/models/trade/inclusion_validation_rule_spec.rb
+++ b/spec/models/trade/inclusion_validation_rule_spec.rb
@@ -111,8 +111,8 @@
     context "when updates and error fixed for all records" do
       specify "error record is destroyed" do
         travel_to(Time.now + 1) do
-          @shipment2.update_attributes(taxon_name: 'Canis lupus')
-          @shipment3.update_attributes(taxon_name: 'Canis lupus')
+          @shipment2.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          @shipment3.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           expect {
             validation_rule.refresh_errors_if_needed(annual_report_upload)
           }.to change { Trade::ValidationError.count }.by(-1)
@@ -123,7 +123,7 @@
     context "when updates and error fixed for some records" do
       specify "error record is updated to reflect new error_count" do
         travel_to(Time.now + 1) do
-          @shipment2.update_attributes(taxon_name: 'Canis lupus')
+          @shipment2.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           expect {
             validation_rule.refresh_errors_if_needed(annual_report_upload)
           }.to change { @validation_error.reload.error_count }.by(-1)
diff --git a/spec/models/trade/sandbox_template_spec.rb b/spec/models/trade/sandbox_template_spec.rb
index 6be016098..dbfb09c2d 100644
--- a/spec/models/trade/sandbox_template_spec.rb
+++ b/spec/models/trade/sandbox_template_spec.rb
@@ -54,7 +54,7 @@
       @shipment1 = sandbox_klass.create(:taxon_name => canis_lupus.full_name)
     end
     specify {
-      @shipment1.update_attributes(:taxon_name => canis_aureus.full_name)
+      @shipment1.update_attributes(:taxon_name => canis_aureus.full_name) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       expect(@shipment1.reload.taxon_concept_id).to eq(canis_aureus.id)
     }
   end
diff --git a/spec/models/trade/validation_rule_spec.rb b/spec/models/trade/validation_rule_spec.rb
index b236d5859..ed62b7997 100644
--- a/spec/models/trade/validation_rule_spec.rb
+++ b/spec/models/trade/validation_rule_spec.rb
@@ -101,8 +101,8 @@
     context "when updates and error fixed for all records" do
       specify "error record is destroyed" do
         travel_to(Time.now + 1) do
-          @shipment2.update_attributes(taxon_name: 'Canis lupus')
-          @shipment3.update_attributes(taxon_name: 'Canis lupus')
+          @shipment2.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          @shipment3.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           expect {
             validation_rule.refresh_errors_if_needed(annual_report_upload)
           }.to change { Trade::ValidationError.count }.by(-1)
@@ -113,7 +113,7 @@
     context "when updates and error fixed for some records" do
       specify "error record is updated to reflect new error_count" do
         travel_to(Time.now + 1) do
-          @shipment2.update_attributes(taxon_name: 'Canis lupus')
+          @shipment2.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           expect {
             validation_rule.refresh_errors_if_needed(annual_report_upload)
           }.to change { @validation_error.reload.error_count }.by(-1)

From 0e5f639e8fcf2afb3844b71d5c6f7133b2ea3515 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 17 Jan 2024 10:03:52 +0000
Subject: [PATCH 014/241] strong params (round 1)

---
 .../checklist/downloads_controller.rb         | 12 ++++++--
 app/controllers/registrations_controller.rb   | 28 ++++++++++---------
 app/controllers/sessions_controller.rb        | 10 +++++--
 app/controllers/trade/shipments_controller.rb |  2 +-
 app/workers/download_worker.rb                |  2 +-
 .../registrations_controller_spec.rb          |  5 +++-
 6 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/app/controllers/checklist/downloads_controller.rb b/app/controllers/checklist/downloads_controller.rb
index b2dfbeaf4..897d080c5 100644
--- a/app/controllers/checklist/downloads_controller.rb
+++ b/app/controllers/checklist/downloads_controller.rb
@@ -17,8 +17,8 @@ def index
 
   # POST downloads/
   def create
-    @download = Download.create(params[:download])
-    if params[:download][:doc_type] == 'citesidmanual'
+    @download = Download.create(download_params)
+    if download_params[:doc_type] == 'citesidmanual'
       ManualDownloadWorker.perform_async(@download.id, params)
     else
       DownloadWorker.perform_async(@download.id, params)
@@ -93,4 +93,12 @@ def not_found
     render :json => { error: "No downloads available" }
   end
 
+  def download_params
+    params.require(:download).permit(
+      # attributes used in this controller.
+      :doc_typ,
+      # other attributes were in model `attr_accessible`.
+      :format
+    )
+  end
 end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 86faad5aa..bb931b991 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -3,17 +3,10 @@ def update
     @user = User.find(current_user.id)
 
     successfully_updated =
-      if needs_password?(@user, params)
-        # TODO: not sure if this still work, need test.
-        # TODO: deprecations https://github.com/heartcombo/devise/blob/main/CHANGELOG.md#400rc1---2016-02-01
-        @user.update_with_password(devise_parameter_sanitizer.sanitize(:account_update))
+      if needs_password?
+        @user.update_with_password(user_params)
       else
-        # remove the virtual current_password attribute
-        # update_without_password doesn't know how to ignore it
-        params[:user].delete(:current_password)
-        # TODO: not sure if this still work, need test.
-        # TODO: deprecations https://github.com/heartcombo/devise/blob/main/CHANGELOG.md#400rc1---2016-02-01
-        @user.update_without_password(devise_parameter_sanitizer.sanitize(:account_update))
+        @user.update_without_password(user_params)
       end
 
     if successfully_updated
@@ -39,8 +32,17 @@ def after_update_path_for(resource)
   # check if we need password to update user data
   # ie if password or email was changed
   # extend this as needed
-  def needs_password?(user, params)
-    user.email != params[:user][:email] ||
-      params[:user][:password].present?
+  def needs_password?
+    @user.email != user_params[:email] || user_params[:password].present?
+  end
+
+  def user_params
+    params.require(:user).permit(
+      # attributes needed by Devise and/or used in this controller.
+      :name, :email, :password, :password_confirmation, :current_password,
+      # other attributes were in model `attr_accessible`.
+      :remember_me, :role, :terms_and_conditions, :is_cites_authority,
+      :organisation, :geo_entity_id, :is_active
+    )
   end
 end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 769429210..472513568 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -2,10 +2,10 @@ class SessionsController < Devise::SessionsController
   respond_to :html, :json
 
   def create
-    resource = User.find_for_database_authentication(email: params[:user][:email])
+    resource = User.find_for_database_authentication(email: user_params[:email])
     return invalid_login_attempt unless resource
 
-    if resource.valid_password?(params[:user][:password])
+    if resource.valid_password?(user_params[:password])
       sign_in :user, resource
       set_flash_message(:notice, :signed_in)
       return respond_with resource, location: after_sign_in_path_for(resource)
@@ -24,4 +24,10 @@ def invalid_login_attempt
       format.json { render json: flash[:error], status: 401 }
     end
   end
+
+  private
+
+  def user_params
+    params.require(:user).permit(:email, :password)
+  end
 end
diff --git a/app/controllers/trade/shipments_controller.rb b/app/controllers/trade/shipments_controller.rb
index 818678ce1..87b7f13b6 100644
--- a/app/controllers/trade/shipments_controller.rb
+++ b/app/controllers/trade/shipments_controller.rb
@@ -37,7 +37,7 @@ def update_batch
 
   def destroy
     @shipment = Trade::Shipment.find(params[:id])
-    @shipment.destroy
+    @shipment.destroy # TODO: didn't check if the destory is successful.
     render :json => nil, :status => :ok
   end
 
diff --git a/app/workers/download_worker.rb b/app/workers/download_worker.rb
index d095a09ea..b97a61c7c 100644
--- a/app/workers/download_worker.rb
+++ b/app/workers/download_worker.rb
@@ -22,7 +22,7 @@ def perform(download_id, params)
       }
 
       params = params.symbolize_keys
-      I18n.locale = params[:locale] # because we're outside of request scope
+      I18n.locale = params[:locale] # because we're outside of request scope # TODO: should use with_locale with block.
       document_module = document_modules[@download.doc_type].new(params)
 
       @download.path     = document_module.generate
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index e28bd4ab9..1bf92dfab 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -16,6 +16,7 @@
         :email => @u1.email, :name => 'ZZ'
       }
       expect(response).to redirect_to(admin_root_url)
+      expect(@u1.reload.name).to eq('ZZ')
     end
     it "should update password" do
       sign_in(@u1)
@@ -25,13 +26,15 @@
         :current_password => '11111111'
       }
       expect(response).to redirect_to(admin_root_url)
+      expect(@u1.reload.valid_password?('22222222')).to eq(true)
     end
     it "should not update that account if not valid" do
       sign_in(@u1)
       put :update, :id => @u1.id, :user => {
-        :email => @u1.email, :name => nil
+        :email => 'another_email@example.com', :name => nil
       }
       expect(response).to render_template("edit")
+      expect(@u1.reload.email).not_to eq('another_email@example.com')
     end
   end
 

From 539e879033382b01681193694817e8ea27191b62 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 17 Jan 2024 10:04:34 +0000
Subject: [PATCH 015/241] Remove broken code

---
 app/controllers/api/geo_relationships_controller.rb | 12 ------------
 config/routes.rb                                    |  2 --
 2 files changed, 14 deletions(-)
 delete mode 100644 app/controllers/api/geo_relationships_controller.rb

diff --git a/app/controllers/api/geo_relationships_controller.rb b/app/controllers/api/geo_relationships_controller.rb
deleted file mode 100644
index 600938945..000000000
--- a/app/controllers/api/geo_relationships_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class Api::GeoRelationshipsController < ApplicationController
-  respond_to :json
-  inherit_resources
-
-  protected
-
-  def collection
-    @geo_relationship_types ||= end_of_association_chain.order(:name).
-      select([:id, :name]).
-      map { |d| { :value => d.id, :text => d.name } }
-  end
-end
diff --git a/config/routes.rb b/config/routes.rb
index f2787adb4..f2ab7f643 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,8 +55,6 @@
     resources :species_listings, :only => [:index]
     resources :change_types, :only => [:index]
     resources :ranks, :only => [:index]
-    resources :geo_entities, :only => [:index]
-    resources :geo_relationship_types, :only => [:index]
     resources :trade_downloads_cache_cleanup, only: [:index]
   end
   namespace :admin do

From a1aaded5bdfa8826c0028134e96405eb15520547 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 17 Jan 2024 12:05:44 +0000
Subject: [PATCH 016/241] found include SentientUser and track_who_does_it in
 Clerk gem README, so safe to remove the dependancy gem in our Gemfile.

---
 Gemfile      | 1 -
 Gemfile.lock | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index a96eebd19..f4f25bb45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -140,7 +140,6 @@ gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest v
 
 # track who created or edited a given object
 gem 'clerk', '0.2.3' # TODO: Need update to 1.0.0 when upgrade to Rails 5. I would say should update our code and just use paper_trail. This gem last update at 2018.
-gem 'sentient_user', '0.4.0'
 gem 'paper_trail', '5.2.3' # TODO: latest is 15.1.0. Need upgrade to v6 for Rails 5.1; v9 for Rails 5.2
 
 gem 'dotenv-rails', '2.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index fefa655c7..85978d3cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -633,7 +633,6 @@ DEPENDENCIES
   rubocop (= 0.40.0)
   rubyzip (~> 2.3, >= 2.3.2)
   sass-rails (~> 5.0)
-  sentient_user (= 0.4.0)
   sidekiq (= 4.2.10)
   sidekiq-status (= 1.1.4)
   sidekiq-unique-jobs (= 4.0.18)

From 82c04aa858b301d137f45cdd60685de63e8316c5 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 17 Jan 2024 18:25:03 +0000
Subject: [PATCH 017/241] strong params (round 2)

---
 .../admin/change_types_controller.rb          |  8 +++++++
 app/controllers/admin/cites_acs_controller.rb | 11 +++++++++
 .../cites_captivity_processes_controller.rb   | 11 +++++++++
 .../admin/cites_cops_controller.rb            | 11 +++++++++
 ...cites_extraordinary_meetings_controller.rb | 11 +++++++++
 .../cites_hash_annotations_controller.rb      | 10 ++++++++
 app/controllers/admin/cites_pcs_controller.rb | 11 +++++++++
 ...tes_suspension_notifications_controller.rb | 11 +++++++++
 .../admin/cites_suspensions_controller.rb     | 17 ++++++++++++++
 app/controllers/admin/cites_tcs_controller.rb | 11 +++++++++
 .../admin/designations_controller.rb          |  9 ++++++++
 .../admin/distributions_controller.rb         | 10 ++++++++
 app/controllers/admin/documents_controller.rb | 16 +++++++++++++
 app/controllers/admin/ec_srgs_controller.rb   | 11 +++++++++
 .../eu_council_regulations_controller.rb      | 11 +++++++++
 .../admin/eu_decision_types_controller.rb     |  9 ++++++++
 .../admin/eu_hash_annotations_controller.rb   | 10 ++++++++
 .../eu_implementing_regulations_controller.rb | 11 +++++++++
 .../admin/eu_opinions_controller.rb           | 13 +++++++++++
 .../admin/eu_regulations_controller.rb        | 11 +++++++++
 .../eu_suspension_regulations_controller.rb   | 11 +++++++++
 app/controllers/admin/events_controller.rb    | 11 +++++++++
 .../admin/geo_entities_controller.rb          | 11 +++++++++
 .../admin/geo_relationships_controller.rb     |  8 +++++++
 .../admin/hybrid_relationships_controller.rb  |  9 ++++++++
 .../admin/instruments_controller.rb           |  9 ++++++++
 app/controllers/admin/languages_controller.rb |  9 ++++++++
 app/controllers/admin/purposes_controller.rb  |  9 ++++++++
 app/controllers/admin/ranks_controller.rb     |  9 ++++++++
 .../admin/references_controller.rb            |  9 ++++++++
 app/controllers/admin/sources_controller.rb   |  9 ++++++++
 .../admin/species_listings_controller.rb      |  8 +++++++
 .../admin/srg_histories_controller.rb         |  9 ++++++++
 .../admin/synonym_relationships_controller.rb |  9 ++++++++
 app/controllers/admin/tags_controller.rb      |  9 ++++++++
 .../taxon_cites_suspensions_controller.rb     | 18 +++++++++++++++
 .../admin/taxon_commons_controller.rb         | 10 ++++++++
 .../taxon_concept_comments_controller.rb      | 14 +++++++++--
 .../taxon_concept_references_controller.rb    | 11 +++++++++
 .../taxon_concept_term_pairs_controller.rb    |  9 ++++++++
 .../admin/taxon_concepts_controller.rb        | 14 +++++++++++
 .../admin/taxon_eu_suspensions_controller.rb  | 13 +++++++++++
 .../admin/taxon_instruments_controller.rb     | 11 ++++++++-
 .../admin/taxon_listing_changes_controller.rb | 23 ++++++++++++++++++-
 .../admin/taxon_quotas_controller.rb          | 13 +++++++++++
 .../admin/taxon_relationships_controller.rb   | 11 ++++++++-
 .../admin/taxonomies_controller.rb            |  6 +++++
 .../term_trade_codes_pairs_controller.rb      |  8 +++++++
 app/controllers/admin/terms_controller.rb     |  6 +++++
 .../trade_name_relationships_controller.rb    |  9 ++++++++
 app/controllers/admin/units_controller.rb     |  8 +++++++
 app/controllers/admin/users_controller.rb     | 10 ++++++++
 app/models/annotation.rb                      |  6 ++---
 app/models/change_type.rb                     |  4 ++--
 app/models/cites_ac.rb                        |  2 +-
 app/models/cites_cop.rb                       |  2 +-
 app/models/cites_extraordinary_meeting.rb     |  2 +-
 app/models/cites_pc.rb                        |  2 +-
 app/models/cites_process.rb                   |  6 ++---
 app/models/cites_suspension.rb                |  6 ++---
 app/models/cites_suspension_confirmation.rb   |  2 +-
 app/models/cites_suspension_notification.rb   |  2 +-
 app/models/cites_tc.rb                        |  2 +-
 app/models/cms_mapping.rb                     |  2 +-
 app/models/comment.rb                         |  4 ++--
 app/models/designation.rb                     |  2 +-
 app/models/distribution.rb                    |  4 ++--
 app/models/document.rb                        | 10 ++++----
 app/models/document_citation.rb               |  2 +-
 app/models/ec_srg.rb                          |  2 +-
 app/models/eu_decision.rb                     | 10 ++++----
 app/models/eu_decision_type.rb                |  2 +-
 app/models/eu_opinion.rb                      |  2 +-
 app/models/eu_regulation.rb                   |  2 +-
 app/models/eu_suspension_regulation.rb        |  2 +-
 app/models/event.rb                           |  8 ++++---
 app/models/geo_entity.rb                      |  6 ++---
 app/models/geo_relationship.rb                |  2 +-
 app/models/instrument.rb                      |  2 +-
 app/models/language.rb                        |  2 +-
 app/models/listing_change.rb                  | 14 +++++------
 app/models/listing_distribution.rb            |  2 +-
 app/models/preset_tag.rb                      |  2 +-
 app/models/quota.rb                           |  2 +-
 app/models/rank.rb                            |  4 ++--
 app/models/reference.rb                       |  2 +-
 app/models/species_listing.rb                 |  2 +-
 app/models/srg_history.rb                     |  2 +-
 app/models/taxon_common.rb                    |  4 ++--
 app/models/taxon_concept.rb                   | 14 +++++------
 app/models/taxon_concept_reference.rb         |  8 +++----
 app/models/taxon_instrument.rb                |  2 +-
 app/models/taxon_relationship.rb              |  4 ++--
 app/models/taxonomy.rb                        |  2 +-
 app/models/term_trade_codes_pair.rb           |  2 +-
 app/models/trade/taxon_concept_term_pair.rb   |  2 +-
 app/models/trade_code.rb                      |  3 +--
 app/models/trade_restriction.rb               | 12 +++++-----
 app/models/user.rb                            |  6 ++---
 .../_form.html.erb                            |  2 +-
 app/views/admin/cites_pcs/_form.html.erb      |  2 +-
 app/views/admin/cites_tcs/_form.html.erb      |  2 +-
 app/views/admin/taxon_commons/_form.html.erb  |  4 ++--
 .../admin/taxon_instruments/_list.html.erb    |  2 +-
 .../admin/taxon_relationships/_form.html.erb  |  2 +-
 config/routes.rb                              |  2 +-
 106 files changed, 654 insertions(+), 107 deletions(-)

diff --git a/app/controllers/admin/change_types_controller.rb b/app/controllers/admin/change_types_controller.rb
index b48233155..212358747 100644
--- a/app/controllers/admin/change_types_controller.rb
+++ b/app/controllers/admin/change_types_controller.rb
@@ -12,4 +12,12 @@ def load_associations
       @designations = Designation.order(:name)
     end
 
+  private
+
+  def change_type_params
+    params.require(:change_type).permit(
+      # attributes were in model `attr_accessible`.
+      :name, :display_name_en, :display_name_es, :display_name_fr, :designation_id
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_acs_controller.rb b/app/controllers/admin/cites_acs_controller.rb
index 6ea81d424..1a228163b 100644
--- a/app/controllers/admin/cites_acs_controller.rb
+++ b/app/controllers/admin/cites_acs_controller.rb
@@ -12,4 +12,15 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def cites_ac_params
+    params.require(:cites_ac).permit(
+      # attributes were in model `attr_accessible`.
+      :is_current, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_captivity_processes_controller.rb b/app/controllers/admin/cites_captivity_processes_controller.rb
index 1f3e86caf..956df325a 100644
--- a/app/controllers/admin/cites_captivity_processes_controller.rb
+++ b/app/controllers/admin/cites_captivity_processes_controller.rb
@@ -48,4 +48,15 @@ def collection
         geo_entities.name_en ASC').
       page(params[:page])
   end
+
+  private
+
+  def cites_captivity_process_params
+    params.require(:cites_captivity_process).permit(
+      # attributes were in model `attr_accessible`.
+      :start_event_id, :geo_entity_id, :resolution, :start_date,
+      :taxon_concept_id, :notes, :status, :document, :document_title,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_cops_controller.rb b/app/controllers/admin/cites_cops_controller.rb
index d20a8ab00..72bde8fbe 100644
--- a/app/controllers/admin/cites_cops_controller.rb
+++ b/app/controllers/admin/cites_cops_controller.rb
@@ -11,4 +11,15 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def cites_cop_params
+    params.require(:cites_cop).permit(
+      # attributes were in model `attr_accessible`.
+      :is_current, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_extraordinary_meetings_controller.rb b/app/controllers/admin/cites_extraordinary_meetings_controller.rb
index 66ee461d4..11a613a35 100644
--- a/app/controllers/admin/cites_extraordinary_meetings_controller.rb
+++ b/app/controllers/admin/cites_extraordinary_meetings_controller.rb
@@ -12,4 +12,15 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def cites_extraordinary_meeting_params
+    params.require(:cites_extraordinary_meeting).permit(
+      # attributes were in model `attr_accessible`.
+      :is_current, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_hash_annotations_controller.rb b/app/controllers/admin/cites_hash_annotations_controller.rb
index 8af4f2ef7..622362d32 100644
--- a/app/controllers/admin/cites_hash_annotations_controller.rb
+++ b/app/controllers/admin/cites_hash_annotations_controller.rb
@@ -9,4 +9,14 @@ def load_associations
     @events = CitesCop.order(:effective_at)
   end
 
+  private
+
+  def cites_hash_annotation_params
+    params.require(:annotation).permit(
+      # attributes were in model `attr_accessible`.
+      :listing_change_id, :symbol, :parent_symbol, :short_note_en,
+      :full_note_en, :short_note_fr, :full_note_fr, :short_note_es, :full_note_es,
+      :display_in_index, :display_in_footnote, :event_id
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_pcs_controller.rb b/app/controllers/admin/cites_pcs_controller.rb
index 846208760..d15b3059d 100644
--- a/app/controllers/admin/cites_pcs_controller.rb
+++ b/app/controllers/admin/cites_pcs_controller.rb
@@ -12,4 +12,15 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def cites_pc_params
+    params.require(:cites_pc).permit(
+      # attributes were in model `attr_accessible`.
+      :is_current, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_suspension_notifications_controller.rb b/app/controllers/admin/cites_suspension_notifications_controller.rb
index ff373999b..769a1f9bb 100644
--- a/app/controllers/admin/cites_suspension_notifications_controller.rb
+++ b/app/controllers/admin/cites_suspension_notifications_controller.rb
@@ -12,4 +12,15 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def cites_suspension_notification_params
+    params.require(:cites_suspension_notification).permit(
+      # attributes were in model `attr_accessible`.
+      :subtype, :new_subtype, :end_date, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_suspensions_controller.rb b/app/controllers/admin/cites_suspensions_controller.rb
index da0e7af9b..4bcce98eb 100644
--- a/app/controllers/admin/cites_suspensions_controller.rb
+++ b/app/controllers/admin/cites_suspensions_controller.rb
@@ -49,4 +49,21 @@ def collection
     @cites_suspensions ||= end_of_association_chain.order('start_date DESC').
       page(params[:page]).search(params[:query])
   end
+
+  private
+
+  def cites_suspension_params
+    params.require(:cites_suspension).permit(
+      # attributes were in model `attr_accessible`.
+      :start_notification_id, :end_notification_id,
+      :applies_to_import, :end_date, :geo_entity_id, :is_current,
+      :notes, :publication_date, :purpose_ids, :quota, :type,
+      :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
+      :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+      :created_by_id, :updated_by_id, :url,
+      :taxon_concept_id, cites_suspension_confirmations_attributes: [
+        :id, :cites_suspension_notification_id, :_destroy
+      ]
+    )
+  end
 end
diff --git a/app/controllers/admin/cites_tcs_controller.rb b/app/controllers/admin/cites_tcs_controller.rb
index 005ecc658..938597ae1 100644
--- a/app/controllers/admin/cites_tcs_controller.rb
+++ b/app/controllers/admin/cites_tcs_controller.rb
@@ -12,4 +12,15 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def cites_tc_params
+    params.require(:cites_tc).permit(
+      # attributes were in model `attr_accessible`.
+      :is_current, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/designations_controller.rb b/app/controllers/admin/designations_controller.rb
index 0860b30a3..63ed83673 100644
--- a/app/controllers/admin/designations_controller.rb
+++ b/app/controllers/admin/designations_controller.rb
@@ -23,4 +23,13 @@ def collection
   def load_associations
     @taxonomies = Taxonomy.order(:name)
   end
+
+  private
+
+  def designation_params
+    params.require(:designation).permit(
+      # attributes were in model `attr_accessible`.
+      :name, :taxonomy_id
+    )
+  end
 end
diff --git a/app/controllers/admin/distributions_controller.rb b/app/controllers/admin/distributions_controller.rb
index 20b3930bd..75672b1e6 100644
--- a/app/controllers/admin/distributions_controller.rb
+++ b/app/controllers/admin/distributions_controller.rb
@@ -72,4 +72,14 @@ def load_distributions
     @distributions = @taxon_concept.distributions.
       joins(:geo_entity).order('geo_entities.name_en ASC')
   end
+
+  private
+
+  def distribution_params
+    params.require(:distribution).permit(
+      # attributes were in model `attr_accessible`.
+      :geo_entity_id, :taxon_concept_id, :tag_list, :internal_notes, :created_by_id, :updated_by_id,
+      references_attributes: [:citation, :created_by_id, :updated_by_id, :id, :_destroy]
+    )
+  end
 end
diff --git a/app/controllers/admin/documents_controller.rb b/app/controllers/admin/documents_controller.rb
index 4b034a59e..283eab48f 100644
--- a/app/controllers/admin/documents_controller.rb
+++ b/app/controllers/admin/documents_controller.rb
@@ -138,4 +138,20 @@ def redirect_url
         admin_documents_url
       end
   end
+
+  private
+
+  def document_params
+    params.require(:document).permit(
+      # attributes were in model `attr_accessible`.
+      :event_id, :filename, :date, :type, :title, :is_public,
+      :language_id,
+      :sort_index, :discussion_id, :discussion_sort_index,
+      :primary_language_document_id,
+      :designation_id,
+      citations_attributes: [
+        :id, :_destroy, :document_id, :stringy_taxon_concept_ids, :geo_entity_ids
+      ]
+    )
+  end
 end
diff --git a/app/controllers/admin/ec_srgs_controller.rb b/app/controllers/admin/ec_srgs_controller.rb
index 9a057d3ac..0bf191e3c 100644
--- a/app/controllers/admin/ec_srgs_controller.rb
+++ b/app/controllers/admin/ec_srgs_controller.rb
@@ -12,4 +12,15 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def ec_srg_params
+    params.require(:ec_srg).permit(
+      # attributes were in model `attr_accessible`.
+      :is_current, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/eu_council_regulations_controller.rb b/app/controllers/admin/eu_council_regulations_controller.rb
index 7d602fea8..9f2c97f38 100644
--- a/app/controllers/admin/eu_council_regulations_controller.rb
+++ b/app/controllers/admin/eu_council_regulations_controller.rb
@@ -15,4 +15,15 @@ def collection
   def list_template
     'admin/eu_regulations_common/list'
   end
+
+  private
+
+  def eu_council_regulation_params
+    params.require(:eu_council_regulation).permit(
+      # attributes were in model `attr_accessible`.
+      :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/eu_decision_types_controller.rb b/app/controllers/admin/eu_decision_types_controller.rb
index a287115ae..49bd5574a 100644
--- a/app/controllers/admin/eu_decision_types_controller.rb
+++ b/app/controllers/admin/eu_decision_types_controller.rb
@@ -14,4 +14,13 @@ def collection
     @eu_decision_types ||= end_of_association_chain.page(params[:page]).
       order('UPPER(name) ASC')
   end
+
+  private
+
+  def eu_decision_type_params
+    params.require(:eu_decision_type).permit(
+      # attributes were in model `attr_accessible`.
+      :name, :tooltip, :decision_type
+    )
+  end
 end
diff --git a/app/controllers/admin/eu_hash_annotations_controller.rb b/app/controllers/admin/eu_hash_annotations_controller.rb
index 77ee7e6c3..c961f488f 100644
--- a/app/controllers/admin/eu_hash_annotations_controller.rb
+++ b/app/controllers/admin/eu_hash_annotations_controller.rb
@@ -9,4 +9,14 @@ def load_associations
     @events = EuRegulation.order(:effective_at)
   end
 
+  private
+
+  def eu_hash_annotation_params
+    params.require(:annotation).permit(
+      # attributes were in model `attr_accessible`.
+      :listing_change_id, :symbol, :parent_symbol, :short_note_en,
+      :full_note_en, :short_note_fr, :full_note_fr, :short_note_es, :full_note_es,
+      :display_in_index, :display_in_footnote, :event_id
+    )
+  end
 end
diff --git a/app/controllers/admin/eu_implementing_regulations_controller.rb b/app/controllers/admin/eu_implementing_regulations_controller.rb
index fcce342ef..fe0d458ee 100644
--- a/app/controllers/admin/eu_implementing_regulations_controller.rb
+++ b/app/controllers/admin/eu_implementing_regulations_controller.rb
@@ -15,4 +15,15 @@ def collection
   def list_template
     'admin/eu_regulations_common/list'
   end
+
+  private
+
+  def eu_implementing_regulation_params
+    params.require(:eu_implementing_regulation).permit(
+      # attributes were in model `attr_accessible`.
+      :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/eu_opinions_controller.rb b/app/controllers/admin/eu_opinions_controller.rb
index a6232b181..f191d1fd9 100644
--- a/app/controllers/admin/eu_opinions_controller.rb
+++ b/app/controllers/admin/eu_opinions_controller.rb
@@ -56,4 +56,17 @@ def collection
         geo_entities.name_en ASC').
       page(params[:page])
   end
+
+  private
+
+  def eu_opinion_params
+    params.require(:eu_opinion).permit(
+      # attributes were in model `attr_accessible`.
+      :document_id, :end_date, :end_event_id, :geo_entity_id, :internal_notes,
+      :is_current, :notes, :start_date, :start_event_id, :eu_decision_type_id,
+      :taxon_concept_id, :type, :conditions_apply, :term_id, :source_id,
+      :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+      :created_by_id, :updated_by_id, :srg_history_id
+    )
+  end
 end
diff --git a/app/controllers/admin/eu_regulations_controller.rb b/app/controllers/admin/eu_regulations_controller.rb
index 185c8cd96..4aac69d13 100644
--- a/app/controllers/admin/eu_regulations_controller.rb
+++ b/app/controllers/admin/eu_regulations_controller.rb
@@ -28,4 +28,15 @@ def load_associations
     @eu_regulations_for_dropdown = EuRegulation.
       order('effective_at DESC, name ASC')
   end
+
+  private
+
+  def eu_regulation_params
+    params.require(:eu_regulation).permit(
+      # attributes were in model `attr_accessible`.
+      :listing_changes_event_id, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/eu_suspension_regulations_controller.rb b/app/controllers/admin/eu_suspension_regulations_controller.rb
index 1715fd091..cf326ced2 100644
--- a/app/controllers/admin/eu_suspension_regulations_controller.rb
+++ b/app/controllers/admin/eu_suspension_regulations_controller.rb
@@ -31,4 +31,15 @@ def load_associations
     @eu_suspension_regulations_for_dropdown = EuSuspensionRegulation.
       order('effective_at DESC, name ASC')
   end
+
+  private
+
+  def eu_suspension_regulation_params
+    params.require(:eu_suspension_regulation).permit(
+      # attributes were in model `attr_accessible`.
+      :eu_suspensions_event_id, :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
index 2e88f79bb..e1db9f5f4 100644
--- a/app/controllers/admin/events_controller.rb
+++ b/app/controllers/admin/events_controller.rb
@@ -43,4 +43,15 @@ def collection
   def load_associations
     @designations = Designation.order(:name)
   end
+
+  private
+
+  def event_params
+    params.require(:event).permit(
+      # attributes were in model `attr_accessible`.
+      :name, :designation_id, :description, :extended_description,
+      :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/geo_entities_controller.rb b/app/controllers/admin/geo_entities_controller.rb
index 9d38052fa..20b687fe9 100644
--- a/app/controllers/admin/geo_entities_controller.rb
+++ b/app/controllers/admin/geo_entities_controller.rb
@@ -28,4 +28,15 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def geo_entity_params
+    params.require(:geo_entity).permit(
+      # attributes were in model `attr_accessible`.
+      :geo_entity_type_id, :iso_code2, :iso_code3,
+      :legacy_id, :legacy_type, :long_name, :name_en, :name_es, :name_fr,
+      :is_current
+    )
+  end
 end
diff --git a/app/controllers/admin/geo_relationships_controller.rb b/app/controllers/admin/geo_relationships_controller.rb
index 750a72bf3..649888d57 100644
--- a/app/controllers/admin/geo_relationships_controller.rb
+++ b/app/controllers/admin/geo_relationships_controller.rb
@@ -36,4 +36,12 @@ def collection
       page(params[:page])
   end
 
+  private
+
+  def geo_relationship_params
+    params.require(:geo_relationship).permit(
+      # attributes were in model `attr_accessible`.
+      :geo_entity_id, :geo_relationship_type_id, :other_geo_entity_id
+    )
+  end
 end
diff --git a/app/controllers/admin/hybrid_relationships_controller.rb b/app/controllers/admin/hybrid_relationships_controller.rb
index 0d4ddb168..97c690169 100644
--- a/app/controllers/admin/hybrid_relationships_controller.rb
+++ b/app/controllers/admin/hybrid_relationships_controller.rb
@@ -63,4 +63,13 @@ def load_hybrid_relationship_type
       find_by_name(TaxonRelationshipType::HAS_HYBRID)
   end
 
+  private
+
+  def hybrid_relationship_params
+    params.require(:taxon_relationship).permit(
+      # attributes were in model `attr_accessible`.
+      :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/instruments_controller.rb b/app/controllers/admin/instruments_controller.rb
index 746c93f7c..ad2cd48d3 100644
--- a/app/controllers/admin/instruments_controller.rb
+++ b/app/controllers/admin/instruments_controller.rb
@@ -22,4 +22,13 @@ def collection
   def load_associations
     @designations = Designation.order(:name)
   end
+
+  private
+
+  def instrument_params
+    params.require(:instrument).permit(
+      # attributes were in model `attr_accessible`.
+      :designation_id, :name
+    )
+  end
 end
diff --git a/app/controllers/admin/languages_controller.rb b/app/controllers/admin/languages_controller.rb
index e109c77dc..5d8c2cef6 100644
--- a/app/controllers/admin/languages_controller.rb
+++ b/app/controllers/admin/languages_controller.rb
@@ -7,4 +7,13 @@ def collection
         page(params[:page]).
         search(params[:query])
     end
+
+  private
+
+  def language_params
+    params.require(:language).permit(
+      # attributes were in model `attr_accessible`.
+      :iso_code1, :iso_code3, :name_en, :name_fr, :name_es
+    )
+  end
 end
diff --git a/app/controllers/admin/purposes_controller.rb b/app/controllers/admin/purposes_controller.rb
index ae88f84eb..a597f6025 100644
--- a/app/controllers/admin/purposes_controller.rb
+++ b/app/controllers/admin/purposes_controller.rb
@@ -22,4 +22,13 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def purpose_params
+    params.require(:purpose).permit(
+      # attributes were in model `attr_accessible`.
+      :code, :type, :name_en, :name_es, :name_fr
+    )
+  end
 end
diff --git a/app/controllers/admin/ranks_controller.rb b/app/controllers/admin/ranks_controller.rb
index da5009b65..f2ed178dc 100644
--- a/app/controllers/admin/ranks_controller.rb
+++ b/app/controllers/admin/ranks_controller.rb
@@ -5,4 +5,13 @@ class Admin::RanksController < Admin::StandardAuthorizationController
   def collection
     @ranks ||= end_of_association_chain.order(:taxonomic_position).page(params[:page])
   end
+
+  private
+
+  def rank_params
+    params.require(:rank).permit(
+      # attributes were in model `attr_accessible`.
+      :name, :display_name_en, :display_name_es, :display_name_fr, :taxonomic_position, :fixed_order
+    )
+  end
 end
diff --git a/app/controllers/admin/references_controller.rb b/app/controllers/admin/references_controller.rb
index d9db02c3d..a6bca7e54 100644
--- a/app/controllers/admin/references_controller.rb
+++ b/app/controllers/admin/references_controller.rb
@@ -30,4 +30,13 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def reference_params
+    params.require(:reference).permit(
+      # attributes were in model `attr_accessible`.
+      :citation, :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/sources_controller.rb b/app/controllers/admin/sources_controller.rb
index 82bff479f..f8546d6a2 100644
--- a/app/controllers/admin/sources_controller.rb
+++ b/app/controllers/admin/sources_controller.rb
@@ -22,4 +22,13 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def source_params
+    params.require(:source).permit(
+      # attributes were in model `attr_accessible`.
+      :code, :type, :name_en, :name_es, :name_fr
+    )
+  end
 end
diff --git a/app/controllers/admin/species_listings_controller.rb b/app/controllers/admin/species_listings_controller.rb
index 158c28e07..491ffa401 100644
--- a/app/controllers/admin/species_listings_controller.rb
+++ b/app/controllers/admin/species_listings_controller.rb
@@ -13,4 +13,12 @@ def load_associations
       @designations = Designation.order(:name)
     end
 
+  private
+
+  def species_listing_params
+    params.require(:species_listing).permit(
+      # attributes were in model `attr_accessible`.
+      :designation_id, :name, :abbreviation
+    )
+  end
 end
diff --git a/app/controllers/admin/srg_histories_controller.rb b/app/controllers/admin/srg_histories_controller.rb
index 239362257..7298860a6 100644
--- a/app/controllers/admin/srg_histories_controller.rb
+++ b/app/controllers/admin/srg_histories_controller.rb
@@ -5,4 +5,13 @@ def collection
     @srg_histories ||= end_of_association_chain.page(params[:page]).
       order('UPPER(name) ASC')
   end
+
+  private
+
+  def srg_history_params
+    params.require(:srg_history).permit(
+      # attributes were in model `attr_accessible`.
+      :name, :tooltip
+    )
+  end
 end
diff --git a/app/controllers/admin/synonym_relationships_controller.rb b/app/controllers/admin/synonym_relationships_controller.rb
index da6f07f2a..943a533ca 100644
--- a/app/controllers/admin/synonym_relationships_controller.rb
+++ b/app/controllers/admin/synonym_relationships_controller.rb
@@ -63,4 +63,13 @@ def load_synonym_relationship_type
       find_by_name(TaxonRelationshipType::HAS_SYNONYM)
   end
 
+  private
+
+  def synonym_relationship_params
+    params.require(:taxon_relationship).permit(
+      # attributes were in model `attr_accessible`.
+      :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 0ba405df3..ab2eb2b47 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -10,4 +10,13 @@ def collection
       order('UPPER(name) ASC, model ASC').
       search(params[:query])
   end
+
+  private
+
+  def tag_params
+    params.require(:tag).permit(
+      # attributes were in model `attr_accessible`.
+      :model, :name
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_cites_suspensions_controller.rb b/app/controllers/admin/taxon_cites_suspensions_controller.rb
index ff38b9747..df0486d59 100644
--- a/app/controllers/admin/taxon_cites_suspensions_controller.rb
+++ b/app/controllers/admin/taxon_cites_suspensions_controller.rb
@@ -60,4 +60,22 @@ def load_lib_objects
   def collection
     @cites_suspensions ||= end_of_association_chain.page(params[:page])
   end
+
+  private
+
+  def cites_suspension_params
+    params.require(:cites_suspension).permit(
+      # attributes were in model `attr_accessible`.
+      :start_notification_id, :end_notification_id,
+      :applies_to_import, :end_date, :geo_entity_id, :is_current,
+      :notes, :publication_date, :purpose_ids, :quota, :type,
+      :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
+      :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+      :created_by_id, :updated_by_id, :url,
+      :taxon_concept_id,
+      cites_suspension_confirmations_attributes: [
+        :cites_suspension_notification_id, :id, :_destroy
+      ]
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_commons_controller.rb b/app/controllers/admin/taxon_commons_controller.rb
index 5acf7be29..0fd0a01cd 100644
--- a/app/controllers/admin/taxon_commons_controller.rb
+++ b/app/controllers/admin/taxon_commons_controller.rb
@@ -61,4 +61,14 @@ def destroy
   def load_associations
     @languages = Language.order(:name_en)
   end
+
+  private
+
+  def taxon_common_params
+    params.require(:taxon_common).permit(
+      # attributes were in model `attr_accessible`.
+      :common_name_id, :taxon_concept_id, :created_by_id,
+      :updated_by_id, :name, :language_id
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_concept_comments_controller.rb b/app/controllers/admin/taxon_concept_comments_controller.rb
index fd925381f..4dbeb5632 100644
--- a/app/controllers/admin/taxon_concept_comments_controller.rb
+++ b/app/controllers/admin/taxon_concept_comments_controller.rb
@@ -15,7 +15,7 @@ def index
 
   def create
     @taxon_concept = TaxonConcept.find(params[:taxon_concept_id])
-    @comment = @taxon_concept.comments.create(params[:comment])
+    @comment = @taxon_concept.comments.create(comment_params)
     redirect_to admin_taxon_concept_comments_url(@taxon_concept),
       notice: 'Operation succeeded'
   end
@@ -23,8 +23,18 @@ def create
   def update
     @taxon_concept = TaxonConcept.find(params[:taxon_concept_id])
     @comment = @taxon_concept.comments.find(params[:id])
-    @comment.update_attributes(params[:comment]) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    @comment.update_attributes(comment_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
     redirect_to admin_taxon_concept_comments_url(@taxon_concept),
       notice: 'Operation succeeded'
   end
+
+  private
+
+  def comment_params
+    params.require(:comment).permit(
+      # attributes were in model `attr_accessible`.
+      :comment_type, :commentable_id, :commentable_type, :note,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_concept_references_controller.rb b/app/controllers/admin/taxon_concept_references_controller.rb
index c5aa4d091..48d2e4d40 100644
--- a/app/controllers/admin/taxon_concept_references_controller.rb
+++ b/app/controllers/admin/taxon_concept_references_controller.rb
@@ -70,4 +70,15 @@ def destroy
       }
     end
   end
+
+  private
+
+  def taxon_concept_reference_params
+    params.require(:taxon_concept_reference).permit(
+      # attributes were in model `attr_accessible`.
+      :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
+      :excluded_taxon_concepts_ids, :created_by_id, :updated_by_id,
+      reference_attributes: [:citation, :created_by_id, :updated_by_id, :id, :_destroy]
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_concept_term_pairs_controller.rb b/app/controllers/admin/taxon_concept_term_pairs_controller.rb
index 03d264271..4325d0249 100644
--- a/app/controllers/admin/taxon_concept_term_pairs_controller.rb
+++ b/app/controllers/admin/taxon_concept_term_pairs_controller.rb
@@ -18,4 +18,13 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def taxon_concept_term_pair_params
+    params.require(:taxon_concept_term_pair).permit(
+      # attributes were in model `attr_accessible`.
+      :taxon_concept_id, :term_id
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_concepts_controller.rb b/app/controllers/admin/taxon_concepts_controller.rb
index 9dae748f3..dc276da91 100644
--- a/app/controllers/admin/taxon_concepts_controller.rb
+++ b/app/controllers/admin/taxon_concepts_controller.rb
@@ -134,4 +134,18 @@ def render_new_by_name_status
     end
   end
 
+  private
+
+  def taxon_concept_params
+    params.require(:taxon_concept).permit(
+      # attributes were in model `attr_accessible`.
+      :parent_id, :taxonomy_id, :rank_id,
+      :parent_id, :author_year, :taxon_name_id, :taxonomic_position,
+      :legacy_id, :legacy_type, :scientific_name, :name_status,
+      :tag_list, :legacy_trade_code, :hybrid_parents_ids,
+      :accepted_names_ids, :accepted_names_for_trade_name_ids,
+      :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+      :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_eu_suspensions_controller.rb b/app/controllers/admin/taxon_eu_suspensions_controller.rb
index 2d61c9aa2..5b7adfd8a 100644
--- a/app/controllers/admin/taxon_eu_suspensions_controller.rb
+++ b/app/controllers/admin/taxon_eu_suspensions_controller.rb
@@ -75,4 +75,17 @@ def collection
         geo_entities.name_en ASC').
       page(params[:page])
   end
+
+  private
+
+  def eu_suspension_params
+    params.require(:eu_suspension).permit(
+      # attributes were in model `attr_accessible`.
+      :end_date, :end_event_id, :geo_entity_id, :internal_notes,
+      :is_current, :notes, :start_date, :start_event_id, :eu_decision_type_id,
+      :taxon_concept_id, :type, :conditions_apply, :term_id, :source_id,
+      :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+      :created_by_id, :updated_by_id, :srg_history_id
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_instruments_controller.rb b/app/controllers/admin/taxon_instruments_controller.rb
index 8313c0e7d..ce0b9a433 100644
--- a/app/controllers/admin/taxon_instruments_controller.rb
+++ b/app/controllers/admin/taxon_instruments_controller.rb
@@ -18,7 +18,7 @@ def new
 
   def create
     @taxon_concept = TaxonConcept.find(params[:taxon_concept_id])
-    @taxon_instrument = TaxonInstrument.new(params[:taxon_instrument])
+    @taxon_instrument = TaxonInstrument.new(taxon_instrument_params)
     if @taxon_concept.taxon_instruments << @taxon_instrument
       load_taxon_instruments
       render 'index'
@@ -63,4 +63,13 @@ def load_taxon_instruments
       includes(:instrument).
       page(params[:page])
   end
+
+  private
+
+  def taxon_instrument_params
+    params.require(:taxon_instrument).permit(
+      # attributes were in model `attr_accessible`.
+      :effective_from, :instrument_id, :taxon_concept_id
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_listing_changes_controller.rb b/app/controllers/admin/taxon_listing_changes_controller.rb
index cb13ddd8b..ffd3a269a 100644
--- a/app/controllers/admin/taxon_listing_changes_controller.rb
+++ b/app/controllers/admin/taxon_listing_changes_controller.rb
@@ -28,7 +28,7 @@ def new
   def create
     @taxon_concept = TaxonConcept.find(params[:taxon_concept_id])
     @designation = Designation.find(params[:designation_id])
-    @listing_change = ListingChange.new(params[:listing_change])
+    @listing_change = ListingChange.new(listing_change_params)
     if @taxon_concept.listing_changes << @listing_change
       redirect_to admin_taxon_concept_designation_listing_changes_url(@taxon_concept, @designation)
     else
@@ -129,4 +129,25 @@ def load_listing_changes
       order('listing_changes.effective_at DESC').
       page(params[:page]).where(:parent_id => nil)
   end
+
+  private
+
+  def listing_change_params
+    params.require(:listing_change).permit(
+      :taxon_concept_id, :species_listing_id, :change_type_id,
+      :effective_at, :is_current, :parent_id, :geo_entity_ids,
+      :inclusion_taxon_concept_id, :hash_annotation_id, :event_id,
+      :excluded_geo_entities_ids, :excluded_taxon_concepts_ids, :internal_notes,
+      :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+      :created_by_id, :updated_by_id,
+      annotation_attributes: [
+        :listing_change_id, :symbol, :parent_symbol, :short_note_en,
+        :full_note_en, :short_note_fr, :full_note_fr, :short_note_es, :full_note_es,
+        :display_in_index, :display_in_footnote, :event_id, :id, :_destroy
+      ],
+      party_listing_distribution_attributes: [
+        :id, :_destroy, :geo_entity_id, :listing_change_id, :is_party
+      ]
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_quotas_controller.rb b/app/controllers/admin/taxon_quotas_controller.rb
index bac429999..9e9a91a32 100644
--- a/app/controllers/admin/taxon_quotas_controller.rb
+++ b/app/controllers/admin/taxon_quotas_controller.rb
@@ -66,4 +66,17 @@ def collection
         notes ASC').
       page(params[:page])
   end
+
+  private
+
+  def quota_params
+    params.require(:quota).permit(
+      :public_display, :end_date, :geo_entity_id, :is_current,
+      :notes, :publication_date, :purpose_ids, :quota, :type,
+      :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
+      :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+      :created_by_id, :updated_by_id, :url,
+      :taxon_concept_id
+    )
+  end
 end
diff --git a/app/controllers/admin/taxon_relationships_controller.rb b/app/controllers/admin/taxon_relationships_controller.rb
index 4a44e418a..8ce083af4 100644
--- a/app/controllers/admin/taxon_relationships_controller.rb
+++ b/app/controllers/admin/taxon_relationships_controller.rb
@@ -24,7 +24,7 @@ def create
     # we want it to use the information that comes from the form in the params hash.
     # We still want the @taxon_concept variable to be instantiated, so we keep using
     # the *belongs_to* helper for that.
-    @taxon_relationship = TaxonRelationship.new(params[:taxon_relationship])
+    @taxon_relationship = TaxonRelationship.new(taxon_relationship_params)
 
     create! do |success, failure|
       success.js { render 'create' }
@@ -70,4 +70,13 @@ def collection
       where(:"taxon_relationship_types.name" => @taxon_relationship_type.name).
       page(params[:page])
   end
+
+  private
+
+  def taxon_relationship_params
+    params.require(:taxon_relationship).permit(
+      :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
+      :created_by_id, :updated_by_id
+    )
+  end
 end
diff --git a/app/controllers/admin/taxonomies_controller.rb b/app/controllers/admin/taxonomies_controller.rb
index 33d1ef7ec..06aac0c58 100644
--- a/app/controllers/admin/taxonomies_controller.rb
+++ b/app/controllers/admin/taxonomies_controller.rb
@@ -17,4 +17,10 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def taxonomy_params
+    params.require(:taxonomy).permit(:name)
+  end
 end
diff --git a/app/controllers/admin/term_trade_codes_pairs_controller.rb b/app/controllers/admin/term_trade_codes_pairs_controller.rb
index a4de66fd5..25a22df32 100644
--- a/app/controllers/admin/term_trade_codes_pairs_controller.rb
+++ b/app/controllers/admin/term_trade_codes_pairs_controller.rb
@@ -51,4 +51,12 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def term_trade_codes_pair_params
+    params.require(:term_trade_codes_pair).permit(
+      :trade_code_id, :trade_code_type, :term_id
+    )
+  end
 end
diff --git a/app/controllers/admin/terms_controller.rb b/app/controllers/admin/terms_controller.rb
index 13a4567b8..16ec47534 100644
--- a/app/controllers/admin/terms_controller.rb
+++ b/app/controllers/admin/terms_controller.rb
@@ -22,4 +22,10 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def term_params
+    params.require(:term).permit(:code, :type, :name_en, :name_es, :name_fr)
+  end
 end
diff --git a/app/controllers/admin/trade_name_relationships_controller.rb b/app/controllers/admin/trade_name_relationships_controller.rb
index 2eb5cb360..f8ba53d73 100644
--- a/app/controllers/admin/trade_name_relationships_controller.rb
+++ b/app/controllers/admin/trade_name_relationships_controller.rb
@@ -63,4 +63,13 @@ def load_trade_name_relationship_type
       find_by_name(TaxonRelationshipType::HAS_TRADE_NAME)
   end
 
+  private
+
+  def trade_name_relationship_params
+    params.require(:taxon_relationship).permit(
+      :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
+      :created_by_id, :updated_by_id
+    )
+  end
+
 end
diff --git a/app/controllers/admin/units_controller.rb b/app/controllers/admin/units_controller.rb
index 8d6ca8f53..ccf0a4690 100644
--- a/app/controllers/admin/units_controller.rb
+++ b/app/controllers/admin/units_controller.rb
@@ -22,4 +22,12 @@ def collection
       page(params[:page]).
       search(params[:query])
   end
+
+  private
+
+  def unit_params
+    params.require(:unit).permit(
+      :code, :type, :name_en, :name_es, :name_fr
+    )
+  end
 end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index a5de1871c..578ee0654 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -50,4 +50,14 @@ def load_associations
       ).
       order('name_en')
   end
+
+  private
+
+  def user_params
+    params.require(:user).permit(
+      :email, :name, :password, :password_confirmation,
+      :remember_me, :role, :terms_and_conditions, :is_cites_authority,
+      :organisation, :geo_entity_id, :is_active
+    )
+  end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 600b0f2d0..ad0cf1bd9 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -24,9 +24,9 @@
 
 class Annotation < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :listing_change_id, :symbol, :parent_symbol, :short_note_en,
-    :full_note_en, :short_note_fr, :full_note_fr, :short_note_es, :full_note_es,
-    :display_in_index, :display_in_footnote, :event_id
+  # attr_accessible :listing_change_id, :symbol, :parent_symbol, :short_note_en,
+  #   :full_note_en, :short_note_fr, :full_note_fr, :short_note_es, :full_note_es,
+  #   :display_in_index, :display_in_footnote, :event_id
 
   has_many :listing_changes
   has_many :hashed_listing_changes,
diff --git a/app/models/change_type.rb b/app/models/change_type.rb
index 09c0c64ae..602378679 100644
--- a/app/models/change_type.rb
+++ b/app/models/change_type.rb
@@ -13,8 +13,8 @@
 #
 
 class ChangeType < ActiveRecord::Base
-  attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
-    :designation_id
+  # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
+  #   :designation_id
   include Dictionary
   build_dictionary :addition, :deletion, :reservation, :reservation_withdrawal, :exception
 
diff --git a/app/models/cites_ac.rb b/app/models/cites_ac.rb
index 672479eaa..e6a65b556 100644
--- a/app/models/cites_ac.rb
+++ b/app/models/cites_ac.rb
@@ -26,7 +26,7 @@
 # Cites Animal Committee
 
 class CitesAc < Event
-  attr_accessible :is_current
+  # attr_accessible :is_current
 
   validates :effective_at, :presence => true
 
diff --git a/app/models/cites_cop.rb b/app/models/cites_cop.rb
index 35fee61b4..4e129ba0e 100644
--- a/app/models/cites_cop.rb
+++ b/app/models/cites_cop.rb
@@ -24,7 +24,7 @@
 #
 
 class CitesCop < Event
-  attr_accessible :is_current
+  # attr_accessible :is_current
   has_many :listing_changes, :foreign_key => :event_id
   has_many :hash_annotations, :class_name => 'Annotation', :foreign_key => :event_id
 
diff --git a/app/models/cites_extraordinary_meeting.rb b/app/models/cites_extraordinary_meeting.rb
index 693a7e685..fb5ff452f 100644
--- a/app/models/cites_extraordinary_meeting.rb
+++ b/app/models/cites_extraordinary_meeting.rb
@@ -24,7 +24,7 @@
 #
 
 class CitesExtraordinaryMeeting < Event
-  attr_accessible :is_current
+  # attr_accessible :is_current
 
   validates :effective_at, :presence => true
 
diff --git a/app/models/cites_pc.rb b/app/models/cites_pc.rb
index ceb289105..b17133806 100644
--- a/app/models/cites_pc.rb
+++ b/app/models/cites_pc.rb
@@ -26,7 +26,7 @@
 # Cites Plant Committee
 
 class CitesPc < Event
-  attr_accessible :is_current
+  # attr_accessible :is_current
 
   validates :effective_at, :presence => true
 
diff --git a/app/models/cites_process.rb b/app/models/cites_process.rb
index b9a96dcc4..13ede34dd 100644
--- a/app/models/cites_process.rb
+++ b/app/models/cites_process.rb
@@ -1,8 +1,8 @@
 class CitesProcess < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :start_event_id, :geo_entity_id, :resolution, :start_date,
-                  :taxon_concept_id, :notes, :status, :document, :document_title,
-                  :created_by_id, :updated_by_id
+  # attr_accessible :start_event_id, :geo_entity_id, :resolution, :start_date,
+  #                 :taxon_concept_id, :notes, :status, :document, :document_title,
+  #                 :created_by_id, :updated_by_id
   belongs_to :taxon_concept
   belongs_to :geo_entity
   belongs_to :start_event, :class_name => 'Event'
diff --git a/app/models/cites_suspension.rb b/app/models/cites_suspension.rb
index 9eefb70bf..f68cf27d1 100644
--- a/app/models/cites_suspension.rb
+++ b/app/models/cites_suspension.rb
@@ -31,9 +31,9 @@
 #
 
 class CitesSuspension < TradeRestriction
-  attr_accessible :start_notification_id, :end_notification_id,
-    :cites_suspension_confirmations_attributes,
-    :applies_to_import
+  # attr_accessible :start_notification_id, :end_notification_id,
+  #   :cites_suspension_confirmations_attributes,
+  #   :applies_to_import
   belongs_to :taxon_concept
   belongs_to :start_notification, :class_name => 'CitesSuspensionNotification'
   belongs_to :end_notification, :class_name => 'CitesSuspensionNotification'
diff --git a/app/models/cites_suspension_confirmation.rb b/app/models/cites_suspension_confirmation.rb
index 81c7c0404..bbabaffb3 100644
--- a/app/models/cites_suspension_confirmation.rb
+++ b/app/models/cites_suspension_confirmation.rb
@@ -10,7 +10,7 @@
 #
 
 class CitesSuspensionConfirmation < ActiveRecord::Base
-  attr_accessible :cites_suspension_notification_id
+  # attr_accessible :cites_suspension_notification_id
   belongs_to :confirmation_notification, :class_name => 'CitesSuspensionNotification',
     :foreign_key => :cites_suspension_notification_id
   belongs_to :confirmed_suspension, :class_name => 'CitesSuspension',
diff --git a/app/models/cites_suspension_notification.rb b/app/models/cites_suspension_notification.rb
index 7844ee949..ce4703ff5 100644
--- a/app/models/cites_suspension_notification.rb
+++ b/app/models/cites_suspension_notification.rb
@@ -24,7 +24,7 @@
 #
 
 class CitesSuspensionNotification < Event
-  attr_accessible :subtype, :new_subtype, :end_date
+  # attr_accessible :subtype, :new_subtype, :end_date
   attr_accessor :new_subtype
   has_many :started_suspensions, :foreign_key => :start_notification_id, :class_name => 'CitesSuspension'
   has_many :ended_suspensions, :foreign_key => :end_notification_id, :class_name => 'CitesSuspension'
diff --git a/app/models/cites_tc.rb b/app/models/cites_tc.rb
index 7321c6968..31fa43cbc 100644
--- a/app/models/cites_tc.rb
+++ b/app/models/cites_tc.rb
@@ -26,7 +26,7 @@
 # Cites Tech Committee
 
 class CitesTc < Event
-  attr_accessible :is_current
+  # attr_accessible :is_current
 
   validates :effective_at, :presence => true
 
diff --git a/app/models/cms_mapping.rb b/app/models/cms_mapping.rb
index 558c78001..21d6622ee 100644
--- a/app/models/cms_mapping.rb
+++ b/app/models/cms_mapping.rb
@@ -14,7 +14,7 @@
 #
 
 class CmsMapping < ActiveRecord::Base
-  attr_accessible :accepted_name_id, :cms_author, :cms_taxon_name, :cms_uuid, :details, :taxon_concept_id
+  # attr_accessible :accepted_name_id, :cms_author, :cms_taxon_name, :cms_uuid, :details, :taxon_concept_id
 
   # serialize :details, ActiveRecord::Coders::Hstore
   belongs_to :taxon_concept
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 9fdd19dba..19cb9ba33 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -15,7 +15,7 @@
 
 class Comment < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :comment_type, :commentable_id, :commentable_type, :note,
-    :created_by_id, :updated_by_id
+  # attr_accessible :comment_type, :commentable_id, :commentable_type, :note,
+  #   :created_by_id, :updated_by_id
   belongs_to :commentable, polymorphic: true
 end
diff --git a/app/models/designation.rb b/app/models/designation.rb
index 21284a3ce..138c75110 100644
--- a/app/models/designation.rb
+++ b/app/models/designation.rb
@@ -10,7 +10,7 @@
 #
 
 class Designation < ActiveRecord::Base
-  attr_accessible :name, :taxonomy_id
+  # attr_accessible :name, :taxonomy_id
   include Dictionary
   build_dictionary :cites, :eu, :cms
 
diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index 7d61ccb33..c26edf7f2 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -14,8 +14,8 @@
 
 class Distribution < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :geo_entity_id, :taxon_concept_id, :tag_list,
-    :references_attributes, :internal_notes, :created_by_id, :updated_by_id
+  # attr_accessible :geo_entity_id, :taxon_concept_id, :tag_list,
+  #   :references_attributes, :internal_notes, :created_by_id, :updated_by_id
   acts_as_taggable
 
   normalise_blank_values
diff --git a/app/models/document.rb b/app/models/document.rb
index 31de6644b..276499e12 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -30,11 +30,11 @@ class Document < ActiveRecord::Base
     :using => { :tsearch => { :prefix => true } },
     :order_within_rank => "documents.date, documents.title, documents.id"
   track_who_does_it
-  attr_accessible :event_id, :filename, :date, :type, :title, :is_public,
-    :language_id, :citations_attributes,
-    :sort_index, :discussion_id, :discussion_sort_index,
-    :primary_language_document_id,
-    :designation_id
+  # attr_accessible :event_id, :filename, :date, :type, :title, :is_public,
+  #   :language_id, :citations_attributes,
+  #   :sort_index, :discussion_id, :discussion_sort_index,
+  #   :primary_language_document_id,
+  #   :designation_id
   belongs_to :designation
   belongs_to :event
   belongs_to :language
diff --git a/app/models/document_citation.rb b/app/models/document_citation.rb
index 424f5f495..cc3c473ac 100644
--- a/app/models/document_citation.rb
+++ b/app/models/document_citation.rb
@@ -13,7 +13,7 @@
 
 class DocumentCitation < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :document_id, :stringy_taxon_concept_ids, :geo_entity_ids
+  # attr_accessible :document_id, :stringy_taxon_concept_ids, :geo_entity_ids
   has_many :document_citation_taxon_concepts, dependent: :destroy, autosave: true
   has_many :taxon_concepts, through: :document_citation_taxon_concepts
   has_many :document_citation_geo_entities, dependent: :destroy, autosave: true
diff --git a/app/models/ec_srg.rb b/app/models/ec_srg.rb
index 0d6c0116c..bea212d04 100644
--- a/app/models/ec_srg.rb
+++ b/app/models/ec_srg.rb
@@ -26,7 +26,7 @@
 # European Commission Scientific Review Group
 
 class EcSrg < Event
-  attr_accessible :is_current
+  # attr_accessible :is_current
 
   has_many :eu_opinions, :foreign_key => :start_event_id,
     :dependent => :nullify
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index e138c0dc5..936348e08 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -30,11 +30,11 @@
 require 'csv'
 class EuDecision < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :end_date, :end_event_id, :geo_entity_id, :internal_notes,
-    :is_current, :notes, :start_date, :start_event_id, :eu_decision_type_id,
-    :taxon_concept_id, :type, :conditions_apply, :term_id, :source_id,
-    :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
-    :created_by_id, :updated_by_id, :srg_history_id
+  # attr_accessible :end_date, :end_event_id, :geo_entity_id, :internal_notes,
+  #   :is_current, :notes, :start_date, :start_event_id, :eu_decision_type_id,
+  #   :taxon_concept_id, :type, :conditions_apply, :term_id, :source_id,
+  #   :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+  #   :created_by_id, :updated_by_id, :srg_history_id
 
   belongs_to :taxon_concept
   belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id
diff --git a/app/models/eu_decision_type.rb b/app/models/eu_decision_type.rb
index c6a13a14d..94dff7df9 100644
--- a/app/models/eu_decision_type.rb
+++ b/app/models/eu_decision_type.rb
@@ -11,7 +11,7 @@
 #
 
 class EuDecisionType < ActiveRecord::Base
-  attr_accessible :name, :tooltip, :decision_type
+  # attr_accessible :name, :tooltip, :decision_type
   include Dictionary
   build_dictionary :negative_opinion, :positive_opinion, :no_opinion,
     :suspension, :srg_referral
diff --git a/app/models/eu_opinion.rb b/app/models/eu_opinion.rb
index 1808be801..0913297df 100644
--- a/app/models/eu_opinion.rb
+++ b/app/models/eu_opinion.rb
@@ -27,7 +27,7 @@
 #
 
 class EuOpinion < EuDecision
-  attr_accessible :document_id
+  # attr_accessible :document_id
 
   belongs_to :document
 
diff --git a/app/models/eu_regulation.rb b/app/models/eu_regulation.rb
index 0510d3c85..c53cb154b 100644
--- a/app/models/eu_regulation.rb
+++ b/app/models/eu_regulation.rb
@@ -24,7 +24,7 @@
 #
 
 class EuRegulation < Event
-  attr_accessible :listing_changes_event_id, :end_date
+  # attr_accessible :listing_changes_event_id, :end_date
   attr_accessor :listing_changes_event_id
 
   has_many :listing_changes, :foreign_key => :event_id,
diff --git a/app/models/eu_suspension_regulation.rb b/app/models/eu_suspension_regulation.rb
index 2d0710be9..39e300d1a 100644
--- a/app/models/eu_suspension_regulation.rb
+++ b/app/models/eu_suspension_regulation.rb
@@ -24,7 +24,7 @@
 #
 
 class EuSuspensionRegulation < Event
-  attr_accessible :eu_suspensions_event_id
+  # attr_accessible :eu_suspensions_event_id
   attr_accessor :eu_suspensions_event_id
 
   has_many :eu_suspensions, :foreign_key => :start_event_id,
diff --git a/app/models/event.rb b/app/models/event.rb
index 6cc8c9b46..16dd1e5dd 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -25,9 +25,11 @@
 
 class Event < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :name, :designation_id, :description, :extended_description,
-    :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
-    :created_by_id, :updated_by_id
+
+  # attr_accessible :name, :designation_id, :description, :extended_description,
+  #   :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
+  #   :created_by_id, :updated_by_id
+
   attr_reader :effective_at_formatted
 
   belongs_to :designation
diff --git a/app/models/geo_entity.rb b/app/models/geo_entity.rb
index ccc0d5715..d21b9d9ba 100644
--- a/app/models/geo_entity.rb
+++ b/app/models/geo_entity.rb
@@ -18,9 +18,9 @@
 #
 
 class GeoEntity < ActiveRecord::Base
-  attr_accessible :geo_entity_type_id, :iso_code2, :iso_code3,
-    :legacy_id, :legacy_type, :long_name, :name_en, :name_es, :name_fr,
-    :is_current
+  # attr_accessible :geo_entity_type_id, :iso_code2, :iso_code3,
+  #   :legacy_id, :legacy_type, :long_name, :name_en, :name_es, :name_fr,
+  #   :is_current
   translates :name
   belongs_to :geo_entity_type
   has_many :geo_relationships
diff --git a/app/models/geo_relationship.rb b/app/models/geo_relationship.rb
index c20c7c907..e1f3028f0 100644
--- a/app/models/geo_relationship.rb
+++ b/app/models/geo_relationship.rb
@@ -11,7 +11,7 @@
 #
 
 class GeoRelationship < ActiveRecord::Base
-  attr_accessible :geo_entity_id, :geo_relationship_type_id, :other_geo_entity_id
+  # attr_accessible :geo_entity_id, :geo_relationship_type_id, :other_geo_entity_id
   belongs_to :geo_relationship_type
   belongs_to :geo_entity
   belongs_to :related_geo_entity, :class_name => 'GeoEntity', :foreign_key => :other_geo_entity_id
diff --git a/app/models/instrument.rb b/app/models/instrument.rb
index 8651c1d2a..a8e52a58c 100644
--- a/app/models/instrument.rb
+++ b/app/models/instrument.rb
@@ -10,7 +10,7 @@
 #
 
 class Instrument < ActiveRecord::Base
-  attr_accessible :designation_id, :name
+  # attr_accessible :designation_id, :name
 
   validates :name, :presence => true, :uniqueness => { :scope => :designation_id }
 
diff --git a/app/models/language.rb b/app/models/language.rb
index 22b0358f5..234d21134 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -13,7 +13,7 @@
 #
 
 class Language < ActiveRecord::Base
-  attr_accessible :iso_code1, :iso_code3, :name_en, :name_fr, :name_es
+  # attr_accessible :iso_code1, :iso_code3, :name_en, :name_fr, :name_es
   translates :name
 
   has_many :common_names
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 7373e8645..1b1ac9c51 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -28,13 +28,13 @@
 
 class ListingChange < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :taxon_concept_id, :species_listing_id, :change_type_id,
-    :effective_at, :is_current, :parent_id, :geo_entity_ids,
-    :party_listing_distribution_attributes, :inclusion_taxon_concept_id,
-    :annotation_attributes, :hash_annotation_id, :event_id,
-    :excluded_geo_entities_ids, :excluded_taxon_concepts_ids, :internal_notes,
-    :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
-    :created_by_id, :updated_by_id
+  # attr_accessible :taxon_concept_id, :species_listing_id, :change_type_id,
+  #   :effective_at, :is_current, :parent_id, :geo_entity_ids,
+  #   :party_listing_distribution_attributes, :inclusion_taxon_concept_id,
+  #   :annotation_attributes, :hash_annotation_id, :event_id,
+  #   :excluded_geo_entities_ids, :excluded_taxon_concepts_ids, :internal_notes,
+  #   :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+  #   :created_by_id, :updated_by_id
 
   attr_accessor :excluded_geo_entities_ids, :excluded_taxon_concepts_ids
 
diff --git a/app/models/listing_distribution.rb b/app/models/listing_distribution.rb
index 1d5550933..a69275486 100644
--- a/app/models/listing_distribution.rb
+++ b/app/models/listing_distribution.rb
@@ -15,7 +15,7 @@
 
 class ListingDistribution < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :geo_entity_id, :listing_change_id, :is_party
+  # attr_accessible :geo_entity_id, :listing_change_id, :is_party
   belongs_to :geo_entity
   belongs_to :listing_change
 
diff --git a/app/models/preset_tag.rb b/app/models/preset_tag.rb
index 4a2c9d6e9..276d370a0 100644
--- a/app/models/preset_tag.rb
+++ b/app/models/preset_tag.rb
@@ -10,7 +10,7 @@
 #
 
 class PresetTag < ActiveRecord::Base
-  attr_accessible :model, :name
+  # attr_accessible :model, :name
 
   TYPES = {
     :Distribution => 'Distribution',
diff --git a/app/models/quota.rb b/app/models/quota.rb
index 0f389ad5a..5c4b752bc 100644
--- a/app/models/quota.rb
+++ b/app/models/quota.rb
@@ -32,7 +32,7 @@
 
 class Quota < TradeRestriction
 
-  attr_accessible :public_display
+  # attr_accessible :public_display
 
   validates :quota, :presence => true
   validates :quota, :numericality => { :greater_than_or_equal_to => -1.0 }
diff --git a/app/models/rank.rb b/app/models/rank.rb
index 736e767b8..8a5f372c2 100644
--- a/app/models/rank.rb
+++ b/app/models/rank.rb
@@ -14,8 +14,8 @@
 #
 
 class Rank < ActiveRecord::Base
-  attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
-    :taxonomic_position, :fixed_order
+  # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
+  #   :taxonomic_position, :fixed_order
   include Dictionary
   build_dictionary :kingdom, :phylum, :class, :order, :family, :subfamily, :genus, :species, :subspecies, :variety
 
diff --git a/app/models/reference.rb b/app/models/reference.rb
index 9f82c49ab..dd2e21215 100644
--- a/app/models/reference.rb
+++ b/app/models/reference.rb
@@ -18,7 +18,7 @@
 
 class Reference < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :citation, :created_by_id, :updated_by_id
+  # attr_accessible :citation, :created_by_id, :updated_by_id
 
   validates :citation, :presence => true
   has_many :taxon_concept_references
diff --git a/app/models/species_listing.rb b/app/models/species_listing.rb
index 7830327f2..6c1676cca 100644
--- a/app/models/species_listing.rb
+++ b/app/models/species_listing.rb
@@ -11,7 +11,7 @@
 #
 
 class SpeciesListing < ActiveRecord::Base
-  attr_accessible :designation_id, :name, :abbreviation
+  # attr_accessible :designation_id, :name, :abbreviation
 
   belongs_to :designation
   has_many :listing_changes
diff --git a/app/models/srg_history.rb b/app/models/srg_history.rb
index 85d6c426c..faabb9de0 100644
--- a/app/models/srg_history.rb
+++ b/app/models/srg_history.rb
@@ -1,5 +1,5 @@
 class SrgHistory < ActiveRecord::Base
-  attr_accessible :name, :tooltip
+  # attr_accessible :name, :tooltip
 
   has_many :eu_decisions
 
diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index fb7c4dea2..22d74e487 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -13,8 +13,8 @@
 
 class TaxonCommon < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :common_name_id, :taxon_concept_id, :created_by_id,
-    :updated_by_id, :name, :language_id
+  # attr_accessible :common_name_id, :taxon_concept_id, :created_by_id,
+  #   :updated_by_id, :name, :language_id
   attr_accessor :name, :language_id
   belongs_to :common_name
   belongs_to :taxon_concept
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index 9eb2da679..045b90cce 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -42,13 +42,13 @@ class TaxonConcept < ActiveRecord::Base
       rank_name: :rank_name
     }
 
-  attr_accessible :parent_id, :taxonomy_id, :rank_id,
-    :parent_id, :author_year, :taxon_name_id, :taxonomic_position,
-    :legacy_id, :legacy_type, :scientific_name, :name_status,
-    :tag_list, :legacy_trade_code, :hybrid_parents_ids,
-    :accepted_names_ids, :accepted_names_for_trade_name_ids,
-    :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
-    :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id
+  # attr_accessible :parent_id, :taxonomy_id, :rank_id,
+  #   :parent_id, :author_year, :taxon_name_id, :taxonomic_position,
+  #   :legacy_id, :legacy_type, :scientific_name, :name_status,
+  #   :tag_list, :legacy_trade_code, :hybrid_parents_ids,
+  #   :accepted_names_ids, :accepted_names_for_trade_name_ids,
+  #   :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+  #   :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id
 
   attr_writer :accepted_names_ids,
     :accepted_names_for_trade_name_ids,
diff --git a/app/models/taxon_concept_reference.rb b/app/models/taxon_concept_reference.rb
index 06d5fbc7d..cce24be17 100644
--- a/app/models/taxon_concept_reference.rb
+++ b/app/models/taxon_concept_reference.rb
@@ -16,9 +16,9 @@
 
 class TaxonConceptReference < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
-    :excluded_taxon_concepts_ids, :reference_attributes,
-    :created_by_id, :updated_by_id
+  # attr_accessible :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
+  #   :excluded_taxon_concepts_ids, :reference_attributes,
+  #   :created_by_id, :updated_by_id
 
   belongs_to :reference
   belongs_to :taxon_concept
@@ -30,7 +30,7 @@ class TaxonConceptReference < ActiveRecord::Base
   validates :reference_id, :uniqueness => { :scope => [:taxon_concept_id] }
 
   def excluded_taxon_concepts
-    ids = excluded_taxon_concepts_ids.try(:split, ",")
+    ids = excluded_taxon_concepts_ids.try(:split, ",")&.flatten
     ids.flatten.present? ? TaxonConcept.where(id: ids).order(:full_name) : []
   end
 
diff --git a/app/models/taxon_instrument.rb b/app/models/taxon_instrument.rb
index 3d5667ada..57cfaca40 100644
--- a/app/models/taxon_instrument.rb
+++ b/app/models/taxon_instrument.rb
@@ -14,7 +14,7 @@
 
 class TaxonInstrument < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :effective_from, :instrument_id, :taxon_concept_id
+  # attr_accessible :effective_from, :instrument_id, :taxon_concept_id
 
   belongs_to :instrument
   belongs_to :taxon_concept
diff --git a/app/models/taxon_relationship.rb b/app/models/taxon_relationship.rb
index 6a96cc205..09eeaa932 100644
--- a/app/models/taxon_relationship.rb
+++ b/app/models/taxon_relationship.rb
@@ -14,8 +14,8 @@
 
 class TaxonRelationship < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
-    :created_by_id, :updated_by_id
+  # attr_accessible :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
+  #   :created_by_id, :updated_by_id
   belongs_to :taxon_relationship_type
   belongs_to :taxon_concept
   belongs_to :other_taxon_concept, :class_name => 'TaxonConcept',
diff --git a/app/models/taxonomy.rb b/app/models/taxonomy.rb
index 43e640ecc..96faee418 100644
--- a/app/models/taxonomy.rb
+++ b/app/models/taxonomy.rb
@@ -12,7 +12,7 @@ class Taxonomy < ActiveRecord::Base
   include Dictionary
   build_dictionary :cites_eu, :cms
 
-  attr_accessible :name
+  # attr_accessible :name
   has_many :designations
   has_many :taxon_concepts
 
diff --git a/app/models/term_trade_codes_pair.rb b/app/models/term_trade_codes_pair.rb
index e3fa1cace..c1a4cf5ef 100644
--- a/app/models/term_trade_codes_pair.rb
+++ b/app/models/term_trade_codes_pair.rb
@@ -11,7 +11,7 @@
 #
 
 class TermTradeCodesPair < ActiveRecord::Base
-  attr_accessible :trade_code_id, :trade_code_type, :term_id
+  # attr_accessible :trade_code_id, :trade_code_type, :term_id
 
   belongs_to :term, :class_name => "TradeCode"
   belongs_to :trade_code
diff --git a/app/models/trade/taxon_concept_term_pair.rb b/app/models/trade/taxon_concept_term_pair.rb
index 336089686..50b2421a8 100644
--- a/app/models/trade/taxon_concept_term_pair.rb
+++ b/app/models/trade/taxon_concept_term_pair.rb
@@ -10,7 +10,7 @@
 #
 
 class Trade::TaxonConceptTermPair < ActiveRecord::Base
-  attr_accessible :taxon_concept_id, :term_id
+  # attr_accessible :taxon_concept_id, :term_id
   validates :taxon_concept_id, :presence => true
   validates :term_id, :presence => true
   validates_uniqueness_of :taxon_concept_id, scope: :term_id
diff --git a/app/models/trade_code.rb b/app/models/trade_code.rb
index a3ce201fc..f179bbe0b 100644
--- a/app/models/trade_code.rb
+++ b/app/models/trade_code.rb
@@ -13,8 +13,7 @@
 #
 
 class TradeCode < ActiveRecord::Base
-  attr_accessible :code, :type,
-    :name_en, :name_es, :name_fr
+  # attr_accessible :code, :type, :name_en, :name_es, :name_fr
   translates :name
 
   validates :code, :presence => true, :uniqueness => { :scope => :type }
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index b3a3abda4..36fe13b55 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -34,12 +34,12 @@
 require 'csv'
 class TradeRestriction < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :end_date, :geo_entity_id, :is_current,
-    :notes, :publication_date, :purpose_ids, :quota, :type,
-    :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
-    :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
-    :created_by_id, :updated_by_id, :url,
-    :taxon_concept_id
+  # attr_accessible :end_date, :geo_entity_id, :is_current,
+  #   :notes, :publication_date, :purpose_ids, :quota, :type,
+  #   :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
+  #   :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
+  #   :created_by_id, :updated_by_id, :url,
+  #   :taxon_concept_id
 
   belongs_to :taxon_concept
   belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id
diff --git a/app/models/user.rb b/app/models/user.rb
index 0193057aa..f2772b05d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -27,9 +27,9 @@ class User < ActiveRecord::Base
   include SentientUser
   devise :database_authenticatable, :registerable, :recoverable, :rememberable,
     :trackable, :validatable
-  attr_accessible :email, :name, :password, :password_confirmation,
-    :remember_me, :role, :terms_and_conditions, :is_cites_authority,
-    :organisation, :geo_entity_id, :is_active
+  # attr_accessible :email, :name, :password, :password_confirmation,
+  #   :remember_me, :role, :terms_and_conditions, :is_cites_authority,
+  #   :organisation, :geo_entity_id, :is_active
 
   MANAGER = 'admin'
   CONTRIBUTOR = 'default' # nonsense
diff --git a/app/views/admin/cites_extraordinary_meetings/_form.html.erb b/app/views/admin/cites_extraordinary_meetings/_form.html.erb
index 215c05d0e..be588d6b1 100644
--- a/app/views/admin/cites_extraordinary_meetings/_form.html.erb
+++ b/app/views/admin/cites_extraordinary_meetings/_form.html.erb
@@ -1,6 +1,6 @@
 <%= form_for [:admin, @cites_extraordinary_meeting], :remote => true do |f| %>
 
-  <%= error_messages_for(@cites_cop) %>
+  <%= error_messages_for(@cites_extraordinary_meeting) %>
 
   <%= f.hidden_field :designation_id %>
   <label>Name</label><%= f.text_field :name %><br />
diff --git a/app/views/admin/cites_pcs/_form.html.erb b/app/views/admin/cites_pcs/_form.html.erb
index 720d68ce4..3830306c6 100644
--- a/app/views/admin/cites_pcs/_form.html.erb
+++ b/app/views/admin/cites_pcs/_form.html.erb
@@ -1,6 +1,6 @@
 <%= form_for [:admin, @cites_pc], :remote => true do |f| %>
 
-  <%= error_messages_for(@cites_cop) %>
+  <%= error_messages_for(@cites_pc) %>
 
   <%= f.hidden_field :designation_id %>
   <label>Name</label><%= f.text_field :name %><br />
diff --git a/app/views/admin/cites_tcs/_form.html.erb b/app/views/admin/cites_tcs/_form.html.erb
index 7195e8a0a..e9907e607 100644
--- a/app/views/admin/cites_tcs/_form.html.erb
+++ b/app/views/admin/cites_tcs/_form.html.erb
@@ -1,6 +1,6 @@
 <%= form_for [:admin, @cites_tc], :remote => true do |f| %>
 
-  <%= error_messages_for(@cites_cop) %>
+  <%= error_messages_for(@cites_tc) %>
 
   <%= f.hidden_field :designation_id %>
   <label>Name</label><%= f.text_field :name %><br />
diff --git a/app/views/admin/taxon_commons/_form.html.erb b/app/views/admin/taxon_commons/_form.html.erb
index eb3180de9..46991aca4 100644
--- a/app/views/admin/taxon_commons/_form.html.erb
+++ b/app/views/admin/taxon_commons/_form.html.erb
@@ -1,8 +1,8 @@
 <%= form_for [:admin, @taxon_concept, @taxon_common], :remote => true do |f| %>
   <%= error_messages_for(@taxon_common) %>
-  <%= f.text_field :name, :value => @taxon_common.common_name.name %>
+  <%= f.text_field :name, :value => @taxon_common.common_name&.name %>
   <%= f.select :language_id,
-    options_from_collection_for_select(@languages, :id, :name_en, @taxon_common.common_name.language_id ),
+    options_from_collection_for_select(@languages, :id, :name_en, @taxon_common.common_name&.language_id ),
     {}, :class => 'select2'
   %>
 <% end %>
diff --git a/app/views/admin/taxon_instruments/_list.html.erb b/app/views/admin/taxon_instruments/_list.html.erb
index 46dcb826c..5d7c9e9ce 100644
--- a/app/views/admin/taxon_instruments/_list.html.erb
+++ b/app/views/admin/taxon_instruments/_list.html.erb
@@ -6,7 +6,7 @@
 <tbody>
   <% @taxon_instruments.each do |ti| %>
     <tr>
-      <td><%= ti.instrument.name %></td>
+      <td><%= ti.instrument&.name %></td>
       <td><%= ti.effective_from_formatted %></td>
       <td>
         <%= link_to delete_icon,
diff --git a/app/views/admin/taxon_relationships/_form.html.erb b/app/views/admin/taxon_relationships/_form.html.erb
index 167ed64c2..60509e8b4 100644
--- a/app/views/admin/taxon_relationships/_form.html.erb
+++ b/app/views/admin/taxon_relationships/_form.html.erb
@@ -18,7 +18,7 @@
     </li>
     <li id="right">
       <div class="elements">
-        <%= select_tag :taxonomy_id, options_from_collection_for_select(@form_taxonomies, :id, :name), :class => "taxonomy_selector" %><br />
+        <%= select_tag :taxonomy_id, options_from_collection_for_select(@form_taxonomies || [], :id, :name), :class => "taxonomy_selector" %><br />
         <input type="text" class="tr-autocomplete"><br />
       </div>
     </li>
diff --git a/config/routes.rb b/config/routes.rb
index f2ab7f643..9d7e27379 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -162,7 +162,7 @@
       resources :cites_captivity_processes, 
         :only => [:index, :new, :create, :edit, :update, :destroy]
     end
-    resources :nomenclature_changes do
+    resources :nomenclature_changes do # TODO: look like only support :index, :show, :destroy
       resources :split, controller: 'nomenclature_changes/split'
       resources :lump, controller: 'nomenclature_changes/lump'
       resources :status_to_accepted,

From 7bc1606b994977cf6b559d44dc42130155c30f22 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 09:46:16 +0000
Subject: [PATCH 018/241] quiet assets from rails log

---
 config/environments/development.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 612a1a3dc..3c65a31ae 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -27,6 +27,9 @@
   # number of complex assets.
   config.assets.debug = true
 
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
   config.assets.digest = true

From 3061263c50c67459abe885f84b823fae1b5b81fe Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 10:38:31 +0000
Subject: [PATCH 019/241] strong params (round 3)

---
 .../nomenclature_changes/build_controller.rb  |  3 +-
 .../nomenclature_changes/lump_controller.rb   | 49 +++++++++++++-
 .../nomenclature_changes/split_controller.rb  | 49 +++++++++++++-
 .../status_swap_controller.rb                 | 65 ++++++++++++++++++-
 .../status_to_accepted_controller.rb          | 65 ++++++++++++++++++-
 .../status_to_synonym_controller.rb           | 65 ++++++++++++++++++-
 app/models/nomenclature_change/input.rb       | 13 ++--
 app/models/nomenclature_change/lump.rb        |  3 +-
 app/models/nomenclature_change/output.rb      | 15 +++--
 .../parent_reassignment.rb                    |  3 +-
 .../reassignment_helpers.rb                   |  7 +-
 app/models/nomenclature_change/split.rb       |  3 +-
 .../status_change_helpers.rb                  |  5 +-
 .../nomenclature_change/status_to_accepted.rb |  3 +-
 14 files changed, 320 insertions(+), 28 deletions(-)

diff --git a/app/controllers/admin/nomenclature_changes/build_controller.rb b/app/controllers/admin/nomenclature_changes/build_controller.rb
index 2771dc6c7..c1a5cbede 100644
--- a/app/controllers/admin/nomenclature_changes/build_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/build_controller.rb
@@ -10,7 +10,8 @@ def finish_wizard_path
   end
 
   def create
-    @nomenclature_change = klass.new(:status => NomenclatureChange::NEW)
+    @nomenclature_change = klass.new()
+    @nomenclature_change.status = NomenclatureChange::NEW
     if @nomenclature_change.save
       redirect_to wizard_path(steps.first, :nomenclature_change_id => @nomenclature_change.id)
     else
diff --git a/app/controllers/admin/nomenclature_changes/lump_controller.rb b/app/controllers/admin/nomenclature_changes/lump_controller.rb
index c258b17dd..f095d0c2c 100644
--- a/app/controllers/admin/nomenclature_changes/lump_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/lump_controller.rb
@@ -31,7 +31,7 @@ def show
 
   def update
     @nomenclature_change.assign_attributes(
-      (params[:nomenclature_change_lump] || {}).merge({
+      (nomenclature_change_lump_params || {}).merge({
         :status => (step == steps.last ? NomenclatureChange::SUBMITTED : step.to_s)
       })
     )
@@ -58,4 +58,51 @@ def klass
     NomenclatureChange::Lump
   end
 
+  def nomenclature_change_lump_params
+    params.require(:nomenclature_change_lump).permit(
+      :event_id, :status,
+      inputs_attributes: [
+        :nomenclature_change_id, :taxon_concept_id,
+        :note_en, :note_es, :note_fr, :internal_note,
+        parent_reassignments_attributes: [
+          :id, :_destroy,
+          :reassignment_target_attributes,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        name_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        distribution_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        legislation_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ]
+      ],
+      output_attributes: [
+        :nomenclature_change_id, :taxon_concept_id,
+        :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+        :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+        :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+        :output_type, :tag_list, :created_by_id, :updated_by_id
+        # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
+        # xxx_attributes suppose not in-use.
+        # :parent_reassignments_attributes,
+        # :name_reassignments_attributes,
+        # :distribution_reassignments_attributes,
+        # :legislation_reassignments_attributes,
+      ]
+    )
+  end
 end
diff --git a/app/controllers/admin/nomenclature_changes/split_controller.rb b/app/controllers/admin/nomenclature_changes/split_controller.rb
index eacd07e99..b558f532d 100644
--- a/app/controllers/admin/nomenclature_changes/split_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/split_controller.rb
@@ -37,7 +37,7 @@ def show
 
   def update
     @nomenclature_change.assign_attributes(
-      (params[:nomenclature_change_split] || {}).merge({
+      (nomenclature_change_split_params || {}).merge({
         :status => (step == steps.last ? NomenclatureChange::SUBMITTED : step.to_s)
       })
     )
@@ -59,4 +59,51 @@ def klass
     NomenclatureChange::Split
   end
 
+  def nomenclature_change_split_params
+    params.require(:nomenclature_change_split).permit(
+      :event_id, :status,
+      inputs_attributes: [
+        :nomenclature_change_id, :taxon_concept_id,
+        :note_en, :note_es, :note_fr, :internal_note,
+        parent_reassignments_attributes: [
+          :id, :_destroy,
+          :reassignment_target_attributes,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        name_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        distribution_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        legislation_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ]
+      ],
+      output_attributes: [
+        :nomenclature_change_id, :taxon_concept_id,
+        :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+        :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+        :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+        :output_type, :tag_list, :created_by_id, :updated_by_id
+        # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
+        # xxx_attributes suppose not in-use.
+        # :parent_reassignments_attributes,
+        # :name_reassignments_attributes,
+        # :distribution_reassignments_attributes,
+        # :legislation_reassignments_attributes,
+      ]
+    )
+  end
 end
diff --git a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
index 75aa7531c..5c25d695c 100644
--- a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
@@ -27,7 +27,7 @@ def show
 
   def update
     @nomenclature_change.assign_attributes(
-      (params[:nomenclature_change_status_swap] || {}).merge({
+      (nomenclature_change_status_swap_params || {}).merge({
         :status => (step == steps.last ? NomenclatureChange::SUBMITTED : step.to_s)
       })
     )
@@ -53,4 +53,67 @@ def klass
     NomenclatureChange::StatusSwap
   end
 
+  def nomenclature_change_status_swap_params
+    params.require(:nomenclature_change_status_swap).permit(
+      :event_id, :status,
+      primary_output_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+        :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+        :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+        :output_type, :tag_list, :created_by_id, :updated_by_id
+        # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
+        # xxx_attributes suppose not in-use.
+        # :parent_reassignments_attributes,
+        # :name_reassignments_attributes,
+        # :distribution_reassignments_attributes,
+        # :legislation_reassignments_attributes,
+      ],
+      secondary_output_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+        :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+        :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+        :output_type, :tag_list, :created_by_id, :updated_by_id
+        # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
+        # xxx_attributes suppose not in-use.
+        # :parent_reassignments_attributes,
+        # :name_reassignments_attributes,
+        # :distribution_reassignments_attributes,
+        # :legislation_reassignments_attributes,
+      ],
+      input_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :note_en, :note_es, :note_fr, :internal_note,
+        parent_reassignments_attributes: [
+          :id, :_destroy,
+          :reassignment_target_attributes,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        name_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        distribution_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        legislation_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ]
+      ]
+    )
+  end
 end
diff --git a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
index 4e4a88433..3f3aecde4 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
@@ -19,7 +19,7 @@ def show
 
   def update
     @nomenclature_change.assign_attributes(
-      (params[:nomenclature_change_status_to_accepted] || {}).merge({
+      (nomenclature_change_status_to_accepted_params || {}).merge({
         :status => (step == steps.last ? NomenclatureChange::SUBMITTED : step.to_s)
       })
     )
@@ -41,4 +41,67 @@ def klass
     NomenclatureChange::StatusToAccepted
   end
 
+  def nomenclature_change_status_to_accepted_params
+    params.require(:nomenclature_change_status_to_accepted).permit(
+      :created_by_id, :updated_by_id, :event_id, :status,
+      primary_output_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+        :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+        :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+        :output_type, :tag_list, :created_by_id, :updated_by_id
+        # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
+        # xxx_attributes suppose not in-use.
+        # :parent_reassignments_attributes,
+        # :name_reassignments_attributes,
+        # :distribution_reassignments_attributes,
+        # :legislation_reassignments_attributes,
+      ],
+      secondary_output_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+        :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+        :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+        :output_type, :tag_list, :created_by_id, :updated_by_id
+        # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
+        # xxx_attributes suppose not in-use.
+        # :parent_reassignments_attributes,
+        # :name_reassignments_attributes,
+        # :distribution_reassignments_attributes,
+        # :legislation_reassignments_attributes,
+      ],
+      input_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :note_en, :note_es, :note_fr, :internal_note,
+        parent_reassignments_attributes: [
+          :id, :_destroy,
+          :reassignment_target_attributes,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        name_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        distribution_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        legislation_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ]
+      ]
+    )
+  end
 end
diff --git a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
index df3ef63fd..6a5beca53 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
@@ -29,7 +29,7 @@ def show
 
   def update
     @nomenclature_change.assign_attributes(
-      (params[:nomenclature_change_status_to_synonym] || {}).merge({
+      (nomenclature_change_status_to_synonym_params || {}).merge({
         :status => (step == steps.last ? NomenclatureChange::SUBMITTED : step.to_s)
       })
     )
@@ -52,4 +52,67 @@ def klass
     NomenclatureChange::StatusToSynonym
   end
 
+  def nomenclature_change_status_to_synonym_params
+    params.require(:nomenclature_change_status_to_synonym).permit(
+      :event_id, :status,
+      primary_output_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+        :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+        :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+        :output_type, :tag_list, :created_by_id, :updated_by_id
+        # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
+        # xxx_attributes suppose not in-use.
+        # :parent_reassignments_attributes,
+        # :name_reassignments_attributes,
+        # :distribution_reassignments_attributes,
+        # :legislation_reassignments_attributes,
+      ],
+      secondary_output_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+        :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+        :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+        :output_type, :tag_list, :created_by_id, :updated_by_id
+        # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
+        # xxx_attributes suppose not in-use.
+        # :parent_reassignments_attributes,
+        # :name_reassignments_attributes,
+        # :distribution_reassignments_attributes,
+        # :legislation_reassignments_attributes,
+      ],
+      input_attributes: [
+        :id, :_destroy,
+        :nomenclature_change_id, :taxon_concept_id,
+        :note_en, :note_es, :note_fr, :internal_note,
+        parent_reassignments_attributes: [
+          :id, :_destroy,
+          :reassignment_target_attributes,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        name_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        distribution_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ],
+        legislation_reassignments_attributes: [
+          :id, :_destroy,
+          :type, :reassignable_id, :reassignable_type,
+          :nomenclature_change_input_id, :nomenclature_change_output_id,
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+        ]
+      ]
+    )
+  end
 end
diff --git a/app/models/nomenclature_change/input.rb b/app/models/nomenclature_change/input.rb
index f2ea35e01..fd0f5f65a 100644
--- a/app/models/nomenclature_change/input.rb
+++ b/app/models/nomenclature_change/input.rb
@@ -19,12 +19,13 @@
 # Inputs are required to be existing taxon concepts.
 class NomenclatureChange::Input < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :nomenclature_change_id, :taxon_concept_id,
-    :note_en, :note_es, :note_fr, :internal_note,
-    :parent_reassignments_attributes,
-    :name_reassignments_attributes,
-    :distribution_reassignments_attributes,
-    :legislation_reassignments_attributes
+  # Migrated to controller (Strong Parameters)
+  # attr_accessible :nomenclature_change_id, :taxon_concept_id,
+  #   :note_en, :note_es, :note_fr, :internal_note,
+  #   :parent_reassignments_attributes,
+  #   :name_reassignments_attributes,
+  #   :distribution_reassignments_attributes,
+  #   :legislation_reassignments_attributes
   belongs_to :nomenclature_change
   belongs_to :taxon_concept
   has_many :reassignments,
diff --git a/app/models/nomenclature_change/lump.rb b/app/models/nomenclature_change/lump.rb
index 7e865f12a..bfcd7fc5b 100644
--- a/app/models/nomenclature_change/lump.rb
+++ b/app/models/nomenclature_change/lump.rb
@@ -14,7 +14,8 @@
 
 class NomenclatureChange::Lump < NomenclatureChange
   build_steps(:inputs, :outputs, :notes, :legislation, :summary)
-  attr_accessible :inputs_attributes, :output_attributes
+  # Migrated to controller (Strong Parameters)
+  # attr_accessible :inputs_attributes, :output_attributes
   has_many :inputs, :inverse_of => :nomenclature_change,
     :class_name => NomenclatureChange::Input,
     :foreign_key => :nomenclature_change_id,
diff --git a/app/models/nomenclature_change/output.rb b/app/models/nomenclature_change/output.rb
index 57129c727..424d408fd 100644
--- a/app/models/nomenclature_change/output.rb
+++ b/app/models/nomenclature_change/output.rb
@@ -35,13 +35,14 @@
 class NomenclatureChange::Output < ActiveRecord::Base
   track_who_does_it
   attr_accessor :output_type # New taxon, Existing subspecies, Existing taxon
-  attr_accessible :nomenclature_change_id, :taxon_concept_id,
-    :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
-    :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
-    :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-    :parent_reassignments_attributes, :name_reassignments_attributes,
-    :distribution_reassignments_attributes, :legislation_reassignments_attributes,
-    :output_type, :tag_list, :created_by_id, :updated_by_id
+  # Migrated to controller (Strong Parameters)
+  # attr_accessible :nomenclature_change_id, :taxon_concept_id,
+  #   :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
+  #   :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
+  #   :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
+  #   :parent_reassignments_attributes, :name_reassignments_attributes,
+  #   :distribution_reassignments_attributes, :legislation_reassignments_attributes,
+  #   :output_type, :tag_list, :created_by_id, :updated_by_id
 
   belongs_to :nomenclature_change
   belongs_to :taxon_concept
diff --git a/app/models/nomenclature_change/parent_reassignment.rb b/app/models/nomenclature_change/parent_reassignment.rb
index 5ba0a4318..94c61b3ce 100644
--- a/app/models/nomenclature_change/parent_reassignment.rb
+++ b/app/models/nomenclature_change/parent_reassignment.rb
@@ -19,7 +19,8 @@
 
 # Reassignable is a taxon concept that is reassigned to a new parent
 class NomenclatureChange::ParentReassignment < NomenclatureChange::Reassignment
-  attr_accessible :reassignment_target_attributes
+  # Migrated to controller (Strong Parameters)
+  # attr_accessible :reassignment_target_attributes
   has_one :reassignment_target, :inverse_of => :reassignment,
     :class_name => NomenclatureChange::ReassignmentTarget,
     :foreign_key => :nomenclature_change_reassignment_id
diff --git a/app/models/nomenclature_change/reassignment_helpers.rb b/app/models/nomenclature_change/reassignment_helpers.rb
index 210f2eee6..68670490e 100644
--- a/app/models/nomenclature_change/reassignment_helpers.rb
+++ b/app/models/nomenclature_change/reassignment_helpers.rb
@@ -3,9 +3,10 @@ module NomenclatureChange::ReassignmentHelpers
   def self.included(base)
     base.class_eval do
       track_who_does_it
-      attr_accessible :type, :reassignable_id, :reassignable_type,
-        :nomenclature_change_input_id, :nomenclature_change_output_id,
-        :note_en, :note_es, :note_fr, :internal_note, :output_ids
+      # Migrated to controller (Strong Parameters)
+      # attr_accessible :type, :reassignable_id, :reassignable_type,
+      #   :nomenclature_change_input_id, :nomenclature_change_output_id,
+      #   :note_en, :note_es, :note_fr, :internal_note, :output_ids
       belongs_to :reassignable, :polymorphic => true
       has_many :reassignment_targets,
         inverse_of: :reassignment,
diff --git a/app/models/nomenclature_change/split.rb b/app/models/nomenclature_change/split.rb
index c8dc95f30..e51cb4d7c 100644
--- a/app/models/nomenclature_change/split.rb
+++ b/app/models/nomenclature_change/split.rb
@@ -15,7 +15,8 @@
 class NomenclatureChange::Split < NomenclatureChange
   build_steps(:inputs, :outputs, :notes, :children, :names, :distribution,
     :legislation, :summary)
-  attr_accessible :input_attributes, :outputs_attributes
+  # Migrated to controller (Strong Parameters)
+  # attr_accessible :input_attributes, :outputs_attributes
   has_one :input, :inverse_of => :nomenclature_change,
     :class_name => NomenclatureChange::Input,
     :foreign_key => :nomenclature_change_id,
diff --git a/app/models/nomenclature_change/status_change_helpers.rb b/app/models/nomenclature_change/status_change_helpers.rb
index 6a93d7770..77f80bf85 100644
--- a/app/models/nomenclature_change/status_change_helpers.rb
+++ b/app/models/nomenclature_change/status_change_helpers.rb
@@ -2,8 +2,9 @@ module NomenclatureChange::StatusChangeHelpers
 
   def self.included(base)
     base.class_eval do
-      attr_accessible :primary_output_attributes, :secondary_output_attributes,
-        :input_attributes
+      # Migrated to controller (Strong Parameters)
+      # attr_accessible :primary_output_attributes, :secondary_output_attributes,
+      #   :input_attributes
       has_one :input, :inverse_of => :nomenclature_change,
         :class_name => NomenclatureChange::Input,
         :foreign_key => :nomenclature_change_id,
diff --git a/app/models/nomenclature_change/status_to_accepted.rb b/app/models/nomenclature_change/status_to_accepted.rb
index ec5f0e42e..d91467610 100644
--- a/app/models/nomenclature_change/status_to_accepted.rb
+++ b/app/models/nomenclature_change/status_to_accepted.rb
@@ -15,7 +15,8 @@
 # A status change to A needs to have one output.
 class NomenclatureChange::StatusToAccepted < NomenclatureChange
   include NomenclatureChange::StatusChangeHelpers
-  attr_accessible :created_by_id, :updated_by_id
+  # Migrated to controller (Strong Parameters)
+  # attr_accessible :created_by_id, :updated_by_id
   build_steps(
     :primary_output, :summary
   )

From c0b1ad9e194cff5f3df777b443c48fea06f58f40 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 10:39:04 +0000
Subject: [PATCH 020/241] strong params (round 3) (missed)

---
 app/models/nomenclature_change.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/nomenclature_change.rb b/app/models/nomenclature_change.rb
index 832305892..a8569a65f 100644
--- a/app/models/nomenclature_change.rb
+++ b/app/models/nomenclature_change.rb
@@ -17,7 +17,8 @@ class NomenclatureChange < ActiveRecord::Base
   include StatusDictionary
   build_steps
   track_who_does_it
-  attr_accessible :event_id, :status
+  # Migrated to controller (Strong Parameters)
+  # attr_accessible :event_id, :status
 
   belongs_to :event
 

From d9c35910a81619426c59334190b96c8734e43ee8 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 10:39:18 +0000
Subject: [PATCH 021/241] strong params (round 4) add comments

---
 app/models/annotation.rb                    | 2 ++
 app/models/change_type.rb                   | 1 +
 app/models/cites_ac.rb                      | 1 +
 app/models/cites_cop.rb                     | 1 +
 app/models/cites_extraordinary_meeting.rb   | 1 +
 app/models/cites_pc.rb                      | 1 +
 app/models/cites_process.rb                 | 1 +
 app/models/cites_suspension.rb              | 1 +
 app/models/cites_suspension_confirmation.rb | 1 +
 app/models/cites_suspension_notification.rb | 1 +
 app/models/cites_tc.rb                      | 1 +
 app/models/cms_mapping.rb                   | 1 +
 app/models/comment.rb                       | 1 +
 app/models/designation.rb                   | 1 +
 app/models/distribution.rb                  | 1 +
 app/models/document.rb                      | 1 +
 app/models/document_citation.rb             | 1 +
 app/models/ec_srg.rb                        | 1 +
 app/models/eu_decision.rb                   | 1 +
 app/models/eu_decision_type.rb              | 1 +
 app/models/eu_opinion.rb                    | 1 +
 app/models/eu_regulation.rb                 | 1 +
 app/models/eu_suspension_regulation.rb      | 1 +
 app/models/event.rb                         | 1 +
 app/models/geo_entity.rb                    | 1 +
 app/models/geo_relationship.rb              | 1 +
 app/models/instrument.rb                    | 1 +
 app/models/language.rb                      | 1 +
 app/models/listing_change.rb                | 1 +
 app/models/listing_distribution.rb          | 1 +
 app/models/preset_tag.rb                    | 1 +
 app/models/quota.rb                         | 2 +-
 app/models/rank.rb                          | 1 +
 app/models/reference.rb                     | 1 +
 app/models/species_listing.rb               | 1 +
 app/models/srg_history.rb                   | 1 +
 app/models/taxon_common.rb                  | 1 +
 app/models/taxon_concept.rb                 | 1 +
 app/models/taxon_concept_reference.rb       | 1 +
 app/models/taxon_instrument.rb              | 1 +
 app/models/taxon_relationship.rb            | 1 +
 app/models/taxonomy.rb                      | 1 +
 app/models/term_trade_codes_pair.rb         | 1 +
 app/models/trade/taxon_concept_term_pair.rb | 1 +
 app/models/trade_code.rb                    | 1 +
 app/models/trade_restriction.rb             | 1 +
 app/models/user.rb                          | 1 +
 47 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index ad0cf1bd9..11675ae57 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -24,6 +24,8 @@
 
 class Annotation < ActiveRecord::Base
   track_who_does_it
+
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :listing_change_id, :symbol, :parent_symbol, :short_note_en,
   #   :full_note_en, :short_note_fr, :full_note_fr, :short_note_es, :full_note_es,
   #   :display_in_index, :display_in_footnote, :event_id
diff --git a/app/models/change_type.rb b/app/models/change_type.rb
index 602378679..66fd7aeec 100644
--- a/app/models/change_type.rb
+++ b/app/models/change_type.rb
@@ -13,6 +13,7 @@
 #
 
 class ChangeType < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
   #   :designation_id
   include Dictionary
diff --git a/app/models/cites_ac.rb b/app/models/cites_ac.rb
index e6a65b556..dcff48034 100644
--- a/app/models/cites_ac.rb
+++ b/app/models/cites_ac.rb
@@ -26,6 +26,7 @@
 # Cites Animal Committee
 
 class CitesAc < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :is_current
 
   validates :effective_at, :presence => true
diff --git a/app/models/cites_cop.rb b/app/models/cites_cop.rb
index 4e129ba0e..b92787a86 100644
--- a/app/models/cites_cop.rb
+++ b/app/models/cites_cop.rb
@@ -24,6 +24,7 @@
 #
 
 class CitesCop < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :is_current
   has_many :listing_changes, :foreign_key => :event_id
   has_many :hash_annotations, :class_name => 'Annotation', :foreign_key => :event_id
diff --git a/app/models/cites_extraordinary_meeting.rb b/app/models/cites_extraordinary_meeting.rb
index fb5ff452f..21101aec6 100644
--- a/app/models/cites_extraordinary_meeting.rb
+++ b/app/models/cites_extraordinary_meeting.rb
@@ -24,6 +24,7 @@
 #
 
 class CitesExtraordinaryMeeting < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :is_current
 
   validates :effective_at, :presence => true
diff --git a/app/models/cites_pc.rb b/app/models/cites_pc.rb
index b17133806..7aa7aa9ba 100644
--- a/app/models/cites_pc.rb
+++ b/app/models/cites_pc.rb
@@ -26,6 +26,7 @@
 # Cites Plant Committee
 
 class CitesPc < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :is_current
 
   validates :effective_at, :presence => true
diff --git a/app/models/cites_process.rb b/app/models/cites_process.rb
index 13ede34dd..d794f10eb 100644
--- a/app/models/cites_process.rb
+++ b/app/models/cites_process.rb
@@ -1,5 +1,6 @@
 class CitesProcess < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :start_event_id, :geo_entity_id, :resolution, :start_date,
   #                 :taxon_concept_id, :notes, :status, :document, :document_title,
   #                 :created_by_id, :updated_by_id
diff --git a/app/models/cites_suspension.rb b/app/models/cites_suspension.rb
index f68cf27d1..f7765a83e 100644
--- a/app/models/cites_suspension.rb
+++ b/app/models/cites_suspension.rb
@@ -31,6 +31,7 @@
 #
 
 class CitesSuspension < TradeRestriction
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :start_notification_id, :end_notification_id,
   #   :cites_suspension_confirmations_attributes,
   #   :applies_to_import
diff --git a/app/models/cites_suspension_confirmation.rb b/app/models/cites_suspension_confirmation.rb
index bbabaffb3..68b86bfef 100644
--- a/app/models/cites_suspension_confirmation.rb
+++ b/app/models/cites_suspension_confirmation.rb
@@ -10,6 +10,7 @@
 #
 
 class CitesSuspensionConfirmation < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :cites_suspension_notification_id
   belongs_to :confirmation_notification, :class_name => 'CitesSuspensionNotification',
     :foreign_key => :cites_suspension_notification_id
diff --git a/app/models/cites_suspension_notification.rb b/app/models/cites_suspension_notification.rb
index ce4703ff5..1c2e2aad1 100644
--- a/app/models/cites_suspension_notification.rb
+++ b/app/models/cites_suspension_notification.rb
@@ -24,6 +24,7 @@
 #
 
 class CitesSuspensionNotification < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :subtype, :new_subtype, :end_date
   attr_accessor :new_subtype
   has_many :started_suspensions, :foreign_key => :start_notification_id, :class_name => 'CitesSuspension'
diff --git a/app/models/cites_tc.rb b/app/models/cites_tc.rb
index 31fa43cbc..a946cdae1 100644
--- a/app/models/cites_tc.rb
+++ b/app/models/cites_tc.rb
@@ -26,6 +26,7 @@
 # Cites Tech Committee
 
 class CitesTc < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :is_current
 
   validates :effective_at, :presence => true
diff --git a/app/models/cms_mapping.rb b/app/models/cms_mapping.rb
index 21d6622ee..fb3b3febb 100644
--- a/app/models/cms_mapping.rb
+++ b/app/models/cms_mapping.rb
@@ -14,6 +14,7 @@
 #
 
 class CmsMapping < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :accepted_name_id, :cms_author, :cms_taxon_name, :cms_uuid, :details, :taxon_concept_id
 
   # serialize :details, ActiveRecord::Coders::Hstore
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 19cb9ba33..ad09ffc74 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -15,6 +15,7 @@
 
 class Comment < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :comment_type, :commentable_id, :commentable_type, :note,
   #   :created_by_id, :updated_by_id
   belongs_to :commentable, polymorphic: true
diff --git a/app/models/designation.rb b/app/models/designation.rb
index 138c75110..3efc3307d 100644
--- a/app/models/designation.rb
+++ b/app/models/designation.rb
@@ -10,6 +10,7 @@
 #
 
 class Designation < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :taxonomy_id
   include Dictionary
   build_dictionary :cites, :eu, :cms
diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index c26edf7f2..904c8e046 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -14,6 +14,7 @@
 
 class Distribution < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_id, :taxon_concept_id, :tag_list,
   #   :references_attributes, :internal_notes, :created_by_id, :updated_by_id
   acts_as_taggable
diff --git a/app/models/document.rb b/app/models/document.rb
index 276499e12..8a569b937 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -30,6 +30,7 @@ class Document < ActiveRecord::Base
     :using => { :tsearch => { :prefix => true } },
     :order_within_rank => "documents.date, documents.title, documents.id"
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :event_id, :filename, :date, :type, :title, :is_public,
   #   :language_id, :citations_attributes,
   #   :sort_index, :discussion_id, :discussion_sort_index,
diff --git a/app/models/document_citation.rb b/app/models/document_citation.rb
index cc3c473ac..002f7ff1a 100644
--- a/app/models/document_citation.rb
+++ b/app/models/document_citation.rb
@@ -13,6 +13,7 @@
 
 class DocumentCitation < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :document_id, :stringy_taxon_concept_ids, :geo_entity_ids
   has_many :document_citation_taxon_concepts, dependent: :destroy, autosave: true
   has_many :taxon_concepts, through: :document_citation_taxon_concepts
diff --git a/app/models/ec_srg.rb b/app/models/ec_srg.rb
index bea212d04..c22f6893c 100644
--- a/app/models/ec_srg.rb
+++ b/app/models/ec_srg.rb
@@ -26,6 +26,7 @@
 # European Commission Scientific Review Group
 
 class EcSrg < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :is_current
 
   has_many :eu_opinions, :foreign_key => :start_event_id,
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index 936348e08..24552839d 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -30,6 +30,7 @@
 require 'csv'
 class EuDecision < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :end_date, :end_event_id, :geo_entity_id, :internal_notes,
   #   :is_current, :notes, :start_date, :start_event_id, :eu_decision_type_id,
   #   :taxon_concept_id, :type, :conditions_apply, :term_id, :source_id,
diff --git a/app/models/eu_decision_type.rb b/app/models/eu_decision_type.rb
index 94dff7df9..69339af37 100644
--- a/app/models/eu_decision_type.rb
+++ b/app/models/eu_decision_type.rb
@@ -11,6 +11,7 @@
 #
 
 class EuDecisionType < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :tooltip, :decision_type
   include Dictionary
   build_dictionary :negative_opinion, :positive_opinion, :no_opinion,
diff --git a/app/models/eu_opinion.rb b/app/models/eu_opinion.rb
index 0913297df..c74e0506b 100644
--- a/app/models/eu_opinion.rb
+++ b/app/models/eu_opinion.rb
@@ -27,6 +27,7 @@
 #
 
 class EuOpinion < EuDecision
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :document_id
 
   belongs_to :document
diff --git a/app/models/eu_regulation.rb b/app/models/eu_regulation.rb
index c53cb154b..3eebcf2ec 100644
--- a/app/models/eu_regulation.rb
+++ b/app/models/eu_regulation.rb
@@ -24,6 +24,7 @@
 #
 
 class EuRegulation < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :listing_changes_event_id, :end_date
   attr_accessor :listing_changes_event_id
 
diff --git a/app/models/eu_suspension_regulation.rb b/app/models/eu_suspension_regulation.rb
index 39e300d1a..63cdfbfe8 100644
--- a/app/models/eu_suspension_regulation.rb
+++ b/app/models/eu_suspension_regulation.rb
@@ -24,6 +24,7 @@
 #
 
 class EuSuspensionRegulation < Event
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :eu_suspensions_event_id
   attr_accessor :eu_suspensions_event_id
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 16dd1e5dd..1ae3fe8eb 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -26,6 +26,7 @@
 class Event < ActiveRecord::Base
   track_who_does_it
 
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :designation_id, :description, :extended_description,
   #   :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
   #   :created_by_id, :updated_by_id
diff --git a/app/models/geo_entity.rb b/app/models/geo_entity.rb
index d21b9d9ba..a5a89b34b 100644
--- a/app/models/geo_entity.rb
+++ b/app/models/geo_entity.rb
@@ -18,6 +18,7 @@
 #
 
 class GeoEntity < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_type_id, :iso_code2, :iso_code3,
   #   :legacy_id, :legacy_type, :long_name, :name_en, :name_es, :name_fr,
   #   :is_current
diff --git a/app/models/geo_relationship.rb b/app/models/geo_relationship.rb
index e1f3028f0..8c010de0c 100644
--- a/app/models/geo_relationship.rb
+++ b/app/models/geo_relationship.rb
@@ -11,6 +11,7 @@
 #
 
 class GeoRelationship < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_id, :geo_relationship_type_id, :other_geo_entity_id
   belongs_to :geo_relationship_type
   belongs_to :geo_entity
diff --git a/app/models/instrument.rb b/app/models/instrument.rb
index a8e52a58c..329b4e5bc 100644
--- a/app/models/instrument.rb
+++ b/app/models/instrument.rb
@@ -10,6 +10,7 @@
 #
 
 class Instrument < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :designation_id, :name
 
   validates :name, :presence => true, :uniqueness => { :scope => :designation_id }
diff --git a/app/models/language.rb b/app/models/language.rb
index 234d21134..61a919e56 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -13,6 +13,7 @@
 #
 
 class Language < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :iso_code1, :iso_code3, :name_en, :name_fr, :name_es
   translates :name
 
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 1b1ac9c51..fcac058c8 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -28,6 +28,7 @@
 
 class ListingChange < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :species_listing_id, :change_type_id,
   #   :effective_at, :is_current, :parent_id, :geo_entity_ids,
   #   :party_listing_distribution_attributes, :inclusion_taxon_concept_id,
diff --git a/app/models/listing_distribution.rb b/app/models/listing_distribution.rb
index a69275486..9f7876d94 100644
--- a/app/models/listing_distribution.rb
+++ b/app/models/listing_distribution.rb
@@ -15,6 +15,7 @@
 
 class ListingDistribution < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_id, :listing_change_id, :is_party
   belongs_to :geo_entity
   belongs_to :listing_change
diff --git a/app/models/preset_tag.rb b/app/models/preset_tag.rb
index 276d370a0..cbe54e402 100644
--- a/app/models/preset_tag.rb
+++ b/app/models/preset_tag.rb
@@ -10,6 +10,7 @@
 #
 
 class PresetTag < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :model, :name
 
   TYPES = {
diff --git a/app/models/quota.rb b/app/models/quota.rb
index 5c4b752bc..cf1d0dcc4 100644
--- a/app/models/quota.rb
+++ b/app/models/quota.rb
@@ -31,7 +31,7 @@
 #
 
 class Quota < TradeRestriction
-
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :public_display
 
   validates :quota, :presence => true
diff --git a/app/models/rank.rb b/app/models/rank.rb
index 8a5f372c2..765a9aacc 100644
--- a/app/models/rank.rb
+++ b/app/models/rank.rb
@@ -14,6 +14,7 @@
 #
 
 class Rank < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
   #   :taxonomic_position, :fixed_order
   include Dictionary
diff --git a/app/models/reference.rb b/app/models/reference.rb
index dd2e21215..21566ef1a 100644
--- a/app/models/reference.rb
+++ b/app/models/reference.rb
@@ -18,6 +18,7 @@
 
 class Reference < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :citation, :created_by_id, :updated_by_id
 
   validates :citation, :presence => true
diff --git a/app/models/species_listing.rb b/app/models/species_listing.rb
index 6c1676cca..433371648 100644
--- a/app/models/species_listing.rb
+++ b/app/models/species_listing.rb
@@ -11,6 +11,7 @@
 #
 
 class SpeciesListing < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :designation_id, :name, :abbreviation
 
   belongs_to :designation
diff --git a/app/models/srg_history.rb b/app/models/srg_history.rb
index faabb9de0..446a99e33 100644
--- a/app/models/srg_history.rb
+++ b/app/models/srg_history.rb
@@ -1,4 +1,5 @@
 class SrgHistory < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :tooltip
 
   has_many :eu_decisions
diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index 22d74e487..1f92a1564 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -13,6 +13,7 @@
 
 class TaxonCommon < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :common_name_id, :taxon_concept_id, :created_by_id,
   #   :updated_by_id, :name, :language_id
   attr_accessor :name, :language_id
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index 045b90cce..d8d40bf1b 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -42,6 +42,7 @@ class TaxonConcept < ActiveRecord::Base
       rank_name: :rank_name
     }
 
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :parent_id, :taxonomy_id, :rank_id,
   #   :parent_id, :author_year, :taxon_name_id, :taxonomic_position,
   #   :legacy_id, :legacy_type, :scientific_name, :name_status,
diff --git a/app/models/taxon_concept_reference.rb b/app/models/taxon_concept_reference.rb
index cce24be17..45e39b885 100644
--- a/app/models/taxon_concept_reference.rb
+++ b/app/models/taxon_concept_reference.rb
@@ -16,6 +16,7 @@
 
 class TaxonConceptReference < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
   #   :excluded_taxon_concepts_ids, :reference_attributes,
   #   :created_by_id, :updated_by_id
diff --git a/app/models/taxon_instrument.rb b/app/models/taxon_instrument.rb
index 57cfaca40..012d13f82 100644
--- a/app/models/taxon_instrument.rb
+++ b/app/models/taxon_instrument.rb
@@ -14,6 +14,7 @@
 
 class TaxonInstrument < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :effective_from, :instrument_id, :taxon_concept_id
 
   belongs_to :instrument
diff --git a/app/models/taxon_relationship.rb b/app/models/taxon_relationship.rb
index 09eeaa932..76032d46c 100644
--- a/app/models/taxon_relationship.rb
+++ b/app/models/taxon_relationship.rb
@@ -14,6 +14,7 @@
 
 class TaxonRelationship < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
   #   :created_by_id, :updated_by_id
   belongs_to :taxon_relationship_type
diff --git a/app/models/taxonomy.rb b/app/models/taxonomy.rb
index 96faee418..fb31c3fb9 100644
--- a/app/models/taxonomy.rb
+++ b/app/models/taxonomy.rb
@@ -12,6 +12,7 @@ class Taxonomy < ActiveRecord::Base
   include Dictionary
   build_dictionary :cites_eu, :cms
 
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :name
   has_many :designations
   has_many :taxon_concepts
diff --git a/app/models/term_trade_codes_pair.rb b/app/models/term_trade_codes_pair.rb
index c1a4cf5ef..c5dd1545c 100644
--- a/app/models/term_trade_codes_pair.rb
+++ b/app/models/term_trade_codes_pair.rb
@@ -11,6 +11,7 @@
 #
 
 class TermTradeCodesPair < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :trade_code_id, :trade_code_type, :term_id
 
   belongs_to :term, :class_name => "TradeCode"
diff --git a/app/models/trade/taxon_concept_term_pair.rb b/app/models/trade/taxon_concept_term_pair.rb
index 50b2421a8..781164679 100644
--- a/app/models/trade/taxon_concept_term_pair.rb
+++ b/app/models/trade/taxon_concept_term_pair.rb
@@ -10,6 +10,7 @@
 #
 
 class Trade::TaxonConceptTermPair < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :term_id
   validates :taxon_concept_id, :presence => true
   validates :term_id, :presence => true
diff --git a/app/models/trade_code.rb b/app/models/trade_code.rb
index f179bbe0b..d633df6a4 100644
--- a/app/models/trade_code.rb
+++ b/app/models/trade_code.rb
@@ -13,6 +13,7 @@
 #
 
 class TradeCode < ActiveRecord::Base
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :code, :type, :name_en, :name_es, :name_fr
   translates :name
 
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index 36fe13b55..ada48d8fb 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -34,6 +34,7 @@
 require 'csv'
 class TradeRestriction < ActiveRecord::Base
   track_who_does_it
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :end_date, :geo_entity_id, :is_current,
   #   :notes, :publication_date, :purpose_ids, :quota, :type,
   #   :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
diff --git a/app/models/user.rb b/app/models/user.rb
index f2772b05d..d730345bc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -27,6 +27,7 @@ class User < ActiveRecord::Base
   include SentientUser
   devise :database_authenticatable, :registerable, :recoverable, :rememberable,
     :trackable, :validatable
+  # Migrated to controller (Strong Parameters)
   # attr_accessible :email, :name, :password, :password_confirmation,
   #   :remember_me, :role, :terms_and_conditions, :is_cites_authority,
   #   :organisation, :geo_entity_id, :is_active

From fdb91a8cb03241a05b3ddab34450def5d095b234 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 12:37:45 +0000
Subject: [PATCH 022/241] strong params (round 5), trace from model

---
 app/controllers/admin/documents_controller.rb |  7 +++++
 .../checklist/downloads_controller.rb         |  2 +-
 app/models/analytics_event.rb                 |  3 ++-
 app/models/cites_rst_process.rb               |  3 ++-
 app/models/common_name.rb                     |  5 ++--
 app/models/designation_geo_entity.rb          |  4 ++-
 app/models/distribution_reference.rb          |  5 ++--
 app/models/document/proposal.rb               |  3 ++-
 app/models/document/proposal_details.rb       |  5 ++--
 app/models/document/review_details.rb         |  3 ++-
 .../document/review_of_significant_trade.rb   |  3 ++-
 app/models/document_citation_geo_entity.rb    |  4 ++-
 app/models/document_citation_taxon_concept.rb |  5 ++--
 app/models/document_tag.rb                    |  3 ++-
 app/models/download.rb                        |  3 ++-
 app/models/eu_country_date.rb                 |  3 ++-
 app/models/eu_decision_confirmation.rb        |  4 ++-
 app/models/geo_entity_type.rb                 |  3 ++-
 app/models/geo_relationship_type.rb           |  3 ++-
 app/models/iucn_mapping.rb                    |  5 ++--
 .../reassignment_target.rb                    |  5 ++--
 app/models/taxon_name.rb                      |  3 ++-
 app/models/taxon_relationship_type.rb         |  3 ++-
 app/models/trade/annual_report_upload.rb      |  7 ++---
 app/models/trade/format_validation_rule.rb    |  3 ++-
 app/models/trade/inclusion_validation_rule.rb |  3 ++-
 app/models/trade/permit.rb                    |  3 ++-
 app/models/trade/sandbox_template.rb          | 27 ++++++++++---------
 app/models/trade/shipment.rb                  | 17 ++++++------
 app/models/trade/trade_data_download.rb       |  8 +++---
 app/models/trade/validation_error.rb          | 16 ++++++-----
 app/models/trade/validation_rule.rb           |  3 ++-
 app/models/trade_restriction_purpose.rb       |  3 ++-
 app/models/trade_restriction_source.rb        |  3 ++-
 app/models/trade_restriction_term.rb          |  3 ++-
 app/models/year_annual_reports_by_country.rb  |  4 +--
 config/initializers/acts_as_taggable_on.rb    | 13 ++++-----
 config/initializers/paper_trail.rb            | 15 ++++++-----
 38 files changed, 130 insertions(+), 85 deletions(-)

diff --git a/app/controllers/admin/documents_controller.rb b/app/controllers/admin/documents_controller.rb
index 283eab48f..658ce0e4a 100644
--- a/app/controllers/admin/documents_controller.rb
+++ b/app/controllers/admin/documents_controller.rb
@@ -151,6 +151,13 @@ def document_params
       :designation_id,
       citations_attributes: [
         :id, :_destroy, :document_id, :stringy_taxon_concept_ids, :geo_entity_ids
+      ],
+      proposal_details_attributes: [
+        :id, :_destroy, :document_id, :proposal_nature, :proposal_outcome_id,
+        :representation, :proposal_number
+      ],
+      review_details_attributes: [
+        :id, :_destroy, :document_id, :review_phase_id, :process_stage_id, :recommended_category
       ]
     )
   end
diff --git a/app/controllers/checklist/downloads_controller.rb b/app/controllers/checklist/downloads_controller.rb
index 897d080c5..600cf2267 100644
--- a/app/controllers/checklist/downloads_controller.rb
+++ b/app/controllers/checklist/downloads_controller.rb
@@ -96,7 +96,7 @@ def not_found
   def download_params
     params.require(:download).permit(
       # attributes used in this controller.
-      :doc_typ,
+      :doc_type,
       # other attributes were in model `attr_accessible`.
       :format
     )
diff --git a/app/models/analytics_event.rb b/app/models/analytics_event.rb
index 8b333c3b8..c2b4bd14f 100644
--- a/app/models/analytics_event.rb
+++ b/app/models/analytics_event.rb
@@ -6,5 +6,6 @@ class AnalyticsEvent < ActiveRecord::Base
   validates :event_name, inclusion: { in: EVENT_NAMES }, presence: true
   validates :event_type, inclusion: { in: EVENT_TYPES }, presence: true
 
-  attr_accessible :event_name, :event_type
+  # Used by `download_db` in app/controllers/cites_trade/home_controller.rb
+  # attr_accessible :event_name, :event_type
 end
diff --git a/app/models/cites_rst_process.rb b/app/models/cites_rst_process.rb
index f7e0a546c..619e2971e 100644
--- a/app/models/cites_rst_process.rb
+++ b/app/models/cites_rst_process.rb
@@ -1,6 +1,7 @@
 class CitesRstProcess < CitesProcess
 
-  attr_accessible :case_id
+  # Used by lib/modules/import/rst/importer.rb
+  # attr_accessible :case_id
 
   STATUS = ['Initiated', 'Ongoing', 'Retained', 'Trade Suspension', 'Closed']
 
diff --git a/app/models/common_name.rb b/app/models/common_name.rb
index d43fe50e1..5ac437323 100644
--- a/app/models/common_name.rb
+++ b/app/models/common_name.rb
@@ -13,8 +13,9 @@
 
 class CommonName < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :language_id, :name,
-    :created_by_id, :updated_by_id
+  # Used by app/models/taxon_common.rb
+  # attr_accessible :language_id, :name,
+  #   :created_by_id, :updated_by_id
   belongs_to :language
   validates :name, :presence => true,
     :uniqueness => { :scope => :language_id }
diff --git a/app/models/designation_geo_entity.rb b/app/models/designation_geo_entity.rb
index 33a76f386..6295a5002 100644
--- a/app/models/designation_geo_entity.rb
+++ b/app/models/designation_geo_entity.rb
@@ -10,6 +10,8 @@
 #
 
 class DesignationGeoEntity < ActiveRecord::Base
-  attr_accessible :designation_id, :geo_entity_id
+  # Relationship table between Designation and GeoEntity.
+  # attr_accessible :designation_id, :geo_entity_id
   belongs_to :designation
+  # TODO: missing `belongs_to :geo_entity`
 end
diff --git a/app/models/distribution_reference.rb b/app/models/distribution_reference.rb
index 5010c832d..7ea850d24 100644
--- a/app/models/distribution_reference.rb
+++ b/app/models/distribution_reference.rb
@@ -13,8 +13,9 @@
 
 class DistributionReference < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :reference_id, :distribution_id, :created_by_id,
-    :updated_by_id
+  # Used by app/models/cms_mapping_manager.rb
+  # attr_accessible :reference_id, :distribution_id, :created_by_id,
+  #   :updated_by_id
 
   belongs_to :reference
   belongs_to :distribution, :touch => true
diff --git a/app/models/document/proposal.rb b/app/models/document/proposal.rb
index 332659708..49ec4dc02 100644
--- a/app/models/document/proposal.rb
+++ b/app/models/document/proposal.rb
@@ -29,7 +29,8 @@ def self.display_name
     'Proposal'
   end
 
-  attr_accessible :proposal_details_attributes
+  # Used in Document Controller
+  # attr_accessible :proposal_details_attributes
 
   has_one :proposal_details,
     :class_name => 'Document::ProposalDetails',
diff --git a/app/models/document/proposal_details.rb b/app/models/document/proposal_details.rb
index 866921183..6c9c2ec95 100644
--- a/app/models/document/proposal_details.rb
+++ b/app/models/document/proposal_details.rb
@@ -13,8 +13,9 @@
 #
 
 class Document::ProposalDetails < ActiveRecord::Base
-  attr_accessible :document_id, :proposal_nature, :proposal_outcome_id,
-    :representation, :proposal_number
+  # Used in DocumentsController
+  # attr_accessible :document_id, :proposal_nature, :proposal_outcome_id,
+  #   :representation, :proposal_number
   self.table_name = 'proposal_details'
   belongs_to :document, touch: true
 end
diff --git a/app/models/document/review_details.rb b/app/models/document/review_details.rb
index 7fe8f3468..5af2d2949 100644
--- a/app/models/document/review_details.rb
+++ b/app/models/document/review_details.rb
@@ -12,7 +12,8 @@
 #
 
 class Document::ReviewDetails < ActiveRecord::Base
-  attr_accessible :document_id, :review_phase_id, :process_stage_id, :recommended_category
+  # Used by DocumentController.
+  # attr_accessible :document_id, :review_phase_id, :process_stage_id, :recommended_category
   self.table_name = 'review_details'
   belongs_to :document, touch: true
 
diff --git a/app/models/document/review_of_significant_trade.rb b/app/models/document/review_of_significant_trade.rb
index be6c7fd08..f834612f6 100644
--- a/app/models/document/review_of_significant_trade.rb
+++ b/app/models/document/review_of_significant_trade.rb
@@ -29,7 +29,8 @@ def self.display_name
     'Review of Significant Trade'
   end
 
-  attr_accessible :review_details_attributes
+  # Used by DocumentsController.
+  # attr_accessible :review_details_attributes
 
   has_one :review_details,
     :class_name => 'Document::ReviewDetails',
diff --git a/app/models/document_citation_geo_entity.rb b/app/models/document_citation_geo_entity.rb
index 4110c7f60..d5d4d0de4 100644
--- a/app/models/document_citation_geo_entity.rb
+++ b/app/models/document_citation_geo_entity.rb
@@ -13,7 +13,9 @@
 
 class DocumentCitationGeoEntity < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :created_by_id, :document_citation_id, :geo_entity_id, :updated_by_id
+  # Used by app/models/nomenclature_change/reassignment_copy_processor.rb and lib/tasks/elibrary/identification_docs_distributions_importer.rb
+  # attr_accessible :created_by_id, :document_citation_id, :geo_entity_id, :updated_by_id
+
   belongs_to :geo_entity
   belongs_to :document_citation, touch: true
   validates :geo_entity_id, uniqueness: {
diff --git a/app/models/document_citation_taxon_concept.rb b/app/models/document_citation_taxon_concept.rb
index 02877f825..39cd90a4a 100644
--- a/app/models/document_citation_taxon_concept.rb
+++ b/app/models/document_citation_taxon_concept.rb
@@ -13,8 +13,9 @@
 
 class DocumentCitationTaxonConcept < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :created_by_id, :document_citation_id, :taxon_concept_id, :updated_by_id,
-    :updated_at
+  # Used by other models, not controllers.
+  # attr_accessible :created_by_id, :document_citation_id, :taxon_concept_id, :updated_by_id,
+  #   :updated_at
   belongs_to :taxon_concept
   belongs_to :document_citation, touch: true
   validates :taxon_concept_id, uniqueness: {
diff --git a/app/models/document_tag.rb b/app/models/document_tag.rb
index 1cf024fad..ff573a982 100644
--- a/app/models/document_tag.rb
+++ b/app/models/document_tag.rb
@@ -10,7 +10,8 @@
 #
 
 class DocumentTag < ActiveRecord::Base
-  attr_accessible :name
+  # Only created by seed and rake task.
+  # attr_accessible :name
 
   has_and_belongs_to_many :documents
 
diff --git a/app/models/download.rb b/app/models/download.rb
index 93a89d9c1..f144ddc97 100644
--- a/app/models/download.rb
+++ b/app/models/download.rb
@@ -14,7 +14,8 @@
 #
 
 class Download < ActiveRecord::Base
-  attr_accessible :format, :doc_type
+  # Migrated to controller (Strong Parameters)
+  # attr_accessible :format, :doc_type
 
   validates :format, :presence => true, :inclusion => { :in => %w(pdf csv json zip) }
   validates :doc_type, :presence => true, :inclusion => { :in => %w(history index citesidmanual) }
diff --git a/app/models/eu_country_date.rb b/app/models/eu_country_date.rb
index a3a3920a3..0643cfd4f 100644
--- a/app/models/eu_country_date.rb
+++ b/app/models/eu_country_date.rb
@@ -1,5 +1,6 @@
 class EuCountryDate < ActiveRecord::Base
-  attr_accessible :eu_accession_year, :eu_exit_year, :geo_entity
+  # Used by rake task.
+  # attr_accessible :eu_accession_year, :eu_exit_year, :geo_entity
 
   belongs_to :geo_entity
   validates :geo_entity, :eu_accession_year, :presence => true
diff --git a/app/models/eu_decision_confirmation.rb b/app/models/eu_decision_confirmation.rb
index 10baafabf..3d2dc4cba 100644
--- a/app/models/eu_decision_confirmation.rb
+++ b/app/models/eu_decision_confirmation.rb
@@ -10,7 +10,9 @@
 #
 
 class EuDecisionConfirmation < ActiveRecord::Base
-  attr_accessible :eu_decision_id, :event_id
+  # Relationship table between Event and EuDecision
+  # attr_accessible :eu_decision_id, :event_id
 
   belongs_to :eu_decision
+  # TODO: missing `belongs_to :event`
 end
diff --git a/app/models/geo_entity_type.rb b/app/models/geo_entity_type.rb
index 98d31533d..31dd6c495 100644
--- a/app/models/geo_entity_type.rb
+++ b/app/models/geo_entity_type.rb
@@ -9,7 +9,8 @@
 #
 
 class GeoEntityType < ActiveRecord::Base
-  attr_accessible :name
+  # Look like the only place create GeoEntityType is lib/tasks/import_trade_shipments.rake
+  # attr_accessible :name
 
   include Dictionary
   build_dictionary :country, :cites_region, :region, :territory,
diff --git a/app/models/geo_relationship_type.rb b/app/models/geo_relationship_type.rb
index 11a3ce7a5..23e65f5a9 100644
--- a/app/models/geo_relationship_type.rb
+++ b/app/models/geo_relationship_type.rb
@@ -9,7 +9,8 @@
 #
 
 class GeoRelationshipType < ActiveRecord::Base
-  attr_accessible :name
+  # Used by seed only.
+  # attr_accessible :name
 
   include Dictionary
   build_dictionary :contains, :intersects
diff --git a/app/models/iucn_mapping.rb b/app/models/iucn_mapping.rb
index d3e7cc2c2..898ee944f 100644
--- a/app/models/iucn_mapping.rb
+++ b/app/models/iucn_mapping.rb
@@ -15,8 +15,9 @@
 #
 
 class IucnMapping < ActiveRecord::Base
-  attr_accessible :iucn_author, :iucn_category, :iucn_taxon_id,
-    :iucn_taxon_name, :taxon_concept_id, :details, :accepted_name_id
+  # Used by IucnMappingManager
+  # attr_accessible :iucn_author, :iucn_category, :iucn_taxon_id,
+  #   :iucn_taxon_name, :taxon_concept_id, :details, :accepted_name_id
 
   # serialize :details, ActiveRecord::Coders::Hstore
   belongs_to :taxon_concept
diff --git a/app/models/nomenclature_change/reassignment_target.rb b/app/models/nomenclature_change/reassignment_target.rb
index 8afc362e1..bd8f7f962 100644
--- a/app/models/nomenclature_change/reassignment_target.rb
+++ b/app/models/nomenclature_change/reassignment_target.rb
@@ -13,8 +13,9 @@
 
 class NomenclatureChange::ReassignmentTarget < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :nomenclature_change_output_id,
-    :nomenclature_change_reassignment_id, :note
+  # Relationship table
+  # attr_accessible :nomenclature_change_output_id,
+  #   :nomenclature_change_reassignment_id, :note
   belongs_to :output, :class_name => NomenclatureChange::Output,
     :foreign_key => :nomenclature_change_output_id
   belongs_to :reassignment,
diff --git a/app/models/taxon_name.rb b/app/models/taxon_name.rb
index d213b1477..e0254f94a 100644
--- a/app/models/taxon_name.rb
+++ b/app/models/taxon_name.rb
@@ -9,7 +9,8 @@
 #
 
 class TaxonName < ActiveRecord::Base
-  attr_accessible :basionym_id, :scientific_name
+  # Used by seed and rake task.
+  # attr_accessible :basionym_id, :scientific_name
 
   validates :scientific_name, :presence => true
 
diff --git a/app/models/taxon_relationship_type.rb b/app/models/taxon_relationship_type.rb
index da4fba33c..6fd9bab4e 100644
--- a/app/models/taxon_relationship_type.rb
+++ b/app/models/taxon_relationship_type.rb
@@ -11,7 +11,8 @@
 #
 
 class TaxonRelationshipType < ActiveRecord::Base
-  attr_accessible :name, :is_intertaxonomic, :is_bidirectional
+  # Used by seed and rake task.
+  # attr_accessible :name, :is_intertaxonomic, :is_bidirectional
 
   include Dictionary
   build_dictionary :equal_to, :includes, :overlaps, :disjunct, :has_synonym,
diff --git a/app/models/trade/annual_report_upload.rb b/app/models/trade/annual_report_upload.rb
index 456a1c910..52de7aaa0 100644
--- a/app/models/trade/annual_report_upload.rb
+++ b/app/models/trade/annual_report_upload.rb
@@ -21,9 +21,10 @@
 class Trade::AnnualReportUpload < ActiveRecord::Base
   include ActiveModel::ForbiddenAttributesProtection
   track_who_does_it
-  attr_accessible :csv_source_file, :trading_country_id, :point_of_view,
-                  :submitted_at, :submitted_by_id, :number_of_rows,
-                  :number_of_records_submitted, :aws_storage_path
+  # Suppose use in controller, but controller using strong parameters...
+  # attr_accessible :csv_source_file, :trading_country_id, :point_of_view,
+  #                 :submitted_at, :submitted_by_id, :number_of_rows,
+  #                 :number_of_records_submitted, :aws_storage_path
   mount_uploader :csv_source_file, Trade::CsvSourceFileUploader
   belongs_to :trading_country, :class_name => GeoEntity, :foreign_key => :trading_country_id
   validates :csv_source_file, :csv_column_headers => true, :on => :create
diff --git a/app/models/trade/format_validation_rule.rb b/app/models/trade/format_validation_rule.rb
index 22fab9d2b..14c6377c8 100644
--- a/app/models/trade/format_validation_rule.rb
+++ b/app/models/trade/format_validation_rule.rb
@@ -16,7 +16,8 @@
 #
 
 class Trade::FormatValidationRule < Trade::ValidationRule
-  attr_accessible :format_re
+  # Only created by seed.
+  # attr_accessible :format_re
 
   def error_message
     column_names.join(', ') + ' must be formatted as ' + format_re
diff --git a/app/models/trade/inclusion_validation_rule.rb b/app/models/trade/inclusion_validation_rule.rb
index 0bc98ad59..e92c98658 100644
--- a/app/models/trade/inclusion_validation_rule.rb
+++ b/app/models/trade/inclusion_validation_rule.rb
@@ -16,7 +16,8 @@
 #
 
 class Trade::InclusionValidationRule < Trade::ValidationRule
-  attr_accessible :valid_values_view
+  # Only created by seed.
+  # attr_accessible :valid_values_view
 
   def matching_records_for_aru_and_error(annual_report_upload, validation_error)
     @query = matching_records(annual_report_upload).where(
diff --git a/app/models/trade/permit.rb b/app/models/trade/permit.rb
index 2d2e7cddb..6d87f748e 100644
--- a/app/models/trade/permit.rb
+++ b/app/models/trade/permit.rb
@@ -9,5 +9,6 @@
 #
 
 class Trade::Permit < ActiveRecord::Base
-  attr_accessible :number
+  # app/models/trade/shipment.rb is the only place create this record.
+  # attr_accessible :number
 end
diff --git a/app/models/trade/sandbox_template.rb b/app/models/trade/sandbox_template.rb
index e0850ca25..0dcebe97c 100644
--- a/app/models/trade/sandbox_template.rb
+++ b/app/models/trade/sandbox_template.rb
@@ -46,19 +46,20 @@ def self.ar_klass(table_name)
         self.table_name = table_name
         has_paper_trail
         include ActiveModel::ForbiddenAttributesProtection
-        attr_accessible :appendix,
-          :taxon_name,
-          :term_code,
-          :quantity,
-          :unit_code,
-          :trading_partner,
-          :country_of_origin,
-          :import_permit,
-          :export_permit,
-          :origin_permit,
-          :purpose_code,
-          :source_code,
-          :year
+        # Too dynamic, hard to trace where using it.
+        # attr_accessible :appendix,
+        #   :taxon_name,
+        #   :term_code,
+        #   :quantity,
+        #   :unit_code,
+        #   :trading_partner,
+        #   :country_of_origin,
+        #   :import_permit,
+        #   :export_permit,
+        #   :origin_permit,
+        #   :purpose_code,
+        #   :source_code,
+        #   :year
         belongs_to :taxon_concept
         belongs_to :reported_taxon_concept, :class_name => TaxonConcept
 
diff --git a/app/models/trade/shipment.rb b/app/models/trade/shipment.rb
index cd769d34f..e84059711 100644
--- a/app/models/trade/shipment.rb
+++ b/app/models/trade/shipment.rb
@@ -33,14 +33,15 @@
 
 class Trade::Shipment < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :annual_report_upload_id, :appendix,
-    :country_of_origin_id, :origin_permit_id,
-    :exporter_id, :import_permit_id, :importer_id, :purpose_id,
-    :quantity, :reporter_type, :reported_by_exporter,
-    :source_id, :taxon_concept_id, :reported_taxon_concept_id,
-    :term_id, :unit_id, :year,
-    :import_permit_number, :export_permit_number, :origin_permit_number,
-    :ignore_warnings, :created_by_id, :updated_by_id
+  # Not sure where using this.
+  # attr_accessible :annual_report_upload_id, :appendix,
+  #   :country_of_origin_id, :origin_permit_id,
+  #   :exporter_id, :import_permit_id, :importer_id, :purpose_id,
+  #   :quantity, :reporter_type, :reported_by_exporter,
+  #   :source_id, :taxon_concept_id, :reported_taxon_concept_id,
+  #   :term_id, :unit_id, :year,
+  #   :import_permit_number, :export_permit_number, :origin_permit_number,
+  #   :ignore_warnings, :created_by_id, :updated_by_id
   attr_accessor :reporter_type, :warnings, :ignore_warnings
 
   validates :quantity, :presence => true, :numericality => {
diff --git a/app/models/trade/trade_data_download.rb b/app/models/trade/trade_data_download.rb
index 5b0ab52bd..03b332065 100644
--- a/app/models/trade/trade_data_download.rb
+++ b/app/models/trade/trade_data_download.rb
@@ -25,9 +25,9 @@
 #
 
 class Trade::TradeDataDownload < ActiveRecord::Base
-
-  attr_accessible :user_ip, :report_type, :year_from, :year_to, :taxon,
-   :appendix, :importer, :exporter, :origin, :term, :unit, :source, :purpose,
-   :number_of_rows, :city, :country, :organization
+  # Used by app/models/trade/trade_data_download_logger.rb
+  # attr_accessible :user_ip, :report_type, :year_from, :year_to, :taxon,
+  #  :appendix, :importer, :exporter, :origin, :term, :unit, :source, :purpose,
+  #  :number_of_rows, :city, :country, :organization
 
 end
diff --git a/app/models/trade/validation_error.rb b/app/models/trade/validation_error.rb
index 098bf11e0..fc73c1d04 100644
--- a/app/models/trade/validation_error.rb
+++ b/app/models/trade/validation_error.rb
@@ -1,11 +1,13 @@
 class Trade::ValidationError < ActiveRecord::Base
   belongs_to :annual_report_upload, class_name: Trade::AnnualReportUpload
   belongs_to :validation_rule, class_name: Trade::ValidationRule
-  attr_accessible :annual_report_upload_id,
-    :validation_rule_id,
-    :matching_criteria,
-    :is_ignored,
-    :is_primary,
-    :error_message,
-    :error_count
+
+  # Used by app/models/trade/validation_rule.rb
+  # attr_accessible :annual_report_upload_id,
+  #   :validation_rule_id,
+  #   :matching_criteria,
+  #   :is_ignored,
+  #   :is_primary,
+  #   :error_message,
+  #   :error_count
 end
diff --git a/app/models/trade/validation_rule.rb b/app/models/trade/validation_rule.rb
index 957b8aec9..c80c22727 100644
--- a/app/models/trade/validation_rule.rb
+++ b/app/models/trade/validation_rule.rb
@@ -16,7 +16,8 @@
 #
 
 class Trade::ValidationRule < ActiveRecord::Base
-  attr_accessible :column_names, :run_order, :is_primary, :scope, :is_strict
+  # Used by seed.
+  # attr_accessible :column_names, :run_order, :is_primary, :scope, :is_strict
   serialize :scope, ActiveRecord::Coders::NestedHstore
   has_many :validation_errors, class_name: Trade::ValidationError
 
diff --git a/app/models/trade_restriction_purpose.rb b/app/models/trade_restriction_purpose.rb
index cbe4887cb..ee714b09e 100644
--- a/app/models/trade_restriction_purpose.rb
+++ b/app/models/trade_restriction_purpose.rb
@@ -13,7 +13,8 @@
 
 class TradeRestrictionPurpose < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :purpose_id, :trade_restriction_id
+  # Relationship model between TradeCode(purpose) and TradeRestriction
+  # attr_accessible :purpose_id, :trade_restriction_id
   belongs_to :trade_restriction
   belongs_to :purpose, :class_name => 'TradeCode'
 end
diff --git a/app/models/trade_restriction_source.rb b/app/models/trade_restriction_source.rb
index 408bd3458..bfcc487e5 100644
--- a/app/models/trade_restriction_source.rb
+++ b/app/models/trade_restriction_source.rb
@@ -13,7 +13,8 @@
 
 class TradeRestrictionSource < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :source_id, :trade_restriction_id
+  # Relationship model between TradeCode(source) and TradeRestriction
+  # attr_accessible :source_id, :trade_restriction_id
   belongs_to :trade_restriction
   belongs_to :source, :class_name => 'TradeCode'
 end
diff --git a/app/models/trade_restriction_term.rb b/app/models/trade_restriction_term.rb
index 5e8c3f8b2..465cea6d9 100644
--- a/app/models/trade_restriction_term.rb
+++ b/app/models/trade_restriction_term.rb
@@ -13,7 +13,8 @@
 
 class TradeRestrictionTerm < ActiveRecord::Base
   track_who_does_it
-  attr_accessible :term_id, :trade_restriction_id
+  # Relationship model between TradeCode(term) and TradeRestriction
+  # attr_accessible :term_id, :trade_restriction_id
   belongs_to :trade_restriction
   belongs_to :term, :class_name => 'TradeCode'
 end
diff --git a/app/models/year_annual_reports_by_country.rb b/app/models/year_annual_reports_by_country.rb
index ebbb71d46..d5dde3a66 100644
--- a/app/models/year_annual_reports_by_country.rb
+++ b/app/models/year_annual_reports_by_country.rb
@@ -10,6 +10,6 @@
 #
 
 class YearAnnualReportsByCountry < ActiveRecord::Base
-  attr_accessible :no, :name_en, :year, :reporter_type, :year_created
-
+  # No idea where using this.
+  # attr_accessible :no, :name_en, :year, :reporter_type, :year_created
 end
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index 63f51f3c4..78e8d0b79 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -1,7 +1,8 @@
-ActsAsTaggableOn::Tag.class_eval do
-  attr_accessible :name
-end
+# Migrated to Strong Parameters
+# ActsAsTaggableOn::Tag.class_eval do
+#   attr_accessible :name
+# end
 
-ActsAsTaggableOn::Tagging.class_eval do
-  attr_accessible :tag_id, :context, :taggable, :taggable_id, :taggable_type, :tagger_id, :tagger_type
-end
+# ActsAsTaggableOn::Tagging.class_eval do
+#   attr_accessible :tag_id, :context, :taggable, :taggable_id, :taggable_type, :tagger_id, :tagger_type
+# end
diff --git a/config/initializers/paper_trail.rb b/config/initializers/paper_trail.rb
index 2205fa8db..c1ba79436 100644
--- a/config/initializers/paper_trail.rb
+++ b/config/initializers/paper_trail.rb
@@ -1,15 +1,16 @@
 # config/initializers/paper_trail.rb
 
-# the following line is required for PaperTrail >= 4.0.0 with Rails
+# the following line is required for PaperTrail >= 4.0.0 and < 12.0.0 with Rails
 PaperTrail::Rails::Engine.eager_load!
 
 class TaxonConceptVersion < PaperTrail::Version
-  attr_accessible :taxon_concept_id,
-    :taxonomy_name,
-    :full_name,
-    :author_year,
-    :name_status,
-    :rank_name
+  # Migrated to Strong Parameters
+  # attr_accessible :taxon_concept_id,
+  #   :taxonomy_name,
+  #   :full_name,
+  #   :author_year,
+  #   :name_status,
+  #   :rank_name
   self.table_name = :taxon_concept_versions
   self.sequence_name = :taxon_concept_versions_id_seq
 end

From 561fe1b0c0ab33f95edf04818d76f24dc9856cab Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 15:57:02 +0000
Subject: [PATCH 023/241] update config for strong params, bugs fix, and fix
 rspec. (still got 1 spec failed)

---
 Gemfile                                            |  1 -
 Gemfile.lock                                       |  3 ---
 .../admin/nomenclature_changes/lump_controller.rb  | 10 ++++++++--
 .../admin/nomenclature_changes/split_controller.rb | 14 ++++++++++----
 .../nomenclature_changes/status_swap_controller.rb |  8 ++++++--
 .../status_to_accepted_controller.rb               |  8 ++++++--
 .../status_to_synonym_controller.rb                |  8 ++++++--
 app/controllers/admin/users_controller.rb          |  6 +++---
 .../reassignment_copy_processor.rb                 |  4 ++--
 config/environments/development.rb                 |  4 ----
 config/environments/test.rb                        |  4 ----
 config/initializers/paper_trail.rb                 |  2 ++
 .../admin/change_types_controller_spec.rb          |  2 +-
 .../admin/cites_suspensions_controller_spec.rb     |  2 +-
 .../admin/designations_controller_spec.rb          |  2 +-
 .../admin/eu_opinions_controller_spec.rb           |  2 +-
 .../admin/instruments_controller_spec.rb           |  2 +-
 .../controllers/admin/languages_controller_spec.rb |  2 +-
 .../status_swap_controller_spec.rb                 |  2 +-
 .../status_to_accepted_controller_spec.rb          |  2 +-
 .../status_to_synonym_controller_spec.rb           |  2 +-
 spec/controllers/admin/ranks_controller_spec.rb    |  2 +-
 .../admin/species_listings_controller_spec.rb      |  2 +-
 .../admin/srg_histories_controller_spec.rb         |  4 ++--
 spec/controllers/admin/tags_controller_spec.rb     |  8 ++++----
 .../taxon_cites_suspensions_controller_spec.rb     |  2 +-
 .../admin/taxon_commons_controller_spec.rb         |  3 +--
 .../admin/taxon_concepts_controller_spec.rb        |  6 +++---
 .../admin/taxon_eu_suspensions_controller_spec.rb  |  2 +-
 .../admin/taxon_listing_changes_controller_spec.rb |  2 +-
 .../admin/taxon_quotas_controller_spec.rb          |  2 +-
 31 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/Gemfile b/Gemfile
index f4f25bb45..0e74c3d4d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,6 @@ gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
 gem 'inherited_resources', '1.9.0' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
 gem 'traco', '~> 5.3', '>= 5.3.3' # TODO: latest version @ 2021. Suggest migrate to Mobility gem.
-gem 'protected_attributes_continued', '1.2.4' # TODO: upgrade to latest after we successfully upgrade Rails to 5.
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
 gem 'cancancan', '1.17.0' # TODO, can upgrade to 2.0 after Rails 5
 gem 'ahoy_matey', '2.2.1' # TODO: latest 5.0.2. Can't upgrade to 3.0 until upgrade to Rails 5
diff --git a/Gemfile.lock b/Gemfile.lock
index 85978d3cc..b553e0c07 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -350,8 +350,6 @@ GEM
       pdf-reader (~> 1.2)
       ruby-rc4
       ttfunk (~> 1.0.3)
-    protected_attributes_continued (1.2.4)
-      activemodel (>= 4.0.1, < 6.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -618,7 +616,6 @@ DEPENDENCIES
   pg_array_parser (~> 0.0.9)
   pg_search (= 2.3.0)
   prawn (= 0.13.2)
-  protected_attributes_continued (= 1.2.4)
   rack-cors (= 0.3.0)
   rack-livereload (= 0.3.11)
   rails (= 4.2.11.3)
diff --git a/app/controllers/admin/nomenclature_changes/lump_controller.rb b/app/controllers/admin/nomenclature_changes/lump_controller.rb
index f095d0c2c..f8303285d 100644
--- a/app/controllers/admin/nomenclature_changes/lump_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/lump_controller.rb
@@ -62,14 +62,19 @@ def nomenclature_change_lump_params
     params.require(:nomenclature_change_lump).permit(
       :event_id, :status,
       inputs_attributes: [
+        :id, :_destroy,
         :nomenclature_change_id, :taxon_concept_id,
         :note_en, :note_es, :note_fr, :internal_note,
         parent_reassignments_attributes: [
           :id, :_destroy,
-          :reassignment_target_attributes,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          reassignment_target_attributes: [
+            :id, :_destroy,
+            :nomenclature_change_output_id,
+            :nomenclature_change_reassignment_id, :note
+          ]
         ],
         name_reassignments_attributes: [
           :id, :_destroy,
@@ -91,6 +96,7 @@ def nomenclature_change_lump_params
         ]
       ],
       output_attributes: [
+        :id, :_destroy,
         :nomenclature_change_id, :taxon_concept_id,
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
diff --git a/app/controllers/admin/nomenclature_changes/split_controller.rb b/app/controllers/admin/nomenclature_changes/split_controller.rb
index b558f532d..4cc127c35 100644
--- a/app/controllers/admin/nomenclature_changes/split_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/split_controller.rb
@@ -62,15 +62,20 @@ def klass
   def nomenclature_change_split_params
     params.require(:nomenclature_change_split).permit(
       :event_id, :status,
-      inputs_attributes: [
+      input_attributes: [
+        :id, :_destroy,
         :nomenclature_change_id, :taxon_concept_id,
         :note_en, :note_es, :note_fr, :internal_note,
         parent_reassignments_attributes: [
           :id, :_destroy,
-          :reassignment_target_attributes,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          reassignment_target_attributes: [
+            :id, :_destroy,
+            :nomenclature_change_output_id,
+            :nomenclature_change_reassignment_id, :note
+          ]
         ],
         name_reassignments_attributes: [
           :id, :_destroy,
@@ -91,7 +96,8 @@ def nomenclature_change_split_params
           :note_en, :note_es, :note_fr, :internal_note, :output_ids
         ]
       ],
-      output_attributes: [
+      outputs_attributes: [
+        :id, :_destroy,
         :nomenclature_change_id, :taxon_concept_id,
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
diff --git a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
index 5c25d695c..393fef8b8 100644
--- a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
@@ -90,10 +90,14 @@ def nomenclature_change_status_swap_params
         :note_en, :note_es, :note_fr, :internal_note,
         parent_reassignments_attributes: [
           :id, :_destroy,
-          :reassignment_target_attributes,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          reassignment_target_attributes: [
+            :id, :_destroy,
+            :nomenclature_change_output_id,
+            :nomenclature_change_reassignment_id, :note
+          ]
         ],
         name_reassignments_attributes: [
           :id, :_destroy,
diff --git a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
index 3f3aecde4..0cdb352ab 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
@@ -78,10 +78,14 @@ def nomenclature_change_status_to_accepted_params
         :note_en, :note_es, :note_fr, :internal_note,
         parent_reassignments_attributes: [
           :id, :_destroy,
-          :reassignment_target_attributes,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          reassignment_target_attributes: [
+            :id, :_destroy,
+            :nomenclature_change_output_id,
+            :nomenclature_change_reassignment_id, :note
+          ]
         ],
         name_reassignments_attributes: [
           :id, :_destroy,
diff --git a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
index 6a5beca53..1808a6056 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
@@ -89,10 +89,14 @@ def nomenclature_change_status_to_synonym_params
         :note_en, :note_es, :note_fr, :internal_note,
         parent_reassignments_attributes: [
           :id, :_destroy,
-          :reassignment_target_attributes,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          reassignment_target_attributes: [
+            :id, :_destroy,
+            :nomenclature_change_output_id,
+            :nomenclature_change_reassignment_id, :note
+          ]
         ],
         name_reassignments_attributes: [
           :id, :_destroy,
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 578ee0654..6da5fcc65 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -18,10 +18,10 @@ def edit
 
   def update
     update_result =
-      if params[:user][:password].blank?
-        @user.update_without_password(params[:user])
+      if user_params[:password].blank?
+        @user.update_without_password(user_params)
       else
-        @user.update_attributes(params[:user]) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        @user.update_attributes(user_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
       end
     respond_to do |format|
       format.js {
diff --git a/app/models/nomenclature_change/reassignment_copy_processor.rb b/app/models/nomenclature_change/reassignment_copy_processor.rb
index 4be8f7e80..b2d99665c 100644
--- a/app/models/nomenclature_change/reassignment_copy_processor.rb
+++ b/app/models/nomenclature_change/reassignment_copy_processor.rb
@@ -131,7 +131,7 @@ def build_listing_change_associations(reassignable, copied_object)
       !copied_object.new_record? && exclusion.duplicates({
         parent_id: copied_object.id
       }).first || copied_object.exclusions.build(
-        exclusion.comparison_attributes, :without_protection => true
+        exclusion.comparison_attributes
       )
     end
     # annotation
@@ -150,7 +150,7 @@ def build_trade_restriction_associations(reassignable, copied_object)
         !copied_object.new_record? && trade_restr_code.duplicates({
           trade_restriction_id: copied_object.id
         }).first || copied_object.send(trade_restriction_codes).build(
-          trade_restr_code.comparison_attributes, :without_protection => true
+          trade_restr_code.comparison_attributes
         )
       end
     end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3c65a31ae..f0c7f2016 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -42,10 +42,6 @@
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  # TODO: Only support Rails version < 5
-  # GEM `protected_attributes` settings (https://github.com/rails/protected_attributes#errors)
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Custom cache settings
   config.cache_store = :memory_store, { size: 64.megabytes }
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4472f8ae8..6e180d753 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -41,10 +41,6 @@
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  # TODO: Only support Rails version < 5
-  # GEM `protected_attributes` settings (https://github.com/rails/protected_attributes#errors)
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Custom cache settings
   config.cache_store = :null_store
 
diff --git a/config/initializers/paper_trail.rb b/config/initializers/paper_trail.rb
index c1ba79436..9cfcb752e 100644
--- a/config/initializers/paper_trail.rb
+++ b/config/initializers/paper_trail.rb
@@ -1,5 +1,7 @@
 # config/initializers/paper_trail.rb
 
+PaperTrail.config.track_associations = false
+
 # the following line is required for PaperTrail >= 4.0.0 and < 12.0.0 with Rails
 PaperTrail::Rails::Engine.eager_load!
 
diff --git a/spec/controllers/admin/change_types_controller_spec.rb b/spec/controllers/admin/change_types_controller_spec.rb
index 166354d29..1326a485c 100644
--- a/spec/controllers/admin/change_types_controller_spec.rb
+++ b/spec/controllers/admin/change_types_controller_spec.rb
@@ -25,7 +25,7 @@
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, change_type: {}
+      xhr :post, :create, change_type: { dummy: 'test' }
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/cites_suspensions_controller_spec.rb b/spec/controllers/admin/cites_suspensions_controller_spec.rb
index cfa6ce7e5..49e8c22e8 100644
--- a/spec/controllers/admin/cites_suspensions_controller_spec.rb
+++ b/spec/controllers/admin/cites_suspensions_controller_spec.rb
@@ -45,7 +45,7 @@
       end
     end
     it "renders new when not successful" do
-      post :create, :cites_suspension => {}
+      post :create, :cites_suspension => { dummy: 'test'}
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/designations_controller_spec.rb b/spec/controllers/admin/designations_controller_spec.rb
index 52c724438..16d75c220 100644
--- a/spec/controllers/admin/designations_controller_spec.rb
+++ b/spec/controllers/admin/designations_controller_spec.rb
@@ -34,7 +34,7 @@
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, designation: {}
+      xhr :post, :create, designation: { dummy: 'test'}
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/eu_opinions_controller_spec.rb b/spec/controllers/admin/eu_opinions_controller_spec.rb
index c54d779d0..ed1911c10 100644
--- a/spec/controllers/admin/eu_opinions_controller_spec.rb
+++ b/spec/controllers/admin/eu_opinions_controller_spec.rb
@@ -77,7 +77,7 @@
 
     context "when not successful" do
       it "renders new" do
-        post :create, eu_opinion: {},
+        post :create, eu_opinion: { dummy: 'test' },
           taxon_concept_id: @taxon_concept.id
         expect(response).to render_template("new")
       end
diff --git a/spec/controllers/admin/instruments_controller_spec.rb b/spec/controllers/admin/instruments_controller_spec.rb
index 335f3cb4c..8e9604117 100644
--- a/spec/controllers/admin/instruments_controller_spec.rb
+++ b/spec/controllers/admin/instruments_controller_spec.rb
@@ -34,7 +34,7 @@
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, instrument: {}
+      xhr :post, :create, instrument: { dummy: 'test' }
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/languages_controller_spec.rb b/spec/controllers/admin/languages_controller_spec.rb
index 6eab1781c..e6388d2f4 100644
--- a/spec/controllers/admin/languages_controller_spec.rb
+++ b/spec/controllers/admin/languages_controller_spec.rb
@@ -22,7 +22,7 @@
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, language: {}
+      xhr :post, :create, language: { dummy: 'test' }
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
index 2f124144d..7fc49a850 100644
--- a/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
@@ -90,7 +90,7 @@
     end
     context 'when unsuccessful' do
       it 're-renders step' do
-        put :update, nomenclature_change_status_swap: {},
+        put :update, nomenclature_change_status_swap: { dummy: 'test'},
           nomenclature_change_id: @status_change.id, id: 'primary_output'
         expect(response).to render_template('primary_output')
       end
diff --git a/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
index 1ad1a65ce..90416ae2b 100644
--- a/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
@@ -63,7 +63,7 @@
     end
     context 'when unsuccessful' do
       it 're-renders step' do
-        put :update, nomenclature_change_status_to_accepted: {},
+        put :update, nomenclature_change_status_to_accepted: { dummy: 'test'},
           nomenclature_change_id: @status_change.id, id: 'primary_output'
         expect(response).to render_template('primary_output')
       end
diff --git a/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
index f750f8e7d..07370ae57 100644
--- a/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
@@ -68,7 +68,7 @@
     end
     context 'when unsuccessful' do
       it 're-renders step' do
-        put :update, nomenclature_change_status_to_synonym: {},
+        put :update, nomenclature_change_status_to_synonym: { dummy: 'test'},
           nomenclature_change_id: @status_change.id, id: 'primary_output'
         expect(response).to render_template('primary_output')
       end
diff --git a/spec/controllers/admin/ranks_controller_spec.rb b/spec/controllers/admin/ranks_controller_spec.rb
index dbe03df3f..82ebb203f 100644
--- a/spec/controllers/admin/ranks_controller_spec.rb
+++ b/spec/controllers/admin/ranks_controller_spec.rb
@@ -22,7 +22,7 @@
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, rank: {}
+      xhr :post, :create, rank: { dummy: 'test'}
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/species_listings_controller_spec.rb b/spec/controllers/admin/species_listings_controller_spec.rb
index bb8c91a41..870d1d096 100644
--- a/spec/controllers/admin/species_listings_controller_spec.rb
+++ b/spec/controllers/admin/species_listings_controller_spec.rb
@@ -25,7 +25,7 @@
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, species_listing: {}
+      xhr :post, :create, species_listing: { dummy: 'test' }
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/srg_histories_controller_spec.rb b/spec/controllers/admin/srg_histories_controller_spec.rb
index 2667db0ae..b0cd77095 100644
--- a/spec/controllers/admin/srg_histories_controller_spec.rb
+++ b/spec/controllers/admin/srg_histories_controller_spec.rb
@@ -25,7 +25,7 @@
 
     context "when not successful" do
       it "renders new" do
-        post :create, srg_history: {}, format: :js
+        post :create, srg_history: { dummy: 'test' }, format: :js
 
         expect(response).to render_template("new")
       end
@@ -39,7 +39,7 @@
 
     context "when successful" do
       it "renders the create js template" do
-        put :update, id: @srg_history.id, format: :js
+        put :update, id: @srg_history.id, srg_history: { dummy: 'test' }, format: :js
 
         expect(response).to render_template("create")
       end
diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb
index 3f4bb6d26..771c22a02 100644
--- a/spec/controllers/admin/tags_controller_spec.rb
+++ b/spec/controllers/admin/tags_controller_spec.rb
@@ -14,11 +14,11 @@
   describe "XHR POST create" do
     it "renders create when successful" do
       xhr :post, :create,
-        preset_tag: { name: "Test Tag", model: "TaxonConcept" }
+        tag: { name: "Test Tag", model: "TaxonConcept" }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, preset_tag: {}
+      xhr :post, :create, tag: { dummy: 'test' }
       expect(response).to render_template("new")
     end
   end
@@ -28,12 +28,12 @@
     context "when JSON" do
       it "responds with 200 when successful" do
         xhr :put, :update, :format => 'json', :id => preset_tag.id,
-          :preset_tag => {}
+          :tag => { dummy: 'test' }
         expect(response).to be_success
       end
       it "responds with json error when not successful" do
         xhr :put, :update, :format => 'json', :id => preset_tag.id,
-          :preset_tag => { :model => 'FakeCategory' }
+          :tag => { :model => 'FakeCategory' }
         expect(JSON.parse(response.body)).to include('errors')
       end
     end
diff --git a/spec/controllers/admin/taxon_cites_suspensions_controller_spec.rb b/spec/controllers/admin/taxon_cites_suspensions_controller_spec.rb
index ed01e82bd..791677de2 100644
--- a/spec/controllers/admin/taxon_cites_suspensions_controller_spec.rb
+++ b/spec/controllers/admin/taxon_cites_suspensions_controller_spec.rb
@@ -44,7 +44,7 @@
       end
     end
     it "renders new when not successful" do
-      post :create, :cites_suspension => {},
+      post :create, :cites_suspension => { dummy: 'test'},
         :taxon_concept_id => @taxon_concept.id
       expect(response).to render_template('new')
     end
diff --git a/spec/controllers/admin/taxon_commons_controller_spec.rb b/spec/controllers/admin/taxon_commons_controller_spec.rb
index 4682c712a..783816ccf 100644
--- a/spec/controllers/admin/taxon_commons_controller_spec.rb
+++ b/spec/controllers/admin/taxon_commons_controller_spec.rb
@@ -29,8 +29,7 @@
     it "renders new when not successful" do
       xhr :post, :create,
         :taxon_concept_id => @taxon_concept.id,
-        :taxon_common => {
-        }
+        :taxon_common => { dummy: 'test' }
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/taxon_concepts_controller_spec.rb b/spec/controllers/admin/taxon_concepts_controller_spec.rb
index dde27ef34..dfd65188d 100644
--- a/spec/controllers/admin/taxon_concepts_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concepts_controller_spec.rb
@@ -46,7 +46,7 @@
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, taxon_concept: {}
+      xhr :post, :create, taxon_concept: { dummy: 'test'}
       expect(response).to render_template("new")
     end
     it "renders new_synonym when not successful S" do
@@ -68,7 +68,7 @@
     context "when JSON" do
       it "responds with 200 when successful" do
         xhr :put, :update, :format => 'json', :id => taxon_concept.id,
-          :taxon_concept => {}
+          :taxon_concept => { dummy: 'test' }
         expect(response).to be_success
       end
       it "responds with json error when not successful" do
@@ -80,7 +80,7 @@
     context "when HTML" do
       it "redirects to edit when successful" do
         put :update, :id => taxon_concept.id,
-          :taxon_commons_attributes => FactoryGirl.attributes_for(:common_name)
+          :taxon_concept => { dummy: 'test' }
         expect(response).to redirect_to(edit_admin_taxon_concept_url(taxon_concept))
       end
       it "renders edit when not successful" do
diff --git a/spec/controllers/admin/taxon_eu_suspensions_controller_spec.rb b/spec/controllers/admin/taxon_eu_suspensions_controller_spec.rb
index f3ddd6a42..3834e5cc6 100644
--- a/spec/controllers/admin/taxon_eu_suspensions_controller_spec.rb
+++ b/spec/controllers/admin/taxon_eu_suspensions_controller_spec.rb
@@ -52,7 +52,7 @@
 
     context "when not successful" do
       it "renders new" do
-        post :create, :eu_suspension => {},
+        post :create, :eu_suspension => { dummy: 'test' },
           :taxon_concept_id => @taxon_concept.id
         expect(response).to render_template("new")
       end
diff --git a/spec/controllers/admin/taxon_listing_changes_controller_spec.rb b/spec/controllers/admin/taxon_listing_changes_controller_spec.rb
index 190acd9c3..35194fae4 100644
--- a/spec/controllers/admin/taxon_listing_changes_controller_spec.rb
+++ b/spec/controllers/admin/taxon_listing_changes_controller_spec.rb
@@ -87,7 +87,7 @@
     end
     it "renders new when not successful" do
       taxon_concept = create(:taxon_concept)
-      post :create, :listing_change => {},
+      post :create, :listing_change => { dummy: 'test' },
         :taxon_concept_id => @taxon_concept.id,
         :designation_id => @designation.id
       expect(response).to render_template("new")
diff --git a/spec/controllers/admin/taxon_quotas_controller_spec.rb b/spec/controllers/admin/taxon_quotas_controller_spec.rb
index 368d80731..365660e60 100644
--- a/spec/controllers/admin/taxon_quotas_controller_spec.rb
+++ b/spec/controllers/admin/taxon_quotas_controller_spec.rb
@@ -50,7 +50,7 @@
       end
     end
     it "renders new when not successful" do
-      post :create, :quota => {},
+      post :create, :quota => { dummy: 'test' },
         :taxon_concept_id => @taxon_concept.id
       expect(response).to render_template("new")
     end

From 3bab7363a714a00c66afe07323538b4d868f6f0e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 17:15:09 +0000
Subject: [PATCH 024/241] bug fixes

---
 .../admin/nomenclature_changes/lump_controller_spec.rb      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
index 9d47f43be..3a619f7c4 100644
--- a/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
@@ -79,8 +79,8 @@
       it 'redirects to next step' do
         put :update, nomenclature_change_lump: {
           inputs_attributes: {
-            0 => { taxon_concept_id: create_cites_eu_species.id },
-            1 => { taxon_concept_id: create_cites_eu_species.id }
+            '0' => { taxon_concept_id: create_cites_eu_species.id },
+            '1' => { taxon_concept_id: create_cites_eu_species.id }
           }
         }, nomenclature_change_id: @lump.id, id: 'inputs'
         expect(response).to redirect_to(
@@ -95,7 +95,7 @@
         put :update,
           nomenclature_change_lump: {
             inputs_attributes: {
-              0 => { taxon_concept_id: nil }
+              '0' => { taxon_concept_id: nil }
             }
           }, nomenclature_change_id: @lump.id, id: 'inputs'
         expect(response).to render_template('inputs')

From b991d4f97ded7888148ba0c5034fd028c937c8fc Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 18:42:26 +0000
Subject: [PATCH 025/241] upgrade paper_trail to 10.3.1 (was 5.2.3)

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e74c3d4d..73a853ade 100644
--- a/Gemfile
+++ b/Gemfile
@@ -139,7 +139,7 @@ gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest v
 
 # track who created or edited a given object
 gem 'clerk', '0.2.3' # TODO: Need update to 1.0.0 when upgrade to Rails 5. I would say should update our code and just use paper_trail. This gem last update at 2018.
-gem 'paper_trail', '5.2.3' # TODO: latest is 15.1.0. Need upgrade to v6 for Rails 5.1; v9 for Rails 5.2
+gem 'paper_trail', '10.3.1' # TODO: latest is 15.1.0. Can upgrade to newer version when we at Rails 5.2
 
 gem 'dotenv-rails', '2.0.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b553e0c07..963f44981 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,8 +327,8 @@ GEM
     numerizer (0.1.1)
     oj (3.14.2)
     orm_adapter (0.5.0)
-    paper_trail (5.2.3)
-      activerecord (>= 3.0, < 6.0)
+    paper_trail (10.3.1)
+      activerecord (>= 4.2)
       request_store (~> 1.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -610,7 +610,7 @@ DEPENDENCIES
   nested_form (~> 0.3.2)
   nokogiri (= 1.12.5)
   oj (= 3.14.2)
-  paper_trail (= 5.2.3)
+  paper_trail (= 10.3.1)
   pdfkit (~> 0.8.7.3)
   pg (= 0.21.0)
   pg_array_parser (~> 0.0.9)

From 5105c1f88b393da64a59d2c7bd790cde46e4034e Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Fri, 19 Jan 2024 10:00:49 +0000
Subject: [PATCH 026/241] deps: fix specific versions of Ember (1.6.1) and
 Ember Data (0.14) client js libraries

Fixes issues caused by updating versions of the ember-rails and ember-data-source gems
by running the following:

    rails generate ember:install --tag=v1.6.1 --ember
    rails generate ember:install --tag=v0.14 --ember-data

...and committing the files the commands place in `vendor/`
---
 vendor/assets/ember/development/ember-data.js | 10206 ++++
 .../development/ember-template-compiler.js    |   338 +
 vendor/assets/ember/development/ember.js      | 46764 ++++++++++++++++
 vendor/assets/ember/production/ember-data.js  | 10189 ++++
 .../production/ember-template-compiler.js     |   338 +
 vendor/assets/ember/production/ember.js       | 46321 +++++++++++++++
 6 files changed, 114156 insertions(+)
 create mode 100644 vendor/assets/ember/development/ember-data.js
 create mode 100644 vendor/assets/ember/development/ember-template-compiler.js
 create mode 100644 vendor/assets/ember/development/ember.js
 create mode 100644 vendor/assets/ember/production/ember-data.js
 create mode 100644 vendor/assets/ember/production/ember-template-compiler.js
 create mode 100644 vendor/assets/ember/production/ember.js

diff --git a/vendor/assets/ember/development/ember-data.js b/vendor/assets/ember/development/ember-data.js
new file mode 100644
index 000000000..8ef3ebe2c
--- /dev/null
+++ b/vendor/assets/ember/development/ember-data.js
@@ -0,0 +1,10206 @@
+// Fetched from channel: tags/v0.14, with url http://builds.emberjs.com/tags/v0.14/ember-data.js
+// Fetched on: 2024-01-19T09:54:32Z
+// Version: v0.14
+// Last commit: d9cd270 (2013-08-31 17:12:14 -0700)
+
+
+(function() {
+var define, requireModule;
+
+(function() {
+  var registry = {}, seen = {};
+
+  define = function(name, deps, callback) {
+    registry[name] = { deps: deps, callback: callback };
+  };
+
+  requireModule = function(name) {
+    if (seen[name]) { return seen[name]; }
+    seen[name] = {};
+
+    var mod, deps, callback, reified , exports;
+
+    mod = registry[name];
+
+    if (!mod) {
+      throw new Error("Module '" + name + "' not found.");
+    }
+
+    deps = mod.deps;
+    callback = mod.callback;
+    reified = [];
+    exports;
+
+    for (var i=0, l=deps.length; i<l; i++) {
+      if (deps[i] === 'exports') {
+        reified.push(exports = {});
+      } else {
+        reified.push(requireModule(deps[i]));
+      }
+    }
+
+    var value = callback.apply(this, reified);
+    return seen[name] = exports || value;
+  };
+})();
+(function() {
+/**
+  @module ember-data
+*/
+
+/**
+  All Ember Data methods and functions are defined inside of this namespace.
+
+  @class DS
+  @static
+*/
+
+if ('undefined' === typeof DS) {
+  /*global DS:true*/
+  DS = Ember.Namespace.create({
+    VERSION: '0.14'
+  });
+
+  if ('undefined' !== typeof window) {
+    window.DS = DS;
+  }
+}
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set;
+
+DS.NewJSONSerializer = Ember.Object.extend({
+  deserialize: function(type, data) {
+    var store = get(this, 'store');
+
+    type.eachRelationship(function(key, relationship) {
+      var type = relationship.type,
+          value = data[key];
+
+      if (value == null) { return; }
+
+      if (relationship.kind === 'belongsTo') {
+        this.deserializeRecordId(data, key, type, value);
+      } else if (relationship.kind === 'hasMany') {
+        this.deserializeRecordIds(data, key, type, value);
+      }
+    }, this);
+
+    return data;
+  },
+
+  deserializeRecordId: function(data, key, type, id) {
+    if (typeof id === 'number' || typeof id === 'string') {
+      data[key] = get(this, 'store').recordFor(type, id);
+    }
+  },
+
+  deserializeRecordIds: function(data, key, type, ids) {
+    for (var i=0, l=ids.length; i<l; i++) {
+      this.deserializeRecordId(ids, i, type, ids[i]);
+    }
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+// Keep ED compatible with previous versions of ember
+// TODO: Remove this check for Ember 1.0
+if (!Ember.DataAdapter) { return; }
+
+var get = Ember.get, capitalize = Ember.String.capitalize, underscore = Ember.String.underscore, DS = window.DS ;
+
+/**
+  Extend `Ember.DataAdapter` with ED specific code.
+*/
+DS.DebugAdapter = Ember.DataAdapter.extend({
+  getFilters: function() {
+    return [
+      { name: 'isNew', desc: 'New' },
+      { name: 'isModified', desc: 'Modified' },
+      { name: 'isClean', desc: 'Clean' }
+    ];
+  },
+
+  detect: function(klass) {
+    return klass !== DS.Model && DS.Model.detect(klass);
+  },
+
+  columnsForType: function(type) {
+    var columns = [{ name: 'id', desc: 'Id' }], count = 0, self = this;
+    Ember.A(get(type, 'attributes')).forEach(function(name, meta) {
+        if (count++ > self.attributeLimit) { return false; }
+        var desc = capitalize(underscore(name).replace('_', ' '));
+        columns.push({ name: name, desc: desc });
+    });
+    return columns;
+  },
+
+  getRecords: function(type) {
+    return this.get('store').all(type);
+  },
+
+  getRecordColumnValues: function(record) {
+    var self = this, count = 0,
+        columnValues = { id: get(record, 'id') };
+
+    record.eachAttribute(function(key) {
+      if (count++ > self.attributeLimit) {
+        return false;
+      }
+      var value = get(record, key);
+      columnValues[key] = value;
+    });
+    return columnValues;
+  },
+
+  getRecordKeywords: function(record) {
+    var keywords = [], keys = Ember.A(['id']);
+    record.eachAttribute(function(key) {
+      keys.push(key);
+    });
+    keys.forEach(function(key) {
+      keywords.push(get(record, key));
+    });
+    return keywords;
+  },
+
+  getRecordFilterValues: function(record) {
+    return {
+      isNew: record.get('isNew'),
+      isModified: record.get('isDirty') && !record.get('isNew'),
+      isClean: !record.get('isDirty')
+    };
+  },
+
+  getRecordColor: function(record) {
+    var color = 'black';
+    if (record.get('isNew')) {
+      color = 'green';
+    } else if (record.get('isDirty')) {
+      color = 'blue';
+    }
+    return color;
+  },
+
+  observeRecord: function(record, recordUpdated) {
+    var releaseMethods = Ember.A(), self = this,
+        keysToObserve = Ember.A(['id', 'isNew', 'isDirty']);
+
+    record.eachAttribute(function(key) {
+      keysToObserve.push(key);
+    });
+
+    keysToObserve.forEach(function(key) {
+      var handler = function() {
+        recordUpdated(self.wrapRecord(record));
+      };
+      Ember.addObserver(record, key, handler);
+      releaseMethods.push(function() {
+        Ember.removeObserver(record, key, handler);
+      });
+    });
+
+    var release = function() {
+      releaseMethods.forEach(function(fn) { fn(); } );
+    };
+
+    return release;
+  }
+
+});
+
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var set = Ember.set;
+
+/*
+  This code registers an injection for Ember.Application.
+
+  If an Ember.js developer defines a subclass of DS.Store on their application,
+  this code will automatically instantiate it and make it available on the
+  router.
+
+  Additionally, after an application's controllers have been injected, they will
+  each have the store made available to them.
+
+  For example, imagine an Ember.js application with the following classes:
+
+  App.Store = DS.Store.extend({
+    adapter: 'App.MyCustomAdapter'
+  });
+
+  App.PostsController = Ember.ArrayController.extend({
+    // ...
+  });
+
+  When the application is initialized, `App.Store` will automatically be
+  instantiated, and the instance of `App.PostsController` will have its `store`
+  property set to that instance.
+
+  Note that this code will only be run if the `ember-application` package is
+  loaded. If Ember Data is being used in an environment other than a
+  typical application (e.g., node.js where only `ember-runtime` is available),
+  this code will be ignored.
+*/
+
+Ember.onLoad('Ember.Application', function(Application) {
+  Application.initializer({
+    name: "store",
+
+    initialize: function(container, application) {
+      Ember.assert("You included Ember Data but didn't define "+application.toString()+".Store", application.Store);
+
+      application.register('store:main', application.Store);
+      application.register('serializer:_default', DS.NewJSONSerializer);
+
+      // Eagerly generate the store so defaultStore is populated.
+      // TODO: Do this in a finisher hook
+      container.lookup('store:main');
+    }
+  });
+
+  // Keep ED compatible with previous versions of ember
+  // TODO: Remove the if statement for Ember 1.0
+  if (DS.DebugAdapter) {
+    Application.initializer({
+      name: "dataAdapter",
+
+      initialize: function(container, application) {
+        application.register('dataAdapter:main', DS.DebugAdapter);
+      }
+    });
+  }
+
+  Application.initializer({
+    name: "injectStore",
+
+    initialize: function(container, application) {
+      application.inject('controller', 'store', 'store:main');
+      application.inject('route', 'store', 'store:main');
+      application.inject('dataAdapter', 'store', 'store:main');
+    }
+  });
+
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+/**
+  Date.parse with progressive enhancement for ISO 8601 <https://github.com/csnover/js-iso8601>
+
+  © 2011 Colin Snover <http://zetafleet.com>
+
+  Released under MIT license.
+
+  @class Date
+  @namespace Ember
+  @static
+*/
+Ember.Date = Ember.Date || {};
+
+var origParse = Date.parse, numericKeys = [ 1, 4, 5, 6, 7, 10, 11 ];
+
+/**
+  @method parse
+  @param date
+*/
+Ember.Date.parse = function (date) {
+    var timestamp, struct, minutesOffset = 0;
+
+    // ES5 §15.9.4.2 states that the string should attempt to be parsed as a Date Time String Format string
+    // before falling back to any implementation-specific date parsing, so that’s what we do, even if native
+    // implementations could be faster
+    //              1 YYYY                2 MM       3 DD           4 HH    5 mm       6 ss        7 msec        8 Z 9 ±    10 tzHH    11 tzmm
+    if ((struct = /^(\d{4}|[+\-]\d{6})(?:-(\d{2})(?:-(\d{2}))?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(\d{2})(?::(\d{2}))?)?)?$/.exec(date))) {
+        // avoid NaN timestamps caused by “undefined” values being passed to Date.UTC
+        for (var i = 0, k; (k = numericKeys[i]); ++i) {
+            struct[k] = +struct[k] || 0;
+        }
+
+        // allow undefined days and months
+        struct[2] = (+struct[2] || 1) - 1;
+        struct[3] = +struct[3] || 1;
+
+        if (struct[8] !== 'Z' && struct[9] !== undefined) {
+            minutesOffset = struct[10] * 60 + struct[11];
+
+            if (struct[9] === '+') {
+                minutesOffset = 0 - minutesOffset;
+            }
+        }
+
+        timestamp = Date.UTC(struct[1], struct[2], struct[3], struct[4], struct[5] + minutesOffset, struct[6], struct[7]);
+    }
+    else {
+        timestamp = origParse ? origParse(date) : NaN;
+    }
+
+    return timestamp;
+};
+
+if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Date) {
+  Date.parse = Ember.Date.parse;
+}
+
+})();
+
+
+
+(function() {
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var Evented = Ember.Evented,              // ember-runtime/mixins/evented
+    Deferred = Ember.DeferredMixin,       // ember-runtime/mixins/evented
+    run = Ember.run,                      // ember-metal/run-loop
+    get = Ember.get;                      // ember-metal/accessors
+
+var LoadPromise = Ember.Mixin.create(Evented, Deferred, {
+  init: function() {
+    this._super.apply(this, arguments);
+
+    this.one('didLoad', this, function() {
+      this.resolve(this);
+    });
+
+    this.one('becameError', this, function() {
+      this.reject(this);
+    });
+
+    if (get(this, 'isLoaded')) {
+      this.trigger('didLoad');
+    }
+  }
+});
+
+DS.LoadPromise = LoadPromise;
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+var LoadPromise = DS.LoadPromise; // system/mixins/load_promise
+
+/**
+  A record array is an array that contains records of a certain type. The record
+  array materializes records as needed when they are retrieved for the first
+  time. You should not create record arrays yourself. Instead, an instance of
+  DS.RecordArray or its subclasses will be returned by your application's store
+  in response to queries.
+
+  @class RecordArray
+  @namespace DS
+  @extends Ember.ArrayProxy
+  @uses Ember.Evented
+  @uses DS.LoadPromise
+*/
+
+DS.RecordArray = Ember.ArrayProxy.extend(LoadPromise, {
+  /**
+    The model type contained by this record array.
+
+    @property type
+    @type DS.Model
+  */
+  type: null,
+
+  // The array of client ids backing the record array. When a
+  // record is requested from the record array, the record
+  // for the client id at the same index is materialized, if
+  // necessary, by the store.
+  content: null,
+
+  isLoaded: false,
+  isUpdating: false,
+
+  // The store that created this record array.
+  store: null,
+
+  objectAtContent: function(index) {
+    var content = get(this, 'content'),
+        reference = content.objectAt(index),
+        store = get(this, 'store');
+
+    if (reference instanceof DS.Model) {
+      return reference;
+    }
+
+    if (reference) {
+      return store.recordForReference(reference);
+    }
+  },
+
+  materializedObjectAt: function(index) {
+    var reference = get(this, 'content').objectAt(index);
+    if (!reference) { return; }
+
+    if (get(this, 'store').recordIsMaterialized(reference)) {
+      return this.objectAt(index);
+    }
+  },
+
+  update: function() {
+    if (get(this, 'isUpdating')) { return; }
+
+    var store = get(this, 'store'),
+        type = get(this, 'type');
+
+    store.fetchAll(type, this);
+  },
+
+  addReference: function(reference) {
+    get(this, 'content').addObject(reference);
+  },
+
+  removeReference: function(reference) {
+    get(this, 'content').removeObject(reference);
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get;
+
+/**
+  @class FilteredRecordArray
+  @namespace DS
+  @extends DS.RecordArray
+*/
+DS.FilteredRecordArray = DS.RecordArray.extend({
+  filterFunction: null,
+  isLoaded: true,
+
+  replace: function() {
+    var type = get(this, 'type').toString();
+    throw new Error("The result of a client-side filter (on " + type + ") is immutable.");
+  },
+
+  updateFilter: Ember.observer(function() {
+    var manager = get(this, 'manager');
+    manager.updateFilter(this, get(this, 'type'), get(this, 'filterFunction'));
+  }, 'filterFunction')
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+/**
+  @class AdapterPopulatedRecordArray
+  @namespace DS
+  @extends DS.RecordArray
+*/
+DS.AdapterPopulatedRecordArray = DS.RecordArray.extend({
+  query: null,
+
+  replace: function() {
+    var type = get(this, 'type').toString();
+    throw new Error("The result of a server query (on " + type + ") is immutable.");
+  },
+
+  load: function(references) {
+    this.setProperties({
+      content: Ember.A(references),
+      isLoaded: true
+    });
+
+    // TODO: does triggering didLoad event should be the last action of the runLoop?
+    Ember.run.once(this, 'trigger', 'didLoad');
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+var map = Ember.EnumerableUtils.map;
+
+/**
+  A ManyArray is a RecordArray that represents the contents of a has-many
+  relationship.
+
+  The ManyArray is instantiated lazily the first time the relationship is
+  requested.
+
+  ### Inverses
+
+  Often, the relationships in Ember Data applications will have
+  an inverse. For example, imagine the following models are
+  defined:
+
+      App.Post = DS.Model.extend({
+        comments: DS.hasMany('App.Comment')
+      });
+
+      App.Comment = DS.Model.extend({
+        post: DS.belongsTo('App.Post')
+      });
+
+  If you created a new instance of `App.Post` and added
+  a `App.Comment` record to its `comments` has-many
+  relationship, you would expect the comment's `post`
+  property to be set to the post that contained
+  the has-many.
+
+  We call the record to which a relationship belongs the
+  relationship's _owner_.
+
+  @class ManyArray
+  @namespace DS
+  @extends DS.RecordArray
+*/
+DS.ManyArray = DS.RecordArray.extend({
+  init: function() {
+    this._super.apply(this, arguments);
+    this._changesToSync = Ember.OrderedSet.create();
+  },
+
+  /**
+    The record to which this relationship belongs.
+
+    @property {DS.Model}
+    @private
+  */
+  owner: null,
+
+  /**
+    `true` if the relationship is polymorphic, `false` otherwise.
+
+    @property {Boolean}
+    @private
+  */
+  isPolymorphic: false,
+
+  // LOADING STATE
+
+  isLoaded: false,
+
+  loadingRecordsCount: function(count) {
+    this.loadingRecordsCount = count;
+  },
+
+  loadedRecord: function() {
+    this.loadingRecordsCount--;
+    if (this.loadingRecordsCount === 0) {
+      set(this, 'isLoaded', true);
+      this.trigger('didLoad');
+    }
+  },
+
+  fetch: function() {
+    var references = get(this, 'content'),
+        store = get(this, 'store'),
+        owner = get(this, 'owner');
+
+    store.fetchUnloadedReferences(references, owner);
+  },
+
+  // Overrides Ember.Array's replace method to implement
+  replaceContent: function(index, removed, added) {
+    // Map the array of record objects into an array of  client ids.
+    added = map(added, function(record) {
+      Ember.assert("You can only add records of " + (get(this, 'type') && get(this, 'type').toString()) + " to this relationship.", !get(this, 'type') || (get(this, 'type').detectInstance(record)) );
+      return get(record, '_reference');
+    }, this);
+
+    this._super(index, removed, added);
+  },
+
+  arrangedContentDidChange: function() {
+    this.fetch();
+  },
+
+  arrayContentWillChange: function(index, removed, added) {
+    var owner = get(this, 'owner'),
+        name = get(this, 'name');
+
+    if (!owner._suspendedRelationships) {
+      // This code is the first half of code that continues inside
+      // of arrayContentDidChange. It gets or creates a change from
+      // the child object, adds the current owner as the old
+      // parent if this is the first time the object was removed
+      // from a ManyArray, and sets `newParent` to null.
+      //
+      // Later, if the object is added to another ManyArray,
+      // the `arrayContentDidChange` will set `newParent` on
+      // the change.
+      for (var i=index; i<index+removed; i++) {
+        var reference = get(this, 'content').objectAt(i);
+
+        var change = DS.RelationshipChange.createChange(owner.get('_reference'), reference, get(this, 'store'), {
+          parentType: owner.constructor,
+          changeType: "remove",
+          kind: "hasMany",
+          key: name
+        });
+
+        this._changesToSync.add(change);
+      }
+    }
+
+    return this._super.apply(this, arguments);
+  },
+
+  arrayContentDidChange: function(index, removed, added) {
+    this._super.apply(this, arguments);
+
+    var owner = get(this, 'owner'),
+        name = get(this, 'name'),
+        store = get(this, 'store');
+
+    if (!owner._suspendedRelationships) {
+      // This code is the second half of code that started in
+      // `arrayContentWillChange`. It gets or creates a change
+      // from the child object, and adds the current owner as
+      // the new parent.
+      for (var i=index; i<index+added; i++) {
+        var reference = get(this, 'content').objectAt(i);
+
+        var change = DS.RelationshipChange.createChange(owner.get('_reference'), reference, store, {
+          parentType: owner.constructor,
+          changeType: "add",
+          kind:"hasMany",
+          key: name
+        });
+        change.hasManyName = name;
+
+        this._changesToSync.add(change);
+      }
+
+      // We wait until the array has finished being
+      // mutated before syncing the OneToManyChanges created
+      // in arrayContentWillChange, so that the array
+      // membership test in the sync() logic operates
+      // on the final results.
+      this._changesToSync.forEach(function(change) {
+        change.sync();
+      });
+      DS.OneToManyChange.ensureSameTransaction(this._changesToSync, store);
+      this._changesToSync.clear();
+    }
+  },
+
+  // Create a child record within the owner
+  createRecord: function(hash, transaction) {
+    var owner = get(this, 'owner'),
+        store = get(owner, 'store'),
+        type = get(this, 'type'),
+        record;
+
+    Ember.assert("You can not create records of " + (get(this, 'type') && get(this, 'type').toString()) + " on this polymorphic relationship.", !get(this, 'isPolymorphic'));
+
+    transaction = transaction || get(owner, 'transaction');
+
+    record = store.createRecord.call(store, type, hash, transaction);
+    this.pushObject(record);
+
+    return record;
+  }
+
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set, forEach = Ember.EnumerableUtils.forEach;
+
+/**
+  @module ember-data
+*/
+
+/**
+  A transaction allows you to collect multiple records into a unit of work
+  that can be committed or rolled back as a group.
+
+  For example, if a record has local modifications that have not yet
+  been saved, calling `commit()` on its transaction will cause those
+  modifications to be sent to the adapter to be saved. Calling
+  `rollback()` on its transaction would cause all of the modifications to
+  be discarded and the record to return to the last known state before
+  changes were made.
+
+  If a newly created record's transaction is rolled back, it will
+  immediately transition to the deleted state.
+
+  If you do not explicitly create a transaction, a record is assigned to
+  an implicit transaction called the default transaction. In these cases,
+  you can treat your application's instance of `DS.Store` as a transaction
+  and call the `commit()` and `rollback()` methods on the store itself.
+
+  Once a record has been successfully committed or rolled back, it will
+  be moved back to the implicit transaction. Because it will now be in
+  a clean state, it can be moved to a new transaction if you wish.
+
+  ### Creating a Transaction
+
+  To create a new transaction, call the `transaction()` method of your
+  application's `DS.Store` instance:
+
+      var transaction = App.store.transaction();
+
+  This will return a new instance of `DS.Transaction` with no records
+  yet assigned to it.
+
+  ### Adding Existing Records
+
+  Add records to a transaction using the `add()` method:
+
+      record = App.store.find(App.Person, 1);
+      transaction.add(record);
+
+  Note that only records whose `isDirty` flag is `false` may be added
+  to a transaction. Once modifications to a record have been made
+  (its `isDirty` flag is `true`), it is not longer able to be added to
+  a transaction.
+
+  ### Creating New Records
+
+  Because newly created records are dirty from the time they are created,
+  and because dirty records can not be added to a transaction, you must
+  use the `createRecord()` method to assign new records to a transaction.
+
+  For example, instead of this:
+
+    var transaction = store.transaction();
+    var person = App.Person.createRecord({ name: "Steve" });
+
+    // won't work because person is dirty
+    transaction.add(person);
+
+  Call `createRecord()` on the transaction directly:
+
+    var transaction = store.transaction();
+    transaction.createRecord(App.Person, { name: "Steve" });
+
+  ### Asynchronous Commits
+
+  Typically, all of the records in a transaction will be committed
+  together. However, new records that have a dependency on other new
+  records need to wait for their parent record to be saved and assigned an
+  ID. In that case, the child record will continue to live in the
+  transaction until its parent is saved, at which time the transaction will
+  attempt to commit again.
+
+  For this reason, you should not re-use transactions once you have committed
+  them. Always make a new transaction and move the desired records to it before
+  calling commit.
+
+  @class Transaction
+  @namespace DS
+  @extends Ember.Object
+*/
+DS.Transaction = Ember.Object.extend({
+  /**
+    Creates the bucket data structure used to segregate records by
+    type.
+
+    @method init
+    @private
+  */
+  init: function() {
+    set(this, 'records', Ember.OrderedSet.create());
+  },
+
+  /**
+    Creates a new record of the given type and assigns it to the transaction
+    on which the method was called.
+
+    This is useful as only clean records can be added to a transaction and
+    new records created using other methods immediately become dirty.
+
+    @method createRecord
+    @param {DS.Model} type the model type to create
+    @param {Object} hash the data hash to assign the new record
+  */
+  createRecord: function(type, hash) {
+    var store = get(this, 'store');
+
+    return store.createRecord(type, hash, this);
+  },
+
+  isEqualOrDefault: function(other) {
+    if (this === other || other === get(this, 'store.defaultTransaction')) {
+      return true;
+    }
+  },
+
+  isDefault: Ember.computed(function() {
+    return this === get(this, 'store.defaultTransaction');
+  }).volatile(),
+
+  /**
+    Adds an existing record to this transaction. Only records without
+    modificiations (i.e., records whose `isDirty` property is `false`)
+    can be added to a transaction.
+
+    @method add
+    @param {DS.Model} record the record to add to the transaction
+  */
+  add: function(record) {
+    Ember.assert("You must pass a record into transaction.add()", record instanceof DS.Model);
+
+    var store = get(this, 'store');
+    var adapter = get(store, '_adapter');
+    var serializer = get(adapter, 'serializer');
+    serializer.eachEmbeddedRecord(record, function(embeddedRecord, embeddedType) {
+      if (embeddedType === 'load') { return; }
+
+      this.add(embeddedRecord);
+    }, this);
+
+    this.adoptRecord(record);
+  },
+
+  relationships: Ember.computed(function() {
+    var relationships = Ember.OrderedSet.create(),
+        records = get(this, 'records'),
+        store = get(this, 'store');
+
+    forEach(records, function(record) {
+      var reference = get(record, '_reference');
+      var changes = store.relationshipChangesFor(reference);
+      for(var i = 0; i < changes.length; i++) {
+        relationships.add(changes[i]);
+      }
+    });
+
+    return relationships;
+  }).volatile(),
+
+  commitDetails: Ember.computed(function() {
+    var commitDetails = Ember.MapWithDefault.create({
+      defaultValue: function() {
+        return {
+          created: Ember.OrderedSet.create(),
+          updated: Ember.OrderedSet.create(),
+          deleted: Ember.OrderedSet.create()
+        };
+      }
+    });
+
+    var records = get(this, 'records'),
+        store = get(this, 'store');
+
+    forEach(records, function(record) {
+      if(!get(record, 'isDirty')) return;
+      record.send('willCommit');
+      var adapter = store.adapterForType(record.constructor);
+      commitDetails.get(adapter)[get(record, 'dirtyType')].add(record);
+    });
+
+    return commitDetails;
+  }).volatile(),
+
+  /**
+    Commits the transaction, which causes all of the modified records that
+    belong to the transaction to be sent to the adapter to be saved.
+
+    Once you call `commit()` on a transaction, you should not re-use it.
+
+    When a record is saved, it will be removed from this transaction and
+    moved back to the store's default transaction.
+
+    @method commit
+  */
+  commit: function() {
+    var store = get(this, 'store');
+
+    if (get(this, 'isDefault')) {
+      set(store, 'defaultTransaction', store.transaction());
+    }
+
+    this.removeCleanRecords();
+
+    var commitDetails = get(this, 'commitDetails'),
+        relationships = get(this, 'relationships');
+
+    forEach(commitDetails, function(adapter, commitDetails) {
+      Ember.assert("You tried to commit records but you have no adapter", adapter);
+      Ember.assert("You tried to commit records but your adapter does not implement `commit`", adapter.commit);
+
+      adapter.commit(store, commitDetails);
+    });
+
+    // Once we've committed the transaction, there is no need to
+    // keep the OneToManyChanges around. Destroy them so they
+    // can be garbage collected.
+    relationships.forEach(function(relationship) {
+      relationship.destroy();
+    });
+  },
+
+  /**
+    Rolling back a transaction resets the records that belong to
+    that transaction.
+
+    Updated records have their properties reset to the last known
+    value from the persistence layer. Deleted records are reverted
+    to a clean, non-deleted state. Newly created records immediately
+    become deleted, and are not sent to the adapter to be persisted.
+
+    After the transaction is rolled back, any records that belong
+    to it will return to the store's default transaction, and the
+    current transaction should not be used again.
+
+    @method rollback
+  */
+  rollback: function() {
+    // Destroy all relationship changes and compute
+    // all references affected
+    var references = Ember.OrderedSet.create();
+    var relationships = get(this, 'relationships');
+    relationships.forEach(function(r) {
+      references.add(r.firstRecordReference);
+      references.add(r.secondRecordReference);
+      r.destroy();
+    });
+
+    var records = get(this, 'records');
+    forEach(records, function(record) {
+      if (!record.get('isDirty')) return;
+      record.send('rollback');
+    });
+
+    // Now that all records in the transaction are guaranteed to be
+    // clean, migrate them all to the store's default transaction.
+    this.removeCleanRecords();
+
+    // Remaining associated references are not part of the transaction, but
+    // can still have hasMany's which have not been reloaded
+    references.forEach(function(r) {
+      if (r && r.record) {
+        var record = r.record;
+        record.suspendRelationshipObservers(function() {
+          record.reloadHasManys();
+        });
+      }
+    }, this);
+  },
+
+  /**
+    Removes a record from this transaction and back to the store's
+    default transaction.
+
+    Note: This method is private for now, but should probably be exposed
+    in the future once we have stricter error checking (for example, in the
+    case of the record being dirty).
+
+    @method remove
+    @private
+    @param {DS.Model} record
+  */
+  remove: function(record) {
+    var defaultTransaction = get(this, 'store.defaultTransaction');
+    defaultTransaction.adoptRecord(record);
+  },
+
+  /**
+    Removes all of the records in the transaction's clean bucket.
+
+    @method removeCleanRecords
+    @private
+  */
+  removeCleanRecords: function() {
+    var records = get(this, 'records');
+    forEach(records, function(record) {
+      if(!record.get('isDirty')) {
+        this.remove(record);
+      }
+    }, this);
+  },
+
+  /**
+    This method moves a record into a different transaction without the normal
+    checks that ensure that the user is not doing something weird, like moving
+    a dirty record into a new transaction.
+
+    It is designed for internal use, such as when we are moving a clean record
+    into a new transaction when the transaction is committed.
+
+    This method must not be called unless the record is clean.
+
+    @method adoptRecord
+    @private
+    @param {DS.Model} record
+  */
+  adoptRecord: function(record) {
+    var oldTransaction = get(record, 'transaction');
+
+    if (oldTransaction) {
+      oldTransaction.removeRecord(record);
+    }
+
+    get(this, 'records').add(record);
+    set(record, 'transaction', this);
+  },
+
+  /**
+   Removes the record without performing the normal checks
+   to ensure that the record is re-added to the store's
+   default transaction.
+
+   @method removeRecord
+   @private
+   @param record
+  */
+  removeRecord: function(record) {
+    get(this, 'records').remove(record);
+  }
+
+});
+
+DS.Transaction.reopenClass({
+  ensureSameTransaction: function(records){
+    var transactions = Ember.A();
+    forEach( records, function(record){
+      if (record){ transactions.pushObject(get(record, 'transaction')); }
+    });
+
+    var transaction = transactions.reduce(function(prev, t) {
+      if (!get(t, 'isDefault')) {
+        if (prev === null) { return t; }
+        Ember.assert("All records in a changed relationship must be in the same transaction. You tried to change the relationship between records when one is in " + t + " and the other is in " + prev, t === prev);
+      }
+
+      return prev;
+    }, null);
+
+    if (transaction) {
+      forEach( records, function(record){
+        if (record){ transaction.add(record); }
+      });
+    } else {
+      transaction = transactions.objectAt(0);
+    }
+    return transaction;
+   }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get;
+
+var resolveMapConflict = function(oldValue, newValue) {
+  return oldValue;
+};
+
+var transformMapKey = function(key, value) {
+  return key;
+};
+
+var transformMapValue = function(key, value) {
+  return value;
+};
+
+/**
+  The Mappable mixin is designed for classes that would like to
+  behave as a map for configuration purposes.
+
+  For example, the DS.Adapter class can behave like a map, with
+  more semantic API, via the `map` API:
+
+    DS.Adapter.map('App.Person', { firstName: { key: 'FIRST' } });
+
+  Class configuration via a map-like API has a few common requirements
+  that differentiate it from the standard Ember.Map implementation.
+
+  First, values often are provided as strings that should be normalized
+  into classes the first time the configuration options are used.
+
+  Second, the values configured on parent classes should also be taken
+  into account.
+
+  Finally, setting the value of a key sometimes should merge with the
+  previous value, rather than replacing it.
+
+  This mixin provides a instance method, `createInstanceMapFor`, that
+  will reify all of the configuration options set on an instance's
+  constructor and provide it for the instance to use.
+
+  Classes can implement certain hooks that allow them to customize
+  the requirements listed above:
+
+  * `resolveMapConflict` - called when a value is set for an existing
+    value
+  * `transformMapKey` - allows a key name (for example, a global path
+    to a class) to be normalized
+  * `transformMapValue` - allows a value (for example, a class that
+    should be instantiated) to be normalized
+
+  Classes that implement this mixin should also implement a class
+  method built using the `generateMapFunctionFor` method:
+
+    DS.Adapter.reopenClass({
+      map: DS.Mappable.generateMapFunctionFor('attributes', function(key, newValue, map) {
+        var existingValue = map.get(key);
+
+        for (var prop in newValue) {
+          if (!newValue.hasOwnProperty(prop)) { continue; }
+          existingValue[prop] = newValue[prop];
+        }
+      })
+    });
+
+  The function passed to `generateMapFunctionFor` is invoked every time a
+  new value is added to the map.
+
+  @class _Mappable
+  @private
+  @namespace DS
+**/
+DS._Mappable = Ember.Mixin.create({
+  createInstanceMapFor: function(mapName) {
+    var instanceMeta = getMappableMeta(this);
+
+    instanceMeta.values = instanceMeta.values || {};
+
+    if (instanceMeta.values[mapName]) { return instanceMeta.values[mapName]; }
+
+    var instanceMap = instanceMeta.values[mapName] = new Ember.Map();
+
+    var klass = this.constructor;
+
+    while (klass && klass !== DS.Store) {
+      this._copyMap(mapName, klass, instanceMap);
+      klass = klass.superclass;
+    }
+
+    instanceMeta.values[mapName] = instanceMap;
+    return instanceMap;
+  },
+
+  _copyMap: function(mapName, klass, instanceMap) {
+    var classMeta = getMappableMeta(klass);
+
+    var classMap = classMeta[mapName];
+    if (classMap) {
+      classMap.forEach(eachMap, this);
+    }
+
+    function eachMap(key, value) {
+      var transformedKey = (klass.transformMapKey || transformMapKey)(key, value);
+      var transformedValue = (klass.transformMapValue || transformMapValue)(key, value);
+
+      var oldValue = instanceMap.get(transformedKey);
+      var newValue = transformedValue;
+
+      if (oldValue) {
+        newValue = (this.constructor.resolveMapConflict || resolveMapConflict)(oldValue, newValue);
+      }
+
+      instanceMap.set(transformedKey, newValue);
+    }
+  }
+
+
+});
+
+DS._Mappable.generateMapFunctionFor = function(mapName, transform) {
+  return function(key, value) {
+    var meta = getMappableMeta(this);
+
+    var map = meta[mapName] || Ember.MapWithDefault.create({
+      defaultValue: function() { return {}; }
+    });
+
+    transform.call(this, key, value, map);
+
+    meta[mapName] = map;
+  };
+};
+
+function getMappableMeta(obj) {
+  var meta = Ember.meta(obj, true),
+      keyName = 'DS.Mappable',
+      value = meta[keyName];
+
+  if (!value) { meta[keyName] = {}; }
+
+  if (!meta.hasOwnProperty(keyName)) {
+    meta[keyName] = Ember.create(meta[keyName]);
+  }
+
+  return meta[keyName];
+}
+
+})();
+
+
+
+(function() {
+/*globals Ember*/
+/*jshint eqnull:true*/
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+var once = Ember.run.once;
+var isNone = Ember.isNone;
+var forEach = Ember.EnumerableUtils.forEach;
+var indexOf = Ember.EnumerableUtils.indexOf;
+var map = Ember.EnumerableUtils.map;
+
+// These values are used in the data cache when clientIds are
+// needed but the underlying data has not yet been loaded by
+// the server.
+var UNLOADED = 'unloaded';
+var LOADING = 'loading';
+var MATERIALIZED = { materialized: true };
+var CREATED = { created: true };
+
+// Implementors Note:
+//
+//   The variables in this file are consistently named according to the following
+//   scheme:
+//
+//   * +id+ means an identifier managed by an external source, provided inside
+//     the data provided by that source. These are always coerced to be strings
+//     before being used internally.
+//   * +clientId+ means a transient numerical identifier generated at runtime by
+//     the data store. It is important primarily because newly created objects may
+//     not yet have an externally generated id.
+//   * +reference+ means a record reference object, which holds metadata about a
+//     record, even if it has not yet been fully materialized.
+//   * +type+ means a subclass of DS.Model.
+
+// Used by the store to normalize IDs entering the store.  Despite the fact
+// that developers may provide IDs as numbers (e.g., `store.find(Person, 1)`),
+// it is important that internally we use strings, since IDs may be serialized
+// and lose type information.  For example, Ember's router may put a record's
+// ID into the URL, and if we later try to deserialize that URL and find the
+// corresponding record, we will not know if it is a string or a number.
+var coerceId = function(id) {
+  return id == null ? null : id+'';
+};
+
+/**
+  The store contains all of the data for records loaded from the server.
+  It is also responsible for creating instances of DS.Model that wrap
+  the individual data for a record, so that they can be bound to in your
+  Handlebars templates.
+
+  Define your application's store like this:
+
+       MyApp.Store = DS.Store.extend();
+
+  Most Ember.js applications will only have a single `DS.Store` that is
+  automatically created by their `Ember.Application`.
+
+  You can retrieve models from the store in several ways. To retrieve a record
+  for a specific id, use `DS.Model`'s `find()` method:
+
+       var person = App.Person.find(123);
+
+  If your application has multiple `DS.Store` instances (an unusual case), you can
+  specify which store should be used:
+
+      var person = store.find(App.Person, 123);
+
+  In general, you should retrieve models using the methods on `DS.Model`; you should
+  rarely need to interact with the store directly.
+
+  By default, the store will talk to your backend using a standard REST mechanism.
+  You can customize how the store talks to your backend by specifying a custom adapter:
+
+       MyApp.store = DS.Store.create({
+         adapter: 'MyApp.CustomAdapter'
+       });
+
+  You can learn more about writing a custom adapter by reading the `DS.Adapter`
+  documentation.
+
+  @class Store
+  @namespace DS
+  @extends Ember.Object
+  @uses DS._Mappable
+*/
+DS.Store = Ember.Object.extend(DS._Mappable, {
+
+  /**
+    Many methods can be invoked without specifying which store should be used.
+    In those cases, the first store created will be used as the default. If
+    an application has multiple stores, it should specify which store to use
+    when performing actions, such as finding records by ID.
+
+    The init method registers this store as the default if none is specified.
+
+    @method init
+  */
+  init: function() {
+    if (!get(DS, 'defaultStore') || get(this, 'isDefaultStore')) {
+      set(DS, 'defaultStore', this);
+    }
+
+    // internal bookkeeping; not observable
+    this.typeMaps = {};
+    this.recordArrayManager = DS.RecordArrayManager.create({
+      store: this
+    });
+    this.relationshipChanges = {};
+
+    set(this, 'currentTransaction', this.transaction());
+    set(this, 'defaultTransaction', this.transaction());
+  },
+
+  /**
+    Returns a new transaction scoped to this store. This delegates
+    responsibility for invoking the adapter's commit mechanism to
+    a transaction.
+
+    Transaction are responsible for tracking changes to records
+    added to them, and supporting `commit` and `rollback`
+    functionality. Committing a transaction invokes the store's
+    adapter, while rolling back a transaction reverses all
+    changes made to records added to the transaction.
+
+    A store has an implicit (default) transaction, which tracks changes
+    made to records not explicitly added to a transaction.
+
+    @method transaction
+    @returns DS.Transaction
+  */
+  transaction: function() {
+    return DS.Transaction.create({ store: this });
+  },
+
+  /**
+    Instructs the store to materialize the data for a given record.
+
+    To materialize a record, the store first retrieves the opaque data that was
+    passed to either `load()` or `loadMany()`. Then, the data and the record
+    are passed to the adapter's `materialize()` method, which allows the adapter
+    to translate arbitrary data structures from the adapter into the normalized
+    form the record expects.
+
+    The adapter's `materialize()` method will invoke `materializeAttribute()`,
+    `materializeHasMany()` and `materializeBelongsTo()` on the record to
+    populate it with normalized values.
+
+    @method materializeData
+    @private
+    @param {DS.Model} record
+  */
+  materializeData: function(record) {
+    var reference = get(record, '_reference'),
+        data = reference.data,
+        adapter = this.adapterForType(record.constructor);
+
+    reference.data = MATERIALIZED;
+
+    record.setupData();
+
+    if (data !== CREATED) {
+      // Instructs the adapter to extract information from the
+      // opaque data and materialize the record's attributes and
+      // relationships.
+      adapter.materialize(record, data, reference.prematerialized);
+    }
+  },
+
+  /**
+    The adapter to use to communicate to a backend server or other persistence layer.
+
+    This can be specified as an instance, a class, or a property path that specifies
+    where the adapter can be located.
+
+    @property adapter
+    @type {DS.Adapter|String}
+  */
+  adapter: Ember.computed(function(){
+    if (!Ember.testing) {
+      Ember.debug("A custom DS.Adapter was not provided as the 'Adapter' property of your application's Store. The default (DS.RESTAdapter) will be used.");
+    }
+
+    return 'DS.RESTAdapter';
+  }).property(),
+
+
+  /**
+    Returns a JSON representation of the record using the adapter's
+    serialization strategy. This method exists primarily to enable
+    a record, which has access to its store (but not the store's
+    adapter) to provide a `serialize()` convenience.
+
+    The available options are:
+
+    * `includeId`: `true` if the record's ID should be included in
+      the JSON representation
+
+    @method serialize
+    @private
+    @param {DS.Model} record the record to serialize
+    @param {Object} options an options hash
+  */
+  serialize: function(record, options) {
+    return this.adapterForType(record.constructor).serialize(record, options);
+  },
+
+  /**
+    This property returns the adapter, after resolving a possible
+    property path.
+
+    If the supplied `adapter` was a class, or a String property
+    path resolved to a class, this property will instantiate the
+    class.
+
+    This property is cacheable, so the same instance of a specified
+    adapter class should be used for the lifetime of the store.
+
+    @property _adapter
+    @private
+    @returns DS.Adapter
+  */
+  _adapter: Ember.computed(function() {
+    var adapter = get(this, 'adapter');
+    if (typeof adapter === 'string') {
+      adapter = get(this, adapter, false) || get(Ember.lookup, adapter);
+    }
+
+    if (DS.Adapter.detect(adapter)) {
+      adapter = adapter.create();
+    }
+
+    return adapter;
+  }).property('adapter'),
+
+  /**
+    A monotonically increasing number to be used to uniquely identify
+    data and records.
+
+    It starts at 1 so other parts of the code can test for truthiness
+    when provided a `clientId` instead of having to explicitly test
+    for undefined.
+
+    @property clientIdCounter
+    @private
+  */
+  clientIdCounter: 1,
+
+  // .....................
+  // . CREATE NEW RECORD .
+  // .....................
+
+  /**
+    Create a new record in the current store. The properties passed
+    to this method are set on the newly created record.
+
+    Note: The third `transaction` property is for internal use only.
+    If you want to create a record inside of a given transaction,
+    use `transaction.createRecord()` instead of `store.createRecord()`.
+
+    @method createRecord
+    @param {subclass of DS.Model} type
+    @param {Object} properties a hash of properties to set on the
+      newly created record.
+    @returns DS.Model
+  */
+  createRecord: function(type, properties, transaction) {
+    properties = properties || {};
+
+    // Create a new instance of the model `type` and put it
+    // into the specified `transaction`. If no transaction is
+    // specified, the default transaction will be used.
+    var record = type._create({
+      store: this
+    });
+
+    transaction = transaction || get(this, 'defaultTransaction');
+
+    // adoptRecord is an internal API that allows records to move
+    // into a transaction without assertions designed for app
+    // code. It is used here to ensure that regardless of new
+    // restrictions on the use of the public `transaction.add()`
+    // API, we will always be able to insert new records into
+    // their transaction.
+    transaction.adoptRecord(record);
+
+    // `id` is a special property that may not be a `DS.attr`
+    var id = properties.id;
+
+    // If the passed properties do not include a primary key,
+    // give the adapter an opportunity to generate one. Typically,
+    // client-side ID generators will use something like uuid.js
+    // to avoid conflicts.
+
+    if (isNone(id)) {
+      var adapter = this.adapterForType(type);
+
+      if (adapter && adapter.generateIdForRecord) {
+        id = coerceId(adapter.generateIdForRecord(this, record));
+        properties.id = id;
+      }
+    }
+
+    // Coerce ID to a string
+    id = coerceId(id);
+
+    // Create a new `clientId` and associate it with the
+    // specified (or generated) `id`. Since we don't have
+    // any data for the server yet (by definition), store
+    // the sentinel value CREATED as the data for this
+    // clientId. If we see this value later, we will skip
+    // materialization.
+    var reference = this.createReference(type, id);
+    reference.data = CREATED;
+
+    // Now that we have a reference, attach it to the record we
+    // just created.
+    set(record, '_reference', reference);
+    reference.record = record;
+
+    // Move the record out of its initial `empty` state into
+    // the `loaded` state.
+    record.loadedData();
+
+    record.setupData();
+
+    // Set the properties specified on the record.
+    record.setProperties(properties);
+
+    // Resolve record promise
+    Ember.run(record, 'resolve', record);
+
+    return record;
+  },
+
+  // .................
+  // . DELETE RECORD .
+  // .................
+
+  /**
+    For symmetry, a record can be deleted via the store.
+
+    @method deleteRecord
+    @param {DS.Model} record
+  */
+  deleteRecord: function(record) {
+    record.deleteRecord();
+  },
+
+  /**
+    For symmetry, a record can be unloaded via the store.
+
+    @method unloadRecord
+    @param {DS.Model} record
+  */
+  unloadRecord: function(record) {
+    record.unloadRecord();
+  },
+
+  // ................
+  // . FIND RECORDS .
+  // ................
+
+  /**
+    This is the main entry point into finding records. The first parameter to
+    this method is always a subclass of `DS.Model`.
+
+    You can use the `find` method on a subclass of `DS.Model` directly if your
+    application only has one store. For example, instead of
+    `store.find(App.Person, 1)`, you could say `App.Person.find(1)`.
+
+    ---
+
+    To find a record by ID, pass the `id` as the second parameter:
+
+        store.find(App.Person, 1);
+        App.Person.find(1);
+
+    If the record with that `id` had not previously been loaded, the store will
+    return an empty record immediately and ask the adapter to find the data by
+    calling the adapter's `find` method.
+
+    The `find` method will always return the same object for a given type and
+    `id`. To check whether the adapter has populated a record, you can check
+    its `isLoaded` property.
+
+    ---
+
+    To find all records for a type, call `find` with no additional parameters:
+
+        store.find(App.Person);
+        App.Person.find();
+
+    This will return a `RecordArray` representing all known records for the
+    given type and kick off a request to the adapter's `findAll` method to load
+    any additional records for the type.
+
+    The `RecordArray` returned by `find()` is live. If any more records for the
+    type are added at a later time through any mechanism, it will automatically
+    update to reflect the change.
+
+    ---
+
+    To find a record by a query, call `find` with a hash as the second
+    parameter:
+
+        store.find(App.Person, { page: 1 });
+        App.Person.find({ page: 1 });
+
+    This will return a `RecordArray` immediately, but it will always be an
+    empty `RecordArray` at first. It will call the adapter's `findQuery`
+    method, which will populate the `RecordArray` once the server has returned
+    results.
+
+    You can check whether a query results `RecordArray` has loaded by checking
+    its `isLoaded` property.
+
+    @method find
+    @param {DS.Model} type
+    @param {Object|String|Integer|null} id
+  */
+  find: function(type, id) {
+    type = this.modelFor(type);
+
+    if (id === undefined) {
+      return this.findAll(type);
+    }
+
+    // We are passed a query instead of an id.
+    if (Ember.typeOf(id) === 'object') {
+      return this.findQuery(type, id);
+    }
+
+    return this.findById(type, coerceId(id));
+  },
+
+  /**
+    This method returns a record for a given type and id combination.
+
+    If the store has never seen this combination of type and id before, it
+    creates a new `clientId` with the LOADING sentinel and asks the adapter to
+    load the data.
+
+    If the store has seen the combination, this method delegates to
+    `getByReference`.
+
+    @method findById
+    @private
+    @param type
+    @param id
+  */
+  findById: function(type, id) {
+    var reference;
+
+    if (this.hasReferenceForId(type, id)) {
+      reference = this.referenceForId(type, id);
+
+      if (reference.data !== UNLOADED) {
+        return this.recordForReference(reference);
+      }
+    }
+
+    if (!reference) {
+      reference = this.createReference(type, id);
+    }
+
+    reference.data = LOADING;
+
+    // create a new instance of the model type in the
+    // 'isLoading' state
+    var record = this.legacyMaterializeRecord(reference);
+
+    if (reference.data === LOADING) {
+      // let the adapter set the data, possibly async
+      var adapter = this.adapterForType(type),
+          store = this;
+
+      Ember.assert("You tried to find a record but you have no adapter (for " + type + ")", adapter);
+      Ember.assert("You tried to find a record but your adapter does not implement `find`", adapter.find);
+
+      var thenable = adapter.find(this, type, id);
+
+      if (thenable && thenable.then) {
+        thenable.then(null /* for future use */, function(error) {
+          store.recordWasError(record);
+        });
+      }
+    }
+
+    return record;
+  },
+
+  reloadRecord: function(record) {
+    var type = record.constructor,
+        adapter = this.adapterForType(type),
+        store = this,
+        id = get(record, 'id');
+
+    Ember.assert("You cannot update a record without an ID", id);
+    Ember.assert("You tried to update a record but you have no adapter (for " + type + ")", adapter);
+    Ember.assert("You tried to update a record but your adapter does not implement `find`", adapter.find);
+
+    var thenable = adapter.find(this, type, id);
+
+    if (thenable && thenable.then) {
+      thenable.then(null /* for future use */, function(error) {
+        store.recordWasError(record);
+      });
+    }
+  },
+
+  /**
+    This method returns a record for a given record reference.
+
+    If no record for the reference has yet been materialized, this method will
+    materialize a new `DS.Model` instance. This allows adapters to eagerly load
+    large amounts of data into the store, and avoid incurring the cost of
+    creating models until they are requested.
+
+    In short, it's a convenient way to get a record for a known
+    record reference, materializing it if necessary.
+
+    @method recordForReference
+    @private
+    @param {Object} reference
+    @returns {DS.Model}
+  */
+  recordForReference: function(reference) {
+    var record = reference.record;
+
+    if (!record) {
+      // create a new instance of the model type in the
+      // 'isLoading' state
+      record = this.legacyMaterializeRecord(reference);
+    }
+
+    return record;
+  },
+
+  /**
+    Given an array of `reference`s, determines which of those
+    `clientId`s has not yet been loaded.
+
+    In preparation for loading, this method also marks any unloaded
+    `clientId`s as loading.
+
+    @method unloadedReferences
+    @private
+    @param references
+  */
+  unloadedReferences: function(references) {
+    var unloadedReferences = [];
+
+    for (var i=0, l=references.length; i<l; i++) {
+      var reference = references[i];
+
+      if (reference instanceof DS.Model) {
+        if (get(reference, 'isEmpty')) {
+          unloadedReferences.push(reference);
+        }
+
+        continue;
+      }
+
+      if (reference.data === UNLOADED) {
+        unloadedReferences.push(reference);
+        reference.data = LOADING;
+      }
+    }
+
+    return unloadedReferences;
+  },
+
+  /**
+    This method is the entry point that relationships use to update
+    themselves when their underlying data changes.
+
+    First, it determines which of its `reference`s are still unloaded,
+    then invokes `findMany` on the adapter.
+
+    @method fetchUnloadedReferences
+    @private
+    @param references
+    @param owner
+  */
+  fetchUnloadedReferences: function(references, owner) {
+    var unloadedReferences = this.unloadedReferences(references);
+    this.fetchMany(unloadedReferences, owner);
+  },
+
+  /**
+    This method takes a list of `reference`s, groups the `reference`s by type,
+    converts the `reference`s into IDs, and then invokes the adapter's `findMany`
+    method.
+
+    The `reference`s are grouped by type to invoke `findMany` on adapters
+    for each unique type in `reference`s.
+
+    It is used both by a brand new relationship (via the `findMany`
+    method) or when the data underlying an existing relationship
+    changes (via the `fetchUnloadedReferences` method).
+
+    @method fetchMany
+    @private
+    @param references
+    @param owner
+  */
+  fetchMany: function(references, owner) {
+    if (!references.length) { return; }
+
+    // Group By Type
+    var referencesByTypeMap = Ember.MapWithDefault.create({
+      defaultValue: function() { return Ember.A(); }
+    });
+    forEach(references, function(reference) {
+      referencesByTypeMap.get(reference.type).push(reference);
+    });
+
+    forEach(referencesByTypeMap, function(type) {
+      var references = referencesByTypeMap.get(type),
+          ids = map(references, function(reference) { return reference.id; });
+
+      var adapter = this.adapterForType(type);
+
+      Ember.assert("You tried to load many records but you have no adapter (for " + type + ")", adapter);
+      Ember.assert("You tried to load many records but your adapter does not implement `findMany`", adapter.findMany);
+
+      adapter.findMany(this, type, ids, owner);
+    }, this);
+  },
+
+  hasReferenceForId: function(type, id) {
+    id = coerceId(id);
+
+    return !!this.typeMapFor(type).idToReference[id];
+  },
+
+  referenceForId: function(type, id) {
+    id = coerceId(id);
+
+    // Check to see if we have seen this type/id pair before.
+    var reference = this.typeMapFor(type).idToReference[id];
+
+    // If not, create a reference for it but don't populate it
+    // with any data yet.
+    if (!reference) {
+      reference = this.createReference(type, id);
+      reference.data = UNLOADED;
+    }
+
+    return reference;
+  },
+
+  /**
+    `findMany` is the entry point that relationships use to generate a
+    new `ManyArray` for the list of IDs specified by the server for
+    the relationship.
+
+    Its responsibilities are:
+
+    * convert the IDs into clientIds
+    * determine which of the clientIds still need to be loaded
+    * create a new ManyArray whose content is *all* of the clientIds
+    * notify the ManyArray of the number of its elements that are
+      already loaded
+    * insert the unloaded references into the `loadingRecordArrays`
+      bookkeeping structure, which will allow the `ManyArray` to know
+      when all of its loading elements are loaded from the server.
+    * ask the adapter to load the unloaded elements, by invoking
+      findMany with the still-unloaded IDs.
+
+    @method findMany
+    @private
+    @param type
+    @param idsOrReferencesOrOpaque
+    @param record
+    @param relationship
+  */
+  findMany: function(type, idsOrReferencesOrOpaque, record, relationship) {
+    // 1. Determine which of the client ids need to be loaded
+    // 2. Create a new ManyArray whose content is ALL of the clientIds
+    // 3. Decrement the ManyArray's counter by the number of loaded clientIds
+    // 4. Put the ManyArray into our bookkeeping data structure, keyed on
+    //    the needed clientIds
+    // 5. Ask the adapter to load the records for the unloaded clientIds (but
+    //    convert them back to ids)
+
+    if (!Ember.isArray(idsOrReferencesOrOpaque)) {
+      var adapter = this.adapterForType(type);
+
+      if (adapter && adapter.findHasMany) {
+        adapter.findHasMany(this, record, relationship, idsOrReferencesOrOpaque);
+      } else if (!isNone(idsOrReferencesOrOpaque)) {
+        Ember.assert("You tried to load many records but you have no adapter (for " + type + ")", adapter);
+        Ember.assert("You tried to load many records but your adapter does not implement `findHasMany`", adapter.findHasMany);
+      }
+
+      return this.recordArrayManager.createManyArray(type, Ember.A());
+    }
+
+    // Coerce server IDs into Record Reference
+    var references = map(idsOrReferencesOrOpaque, function(reference) {
+      if (typeof reference !== 'object' && reference !== null && !(reference instanceof DS.Model)) {
+        return this.referenceForId(type, reference);
+      }
+
+      return reference;
+    }, this);
+
+    var unloadedReferences = this.unloadedReferences(references),
+        manyArray = this.recordArrayManager.createManyArray(type, Ember.A(references)),
+        reference, i, l;
+
+    // Start the decrementing counter on the ManyArray at the number of
+    // records we need to load from the adapter
+    manyArray.loadingRecordsCount(unloadedReferences.length);
+
+    if (unloadedReferences.length) {
+      for (i=0, l=unloadedReferences.length; i<l; i++) {
+        reference = unloadedReferences[i];
+
+        // keep track of the record arrays that a given loading record
+        // is part of. This way, if the same record is in multiple
+        // ManyArrays, all of their loading records counters will be
+        // decremented when the adapter provides the data.
+        this.recordArrayManager.registerWaitingRecordArray(manyArray, reference);
+      }
+
+      this.fetchMany(unloadedReferences, record);
+    } else {
+      // all requested records are available
+      manyArray.set('isLoaded', true);
+
+      Ember.run.once(function() {
+        manyArray.trigger('didLoad');
+      });
+    }
+
+    return manyArray;
+  },
+
+  /**
+    This method delegates a query to the adapter. This is the one place where
+    adapter-level semantics are exposed to the application.
+
+    Exposing queries this way seems preferable to creating an abstract query
+    language for all server-side queries, and then require all adapters to
+    implement them.
+
+    @method findQuery
+    @private
+    @param {Class} type
+    @param {Object} query an opaque query to be used by the adapter
+    @return {DS.AdapterPopulatedRecordArray}
+  */
+  findQuery: function(type, query) {
+    var array = DS.AdapterPopulatedRecordArray.create({
+      type: type,
+      query: query,
+      content: Ember.A(),
+      store: this
+    });
+
+    var adapter = this.adapterForType(type);
+
+    Ember.assert("You tried to load a query but you have no adapter (for " + type + ")", adapter);
+    Ember.assert("You tried to load a query but your adapter does not implement `findQuery`", adapter.findQuery);
+
+    adapter.findQuery(this, type, query, array);
+
+    return array;
+  },
+
+  /**
+    This method returns an array of all records adapter can find.
+    It triggers the adapter's `findAll` method to give it an opportunity to populate
+    the array with records of that type.
+
+    @method findAll
+    @private
+    @param {Class} type
+    @return {DS.AdapterPopulatedRecordArray}
+  */
+  findAll: function(type) {
+    return this.fetchAll(type, this.all(type));
+  },
+
+  /**
+    @method fetchAll
+    @private
+    @param type
+    @param array
+  */
+  fetchAll: function(type, array) {
+    var adapter = this.adapterForType(type),
+        sinceToken = this.typeMapFor(type).metadata.since;
+
+    set(array, 'isUpdating', true);
+
+    Ember.assert("You tried to load all records but you have no adapter (for " + type + ")", adapter);
+    Ember.assert("You tried to load all records but your adapter does not implement `findAll`", adapter.findAll);
+
+    adapter.findAll(this, type, sinceToken);
+
+    return array;
+  },
+
+  /**
+    @method metaForType
+    @param type
+    @param property
+    @param data
+  */
+  metaForType: function(type, property, data) {
+    var target = this.typeMapFor(type).metadata;
+    set(target, property, data);
+  },
+
+  /**
+    @method didUpdateAll
+    @param type
+  */
+  didUpdateAll: function(type) {
+    var findAllCache = this.typeMapFor(type).findAllCache;
+    set(findAllCache, 'isUpdating', false);
+  },
+
+  /**
+    This method returns a filtered array that contains all of the known records
+    for a given type.
+
+    Note that because it's just a filter, it will have any locally
+    created records of the type.
+
+    Also note that multiple calls to `all` for a given type will always
+    return the same RecordArray.
+
+    @method all
+    @param {Class} type
+    @return {DS.RecordArray}
+  */
+  all: function(type) {
+    var typeMap = this.typeMapFor(type),
+        findAllCache = typeMap.findAllCache;
+
+    if (findAllCache) { return findAllCache; }
+
+    var array = DS.RecordArray.create({
+      type: type,
+      content: Ember.A(),
+      store: this,
+      isLoaded: true
+    });
+
+    this.recordArrayManager.registerFilteredRecordArray(array, type);
+
+    typeMap.findAllCache = array;
+    return array;
+  },
+
+  /**
+    Takes a type and filter function, and returns a live RecordArray that
+    remains up to date as new records are loaded into the store or created
+    locally.
+
+    The callback function takes a materialized record, and returns true
+    if the record should be included in the filter and false if it should
+    not.
+
+    The filter function is called once on all records for the type when
+    it is created, and then once on each newly loaded or created record.
+
+    If any of a record's properties change, or if it changes state, the
+    filter function will be invoked again to determine whether it should
+    still be in the array.
+
+    Note that the existence of a filter on a type will trigger immediate
+    materialization of all loaded data for a given type, so you might
+    not want to use filters for a type if you are loading many records
+    into the store, many of which are not active at any given time.
+
+    In this scenario, you might want to consider filtering the raw
+    data before loading it into the store.
+
+    @method filter
+    @param {Class} type
+    @param {Function} filter
+    @return {DS.FilteredRecordArray}
+  */
+  filter: function(type, query, filter) {
+    // allow an optional server query
+    if (arguments.length === 3) {
+      this.findQuery(type, query);
+    } else if (arguments.length === 2) {
+      filter = query;
+    }
+
+    var array = DS.FilteredRecordArray.create({
+      type: type,
+      content: Ember.A(),
+      store: this,
+      manager: this.recordArrayManager,
+      filterFunction: filter
+    });
+
+    this.recordArrayManager.registerFilteredRecordArray(array, type, filter);
+
+    return array;
+  },
+
+  /**
+    This method returns if a certain record is already loaded
+    in the store. Use this function to know beforehand if a find()
+    will result in a request or that it will be a cache hit.
+
+    @method recordIsLoaded
+    @param {Class} type
+    @param {string} id
+    @return {boolean}
+  */
+  recordIsLoaded: function(type, id) {
+    if (!this.hasReferenceForId(type, id)) { return false; }
+    return typeof this.referenceForId(type, id).data === 'object';
+  },
+
+  // ............
+  // . UPDATING .
+  // ............
+
+  /**
+    If the adapter updates attributes or acknowledges creation
+    or deletion, the record will notify the store to update its
+    membership in any filters.
+
+    To avoid thrashing, this method is invoked only once per
+    run loop per record.
+
+    @method dataWasUpdated
+    @private
+    @param {Class} type
+    @param {Number|String} clientId
+    @param {DS.Model} record
+  */
+  dataWasUpdated: function(type, reference, record) {
+    // Because data updates are invoked at the end of the run loop,
+    // it is possible that a record might be deleted after its data
+    // has been modified and this method was scheduled to be called.
+    //
+    // If that's the case, the record would have already been removed
+    // from all record arrays; calling updateRecordArrays would just
+    // add it back. If the record is deleted, just bail. It shouldn't
+    // give us any more trouble after this.
+
+    if (get(record, 'isDeleted')) { return; }
+
+    if (typeof reference.data === "object") {
+      this.recordArrayManager.referenceDidChange(reference);
+    }
+  },
+
+  // ..............
+  // . PERSISTING .
+  // ..............
+
+  /**
+    This method delegates saving to the store's implicit
+    transaction.
+
+    Calling this method is essentially a request to persist
+    any changes to records that were not explicitly added to
+    a transaction.
+
+    @method save
+  */
+  save: function() {
+    once(this, 'commitDefaultTransaction');
+  },
+  commit: Ember.aliasMethod('save'),
+
+  commitDefaultTransaction: function() {
+    get(this, 'defaultTransaction').commit();
+  },
+
+  scheduleSave: function(record) {
+    get(this, 'currentTransaction').add(record);
+    once(this, 'flushSavedRecords');
+  },
+
+  flushSavedRecords: function() {
+    get(this, 'currentTransaction').commit();
+    set(this, 'currentTransaction', this.transaction());
+  },
+
+  /**
+    Adapters should call this method if they would like to acknowledge
+    that all changes related to a record (other than relationship
+    changes) have persisted.
+
+    Because relationship changes affect multiple records, the adapter
+    is responsible for acknowledging the change to the relationship
+    directly (using `store.didUpdateRelationship`) when all aspects
+    of the relationship change have persisted.
+
+    It can be called for created, deleted or updated records.
+
+    If the adapter supplies new data, that data will become the new
+    canonical data for the record. That will result in blowing away
+    all local changes and rematerializing the record with the new
+    data (the "sledgehammer" approach).
+
+    Alternatively, if the adapter does not supply new data, the record
+    will collapse all local changes into its saved data. Subsequent
+    rollbacks of the record will roll back to this point.
+
+    If an adapter is acknowledging receipt of a newly created record
+    that did not generate an id in the client, it *must* either
+    provide data or explicitly invoke `store.didReceiveId` with
+    the server-provided id.
+
+    Note that an adapter may not supply new data when acknowledging
+    a deleted record.
+
+    @method didSaveRecord
+    @param {DS.Model} record the in-flight record
+    @param {Object} data optional data (see above)
+  */
+  didSaveRecord: function(record, data) {
+    if (data) {
+      this.updateId(record, data);
+      this.updateRecordData(record, data);
+    } else {
+      this.didUpdateAttributes(record);
+    }
+
+    record.adapterDidCommit();
+  },
+
+  /**
+    For convenience, if an adapter is performing a bulk commit, it can also
+    acknowledge all of the records at once.
+
+    If the adapter supplies an array of data, they must be in the same order as
+    the array of records passed in as the first parameter.
+
+    @method didSaveRecords
+    @param {#forEach} list a list of records whose changes the
+      adapter is acknowledging. You can pass any object that
+      has an ES5-like `forEach` method, including the
+      `OrderedSet` objects passed into the adapter at commit
+      time.
+    @param {Array[Object]} dataList an Array of data. This
+      parameter must be an integer-indexed Array-like.
+  */
+  didSaveRecords: function(list, dataList) {
+    var i = 0;
+    forEach(list, function(record) {
+      this.didSaveRecord(record, dataList && dataList[i++]);
+    }, this);
+  },
+
+  /**
+    This method allows the adapter to specify that a record
+    could not be saved because it had backend-supplied validation
+    errors.
+
+    The errors object must have keys that correspond to the
+    attribute names. Once each of the specified attributes have
+    changed, the record will automatically move out of the
+    invalid state and be ready to commit again.
+
+    TODO: We should probably automate the process of converting
+    server names to attribute names using the existing serializer
+    infrastructure.
+
+    @method recordWasInvalid
+    @param {DS.Model} record
+    @param {Object} errors
+  */
+  recordWasInvalid: function(record, errors) {
+    record.adapterDidInvalidate(errors);
+  },
+
+  /**
+    This method allows the adapter to specify that a record
+    could not be saved because the server returned an unhandled
+    error.
+
+    @method recordWasError
+    @param {DS.Model} record
+  */
+  recordWasError: function(record) {
+    record.adapterDidError();
+  },
+
+  /**
+    This is a lower-level API than `didSaveRecord` that allows an
+    adapter to acknowledge the persistence of a single attribute.
+
+    This is useful if an adapter needs to make multiple asynchronous
+    calls to fully persist a record. The record will keep track of
+    which attributes and relationships are still outstanding and
+    automatically move into the `saved` state once the adapter has
+    acknowledged everything.
+
+    If a value is provided, it clobbers the locally specified value.
+    Otherwise, the local value becomes the record's last known
+    saved value (which is used when rolling back a record).
+
+    Note that the specified attributeName is the normalized name
+    specified in the definition of the `DS.Model`, not a key in
+    the server-provided data.
+
+    Also note that the adapter is responsible for performing any
+    transformations on the value using the serializer API.
+
+    @method didUpdateAttribute
+    @param {DS.Model} record
+    @param {String} attributeName
+    @param {Object} value
+  */
+  didUpdateAttribute: function(record, attributeName, value) {
+    record.adapterDidUpdateAttribute(attributeName, value);
+  },
+
+  /**
+    This method allows an adapter to acknowledge persistence
+    of all attributes of a record but not relationships or
+    other factors.
+
+    It loops through the record's defined attributes and
+    notifies the record that they are all acknowledged.
+
+    This method does not take optional values, because
+    the adapter is unlikely to have a hash of normalized
+    keys and transformed values, and instead of building
+    one up, it should just call `didUpdateAttribute` as
+    needed.
+
+    This method is intended as a middle-ground between
+    `didSaveRecord`, which acknowledges all changes to
+    a record, and `didUpdateAttribute`, which allows an
+    adapter fine-grained control over updates.
+
+    @method didUpdateAttributes
+    @param {DS.Model} record
+  */
+  didUpdateAttributes: function(record) {
+    record.eachAttribute(function(attributeName) {
+      this.didUpdateAttribute(record, attributeName);
+    }, this);
+  },
+
+  /**
+    This allows an adapter to acknowledge that it has saved all
+    necessary aspects of a relationship change.
+
+    This is separated from acknowledging the record itself
+    (via `didSaveRecord`) because a relationship change can
+    involve as many as three separate records. Records should
+    only move out of the in-flight state once the server has
+    acknowledged all of their relationships, and this differs
+    based upon the adapter's semantics.
+
+    There are three basic scenarios by which an adapter can
+    save a relationship.
+
+    ### Foreign Key
+
+    An adapter can save all relationship changes by updating
+    a foreign key on the child record. If it does this, it
+    should acknowledge the changes when the child record is
+    saved.
+
+        record.eachRelationship(function(name, meta) {
+          if (meta.kind === 'belongsTo') {
+            store.didUpdateRelationship(record, name);
+          }
+        });
+
+        store.didSaveRecord(record, data);
+
+    ### Embedded in Parent
+
+    An adapter can save one-to-many relationships by embedding
+    IDs (or records) in the parent object. In this case, the
+    relationship is not considered acknowledged until both the
+    old parent and new parent have acknowledged the change.
+
+    In this case, the adapter should keep track of the old
+    parent and new parent, and acknowledge the relationship
+    change once both have acknowledged. If one of the two
+    sides does not exist (e.g. the new parent does not exist
+    because of nulling out the belongs-to relationship),
+    the adapter should acknowledge the relationship once
+    the other side has acknowledged.
+
+    ### Separate Entity
+
+    An adapter can save relationships as separate entities
+    on the server. In this case, they should acknowledge
+    the relationship as saved once the server has
+    acknowledged the entity.
+
+    @method didUpdateRelationship
+    @param {DS.Model} record
+    @param {DS.Model} relationshipName
+  */
+  didUpdateRelationship: function(record, relationshipName) {
+    var clientId = get(record, '_reference').clientId;
+
+    var relationship = this.relationshipChangeFor(clientId, relationshipName);
+    //TODO(Igor)
+    if (relationship) { relationship.adapterDidUpdate(); }
+  },
+
+  /**
+    This allows an adapter to acknowledge all relationship changes
+    for a given record.
+
+    Like `didUpdateAttributes`, this is intended as a middle ground
+    between `didSaveRecord` and fine-grained control via the
+    `didUpdateRelationship` API.
+
+    @method didUpdateRelationships
+    @param record
+  */
+  didUpdateRelationships: function(record) {
+    var changes = this.relationshipChangesFor(get(record, '_reference'));
+
+    for (var name in changes) {
+      if (!changes.hasOwnProperty(name)) { continue; }
+      changes[name].adapterDidUpdate();
+    }
+  },
+
+  /**
+    When acknowledging the creation of a locally created record,
+    adapters must supply an id (if they did not implement
+    `generateIdForRecord` to generate an id locally).
+
+    If an adapter does not use `didSaveRecord` and supply a hash
+    (for example, if it needs to make multiple HTTP requests to
+    create and then update the record), it will need to invoke
+    `didReceiveId` with the backend-supplied id.
+
+    When not using `didSaveRecord`, an adapter will need to
+    invoke:
+
+    * didReceiveId (unless the id was generated locally)
+    * didCreateRecord
+    * didUpdateAttribute(s)
+    * didUpdateRelationship(s)
+
+    @method didReceiveId
+    @param {DS.Model} record
+    @param {Number|String} id
+  */
+  didReceiveId: function(record, id) {
+    var typeMap = this.typeMapFor(record.constructor),
+        clientId = get(record, 'clientId'),
+        oldId = get(record, 'id');
+
+    Ember.assert("An adapter cannot assign a new id to a record that already has an id. " + record + " had id: " + oldId + " and you tried to update it with " + id + ". This likely happened because your server returned data in response to a find or update that had a different id than the one you sent.", oldId === undefined || id === oldId);
+
+    typeMap.idToCid[id] = clientId;
+    this.clientIdToId[clientId] = id;
+  },
+
+  /**
+    This method re-indexes the data by its clientId in the store
+    and then notifies the record that it should rematerialize
+    itself.
+
+    @method updateRecordData
+    @private
+    @param {DS.Model} record
+    @param {Object} data
+  */
+  updateRecordData: function(record, data) {
+    get(record, '_reference').data = data;
+    record.didChangeData();
+  },
+
+  /**
+    If an adapter invokes `didSaveRecord` with data, this method
+    extracts the id from the supplied data (using the adapter's
+    `extractId()` method) and indexes the clientId with that id.
+
+    @method updateId
+    @private
+    @param {DS.Model} record
+    @param {Object} data
+  */
+  updateId: function(record, data) {
+    var type = record.constructor,
+        typeMap = this.typeMapFor(type),
+        reference = get(record, '_reference'),
+        oldId = get(record, 'id'),
+        id = this.preprocessData(type, data);
+
+    Ember.assert("An adapter cannot assign a new id to a record that already has an id. " + record + " had id: " + oldId + " and you tried to update it with " + id + ". This likely happened because your server returned data in response to a find or update that had a different id than the one you sent.", oldId === null || id === oldId);
+
+    typeMap.idToReference[id] = reference;
+    reference.id = id;
+  },
+
+  /**
+    This method receives opaque data provided by the adapter and
+    preprocesses it, returning an ID.
+
+    The actual preprocessing takes place in the adapter. If you would
+    like to change the default behavior, you should override the
+    appropriate hooks in `DS.Serializer`.
+
+    @method preprocessData
+    @private
+    @param type
+    @param data
+    @return {String} id the id represented by the data
+  */
+  preprocessData: function(type, data) {
+    return this.adapterForType(type).extractId(type, data);
+  },
+
+  /**
+    Returns a map of IDs to client IDs for a given type.
+
+    @method typeMapFor
+    @private
+    @param type
+  */
+  typeMapFor: function(type) {
+    var typeMaps = get(this, 'typeMaps'),
+        guid = Ember.guidFor(type),
+        typeMap;
+
+    typeMap = typeMaps[guid];
+
+    if (typeMap) { return typeMap; }
+
+    typeMap = {
+      idToReference: {},
+      references: [],
+      metadata: {}
+    };
+
+    typeMaps[guid] = typeMap;
+
+    return typeMap;
+  },
+
+  // ................
+  // . LOADING DATA .
+  // ................
+
+  /**
+    Load new data into the store for a given id and type combination.
+    If data for that record had been loaded previously, the new information
+    overwrites the old.
+
+    If the record you are loading data for has outstanding changes that have not
+    yet been saved, an exception will be thrown.
+
+    @method load
+    @param {DS.Model} type
+    @param data
+    @param prematerialized
+  */
+  load: function(type, data, prematerialized) {
+    var id;
+
+    if (typeof data === 'number' || typeof data === 'string') {
+      id = data;
+      data = prematerialized;
+      prematerialized = null;
+    }
+
+    if (prematerialized && prematerialized.id) {
+      id = prematerialized.id;
+    } else if (id === undefined) {
+      id = this.preprocessData(type, data);
+    }
+
+    id = coerceId(id);
+
+    var reference = this.referenceForId(type, id);
+
+    if (reference.record) {
+      once(reference.record, 'loadedData');
+    }
+
+    reference.data = data;
+    reference.prematerialized = prematerialized;
+
+    this.recordArrayManager.referenceDidChange(reference);
+
+    return reference;
+  },
+
+  newLoad: function(type, data) {
+    var id = coerceId(data.id),
+        reference = this.referenceForId(type, id);
+
+    reference.data = MATERIALIZED;
+
+    if (reference.record) { reference.record.setupData(data); }
+
+    this.recordArrayManager.referenceDidChange(reference);
+
+    return reference;
+  },
+
+  modelFor: function(key) {
+    if (typeof key !== 'string') {
+      return key;
+    }
+
+    var factory = this.container.lookupFactory('model:'+key);
+    factory.store = this;
+
+    return factory;
+  },
+
+  push: function(type, data) {
+    var serializer = this.serializerFor(type);
+    type = this.modelFor(type);
+
+    data = serializer.deserialize(type, data);
+
+    this.newLoad(type, data);
+
+    var reference = this.referenceForId(type, data.id),
+        record = reference.record;
+
+    if (record) {
+      return record;
+    } else {
+      return this.materializeRecord(reference, data);
+    }
+  },
+
+  recordFor: function(type, id) {
+    type = this.modelFor(type);
+
+    var reference = this.referenceForId(type, id);
+    if (reference.record) { return reference.record; }
+
+    return this.materializeRecord(reference);
+  },
+
+  loadMany: function(type, ids, dataList) {
+    if (dataList === undefined) {
+      dataList = ids;
+      ids = map(dataList, function(data) {
+        return this.preprocessData(type, data);
+      }, this);
+    }
+
+    return map(ids, function(id, i) {
+      return this.load(type, id, dataList[i]);
+    }, this);
+  },
+
+  loadHasMany: function(record, key, ids) {
+    //It looks sad to have to do the conversion in the store
+    var type = record.get(key + '.type'),
+        tuples = map(ids, function(id) {
+          return {id: id, type: type};
+        });
+    record.materializeHasMany(key, tuples);
+
+    // Update any existing many arrays that use the previous IDs,
+    // if necessary.
+    record.hasManyDidChange(key);
+
+    var relationship = record.cacheFor(key);
+
+    // TODO (tomdale) this assumes that loadHasMany *always* means
+    // that the records for the provided IDs are loaded.
+    if (relationship) {
+      set(relationship, 'isLoaded', true);
+      relationship.trigger('didLoad');
+    }
+  },
+
+  /**
+    Creates a new reference for a given type & ID pair. Metadata about the
+    record can be stored in the reference without having to create a full-blown
+    DS.Model instance.
+
+    @method createReference
+    @private
+    @param {DS.Model} type
+    @param {String|Number} id
+    @returns {Reference}
+  */
+  createReference: function(type, id) {
+    var typeMap = this.typeMapFor(type),
+        idToReference = typeMap.idToReference;
+
+    Ember.assert('The id ' + id + ' has already been used with another record of type ' + type.toString() + '.', !id || !idToReference[id]);
+
+    var reference = {
+      id: id,
+      clientId: this.clientIdCounter++,
+      type: type
+    };
+
+    // if we're creating an item, this process will be done
+    // later, once the object has been persisted.
+    if (id) {
+      idToReference[id] = reference;
+    }
+
+    typeMap.references.push(reference);
+
+    return reference;
+  },
+
+  // ..........................
+  // . RECORD MATERIALIZATION .
+  // ..........................
+
+  materializeRecord: function(reference, data) {
+    var record = reference.type._create({
+      id: reference.id,
+      store: this,
+      _reference: reference
+    });
+
+    reference.record = record;
+
+    get(this, 'defaultTransaction').adoptRecord(record);
+
+    if (data) {
+      record.setupData(data);
+    }
+
+    return record;
+  },
+
+  legacyMaterializeRecord: function(reference) {
+    var record = reference.type._create({
+      id: reference.id,
+      store: this,
+      _reference: reference
+    });
+
+    reference.record = record;
+
+    get(this, 'defaultTransaction').adoptRecord(record);
+
+    record.loadingData();
+
+    if (typeof reference.data === 'object') {
+      record.loadedData();
+    }
+
+    return record;
+  },
+
+  dematerializeRecord: function(record) {
+    var reference = get(record, '_reference'),
+        type = reference.type,
+        id = reference.id,
+        typeMap = this.typeMapFor(type);
+
+    record.updateRecordArrays();
+
+    if (id) { delete typeMap.idToReference[id]; }
+
+    var loc = indexOf(typeMap.references, reference);
+    typeMap.references.splice(loc, 1);
+  },
+
+  willDestroy: function() {
+    if (get(DS, 'defaultStore') === this) {
+      set(DS, 'defaultStore', null);
+    }
+  },
+
+  // ........................
+  // . RELATIONSHIP CHANGES .
+  // ........................
+
+  addRelationshipChangeFor: function(clientReference, childKey, parentReference, parentKey, change) {
+    var clientId = clientReference.clientId,
+        parentClientId = parentReference ? parentReference.clientId : parentReference;
+    var key = childKey + parentKey;
+    var changes = this.relationshipChanges;
+    if (!(clientId in changes)) {
+      changes[clientId] = {};
+    }
+    if (!(parentClientId in changes[clientId])) {
+      changes[clientId][parentClientId] = {};
+    }
+    if (!(key in changes[clientId][parentClientId])) {
+      changes[clientId][parentClientId][key] = {};
+    }
+    changes[clientId][parentClientId][key][change.changeType] = change;
+  },
+
+  removeRelationshipChangeFor: function(clientReference, childKey, parentReference, parentKey, type) {
+    var clientId = clientReference.clientId,
+        parentClientId = parentReference ? parentReference.clientId : parentReference;
+    var changes = this.relationshipChanges;
+    var key = childKey + parentKey;
+    if (!(clientId in changes) || !(parentClientId in changes[clientId]) || !(key in changes[clientId][parentClientId])){
+      return;
+    }
+    delete changes[clientId][parentClientId][key][type];
+  },
+
+  relationshipChangeFor: function(clientReference, childKey, parentReference, parentKey, type) {
+    var clientId = clientReference.clientId,
+        parentClientId = parentReference ? parentReference.clientId : parentReference;
+    var changes = this.relationshipChanges;
+    var key = childKey + parentKey;
+    if (!(clientId in changes) || !(parentClientId in changes[clientId])){
+      return;
+    }
+    if(type){
+      return changes[clientId][parentClientId][key][type];
+    }
+    else{
+      //TODO(Igor) what if both present
+      return changes[clientId][parentClientId][key]["add"] || changes[clientId][parentClientId][key]["remove"];
+    }
+  },
+
+  relationshipChangePairsFor: function(reference){
+    var toReturn = [];
+
+    if( !reference ) { return toReturn; }
+
+    //TODO(Igor) What about the other side
+    var changesObject = this.relationshipChanges[reference.clientId];
+    for (var objKey in changesObject){
+      if(changesObject.hasOwnProperty(objKey)){
+        for (var changeKey in changesObject[objKey]){
+          if(changesObject[objKey].hasOwnProperty(changeKey)){
+            toReturn.push(changesObject[objKey][changeKey]);
+          }
+        }
+      }
+    }
+    return toReturn;
+  },
+
+  relationshipChangesFor: function(reference) {
+    var toReturn = [];
+
+    if( !reference ) { return toReturn; }
+
+    var relationshipPairs = this.relationshipChangePairsFor(reference);
+    forEach(relationshipPairs, function(pair){
+      var addedChange = pair["add"];
+      var removedChange = pair["remove"];
+      if(addedChange){
+        toReturn.push(addedChange);
+      }
+      if(removedChange){
+        toReturn.push(removedChange);
+      }
+    });
+    return toReturn;
+  },
+  // ......................
+  // . PER-TYPE ADAPTERS
+  // ......................
+
+  adapterForType: function(type) {
+    this._adaptersMap = this.createInstanceMapFor('adapters');
+
+    var adapter = this._adaptersMap.get(type);
+    if (adapter) { return adapter; }
+
+    return this.get('_adapter');
+  },
+
+  // ..............................
+  // . RECORD CHANGE NOTIFICATION .
+  // ..............................
+
+  recordAttributeDidChange: function(reference, attributeName, newValue, oldValue) {
+    var record = reference.record,
+        dirtySet = new Ember.OrderedSet(),
+        adapter = this.adapterForType(record.constructor);
+
+    if (adapter.dirtyRecordsForAttributeChange) {
+      adapter.dirtyRecordsForAttributeChange(dirtySet, record, attributeName, newValue, oldValue);
+    }
+
+    dirtySet.forEach(function(record) {
+      record.adapterDidDirty();
+    });
+  },
+
+  recordBelongsToDidChange: function(dirtySet, child, relationship) {
+    var adapter = this.adapterForType(child.constructor);
+
+    if (adapter.dirtyRecordsForBelongsToChange) {
+      adapter.dirtyRecordsForBelongsToChange(dirtySet, child, relationship);
+    }
+
+    // adapterDidDirty is called by the RelationshipChange that created
+    // the dirtySet.
+  },
+
+  recordHasManyDidChange: function(dirtySet, parent, relationship) {
+    var adapter = this.adapterForType(parent.constructor);
+
+    if (adapter.dirtyRecordsForHasManyChange) {
+      adapter.dirtyRecordsForHasManyChange(dirtySet, parent, relationship);
+    }
+
+    // adapterDidDirty is called by the RelationshipChange that created
+    // the dirtySet.
+  },
+
+  /**
+    Returns an instance of the serializer for a given type. For
+    example, `serializerFor('person')` will return an instance of
+    `App.PersonSerializer`.
+
+    If no `App.PersonSerializer` is found, this method will look
+    for an `App.ApplicationSerializer` (the default serializer for
+    your entire application).
+
+    If no `App.ApplicationSerializer` is found, it will fall back
+    to an instance of `DS.JSONSerializer`.
+
+    @method serializerFor
+    @param {String} type the record to serialize
+  */
+  serializerFor: function(type) {
+    var container = this.container;
+
+    return container.lookup('serializer:'+type) ||
+           container.lookup('serializer:application') ||
+           container.lookup('serializer:_default');
+  }
+});
+
+DS.Store.reopenClass({
+  registerAdapter: DS._Mappable.generateMapFunctionFor('adapters', function(type, adapter, map) {
+    map.set(type, adapter);
+  }),
+
+  transformMapKey: function(key) {
+    if (typeof key === 'string') {
+      var transformedKey;
+      transformedKey = get(Ember.lookup, key);
+      Ember.assert("Could not find model at path " + key, transformedKey);
+      return transformedKey;
+    } else {
+      return key;
+    }
+  },
+
+  transformMapValue: function(key, value) {
+    if (Ember.Object.detect(value)) {
+      return value.create();
+    }
+
+    return value;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set,
+    once = Ember.run.once, arrayMap = Ember.ArrayPolyfills.map;
+
+/*
+  WARNING: Much of these docs are inaccurate as of bf8497.
+
+  This file encapsulates the various states that a record can transition
+  through during its lifecycle.
+
+  ### State Manager
+
+  A record's state manager explicitly tracks what state a record is in
+  at any given time. For instance, if a record is newly created and has
+  not yet been sent to the adapter to be saved, it would be in the
+  `created.uncommitted` state.  If a record has had local modifications
+  made to it that are in the process of being saved, the record would be
+  in the `updated.inFlight` state. (These state paths will be explained
+  in more detail below.)
+
+  Events are sent by the record or its store to the record's state manager.
+  How the state manager reacts to these events is dependent on which state
+  it is in. In some states, certain events will be invalid and will cause
+  an exception to be raised.
+
+  States are hierarchical. For example, a record can be in the
+  `deleted.start` state, then transition into the `deleted.inFlight` state.
+  If a child state does not implement an event handler, the state manager
+  will attempt to invoke the event on all parent states until the root state is
+  reached. The state hierarchy of a record is described in terms of a path
+  string. You can determine a record's current state by getting its manager's
+  current state path:
+
+      record.get('stateManager.currentPath');
+      //=> "created.uncommitted"
+
+  The `DS.Model` states are themselves stateless. What we mean is that,
+  though each instance of a record also has a unique instance of a
+  `DS.StateManager`, the hierarchical states that each of *those* points
+  to is a shared data structure. For performance reasons, instead of each
+  record getting its own copy of the hierarchy of states, each state
+  manager points to this global, immutable shared instance. How does a
+  state know which record it should be acting on?  We pass a reference to
+  the current state manager as the first parameter to every method invoked
+  on a state.
+
+  The state manager passed as the first parameter is where you should stash
+  state about the record if needed; you should never store data on the state
+  object itself. If you need access to the record being acted on, you can
+  retrieve the state manager's `record` property. For example, if you had
+  an event handler `myEvent`:
+
+      myEvent: function(manager) {
+        var record = manager.get('record');
+        record.doSomething();
+      }
+
+  For more information about state managers in general, see the Ember.js
+  documentation on `Ember.StateManager`.
+
+  ### Events, Flags, and Transitions
+
+  A state may implement zero or more events, flags, or transitions.
+
+  #### Events
+
+  Events are named functions that are invoked when sent to a record. The
+  state manager will first look for a method with the given name on the
+  current state. If no method is found, it will search the current state's
+  parent, and then its grandparent, and so on until reaching the top of
+  the hierarchy. If the root is reached without an event handler being found,
+  an exception will be raised. This can be very helpful when debugging new
+  features.
+
+  Here's an example implementation of a state with a `myEvent` event handler:
+
+      aState: DS.State.create({
+        myEvent: function(manager, param) {
+          console.log("Received myEvent with "+param);
+        }
+      })
+
+  To trigger this event:
+
+      record.send('myEvent', 'foo');
+      //=> "Received myEvent with foo"
+
+  Note that an optional parameter can be sent to a record's `send()` method,
+  which will be passed as the second parameter to the event handler.
+
+  Events should transition to a different state if appropriate. This can be
+  done by calling the state manager's `transitionTo()` method with a path to the
+  desired state. The state manager will attempt to resolve the state path
+  relative to the current state. If no state is found at that path, it will
+  attempt to resolve it relative to the current state's parent, and then its
+  parent, and so on until the root is reached. For example, imagine a hierarchy
+  like this:
+
+      * created
+        * start <-- currentState
+        * inFlight
+      * updated
+        * inFlight
+
+  If we are currently in the `start` state, calling
+  `transitionTo('inFlight')` would transition to the `created.inFlight` state,
+  while calling `transitionTo('updated.inFlight')` would transition to
+  the `updated.inFlight` state.
+
+  Remember that *only events* should ever cause a state transition. You should
+  never call `transitionTo()` from outside a state's event handler. If you are
+  tempted to do so, create a new event and send that to the state manager.
+
+  #### Flags
+
+  Flags are Boolean values that can be used to introspect a record's current
+  state in a more user-friendly way than examining its state path. For example,
+  instead of doing this:
+
+      var statePath = record.get('stateManager.currentPath');
+      if (statePath === 'created.inFlight') {
+        doSomething();
+      }
+
+  You can say:
+
+      if (record.get('isNew') && record.get('isSaving')) {
+        doSomething();
+      }
+
+  If your state does not set a value for a given flag, the value will
+  be inherited from its parent (or the first place in the state hierarchy
+  where it is defined).
+
+  The current set of flags are defined below. If you want to add a new flag,
+  in addition to the area below, you will also need to declare it in the
+  `DS.Model` class.
+
+  #### Transitions
+
+  Transitions are like event handlers but are called automatically upon
+  entering or exiting a state. To implement a transition, just call a method
+  either `enter` or `exit`:
+
+      myState: DS.State.create({
+        // Gets called automatically when entering
+        // this state.
+        enter: function(manager) {
+          console.log("Entered myState");
+        }
+      })
+
+  Note that enter and exit events are called once per transition. If the
+  current state changes, but changes to another child state of the parent,
+  the transition event on the parent will not be triggered.
+*/
+
+var hasDefinedProperties = function(object) {
+  // Ignore internal property defined by simulated `Ember.create`.
+  var names = Ember.keys(object);
+  var i, l, name;
+  for (i = 0, l = names.length; i < l; i++ ) {
+    name = names[i];
+    if (object.hasOwnProperty(name) && object[name]) { return true; }
+  }
+
+  return false;
+};
+
+var didChangeData = function(record) {
+  record.materializeData();
+};
+
+var willSetProperty = function(record, context) {
+  context.oldValue = get(record, context.name);
+
+  var change = DS.AttributeChange.createChange(context);
+  record._changesToSync[context.name] = change;
+};
+
+var didSetProperty = function(record, context) {
+  var change = record._changesToSync[context.name];
+  change.value = get(record, context.name);
+  change.sync();
+};
+
+
+// Implementation notes:
+//
+// Each state has a boolean value for all of the following flags:
+//
+// * isLoaded: The record has a populated `data` property. When a
+//   record is loaded via `store.find`, `isLoaded` is false
+//   until the adapter sets it. When a record is created locally,
+//   its `isLoaded` property is always true.
+// * isDirty: The record has local changes that have not yet been
+//   saved by the adapter. This includes records that have been
+//   created (but not yet saved) or deleted.
+// * isSaving: The record's transaction has been committed, but
+//   the adapter has not yet acknowledged that the changes have
+//   been persisted to the backend.
+// * isDeleted: The record was marked for deletion. When `isDeleted`
+//   is true and `isDirty` is true, the record is deleted locally
+//   but the deletion was not yet persisted. When `isSaving` is
+//   true, the change is in-flight. When both `isDirty` and
+//   `isSaving` are false, the change has persisted.
+// * isError: The adapter reported that it was unable to save
+//   local changes to the backend. This may also result in the
+//   record having its `isValid` property become false if the
+//   adapter reported that server-side validations failed.
+// * isNew: The record was created on the client and the adapter
+//   did not yet report that it was successfully saved.
+// * isValid: No client-side validations have failed and the
+//   adapter did not report any server-side validation failures.
+
+// The dirty state is a abstract state whose functionality is
+// shared between the `created` and `updated` states.
+//
+// The deleted state shares the `isDirty` flag with the
+// subclasses of `DirtyState`, but with a very different
+// implementation.
+//
+// Dirty states have three child states:
+//
+// `uncommitted`: the store has not yet handed off the record
+//   to be saved.
+// `inFlight`: the store has handed off the record to be saved,
+//   but the adapter has not yet acknowledged success.
+// `invalid`: the record has invalid information and cannot be
+//   send to the adapter yet.
+var DirtyState = {
+  initialState: 'uncommitted',
+
+  // FLAGS
+  isDirty: true,
+
+  // SUBSTATES
+
+  // When a record first becomes dirty, it is `uncommitted`.
+  // This means that there are local pending changes, but they
+  // have not yet begun to be saved, and are not invalid.
+  uncommitted: {
+
+    // EVENTS
+    willSetProperty: willSetProperty,
+    didSetProperty: didSetProperty,
+
+    becomeDirty: Ember.K,
+
+    willCommit: function(record) {
+      record.transitionTo('inFlight');
+    },
+
+    becameClean: function(record) {
+      record.withTransaction(function(t) {
+        t.remove(record);
+      });
+
+      record.transitionTo('loaded.materializing');
+    },
+
+    becameInvalid: function(record) {
+      record.transitionTo('invalid');
+    },
+
+    rollback: function(record) {
+      record.rollback();
+    }
+  },
+
+  // Once a record has been handed off to the adapter to be
+  // saved, it is in the 'in flight' state. Changes to the
+  // record cannot be made during this window.
+  inFlight: {
+    // FLAGS
+    isSaving: true,
+
+    // TRANSITIONS
+    enter: function(record) {
+      record.becameInFlight();
+    },
+
+    // EVENTS
+
+    materializingData: function(record) {
+      set(record, 'lastDirtyType', get(this, 'dirtyType'));
+      record.transitionTo('materializing');
+    },
+
+    didCommit: function(record) {
+      var dirtyType = get(this, 'dirtyType');
+
+      record.withTransaction(function(t) {
+        t.remove(record);
+      });
+
+      record.transitionTo('saved');
+      record.send('invokeLifecycleCallbacks', dirtyType);
+    },
+
+    didChangeData: didChangeData,
+
+    becameInvalid: function(record, errors) {
+      set(record, 'errors', errors);
+
+      record.transitionTo('invalid');
+      record.send('invokeLifecycleCallbacks');
+    },
+
+    becameError: function(record) {
+      record.transitionTo('error');
+      record.send('invokeLifecycleCallbacks');
+    }
+  },
+
+  // A record is in the `invalid` state when its client-side
+  // invalidations have failed, or if the adapter has indicated
+  // the the record failed server-side invalidations.
+  invalid: {
+    // FLAGS
+    isValid: false,
+
+    exit: function(record) {
+       record.withTransaction(function (t) {
+         t.remove(record);
+       });
+     },
+
+    // EVENTS
+    deleteRecord: function(record) {
+      record.transitionTo('deleted.uncommitted');
+      record.clearRelationships();
+    },
+
+    willSetProperty: willSetProperty,
+
+    didSetProperty: function(record, context) {
+      var errors = get(record, 'errors'),
+          key = context.name;
+
+      set(errors, key, null);
+
+      if (!hasDefinedProperties(errors)) {
+        record.send('becameValid');
+      }
+
+      didSetProperty(record, context);
+    },
+
+    becomeDirty: Ember.K,
+
+    rollback: function(record) {
+      record.send('becameValid');
+      record.send('rollback');
+    },
+
+    becameValid: function(record) {
+      record.transitionTo('uncommitted');
+    },
+
+    invokeLifecycleCallbacks: function(record) {
+      record.trigger('becameInvalid', record);
+    }
+  }
+};
+
+// The created and updated states are created outside the state
+// chart so we can reopen their substates and add mixins as
+// necessary.
+
+function deepClone(object) {
+  var clone = {}, value;
+
+  for (var prop in object) {
+    value = object[prop];
+    if (value && typeof value === 'object') {
+      clone[prop] = deepClone(value);
+    } else {
+      clone[prop] = value;
+    }
+  }
+
+  return clone;
+}
+
+function mixin(original, hash) {
+  for (var prop in hash) {
+    original[prop] = hash[prop];
+  }
+
+  return original;
+}
+
+function dirtyState(options) {
+  var newState = deepClone(DirtyState);
+  return mixin(newState, options);
+}
+
+var createdState = dirtyState({
+  dirtyType: 'created',
+
+  // FLAGS
+  isNew: true
+});
+
+var updatedState = dirtyState({
+  dirtyType: 'updated'
+});
+
+createdState.uncommitted.deleteRecord = function(record) {
+  record.clearRelationships();
+  record.transitionTo('deleted.saved');
+};
+
+createdState.uncommitted.rollback = function(record) {
+  DirtyState.uncommitted.rollback.apply(this, arguments);
+  record.transitionTo('deleted.saved');
+};
+
+updatedState.uncommitted.deleteRecord = function(record) {
+  record.transitionTo('deleted.uncommitted');
+  record.clearRelationships();
+};
+
+var RootState = {
+  // FLAGS
+  isEmpty: false,
+  isLoading: false,
+  isLoaded: false,
+  isReloading: false,
+  isDirty: false,
+  isSaving: false,
+  isDeleted: false,
+  isError: false,
+  isNew: false,
+  isValid: true,
+
+  // SUBSTATES
+
+  // A record begins its lifecycle in the `empty` state.
+  // If its data will come from the adapter, it will
+  // transition into the `loading` state. Otherwise, if
+  // the record is being created on the client, it will
+  // transition into the `created` state.
+  empty: {
+    isEmpty: true,
+
+    // EVENTS
+    loadingData: function(record) {
+      record.transitionTo('loading');
+    },
+
+    loadedData: function(record) {
+      record.transitionTo('loaded.created.uncommitted');
+    },
+
+    pushedData: function(record) {
+      record.transitionTo('loaded.saved');
+    }
+  },
+
+  // A record enters this state when the store askes
+  // the adapter for its data. It remains in this state
+  // until the adapter provides the requested data.
+  //
+  // Usually, this process is asynchronous, using an
+  // XHR to retrieve the data.
+  loading: {
+    // FLAGS
+    isLoading: true,
+
+    // EVENTS
+    loadedData: didChangeData,
+
+    materializingData: function(record) {
+      record.transitionTo('loaded.materializing.firstTime');
+    },
+
+    becameError: function(record) {
+      record.transitionTo('error');
+      record.send('invokeLifecycleCallbacks');
+    }
+  },
+
+  // A record enters this state when its data is populated.
+  // Most of a record's lifecycle is spent inside substates
+  // of the `loaded` state.
+  loaded: {
+    initialState: 'saved',
+
+    // FLAGS
+    isLoaded: true,
+
+    // SUBSTATES
+
+    materializing: {
+      // EVENTS
+      willSetProperty: Ember.K,
+      didSetProperty: Ember.K,
+
+      didChangeData: didChangeData,
+
+      finishedMaterializing: function(record) {
+        record.transitionTo('loaded.saved');
+      },
+
+      // SUBSTATES
+      firstTime: {
+        // FLAGS
+        isLoaded: false,
+
+        exit: function(record) {
+          once(function() {
+            record.trigger('didLoad');
+          });
+        }
+      }
+    },
+
+    reloading: {
+      // FLAGS
+      isReloading: true,
+
+      // TRANSITIONS
+      enter: function(record) {
+        var store = get(record, 'store');
+        store.reloadRecord(record);
+      },
+
+      exit: function(record) {
+        once(record, 'trigger', 'didReload');
+      },
+
+      // EVENTS
+      loadedData: didChangeData,
+
+      materializingData: function(record) {
+        record.transitionTo('loaded.materializing');
+      }
+    },
+
+    // If there are no local changes to a record, it remains
+    // in the `saved` state.
+    saved: {
+      // EVENTS
+      willSetProperty: willSetProperty,
+      didSetProperty: didSetProperty,
+
+      didChangeData: didChangeData,
+      loadedData: didChangeData,
+
+      reloadRecord: function(record) {
+        record.transitionTo('loaded.reloading');
+      },
+
+      materializingData: function(record) {
+        record.transitionTo('loaded.materializing');
+      },
+
+      becomeDirty: function(record) {
+        record.transitionTo('updated.uncommitted');
+      },
+
+      deleteRecord: function(record) {
+        record.transitionTo('deleted.uncommitted');
+        record.clearRelationships();
+      },
+
+      unloadRecord: function(record) {
+        // clear relationships before moving to deleted state
+        // otherwise it fails
+        record.clearRelationships();
+        record.transitionTo('deleted.saved');
+      },
+
+      didCommit: function(record) {
+        record.withTransaction(function(t) {
+          t.remove(record);
+        });
+
+        record.send('invokeLifecycleCallbacks', get(record, 'lastDirtyType'));
+      },
+
+      invokeLifecycleCallbacks: function(record, dirtyType) {
+        if (dirtyType === 'created') {
+          record.trigger('didCreate', record);
+        } else {
+          record.trigger('didUpdate', record);
+        }
+
+        record.trigger('didCommit', record);
+      }
+    },
+
+    // A record is in this state after it has been locally
+    // created but before the adapter has indicated that
+    // it has been saved.
+    created: createdState,
+
+    // A record is in this state if it has already been
+    // saved to the server, but there are new local changes
+    // that have not yet been saved.
+    updated: updatedState
+  },
+
+  // A record is in this state if it was deleted from the store.
+  deleted: {
+    initialState: 'uncommitted',
+    dirtyType: 'deleted',
+
+    // FLAGS
+    isDeleted: true,
+    isLoaded: true,
+    isDirty: true,
+
+    // TRANSITIONS
+    setup: function(record) {
+      var store = get(record, 'store');
+
+      store.recordArrayManager.remove(record);
+    },
+
+    // SUBSTATES
+
+    // When a record is deleted, it enters the `start`
+    // state. It will exit this state when the record's
+    // transaction starts to commit.
+    uncommitted: {
+
+      // EVENTS
+      willCommit: function(record) {
+        record.transitionTo('inFlight');
+      },
+
+      rollback: function(record) {
+        record.rollback();
+      },
+
+      becomeDirty: Ember.K,
+
+      becameClean: function(record) {
+        record.withTransaction(function(t) {
+          t.remove(record);
+        });
+        record.transitionTo('loaded.materializing');
+      }
+    },
+
+    // After a record's transaction is committing, but
+    // before the adapter indicates that the deletion
+    // has saved to the server, a record is in the
+    // `inFlight` substate of `deleted`.
+    inFlight: {
+      // FLAGS
+      isSaving: true,
+
+      // TRANSITIONS
+      enter: function(record) {
+        record.becameInFlight();
+      },
+
+      // EVENTS
+      didCommit: function(record) {
+        record.withTransaction(function(t) {
+          t.remove(record);
+        });
+
+        record.transitionTo('saved');
+
+        record.send('invokeLifecycleCallbacks');
+      }
+    },
+
+    // Once the adapter indicates that the deletion has
+    // been saved, the record enters the `saved` substate
+    // of `deleted`.
+    saved: {
+      // FLAGS
+      isDirty: false,
+
+      setup: function(record) {
+        var store = get(record, 'store');
+        store.dematerializeRecord(record);
+      },
+
+      invokeLifecycleCallbacks: function(record) {
+        record.trigger('didDelete', record);
+        record.trigger('didCommit', record);
+      }
+    }
+  },
+
+  // If the adapter indicates that there was an unknown
+  // error saving a record, the record enters the `error`
+  // state.
+  error: {
+    isError: true,
+
+    // EVENTS
+
+    invokeLifecycleCallbacks: function(record) {
+      record.trigger('becameError', record);
+    }
+  }
+};
+
+var hasOwnProp = {}.hasOwnProperty;
+
+function wireState(object, parent, name) {
+  /*jshint proto:true*/
+  // TODO: Use Object.create and copy instead
+  object = mixin(parent ? Ember.create(parent) : {}, object);
+  object.parentState = parent;
+  object.stateName = name;
+
+  for (var prop in object) {
+    if (!object.hasOwnProperty(prop) || prop === 'parentState' || prop === 'stateName') { continue; }
+    if (typeof object[prop] === 'object') {
+      object[prop] = wireState(object[prop], object, name + "." + prop);
+    }
+  }
+
+  return object;
+}
+
+RootState = wireState(RootState, null, "root");
+
+DS.RootState = RootState;
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var LoadPromise = DS.LoadPromise; // system/mixins/load_promise
+
+var get = Ember.get, set = Ember.set, map = Ember.EnumerableUtils.map, merge = Ember.merge;
+
+var arrayMap = Ember.ArrayPolyfills.map;
+
+var retrieveFromCurrentState = Ember.computed(function(key, value) {
+  return get(get(this, 'currentState'), key);
+}).property('currentState').readOnly();
+
+/**
+
+  The model class that all Ember Data records descend from.
+
+  @class Model
+  @namespace DS
+  @extends Ember.Object
+  @uses Ember.Evented
+  @uses DS.LoadPromise
+*/
+DS.Model = Ember.Object.extend(Ember.Evented, LoadPromise, {
+  isEmpty: retrieveFromCurrentState,
+  isLoading: retrieveFromCurrentState,
+  isLoaded: retrieveFromCurrentState,
+  isReloading: retrieveFromCurrentState,
+  isDirty: retrieveFromCurrentState,
+  isSaving: retrieveFromCurrentState,
+  isDeleted: retrieveFromCurrentState,
+  isError: retrieveFromCurrentState,
+  isNew: retrieveFromCurrentState,
+  isValid: retrieveFromCurrentState,
+  dirtyType: retrieveFromCurrentState,
+
+  clientId: null,
+  id: null,
+  transaction: null,
+  currentState: null,
+  errors: null,
+
+  /**
+    Create a JSON representation of the record, using the serialization
+    strategy of the store's adapter.
+
+    @method serialize
+    @param {Object} options Available options:
+
+    * `includeId`: `true` if the record's ID should be included in the
+      JSON representation.
+
+    @returns {Object} an object whose values are primitive JSON values only
+  */
+  serialize: function(options) {
+    var store = get(this, 'store');
+    return store.serialize(this, options);
+  },
+
+  /**
+    Use {{#crossLink "DS.JSONSerializer"}}DS.JSONSerializer{{/crossLink}} to
+    get the JSON representation of a record.
+
+    @method toJSON
+    @param {Object} options Available options:
+
+    * `includeId`: `true` if the record's ID should be included in the
+      JSON representation.
+
+    @returns {Object} A JSON representation of the object.
+  */
+  toJSON: function(options) {
+    var serializer = DS.JSONSerializer.create();
+    return serializer.serialize(this, options);
+  },
+
+  /**
+    Fired when the record is loaded from the server.
+
+    @event didLoad
+  */
+  didLoad: Ember.K,
+
+  /**
+    Fired when the record is reloaded from the server.
+
+    @event didReload
+  */
+  didReload: Ember.K,
+
+  /**
+    Fired when the record is updated.
+
+    @event didUpdate
+  */
+  didUpdate: Ember.K,
+
+  /**
+    Fired when the record is created.
+
+    @event didCreate
+  */
+  didCreate: Ember.K,
+
+  /**
+    Fired when the record is deleted.
+
+    @event didDelete
+  */
+  didDelete: Ember.K,
+
+  /**
+    Fired when the record becomes invalid.
+
+    @event becameInvalid
+  */
+  becameInvalid: Ember.K,
+
+  /**
+    Fired when the record enters the error state.
+
+    @event becameError
+  */
+  becameError: Ember.K,
+
+  data: Ember.computed(function() {
+    if (!this._data) {
+      this.setupData();
+    }
+
+    return this._data;
+  }).property(),
+
+  materializeData: function() {
+    this.send('materializingData');
+
+    get(this, 'store').materializeData(this);
+
+    this.suspendRelationshipObservers(function() {
+      this.notifyPropertyChange('data');
+    });
+  },
+
+  _data: null,
+
+  init: function() {
+    set(this, 'currentState', DS.RootState.empty);
+    this._super();
+    this._setup();
+  },
+
+  _setup: function() {
+    this._changesToSync = {};
+  },
+
+  send: function(name, context) {
+    var currentState = get(this, 'currentState');
+
+    if (!currentState[name]) {
+      this._unhandledEvent(currentState, name, context);
+    }
+
+    return currentState[name](this, context);
+  },
+
+  transitionTo: function(name) {
+    // POSSIBLE TODO: Remove this code and replace with
+    // always having direct references to state objects
+
+    var pivotName = name.split(".", 1),
+        currentState = get(this, 'currentState'),
+        state = currentState;
+
+    do {
+      if (state.exit) { state.exit(this); }
+      state = state.parentState;
+    } while (!state.hasOwnProperty(pivotName));
+
+    var path = name.split(".");
+
+    var setups = [], enters = [], i, l;
+
+    for (i=0, l=path.length; i<l; i++) {
+      state = state[path[i]];
+
+      if (state.enter) { enters.push(state); }
+      if (state.setup) { setups.push(state); }
+    }
+
+    for (i=0, l=enters.length; i<l; i++) {
+      enters[i].enter(this);
+    }
+
+    set(this, 'currentState', state);
+
+    for (i=0, l=setups.length; i<l; i++) {
+      setups[i].setup(this);
+    }
+  },
+
+  _unhandledEvent: function(state, name, context) {
+    var errorMessage = "Attempted to handle event `" + name + "` ";
+    errorMessage    += "on " + String(this) + " while in state ";
+    errorMessage    += state.stateName + ". ";
+
+    if (context !== undefined) {
+      errorMessage  += "Called with " + Ember.inspect(context) + ".";
+    }
+
+    throw new Ember.Error(errorMessage);
+  },
+
+  withTransaction: function(fn) {
+    var transaction = get(this, 'transaction');
+    if (transaction) { fn(transaction); }
+  },
+
+  loadingData: function() {
+    this.send('loadingData');
+  },
+
+  loadedData: function() {
+    this.send('loadedData');
+  },
+
+  pushedData: function() {
+    this.send('pushedData');
+  },
+
+  didChangeData: function() {
+    this.send('didChangeData');
+  },
+
+  deleteRecord: function() {
+    this.send('deleteRecord');
+  },
+
+  unloadRecord: function() {
+    Ember.assert("You can only unload a loaded, non-dirty record.", !get(this, 'isDirty'));
+
+    this.send('unloadRecord');
+  },
+
+  clearRelationships: function() {
+    this.eachRelationship(function(name, relationship) {
+      if (relationship.kind === 'belongsTo') {
+        set(this, name, null);
+      } else if (relationship.kind === 'hasMany') {
+        this.clearHasMany(relationship);
+      }
+    }, this);
+  },
+
+  updateRecordArrays: function() {
+    var store = get(this, 'store');
+    if (store) {
+      store.dataWasUpdated(this.constructor, get(this, '_reference'), this);
+    }
+  },
+
+  /**
+    If the adapter did not return a hash in response to a commit,
+    merge the changed attributes and relationships into the existing
+    saved data.
+
+    @method adapterDidCommit
+  */
+  adapterDidCommit: function() {
+    var attributes = get(this, 'data');
+
+    get(this.constructor, 'attributes').forEach(function(name, meta) {
+      attributes[name] = get(this, name);
+    }, this);
+
+    this.send('didCommit');
+    this.updateRecordArraysLater();
+  },
+
+  adapterDidDirty: function() {
+    this.send('becomeDirty');
+    this.updateRecordArraysLater();
+  },
+
+  dataDidChange: Ember.observer(function() {
+    this.reloadHasManys();
+    this.send('finishedMaterializing');
+  }, 'data'),
+
+  reloadHasManys: function() {
+    var relationships = get(this.constructor, 'relationshipsByName');
+    this.updateRecordArraysLater();
+    relationships.forEach(function(name, relationship) {
+      if (relationship.kind === 'hasMany') {
+        this.hasManyDidChange(relationship.key);
+      }
+    }, this);
+  },
+
+  hasManyDidChange: function(key) {
+    var cachedValue = this.cacheFor(key);
+
+    if (cachedValue) {
+      var type = get(this.constructor, 'relationshipsByName').get(key).type;
+      var store = get(this, 'store');
+      var ids = this._data[key] || [];
+
+      var references = map(ids, function(id) {
+        if (typeof id === 'object') {
+          if( id.clientId ) {
+            // if it was already a reference, return the reference
+            return id;
+          } else {
+            // <id, type> tuple for a polymorphic association.
+            return store.referenceForId(id.type, id.id);
+          }
+        }
+        return store.referenceForId(type, id);
+      });
+
+      set(cachedValue, 'content', Ember.A(references));
+    }
+  },
+
+  updateRecordArraysLater: function() {
+    Ember.run.once(this, this.updateRecordArrays);
+  },
+
+  setupData: function(data) {
+    this._data = data || { id: null };
+
+    if (data) { this.pushedData(); }
+  },
+
+  materializeId: function(id) {
+    set(this, 'id', id);
+  },
+
+  materializeAttributes: function(attributes) {
+    Ember.assert("Must pass a hash of attributes to materializeAttributes", !!attributes);
+    merge(this._data, attributes);
+  },
+
+  materializeAttribute: function(name, value) {
+    this._data[name] = value;
+  },
+
+  materializeHasMany: function(name, tuplesOrReferencesOrOpaque) {
+    var tuplesOrReferencesOrOpaqueType = typeof tuplesOrReferencesOrOpaque;
+
+    if (tuplesOrReferencesOrOpaque && tuplesOrReferencesOrOpaqueType !== 'string' && tuplesOrReferencesOrOpaque.length > 1) {
+      Ember.assert('materializeHasMany expects tuples, references or opaque token, not ' + tuplesOrReferencesOrOpaque[0], tuplesOrReferencesOrOpaque[0].hasOwnProperty('id') && tuplesOrReferencesOrOpaque[0].type);
+    }
+
+    if( tuplesOrReferencesOrOpaqueType === "string" ) {
+      this._data[name] = tuplesOrReferencesOrOpaque;
+    } else {
+      var references = tuplesOrReferencesOrOpaque;
+
+      if (tuplesOrReferencesOrOpaque && Ember.isArray(tuplesOrReferencesOrOpaque)) {
+        references = this._convertTuplesToReferences(tuplesOrReferencesOrOpaque);
+      }
+
+      this._data[name] = references;
+    }
+  },
+
+  materializeBelongsTo: function(name, tupleOrReference) {
+    if (tupleOrReference) { Ember.assert('materializeBelongsTo expects a tuple or a reference, not a ' + tupleOrReference, !tupleOrReference || (tupleOrReference.hasOwnProperty('id') && tupleOrReference.hasOwnProperty('type'))); }
+
+    this._data[name] = tupleOrReference;
+  },
+
+  _convertTuplesToReferences: function(tuplesOrReferences) {
+    return map(tuplesOrReferences, function(tupleOrReference) {
+      return this._convertTupleToReference(tupleOrReference);
+    }, this);
+  },
+
+  _convertTupleToReference: function(tupleOrReference) {
+    var store = get(this, 'store');
+    if(tupleOrReference.clientId) {
+      return tupleOrReference;
+    } else {
+      return store.referenceForId(tupleOrReference.type, tupleOrReference.id);
+    }
+  },
+
+  rollback: function() {
+    this._setup();
+    this.send('becameClean');
+
+    this.suspendRelationshipObservers(function() {
+      this.notifyPropertyChange('data');
+    });
+  },
+
+  toStringExtension: function() {
+    return get(this, 'id');
+  },
+
+  /**
+    The goal of this method is to temporarily disable specific observers
+    that take action in response to application changes.
+
+    This allows the system to make changes (such as materialization and
+    rollback) that should not trigger secondary behavior (such as setting an
+    inverse relationship or marking records as dirty).
+
+    The specific implementation will likely change as Ember proper provides
+    better infrastructure for suspending groups of observers, and if Array
+    observation becomes more unified with regular observers.
+
+    @method suspendRelationshipObservers
+    @private
+    @param callback
+    @param binding
+  */
+  suspendRelationshipObservers: function(callback, binding) {
+    var observers = get(this.constructor, 'relationshipNames').belongsTo;
+    var self = this;
+
+    try {
+      this._suspendedRelationships = true;
+      Ember._suspendObservers(self, observers, null, 'belongsToDidChange', function() {
+        Ember._suspendBeforeObservers(self, observers, null, 'belongsToWillChange', function() {
+          callback.call(binding || self);
+        });
+      });
+    } finally {
+      this._suspendedRelationships = false;
+    }
+  },
+
+  becameInFlight: function() {
+  },
+
+  /**
+    @method resolveOn
+    @private
+    @param successEvent
+  */
+  resolveOn: function(successEvent) {
+    var model = this;
+
+    return new Ember.RSVP.Promise(function(resolve, reject) {
+      function success() {
+        this.off('becameError', error);
+        this.off('becameInvalid', error);
+        resolve(this);
+      }
+      function error() {
+        this.off(successEvent, success);
+        reject(this);
+      }
+
+      model.one(successEvent, success);
+      model.one('becameError', error);
+      model.one('becameInvalid', error);
+    });
+  },
+
+  /**
+    Save the record.
+
+    @method save
+  */
+  save: function() {
+    this.get('store').scheduleSave(this);
+
+    return this.resolveOn('didCommit');
+  },
+
+  /**
+    Reload the record from the adapter.
+
+    This will only work if the record has already finished loading
+    and has not yet been modified (`isLoaded` but not `isDirty`,
+    or `isSaving`).
+
+    @method reload
+  */
+  reload: function() {
+    this.send('reloadRecord');
+
+    return this.resolveOn('didReload');
+  },
+
+  // FOR USE DURING COMMIT PROCESS
+
+  adapterDidUpdateAttribute: function(attributeName, value) {
+
+    // If a value is passed in, update the internal attributes and clear
+    // the attribute cache so it picks up the new value. Otherwise,
+    // collapse the current value into the internal attributes because
+    // the adapter has acknowledged it.
+    if (value !== undefined) {
+      get(this, 'data')[attributeName] = value;
+      this.notifyPropertyChange(attributeName);
+    } else {
+      value = get(this, attributeName);
+      get(this, 'data')[attributeName] = value;
+    }
+
+    this.updateRecordArraysLater();
+  },
+
+  adapterDidInvalidate: function(errors) {
+    this.send('becameInvalid', errors);
+  },
+
+  adapterDidError: function() {
+    this.send('becameError');
+  },
+
+  /**
+    Override the default event firing from Ember.Evented to
+    also call methods with the given name.
+
+    @method trigger
+    @private
+    @param name
+  */
+  trigger: function(name) {
+    Ember.tryInvoke(this, name, [].slice.call(arguments, 1));
+    this._super.apply(this, arguments);
+  }
+});
+
+// Helper function to generate store aliases.
+// This returns a function that invokes the named alias
+// on the default store, but injects the class as the
+// first parameter.
+var storeAlias = function(methodName) {
+  return function() {
+    var store = get(DS, 'defaultStore'),
+        args = [].slice.call(arguments);
+
+    args.unshift(this);
+    Ember.assert("Your application does not have a 'Store' property defined. Attempts to call '" + methodName + "' on model classes will fail. Please provide one as with 'YourAppName.Store = DS.Store.extend()'", !!store);
+    return store[methodName].apply(store, args);
+  };
+};
+
+DS.Model.reopenClass({
+
+  /**
+    Alias DS.Model's `create` method to `_create`. This allows us to create DS.Model
+    instances from within the store, but if end users accidentally call `create()`
+    (instead of `createRecord()`), we can raise an error.
+
+    @method _create
+    @private
+    @static
+  */
+  _create: DS.Model.create,
+
+  /**
+    Override the class' `create()` method to raise an error. This prevents end users
+    from inadvertently calling `create()` instead of `createRecord()`. The store is
+    still able to create instances by calling the `_create()` method.
+
+    @method create
+    @private
+    @static
+  */
+  create: function() {
+    throw new Ember.Error("You should not call `create` on a model. Instead, call `createRecord` with the attributes you would like to set.");
+  },
+
+  /**
+    See `DS.Store.find()`.
+
+    @method find
+    @param {Object|String|Array|null} query A query to find records by.
+  */
+  find: storeAlias('find'),
+
+  /**
+    See `DS.Store.all()`.
+
+    @method all
+    @return {DS.RecordArray}
+  */
+  all: storeAlias('all'),
+
+  /**
+    See `DS.Store.findQuery()`.
+
+    @method query
+    @param {Object} query an opaque query to be used by the adapter
+    @return {DS.AdapterPopulatedRecordArray}
+  */
+  query: storeAlias('findQuery'),
+
+  /**
+    See `DS.Store.filter()`.
+
+    @method filter
+    @param {Function} filter
+    @return {DS.FilteredRecordArray}
+  */
+  filter: storeAlias('filter'),
+
+  /**
+    See `DS.Store.createRecord()`.
+
+    @method createRecord
+    @param {Object} properties a hash of properties to set on the
+      newly created record.
+    @return DS.Model
+  */
+  createRecord: storeAlias('createRecord')
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get;
+
+/**
+  @class Model
+  @namespace DS
+*/
+DS.Model.reopenClass({
+  attributes: Ember.computed(function() {
+    var map = Ember.Map.create();
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isAttribute) {
+        Ember.assert("You may not set `id` as an attribute on your model. Please remove any lines that look like: `id: DS.attr('<type>')` from " + this.toString(), name !== 'id');
+
+        meta.name = name;
+        map.set(name, meta);
+      }
+    });
+
+    return map;
+  })
+});
+
+
+DS.Model.reopen({
+  eachAttribute: function(callback, binding) {
+    get(this.constructor, 'attributes').forEach(function(name, meta) {
+      callback.call(binding, name, meta);
+    }, binding);
+  },
+
+  attributeWillChange: Ember.beforeObserver(function(record, key) {
+    var reference = get(record, '_reference'),
+        store = get(record, 'store');
+
+    record.send('willSetProperty', { reference: reference, store: store, name: key });
+  }),
+
+  attributeDidChange: Ember.observer(function(record, key) {
+    record.send('didSetProperty', { name: key });
+  })
+});
+
+function getAttr(record, options, key) {
+  var attributes = get(record, 'data');
+  var value = attributes[key];
+
+  if (value === undefined) {
+    if (typeof options.defaultValue === "function") {
+      value = options.defaultValue();
+    } else {
+      value = options.defaultValue;
+    }
+  }
+
+  return value;
+}
+
+DS.attr = function(type, options) {
+  options = options || {};
+
+  var meta = {
+    type: type,
+    isAttribute: true,
+    options: options
+  };
+
+  return Ember.computed(function(key, value, oldValue) {
+    if (arguments.length > 1) {
+      Ember.assert("You may not set `id` as an attribute on your model. Please remove any lines that look like: `id: DS.attr('<type>')` from " + this.constructor.toString(), key !== 'id');
+    } else {
+      value = getAttr(this, options, key);
+    }
+
+    return value;
+  // `data` is never set directly. However, it may be
+  // invalidated from the state manager's setData
+  // event.
+  }).property('data').meta(meta);
+};
+
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+/**
+  An AttributeChange object is created whenever a record's
+  attribute changes value. It is used to track changes to a
+  record between transaction commits.
+
+  @class AttributeChange
+  @namespace DS
+  @private
+  @constructor
+*/
+var AttributeChange = DS.AttributeChange = function(options) {
+  this.reference = options.reference;
+  this.store = options.store;
+  this.name = options.name;
+  this.oldValue = options.oldValue;
+};
+
+AttributeChange.createChange = function(options) {
+  return new AttributeChange(options);
+};
+
+AttributeChange.prototype = {
+  sync: function() {
+    this.store.recordAttributeDidChange(this.reference, this.name, this.value, this.oldValue);
+
+    // TODO: Use this object in the commit process
+    this.destroy();
+  },
+
+  /**
+    If the AttributeChange is destroyed (either by being rolled back
+    or being committed), remove it from the list of pending changes
+    on the record.
+
+    @method destroy
+  */
+  destroy: function() {
+    var record = this.reference.record;
+
+    delete record._changesToSync[this.name];
+  }
+};
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+var forEach = Ember.EnumerableUtils.forEach;
+
+/**
+  @class RelationshipChange
+  @namespace DS
+  @private
+  @construtor
+*/
+DS.RelationshipChange = function(options) {
+  this.parentReference = options.parentReference;
+  this.childReference = options.childReference;
+  this.firstRecordReference = options.firstRecordReference;
+  this.firstRecordKind = options.firstRecordKind;
+  this.firstRecordName = options.firstRecordName;
+  this.secondRecordReference = options.secondRecordReference;
+  this.secondRecordKind = options.secondRecordKind;
+  this.secondRecordName = options.secondRecordName;
+  this.changeType = options.changeType;
+  this.store = options.store;
+
+  this.committed = {};
+};
+
+/**
+  @class RelationshipChangeAdd
+  @namespace DS
+  @private
+  @construtor
+*/
+DS.RelationshipChangeAdd = function(options){
+  DS.RelationshipChange.call(this, options);
+};
+
+/**
+  @class RelationshipChangeRemove
+  @namespace DS
+  @private
+  @construtor
+*/
+DS.RelationshipChangeRemove = function(options){
+  DS.RelationshipChange.call(this, options);
+};
+
+DS.RelationshipChange.create = function(options) {
+  return new DS.RelationshipChange(options);
+};
+
+DS.RelationshipChangeAdd.create = function(options) {
+  return new DS.RelationshipChangeAdd(options);
+};
+
+DS.RelationshipChangeRemove.create = function(options) {
+  return new DS.RelationshipChangeRemove(options);
+};
+
+DS.OneToManyChange = {};
+DS.OneToNoneChange = {};
+DS.ManyToNoneChange = {};
+DS.OneToOneChange = {};
+DS.ManyToManyChange = {};
+
+DS.RelationshipChange._createChange = function(options){
+  if(options.changeType === "add"){
+    return DS.RelationshipChangeAdd.create(options);
+  }
+  if(options.changeType === "remove"){
+    return DS.RelationshipChangeRemove.create(options);
+  }
+};
+
+
+DS.RelationshipChange.determineRelationshipType = function(recordType, knownSide){
+  var knownKey = knownSide.key, key, otherKind;
+  var knownKind = knownSide.kind;
+
+  var inverse = recordType.inverseFor(knownKey);
+
+  if (inverse){
+    key = inverse.name;
+    otherKind = inverse.kind;
+  }
+
+  if (!inverse){
+    return knownKind === "belongsTo" ? "oneToNone" : "manyToNone";
+  }
+  else{
+    if(otherKind === "belongsTo"){
+      return knownKind === "belongsTo" ? "oneToOne" : "manyToOne";
+    }
+    else{
+      return knownKind === "belongsTo" ? "oneToMany" : "manyToMany";
+    }
+  }
+
+};
+
+DS.RelationshipChange.createChange = function(firstRecordReference, secondRecordReference, store, options){
+  // Get the type of the child based on the child's client ID
+  var firstRecordType = firstRecordReference.type, changeType;
+  changeType = DS.RelationshipChange.determineRelationshipType(firstRecordType, options);
+  if (changeType === "oneToMany"){
+    return DS.OneToManyChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+  else if (changeType === "manyToOne"){
+    return DS.OneToManyChange.createChange(secondRecordReference, firstRecordReference, store, options);
+  }
+  else if (changeType === "oneToNone"){
+    return DS.OneToNoneChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+  else if (changeType === "manyToNone"){
+    return DS.ManyToNoneChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+  else if (changeType === "oneToOne"){
+    return DS.OneToOneChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+  else if (changeType === "manyToMany"){
+    return DS.ManyToManyChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+};
+
+DS.OneToNoneChange.createChange = function(childReference, parentReference, store, options) {
+  var key = options.key;
+  var change = DS.RelationshipChange._createChange({
+      parentReference: parentReference,
+      childReference: childReference,
+      firstRecordReference: childReference,
+      store: store,
+      changeType: options.changeType,
+      firstRecordName: key,
+      firstRecordKind: "belongsTo"
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, null, change);
+
+  return change;
+};
+
+DS.ManyToNoneChange.createChange = function(childReference, parentReference, store, options) {
+  var key = options.key;
+  var change = DS.RelationshipChange._createChange({
+      parentReference: childReference,
+      childReference: parentReference,
+      secondRecordReference: childReference,
+      store: store,
+      changeType: options.changeType,
+      secondRecordName: options.key,
+      secondRecordKind: "hasMany"
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, null, change);
+  return change;
+};
+
+
+DS.ManyToManyChange.createChange = function(childReference, parentReference, store, options) {
+  // If the name of the belongsTo side of the relationship is specified,
+  // use that
+  // If the type of the parent is specified, look it up on the child's type
+  // definition.
+  var key = options.key;
+
+  var change = DS.RelationshipChange._createChange({
+      parentReference: parentReference,
+      childReference: childReference,
+      firstRecordReference: childReference,
+      secondRecordReference: parentReference,
+      firstRecordKind: "hasMany",
+      secondRecordKind: "hasMany",
+      store: store,
+      changeType: options.changeType,
+      firstRecordName:  key
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, null, change);
+
+
+  return change;
+};
+
+DS.OneToOneChange.createChange = function(childReference, parentReference, store, options) {
+  var key;
+
+  // If the name of the belongsTo side of the relationship is specified,
+  // use that
+  // If the type of the parent is specified, look it up on the child's type
+  // definition.
+  if (options.parentType) {
+    key = options.parentType.inverseFor(options.key).name;
+  } else if (options.key) {
+    key = options.key;
+  } else {
+    Ember.assert("You must pass either a parentType or belongsToName option to OneToManyChange.forChildAndParent", false);
+  }
+
+  var change = DS.RelationshipChange._createChange({
+      parentReference: parentReference,
+      childReference: childReference,
+      firstRecordReference: childReference,
+      secondRecordReference: parentReference,
+      firstRecordKind: "belongsTo",
+      secondRecordKind: "belongsTo",
+      store: store,
+      changeType: options.changeType,
+      firstRecordName:  key
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, null, change);
+
+
+  return change;
+};
+
+DS.OneToOneChange.maintainInvariant = function(options, store, childReference, key){
+  if (options.changeType === "add" && store.recordIsMaterialized(childReference)) {
+    var child = store.recordForReference(childReference);
+    var oldParent = get(child, key);
+    if (oldParent){
+      var correspondingChange = DS.OneToOneChange.createChange(childReference, oldParent.get('_reference'), store, {
+          parentType: options.parentType,
+          hasManyName: options.hasManyName,
+          changeType: "remove",
+          key: options.key
+        });
+      store.addRelationshipChangeFor(childReference, key, options.parentReference , null, correspondingChange);
+     correspondingChange.sync();
+    }
+  }
+};
+
+DS.OneToManyChange.createChange = function(childReference, parentReference, store, options) {
+  var key;
+
+  // If the name of the belongsTo side of the relationship is specified,
+  // use that
+  // If the type of the parent is specified, look it up on the child's type
+  // definition.
+  if (options.parentType) {
+    key = options.parentType.inverseFor(options.key).name;
+    DS.OneToManyChange.maintainInvariant( options, store, childReference, key );
+  } else if (options.key) {
+    key = options.key;
+  } else {
+    Ember.assert("You must pass either a parentType or belongsToName option to OneToManyChange.forChildAndParent", false);
+  }
+
+  var change = DS.RelationshipChange._createChange({
+      parentReference: parentReference,
+      childReference: childReference,
+      firstRecordReference: childReference,
+      secondRecordReference: parentReference,
+      firstRecordKind: "belongsTo",
+      secondRecordKind: "hasMany",
+      store: store,
+      changeType: options.changeType,
+      firstRecordName:  key
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, change.getSecondRecordName(), change);
+
+
+  return change;
+};
+
+
+DS.OneToManyChange.maintainInvariant = function(options, store, childReference, key){
+  var child = childReference.record;
+
+  if (options.changeType === "add" && child) {
+    var oldParent = get(child, key);
+    if (oldParent){
+      var correspondingChange = DS.OneToManyChange.createChange(childReference, oldParent.get('_reference'), store, {
+          parentType: options.parentType,
+          hasManyName: options.hasManyName,
+          changeType: "remove",
+          key: options.key
+        });
+      store.addRelationshipChangeFor(childReference, key, options.parentReference, correspondingChange.getSecondRecordName(), correspondingChange);
+      correspondingChange.sync();
+    }
+  }
+};
+
+DS.OneToManyChange.ensureSameTransaction = function(changes){
+  var records = Ember.A();
+  forEach(changes, function(change){
+    records.addObject(change.getSecondRecord());
+    records.addObject(change.getFirstRecord());
+  });
+
+  return DS.Transaction.ensureSameTransaction(records);
+};
+
+/**
+  @class RelationshipChange
+  @namespace DS
+*/
+DS.RelationshipChange.prototype = {
+
+  getSecondRecordName: function() {
+    var name = this.secondRecordName, parent;
+
+    if (!name) {
+      parent = this.secondRecordReference;
+      if (!parent) { return; }
+
+      var childType = this.firstRecordReference.type;
+      var inverse = childType.inverseFor(this.firstRecordName);
+      this.secondRecordName = inverse.name;
+    }
+
+    return this.secondRecordName;
+  },
+
+  /**
+    Get the name of the relationship on the belongsTo side.
+
+    @method getFirstRecordName
+    @return {String}
+  */
+  getFirstRecordName: function() {
+    var name = this.firstRecordName;
+    return name;
+  },
+
+  /**
+    @method destroy
+    @private
+  */
+  destroy: function() {
+    var childReference = this.childReference,
+        belongsToName = this.getFirstRecordName(),
+        hasManyName = this.getSecondRecordName(),
+        store = this.store;
+
+    store.removeRelationshipChangeFor(childReference, belongsToName, this.parentReference, hasManyName, this.changeType);
+  },
+
+  /**
+    @method getByReference
+    @private
+    @param reference
+  */
+  getByReference: function(reference) {
+    // return null or undefined if the original reference was null or undefined
+    if (!reference) { return reference; }
+
+    if (reference.record) {
+      return reference.record;
+    }
+  },
+
+  getSecondRecord: function(){
+    return this.getByReference(this.secondRecordReference);
+  },
+
+  /**
+    @method getFirstRecord
+    @private
+  */
+  getFirstRecord: function() {
+    return this.getByReference(this.firstRecordReference);
+  },
+
+  /**
+    Make sure that all three parts of the relationship change are part of
+    the same transaction. If any of the three records is clean and in the
+    default transaction, and the rest are in a different transaction, move
+    them all into that transaction.
+
+    @method ensureSameTransaction
+    @private
+  */
+  ensureSameTransaction: function() {
+    var child = this.getFirstRecord(),
+      parentRecord = this.getSecondRecord();
+
+    var transaction = DS.Transaction.ensureSameTransaction([child, parentRecord]);
+
+    this.transaction = transaction;
+    return transaction;
+  },
+
+  callChangeEvents: function(){
+    var child = this.getFirstRecord(),
+        parentRecord = this.getSecondRecord();
+
+    var dirtySet = new Ember.OrderedSet();
+
+    // TODO: This implementation causes a race condition in key-value
+    // stores. The fix involves buffering changes that happen while
+    // a record is loading. A similar fix is required for other parts
+    // of ember-data, and should be done as new infrastructure, not
+    // a one-off hack. [tomhuda]
+    if (parentRecord && get(parentRecord, 'isLoaded')) {
+      this.store.recordHasManyDidChange(dirtySet, parentRecord, this);
+    }
+
+    if (child) {
+      this.store.recordBelongsToDidChange(dirtySet, child, this);
+    }
+
+    dirtySet.forEach(function(record) {
+      record.adapterDidDirty();
+    });
+  },
+
+  coalesce: function(){
+    var relationshipPairs = this.store.relationshipChangePairsFor(this.firstRecordReference);
+    forEach(relationshipPairs, function(pair){
+      var addedChange = pair["add"];
+      var removedChange = pair["remove"];
+      if(addedChange && removedChange) {
+        addedChange.destroy();
+        removedChange.destroy();
+      }
+    });
+  }
+};
+
+DS.RelationshipChangeAdd.prototype = Ember.create(DS.RelationshipChange.create({}));
+DS.RelationshipChangeRemove.prototype = Ember.create(DS.RelationshipChange.create({}));
+
+DS.RelationshipChangeAdd.prototype.changeType = "add";
+DS.RelationshipChangeAdd.prototype.sync = function() {
+  var secondRecordName = this.getSecondRecordName(),
+      firstRecordName = this.getFirstRecordName(),
+      firstRecord = this.getFirstRecord(),
+      secondRecord = this.getSecondRecord();
+
+  //Ember.assert("You specified a hasMany (" + hasManyName + ") on " + (!belongsToName && (newParent || oldParent || this.lastParent).constructor) + " but did not specify an inverse belongsTo on " + child.constructor, belongsToName);
+  //Ember.assert("You specified a belongsTo (" + belongsToName + ") on " + child.constructor + " but did not specify an inverse hasMany on " + (!hasManyName && (newParent || oldParent || this.lastParentRecord).constructor), hasManyName);
+
+  this.ensureSameTransaction();
+
+  this.callChangeEvents();
+
+  if (secondRecord && firstRecord) {
+    if(this.secondRecordKind === "belongsTo"){
+      secondRecord.suspendRelationshipObservers(function(){
+        set(secondRecord, secondRecordName, firstRecord);
+      });
+
+     }
+     else if(this.secondRecordKind === "hasMany"){
+      secondRecord.suspendRelationshipObservers(function(){
+        get(secondRecord, secondRecordName).addObject(firstRecord);
+      });
+    }
+  }
+
+  if (firstRecord && secondRecord && get(firstRecord, firstRecordName) !== secondRecord) {
+    if(this.firstRecordKind === "belongsTo"){
+      firstRecord.suspendRelationshipObservers(function(){
+        set(firstRecord, firstRecordName, secondRecord);
+      });
+    }
+    else if(this.firstRecordKind === "hasMany"){
+      firstRecord.suspendRelationshipObservers(function(){
+        get(firstRecord, firstRecordName).addObject(secondRecord);
+      });
+    }
+  }
+
+  this.coalesce();
+};
+
+DS.RelationshipChangeRemove.prototype.changeType = "remove";
+DS.RelationshipChangeRemove.prototype.sync = function() {
+  var secondRecordName = this.getSecondRecordName(),
+      firstRecordName = this.getFirstRecordName(),
+      firstRecord = this.getFirstRecord(),
+      secondRecord = this.getSecondRecord();
+
+  //Ember.assert("You specified a hasMany (" + hasManyName + ") on " + (!belongsToName && (newParent || oldParent || this.lastParent).constructor) + " but did not specify an inverse belongsTo on " + child.constructor, belongsToName);
+  //Ember.assert("You specified a belongsTo (" + belongsToName + ") on " + child.constructor + " but did not specify an inverse hasMany on " + (!hasManyName && (newParent || oldParent || this.lastParentRecord).constructor), hasManyName);
+
+  this.ensureSameTransaction(firstRecord, secondRecord, secondRecordName, firstRecordName);
+
+  this.callChangeEvents();
+
+  if (secondRecord && firstRecord) {
+    if(this.secondRecordKind === "belongsTo"){
+      secondRecord.suspendRelationshipObservers(function(){
+        set(secondRecord, secondRecordName, null);
+      });
+    }
+    else if(this.secondRecordKind === "hasMany"){
+      secondRecord.suspendRelationshipObservers(function(){
+        get(secondRecord, secondRecordName).removeObject(firstRecord);
+      });
+    }
+  }
+
+  if (firstRecord && get(firstRecord, firstRecordName)) {
+    if(this.firstRecordKind === "belongsTo"){
+      firstRecord.suspendRelationshipObservers(function(){
+        set(firstRecord, firstRecordName, null);
+      });
+     }
+     else if(this.firstRecordKind === "hasMany"){
+       firstRecord.suspendRelationshipObservers(function(){
+        get(firstRecord, firstRecordName).removeObject(secondRecord);
+      });
+    }
+  }
+
+  this.coalesce();
+};
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set,
+    isNone = Ember.isNone;
+
+/**
+  @module ember-data
+*/
+
+DS.belongsTo = function(type, options) {
+  Ember.assert("The first argument DS.belongsTo must be a model type or string, like DS.belongsTo(App.Person)", !!type && (typeof type === 'string' || DS.Model.detect(type)));
+
+  options = options || {};
+
+  var meta = { type: type, isRelationship: true, options: options, kind: 'belongsTo' };
+
+  return Ember.computed(function(key, value) {
+    var data = get(this, 'data'),
+        store = get(this, 'store'), belongsTo;
+
+    if (typeof type === 'string') {
+      if (type.indexOf(".") === -1) {
+        type = store.modelFor(type);
+      } else {
+        type = get(Ember.lookup, type);
+      }
+    }
+
+    if (arguments.length === 2) {
+      Ember.assert("You can only add a record of " + type.toString() + " to this relationship", !value || type.detectInstance(value));
+      return value === undefined ? null : value;
+    }
+
+    belongsTo = data[key];
+
+    if (belongsTo instanceof DS.Model) { return belongsTo; }
+
+    // TODO (tomdale) The value of the belongsTo in the data hash can be
+    // one of:
+    // 1. null/undefined
+    // 2. a record reference
+    // 3. a tuple returned by the serializer's polymorphism code
+    //
+    // We should really normalize #3 to be the same as #2 to reduce the
+    // complexity here.
+
+    if (isNone(belongsTo)) {
+      return null;
+    }
+
+    // The data has been normalized to a record reference, so
+    // just ask the store for the record for that reference,
+    // materializing it if necessary.
+    if (belongsTo.clientId) {
+      return store.recordForReference(belongsTo);
+    }
+
+    // The data has been normalized into a type/id pair by the
+    // serializer's polymorphism code.
+    return store.findById(belongsTo.type, belongsTo.id);
+  }).property('data').meta(meta);
+};
+
+/*
+  These observers observe all `belongsTo` relationships on the record. See
+  `relationships/ext` to see how these observers get their dependencies.
+
+  @class Model
+  @namespace DS
+*/
+DS.Model.reopen({
+
+  /**
+    @method belongsToWillChange
+    @private
+    @static
+    @param record
+    @param key
+  */
+  belongsToWillChange: Ember.beforeObserver(function(record, key) {
+    if (get(record, 'isLoaded')) {
+      var oldParent = get(record, key);
+
+      var childReference = get(record, '_reference'),
+          store = get(record, 'store');
+      if (oldParent){
+        var change = DS.RelationshipChange.createChange(childReference, get(oldParent, '_reference'), store, { key: key, kind:"belongsTo", changeType: "remove" });
+        change.sync();
+        this._changesToSync[key] = change;
+      }
+    }
+  }),
+
+  /**
+    @method belongsToDidChange
+    @private
+    @static
+    @param record
+    @param key
+  */
+  belongsToDidChange: Ember.immediateObserver(function(record, key) {
+    if (get(record, 'isLoaded')) {
+      var newParent = get(record, key);
+      if(newParent){
+        var childReference = get(record, '_reference'),
+            store = get(record, 'store');
+        var change = DS.RelationshipChange.createChange(childReference, get(newParent, '_reference'), store, { key: key, kind:"belongsTo", changeType: "add" });
+        change.sync();
+        if(this._changesToSync[key]){
+          DS.OneToManyChange.ensureSameTransaction([change, this._changesToSync[key]], store);
+        }
+      }
+    }
+    delete this._changesToSync[key];
+  })
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set, forEach = Ember.EnumerableUtils.forEach;
+
+var hasRelationship = function(type, options) {
+  options = options || {};
+
+  var meta = { type: type, isRelationship: true, options: options, kind: 'hasMany' };
+
+  return Ember.computed(function(key, value) {
+    var data = get(this, 'data'),
+        store = get(this, 'store'),
+        ids, relationship;
+
+    if (typeof type === 'string') {
+      if (type.indexOf(".") === -1) {
+        type = store.modelFor(type);
+      } else {
+        type = get(Ember.lookup, type);
+      }
+    }
+
+    //ids can be references or opaque token
+    //(e.g. `{url: '/relationship'}`) that will be passed to the adapter
+    ids = data[key];
+
+    relationship = store.findMany(type, ids, this, meta);
+    set(relationship, 'owner', this);
+    set(relationship, 'name', key);
+    set(relationship, 'isPolymorphic', options.polymorphic);
+
+    return relationship;
+  }).property().meta(meta);
+};
+
+DS.hasMany = function(type, options) {
+  Ember.assert("The type passed to DS.hasMany must be defined", !!type);
+  return hasRelationship(type, options);
+};
+
+function clearUnmaterializedHasMany(record, relationship) {
+  var data = get(record, 'data');
+
+  var references = data[relationship.key];
+
+  if (!references) { return; }
+
+  var inverse = record.constructor.inverseFor(relationship.key);
+
+  if (inverse) {
+    forEach(references, function(reference) {
+      var childRecord;
+
+      if (childRecord = reference.record) {
+        record.suspendRelationshipObservers(function() {
+          set(childRecord, inverse.name, null);
+        });
+      }
+    });
+  }
+}
+
+DS.Model.reopen({
+  clearHasMany: function(relationship) {
+    var hasMany = this.cacheFor(relationship.name);
+
+    if (hasMany) {
+      hasMany.clear();
+    } else {
+      clearUnmaterializedHasMany(this, relationship);
+    }
+  }
+});
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set;
+
+/**
+  @module ember-data
+*/
+
+/*
+  This file defines several extensions to the base `DS.Model` class that
+  add support for one-to-many relationships.
+*/
+
+/**
+  @class Model
+  @namespace DS
+*/
+DS.Model.reopen({
+
+  /**
+    This Ember.js hook allows an object to be notified when a property
+    is defined.
+
+    In this case, we use it to be notified when an Ember Data user defines a
+    belongs-to relationship. In that case, we need to set up observers for
+    each one, allowing us to track relationship changes and automatically
+    reflect changes in the inverse has-many array.
+
+    This hook passes the class being set up, as well as the key and value
+    being defined. So, for example, when the user does this:
+
+      DS.Model.extend({
+        parent: DS.belongsTo(App.User)
+      });
+
+    This hook would be called with "parent" as the key and the computed
+    property returned by `DS.belongsTo` as the value.
+
+    @method didDefineProperty
+    @param proto
+    @param key
+    @param value
+  */
+  didDefineProperty: function(proto, key, value) {
+    // Check if the value being set is a computed property.
+    if (value instanceof Ember.Descriptor) {
+
+      // If it is, get the metadata for the relationship. This is
+      // populated by the `DS.belongsTo` helper when it is creating
+      // the computed property.
+      var meta = value.meta();
+
+      if (meta.isRelationship && meta.kind === 'belongsTo') {
+        Ember.addObserver(proto, key, null, 'belongsToDidChange');
+        Ember.addBeforeObserver(proto, key, null, 'belongsToWillChange');
+      }
+
+      if (meta.isAttribute) {
+        Ember.addObserver(proto, key, null, 'attributeDidChange');
+        Ember.addBeforeObserver(proto, key, null, 'attributeWillChange');
+      }
+
+      meta.parentType = proto.constructor;
+    }
+  }
+});
+
+/*
+  These DS.Model extensions add class methods that provide relationship
+  introspection abilities about relationships.
+
+  A note about the computed properties contained here:
+
+  **These properties are effectively sealed once called for the first time.**
+  To avoid repeatedly doing expensive iteration over a model's fields, these
+  values are computed once and then cached for the remainder of the runtime of
+  your application.
+
+  If your application needs to modify a class after its initial definition
+  (for example, using `reopen()` to add additional attributes), make sure you
+  do it before using your model with the store, which uses these properties
+  extensively.
+*/
+
+DS.Model.reopenClass({
+  /**
+    For a given relationship name, returns the model type of the relationship.
+
+    For example, if you define a model like this:
+
+        App.Post = DS.Model.extend({
+          comments: DS.hasMany(App.Comment)
+        });
+
+    Calling `App.Post.typeForRelationship('comments')` will return `App.Comment`.
+
+    @method typeForRelationship
+    @static
+    @param {String} name the name of the relationship
+    @return {subclass of DS.Model} the type of the relationship, or undefined
+  */
+  typeForRelationship: function(name) {
+    var relationship = get(this, 'relationshipsByName').get(name);
+    return relationship && relationship.type;
+  },
+
+  inverseFor: function(name) {
+    var inverseType = this.typeForRelationship(name);
+
+    if (!inverseType) { return null; }
+
+    var options = this.metaForProperty(name).options;
+
+    if (options.inverse === null) { return null; }
+    
+    var inverseName, inverseKind;
+
+    if (options.inverse) {
+      inverseName = options.inverse;
+      inverseKind = Ember.get(inverseType, 'relationshipsByName').get(inverseName).kind;
+    } else {
+      var possibleRelationships = findPossibleInverses(this, inverseType);
+
+      if (possibleRelationships.length === 0) { return null; }
+
+      Ember.assert("You defined the '" + name + "' relationship on " + this + ", but multiple possible inverse relationships of type " + this + " were found on " + inverseType + ".", possibleRelationships.length === 1);
+
+      inverseName = possibleRelationships[0].name;
+      inverseKind = possibleRelationships[0].kind;
+    }
+
+    function findPossibleInverses(type, inverseType, possibleRelationships) {
+      possibleRelationships = possibleRelationships || [];
+
+      var relationshipMap = get(inverseType, 'relationships');
+      if (!relationshipMap) { return; }
+
+      var relationships = relationshipMap.get(type);
+      if (relationships) {
+        possibleRelationships.push.apply(possibleRelationships, relationshipMap.get(type));
+      }
+
+      if (type.superclass) {
+        findPossibleInverses(type.superclass, inverseType, possibleRelationships);
+      }
+
+      return possibleRelationships;
+    }
+
+    return {
+      type: inverseType,
+      name: inverseName,
+      kind: inverseKind
+    };
+  },
+
+  /**
+    The model's relationships as a map, keyed on the type of the
+    relationship. The value of each entry is an array containing a descriptor
+    for each relationship with that type, describing the name of the relationship
+    as well as the type.
+
+    For example, given the following model definition:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+          posts: DS.hasMany(App.Post)
+        });
+
+    This computed property would return a map describing these
+    relationships, like this:
+
+        var relationships = Ember.get(App.Blog, 'relationships');
+        relationships.get(App.User);
+        //=> [ { name: 'users', kind: 'hasMany' },
+        //     { name: 'owner', kind: 'belongsTo' } ]
+        relationships.get(App.Post);
+        //=> [ { name: 'posts', kind: 'hasMany' } ]
+
+    @property relationships
+    @static
+    @type Ember.Map
+    @readOnly
+  */
+  relationships: Ember.computed(function() {
+    var map = new Ember.MapWithDefault({
+      defaultValue: function() { return []; }
+    });
+
+    // Loop through each computed property on the class
+    this.eachComputedProperty(function(name, meta) {
+
+      // If the computed property is a relationship, add
+      // it to the map.
+      if (meta.isRelationship) {
+        if (typeof meta.type === 'string') {
+          meta.type = Ember.get(Ember.lookup, meta.type);
+        }
+
+        var relationshipsForType = map.get(meta.type);
+
+        relationshipsForType.push({ name: name, kind: meta.kind });
+      }
+    });
+
+    return map;
+  }),
+
+  /**
+    A hash containing lists of the model's relationships, grouped
+    by the relationship kind. For example, given a model with this
+    definition:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+
+          posts: DS.hasMany(App.Post)
+        });
+
+    This property would contain the following:
+
+       var relationshipNames = Ember.get(App.Blog, 'relationshipNames');
+       relationshipNames.hasMany;
+       //=> ['users', 'posts']
+       relationshipNames.belongsTo;
+       //=> ['owner']
+
+    @property relationshipNames
+    @static
+    @type Object
+    @readOnly
+  */
+  relationshipNames: Ember.computed(function() {
+    var names = { hasMany: [], belongsTo: [] };
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isRelationship) {
+        names[meta.kind].push(name);
+      }
+    });
+
+    return names;
+  }),
+
+  /**
+    An array of types directly related to a model. Each type will be
+    included once, regardless of the number of relationships it has with
+    the model.
+
+    For example, given a model with this definition:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+          posts: DS.hasMany(App.Post)
+        });
+
+    This property would contain the following:
+
+       var relatedTypes = Ember.get(App.Blog, 'relatedTypes');
+       //=> [ App.User, App.Post ]
+
+    @property relatedTypes
+    @static
+    @type Ember.Array
+    @readOnly
+  */
+  relatedTypes: Ember.computed(function() {
+    var type,
+        types = Ember.A();
+
+    // Loop through each computed property on the class,
+    // and create an array of the unique types involved
+    // in relationships
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isRelationship) {
+        type = meta.type;
+
+        if (typeof type === 'string') {
+          type = get(this, type, false) || get(Ember.lookup, type);
+        }
+
+        Ember.assert("You specified a hasMany (" + meta.type + ") on " + meta.parentType + " but " + meta.type + " was not found.",  type);
+
+        if (!types.contains(type)) {
+          Ember.assert("Trying to sideload " + name + " on " + this.toString() + " but the type doesn't exist.", !!type);
+          types.push(type);
+        }
+      }
+    });
+
+    return types;
+  }),
+
+  /**
+    A map whose keys are the relationships of a model and whose values are
+    relationship descriptors.
+
+    For example, given a model with this
+    definition:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+
+          posts: DS.hasMany(App.Post)
+        });
+
+    This property would contain the following:
+
+       var relationshipsByName = Ember.get(App.Blog, 'relationshipsByName');
+       relationshipsByName.get('users');
+       //=> { key: 'users', kind: 'hasMany', type: App.User }
+       relationshipsByName.get('owner');
+       //=> { key: 'owner', kind: 'belongsTo', type: App.User }
+
+    @property relationshipsByName
+    @static
+    @type Ember.Map
+    @readOnly
+  */
+  relationshipsByName: Ember.computed(function() {
+    var map = Ember.Map.create(), type;
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isRelationship) {
+        meta.key = name;
+        type = meta.type;
+
+        if (typeof type === 'string') {
+          if (type.match(/^[^A-Z]/)) {
+            type = this.store.modelFor(type);
+          } else {
+            type = get(this, type, false) || get(Ember.lookup, type);
+          }
+
+          meta.type = type;
+        }
+
+        map.set(name, meta);
+      }
+    });
+
+    return map;
+  }),
+
+  /**
+    A map whose keys are the fields of the model and whose values are strings
+    describing the kind of the field. A model's fields are the union of all of its
+    attributes and relationships.
+
+    For example:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+
+          posts: DS.hasMany(App.Post),
+
+          title: DS.attr('string')
+        });
+
+        var fields = Ember.get(App.Blog, 'fields');
+        fields.forEach(function(field, kind) {
+          console.log(field, kind);
+        });
+
+        // prints:
+        // users, hasMany
+        // owner, belongsTo
+        // posts, hasMany
+        // title, attribute
+
+    @property fields
+    @static
+    @type Ember.Map
+    @readOnly
+  */
+  fields: Ember.computed(function() {
+    var map = Ember.Map.create();
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isRelationship) {
+        map.set(name, meta.kind);
+      } else if (meta.isAttribute) {
+        map.set(name, 'attribute');
+      }
+    });
+
+    return map;
+  }),
+
+  /**
+    Given a callback, iterates over each of the relationships in the model,
+    invoking the callback with the name of each relationship and its relationship
+    descriptor.
+
+    @method eachRelationship
+    @static
+    @param {Function} callback the callback to invoke
+    @param {any} binding the value to which the callback's `this` should be bound
+  */
+  eachRelationship: function(callback, binding) {
+    get(this, 'relationshipsByName').forEach(function(name, relationship) {
+      callback.call(binding, name, relationship);
+    });
+  },
+
+  /**
+    Given a callback, iterates over each of the types related to a model,
+    invoking the callback with the related type's class. Each type will be
+    returned just once, regardless of how many different relationships it has
+    with a model.
+
+    @method eachRelatedType
+    @static
+    @param {Function} callback the callback to invoke
+    @param {any} binding the value to which the callback's `this` should be bound
+  */
+  eachRelatedType: function(callback, binding) {
+    get(this, 'relatedTypes').forEach(function(type) {
+      callback.call(binding, type);
+    });
+  }
+});
+
+DS.Model.reopen({
+  /**
+    Given a callback, iterates over each of the relationships in the model,
+    invoking the callback with the name of each relationship and its relationship
+    descriptor.
+
+    @method eachRelationship
+    @param {Function} callback the callback to invoke
+    @param {any} binding the value to which the callback's `this` should be bound
+  */
+  eachRelationship: function(callback, binding) {
+    this.constructor.eachRelationship(callback, binding);
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+var once = Ember.run.once;
+var forEach = Ember.EnumerableUtils.forEach;
+
+/**
+  @class RecordArrayManager
+  @namespace DS
+  @private
+  @extends Ember.Object
+*/
+DS.RecordArrayManager = Ember.Object.extend({
+  init: function() {
+    this.filteredRecordArrays = Ember.MapWithDefault.create({
+      defaultValue: function() { return []; }
+    });
+
+    this.changedReferences = [];
+  },
+
+  referenceDidChange: function(reference) {
+    this.changedReferences.push(reference);
+    once(this, this.updateRecordArrays);
+  },
+
+  recordArraysForReference: function(reference) {
+    reference.recordArrays = reference.recordArrays || Ember.OrderedSet.create();
+    return reference.recordArrays;
+  },
+
+  /**
+    This method is invoked whenever data is loaded into the store
+    by the adapter or updated by the adapter, or when an attribute
+    changes on a record.
+
+    It updates all filters that a record belongs to.
+
+    To avoid thrashing, it only runs once per run loop per record.
+
+    @method updateRecordArrays
+    @param {Class} type
+    @param {Number|String} clientId
+  */
+  updateRecordArrays: function() {
+    forEach(this.changedReferences, function(reference) {
+      var type = reference.type,
+          recordArrays = this.filteredRecordArrays.get(type),
+          filter;
+
+      forEach(recordArrays, function(array) {
+        filter = get(array, 'filterFunction');
+        this.updateRecordArray(array, filter, type, reference);
+      }, this);
+
+      // loop through all manyArrays containing an unloaded copy of this
+      // clientId and notify them that the record was loaded.
+      var manyArrays = reference.loadingRecordArrays;
+
+      if (manyArrays) {
+        for (var i=0, l=manyArrays.length; i<l; i++) {
+          manyArrays[i].loadedRecord();
+        }
+
+        reference.loadingRecordArrays = [];
+      }
+    }, this);
+
+    this.changedReferences = [];
+  },
+
+  /**
+    Update an individual filter.
+
+    @method updateRecordArray
+    @param {DS.FilteredRecordArray} array
+    @param {Function} filter
+    @param {Class} type
+    @param {Number|String} clientId
+  */
+  updateRecordArray: function(array, filter, type, reference) {
+    var shouldBeInArray, record;
+
+    if (!filter) {
+      shouldBeInArray = true;
+    } else {
+      record = this.store.recordForReference(reference);
+      shouldBeInArray = filter(record);
+    }
+
+    var recordArrays = this.recordArraysForReference(reference);
+
+    if (shouldBeInArray) {
+      recordArrays.add(array);
+      array.addReference(reference);
+    } else if (!shouldBeInArray) {
+      recordArrays.remove(array);
+      array.removeReference(reference);
+    }
+  },
+
+  /**
+    When a record is deleted, it is removed from all its
+    record arrays.
+
+    @method remove
+    @param {DS.Model} record
+  */
+  remove: function(record) {
+    var reference = get(record, '_reference');
+    var recordArrays = reference.recordArrays || [];
+
+    forEach(recordArrays, function(array) {
+      array.removeReference(reference);
+    });
+  },
+
+  /**
+    This method is invoked if the `filterFunction` property is
+    changed on a `DS.FilteredRecordArray`.
+
+    It essentially re-runs the filter from scratch. This same
+    method is invoked when the filter is created in th first place.
+
+    @method updateFilter
+    @param array
+    @param type
+    @param filter
+  */
+  updateFilter: function(array, type, filter) {
+    var typeMap = this.store.typeMapFor(type),
+        references = typeMap.references,
+        reference, data, shouldFilter, record;
+
+    for (var i=0, l=references.length; i<l; i++) {
+      reference = references[i];
+      shouldFilter = false;
+
+      data = reference.data;
+
+      if (typeof data === 'object') {
+        if (record = reference.record) {
+          if (!get(record, 'isDeleted')) { shouldFilter = true; }
+        } else {
+          shouldFilter = true;
+        }
+
+        if (shouldFilter) {
+          this.updateRecordArray(array, filter, type, reference);
+        }
+      }
+    }
+  },
+
+  /**
+    Create a `DS.ManyArray` for a type and list of record references, and index
+    the `ManyArray` under each reference. This allows us to efficiently remove
+    records from `ManyArray`s when they are deleted.
+
+    @method createManyArray
+    @param {Class} type
+    @param {Array} references
+    @return {DS.ManyArray}
+  */
+  createManyArray: function(type, references) {
+    var manyArray = DS.ManyArray.create({
+      type: type,
+      content: references,
+      store: this.store
+    });
+
+    forEach(references, function(reference) {
+      var arrays = this.recordArraysForReference(reference);
+      arrays.add(manyArray);
+    }, this);
+
+    return manyArray;
+  },
+
+  /**
+    Register a RecordArray for a given type to be backed by
+    a filter function. This will cause the array to update
+    automatically when records of that type change attribute
+    values or states.
+
+    @method registerFilteredRecordArray
+    @param {DS.RecordArray} array
+    @param {Class} type
+    @param {Function} filter
+  */
+  registerFilteredRecordArray: function(array, type, filter) {
+    var recordArrays = this.filteredRecordArrays.get(type);
+    recordArrays.push(array);
+
+    this.updateFilter(array, type, filter);
+  },
+
+  // Internally, we maintain a map of all unloaded IDs requested by
+  // a ManyArray. As the adapter loads data into the store, the
+  // store notifies any interested ManyArrays. When the ManyArray's
+  // total number of loading records drops to zero, it becomes
+  // `isLoaded` and fires a `didLoad` event.
+  registerWaitingRecordArray: function(array, reference) {
+    var loadingRecordArrays = reference.loadingRecordArrays || [];
+    loadingRecordArrays.push(array);
+    reference.loadingRecordArrays = loadingRecordArrays;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set, map = Ember.ArrayPolyfills.map, isNone = Ember.isNone;
+
+function mustImplement(name) {
+  return function() {
+    throw new Ember.Error("Your serializer " + this.toString() + " does not implement the required method " + name);
+  };
+}
+
+/**
+  A serializer is responsible for serializing and deserializing a group of
+  records.
+
+  `DS.Serializer` is an abstract base class designed to help you build a
+  serializer that can read to and write from any serialized form.  While most
+  applications will use `DS.JSONSerializer`, which reads and writes JSON, the
+  serializer architecture allows your adapter to transmit things like XML,
+  strings, or custom binary data.
+
+  Typically, your application's `DS.Adapter` is responsible for both creating a
+  serializer as well as calling the appropriate methods when it needs to
+  materialize data or serialize a record.
+
+  The serializer API is designed as a series of layered hooks that you can
+  override to customize any of the individual steps of serialization and
+  deserialization.
+
+  The hooks are organized by the three responsibilities of the serializer:
+
+  1. Determining naming conventions
+  2. Serializing records into a serialized form
+  3. Deserializing records from a serialized form
+
+  Because Ember Data lazily materializes records, the deserialization
+  step, and therefore the hooks you implement, are split into two phases:
+
+  1. Extraction, where the serialized forms for multiple records are
+     extracted from a single payload. The IDs of each record are also
+     extracted for indexing.
+  2. Materialization, where a newly-created record has its attributes
+     and relationships initialized based on the serialized form loaded
+     by the adapter.
+
+  Additionally, a serializer can convert values from their JavaScript
+  versions into their serialized versions via a declarative API.
+
+  ## Naming Conventions
+
+  One of the most common uses of the serializer is to map attribute names
+  from the serialized form to your `DS.Model`. For example, in your model,
+  you may have an attribute called `firstName`:
+
+  ```javascript
+  App.Person = DS.Model.extend({
+    firstName: DS.attr('string')
+  });
+  ```
+
+  However, because the web API your adapter is communicating with is
+  legacy, it calls this attribute `FIRST_NAME`.
+
+  You can determine the attribute name used in the serialized form
+  by implementing `keyForAttributeName`:
+
+  ```javascript
+  keyForAttributeName: function(type, name) {
+    return name.underscore.toUpperCase();
+  }
+  ```
+
+  If your attribute names are not predictable, you can re-map them
+  one-by-one using the adapter's `map` API:
+
+  ```javascript
+  App.Adapter.map('App.Person', {
+    firstName: { key: '*API_USER_FIRST_NAME*' }
+  });
+  ```
+
+  This API will also work for relationships and primary keys. For
+  example:
+
+  ```javascript
+  App.Adapter.map('App.Person', {
+    primaryKey: '_id'
+  });
+  ```
+
+  ## Serialization
+
+  During the serialization process, a record or records are converted
+  from Ember.js objects into their serialized form.
+
+  These methods are designed in layers, like a delicious 7-layer
+  cake (but with fewer layers).
+
+  The main entry point for serialization is the `serialize`
+  method, which takes the record and options.
+
+  The `serialize` method is responsible for:
+
+  * turning the record's attributes (`DS.attr`) into
+    attributes on the JSON object.
+  * optionally adding the record's ID onto the hash
+  * adding relationships (`DS.hasMany` and `DS.belongsTo`)
+    to the JSON object.
+
+  Depending on the backend, the serializer can choose
+  whether to include the `hasMany` or `belongsTo`
+  relationships on the JSON hash.
+
+  For very custom serialization, you can implement your
+  own `serialize` method. In general, however, you will want
+  to override the hooks described below.
+
+  ### Adding the ID
+
+  The default `serialize` will optionally call your serializer's
+  `addId` method with the JSON hash it is creating, the
+  record's type, and the record's ID. The `serialize` method
+  will not call `addId` if the record's ID is undefined.
+
+  Your adapter must specifically request ID inclusion by
+  passing `{ includeId: true }` as an option to `serialize`.
+
+  NOTE: You may not want to include the ID when updating an
+  existing record, because your server will likely disallow
+  changing an ID after it is created, and the PUT request
+  itself will include the record's identification.
+
+  By default, `addId` will:
+
+  1. Get the primary key name for the record by calling
+     the serializer's `primaryKey` with the record's type.
+     Unless you override the `primaryKey` method, this
+     will be `'id'`.
+  2. Assign the record's ID to the primary key in the
+     JSON hash being built.
+
+  If your backend expects a JSON object with the primary
+  key at the root, you can just override the `primaryKey`
+  method on your serializer subclass.
+
+  Otherwise, you can override the `addId` method for
+  more specialized handling.
+
+  ### Adding Attributes
+
+  By default, the serializer's `serialize` method will call
+  `addAttributes` with the JSON object it is creating
+  and the record to serialize.
+
+  The `addAttributes` method will then call `addAttribute`
+  in turn, with the JSON object, the record to serialize,
+  the attribute's name and its type.
+
+  Finally, the `addAttribute` method will serialize the
+  attribute:
+
+  1. It will call `keyForAttributeName` to determine
+     the key to use in the JSON hash.
+  2. It will get the value from the record.
+  3. It will call `serializeValue` with the attribute's
+     value and attribute type to convert it into a
+     JSON-compatible value. For example, it will convert a
+     Date into a String.
+
+  If your backend expects a JSON object with attributes as
+  keys at the root, you can just override the `serializeValue`
+  and `keyForAttributeName` methods in your serializer
+  subclass and let the base class do the heavy lifting.
+
+  If you need something more specialized, you can probably
+  override `addAttribute` and let the default `addAttributes`
+  handle the nitty gritty.
+
+  ### Adding Relationships
+
+  By default, `serialize` will call your serializer's
+  `addRelationships` method with the JSON object that is
+  being built and the record being serialized. The default
+  implementation of this method is to loop over all of the
+  relationships defined on your record type and:
+
+  * If the relationship is a `DS.hasMany` relationship,
+    call `addHasMany` with the JSON object, the record
+    and a description of the relationship.
+  * If the relationship is a `DS.belongsTo` relationship,
+    call `addBelongsTo` with the JSON object, the record
+    and a description of the relationship.
+
+  The relationship description has the following keys:
+
+  * `type`: the class of the associated information (the
+    first parameter to `DS.hasMany` or `DS.belongsTo`)
+  * `kind`: either `hasMany` or `belongsTo`
+
+  The relationship description may get additional
+  information in the future if more capabilities or
+  relationship types are added. However, it will
+  remain backwards-compatible, so the mere existence
+  of new features should not break existing adapters.
+
+  @class Serializer
+  @namespace DS
+  @extends Ember.Object
+*/
+
+DS.Serializer = Ember.Object.extend({
+  init: function() {
+    this.mappings = Ember.Map.create();
+    this.aliases = Ember.Map.create();
+    this.configurations = Ember.Map.create();
+    this.globalConfigurations = {};
+  },
+
+  extract: mustImplement('extract'),
+  extractMany: mustImplement('extractMany'),
+  extractId: mustImplement('extractId'),
+  extractAttribute: mustImplement('extractAttribute'),
+  extractHasMany: mustImplement('extractHasMany'),
+  extractBelongsTo: mustImplement('extractBelongsTo'),
+
+  extractRecordRepresentation: function(loader, type, data, shouldSideload) {
+    var prematerialized = {}, reference;
+
+    if (shouldSideload) {
+      reference = loader.sideload(type, data);
+    } else {
+      reference = loader.load(type, data);
+    }
+
+    this.eachEmbeddedHasMany(type, function(name, relationship) {
+      var embeddedData = this.extractEmbeddedData(data, this.keyFor(relationship));
+      if (!isNone(embeddedData)) {
+        this.extractEmbeddedHasMany(loader, relationship, embeddedData, reference, prematerialized);
+      }
+    }, this);
+
+    this.eachEmbeddedBelongsTo(type, function(name, relationship) {
+      var embeddedData = this.extractEmbeddedData(data, this.keyFor(relationship));
+      if (!isNone(embeddedData)) {
+        this.extractEmbeddedBelongsTo(loader, relationship, embeddedData, reference, prematerialized);
+      }
+    }, this);
+
+    loader.prematerialize(reference, prematerialized);
+
+    return reference;
+  },
+
+  extractEmbeddedHasMany: function(loader, relationship, array, parent, prematerialized) {
+    var references = map.call(array, function(item) {
+      if (!item) { return; }
+
+      var foundType = this.extractEmbeddedType(relationship, item),
+          reference = this.extractRecordRepresentation(loader, foundType, item, true);
+
+      // If the embedded record should also be saved back when serializing the parent,
+      // make sure we set its parent since it will not have an ID.
+      var embeddedType = this.embeddedType(parent.type, relationship.key);
+      if (embeddedType === 'always') {
+        reference.parent = parent;
+      }
+
+      // If the embedded children have an inverse belongs-to, set the
+      // inverse to the current record in their prematerialized data.
+      var parentType = relationship.parentType,
+          inverse = parentType.inverseFor(relationship.key);
+
+      if (inverse) {
+        var inverseName = inverse.name;
+        reference.prematerialized[inverseName] = parent;
+      }
+
+      return reference;
+    }, this);
+
+    prematerialized[relationship.key] = references;
+  },
+
+  extractEmbeddedBelongsTo: function(loader, relationship, data, parent, prematerialized) {
+    var foundType = this.extractEmbeddedType(relationship, data),
+        reference = this.extractRecordRepresentation(loader, foundType, data, true);
+    prematerialized[relationship.key] = reference;
+
+    // If the embedded record should also be saved back when serializing the parent,
+    // make sure we set its parent since it will not have an ID.
+    var embeddedType = this.embeddedType(parent.type, relationship.key);
+    if (embeddedType === 'always') {
+      reference.parent = parent;
+    }
+  },
+
+  /**
+    A hook you can use to customize how the record's type is extracted from
+    the serialized data.
+
+    The `extractEmbeddedType` hook is called with:
+
+    * the relationship
+    * the serialized representation of the record
+
+    By default, it returns the type of the relationship.
+
+    @method extractEmbeddedType
+    @param {Object} relationship an object representing the relationship
+    @param {any} data the serialized representation of the record
+  */
+  extractEmbeddedType: function(relationship, data) {
+    return relationship.type;
+  },
+
+  /**
+    A hook you need to implement in order to extract
+    the data associated with an embedded record.
+
+    @method extractEmbeddedData
+    @param {any} data the serialized representation of the record
+    @param {String} key the key that represents the embedded record
+   */
+  extractEmbeddedData: mustImplement(),
+
+  //.......................
+  //. SERIALIZATION HOOKS
+  //.......................
+
+  /**
+    The main entry point for serializing a record. While you can consider this
+    a hook that can be overridden in your serializer, you will have to manually
+    handle serialization. For most cases, there are more granular hooks that you
+    can override.
+
+    If overriding this method, these are the responsibilities that you will need
+    to implement yourself:
+
+    * If the option hash contains `includeId`, add the record's ID to the serialized form.
+      By default, `serialize` calls `addId` if appropriate.
+    * If the option hash contains `includeType`, add the record's type to the serialized form.
+    * Add the record's attributes to the serialized form. By default, `serialize` calls
+      `addAttributes`.
+    * Add the record's relationships to the serialized form. By default, `serialize` calls
+      `addRelationships`.
+
+    @method serialize
+    @param {DS.Model} record the record to serialize
+    @param {Object} [options] a hash of options
+    @returns {any} the serialized form of the record
+  */
+  serialize: function(record, options) {
+    options = options || {};
+
+    var serialized = this.createSerializedForm(), id;
+
+    if (options.includeId) {
+      if (id = get(record, 'id')) {
+        this._addId(serialized, record.constructor, id);
+      }
+    }
+
+    if (options.includeType) {
+      this.addType(serialized, record.constructor);
+    }
+
+    this.addAttributes(serialized, record);
+    this.addRelationships(serialized, record);
+
+    return serialized;
+  },
+
+  /**
+    Given an attribute type and value, convert the value into the
+    serialized form using the transform registered for that type.
+
+    @method serializeValue
+    @private
+    @param {any} value the value to convert to the serialized form
+    @param {String} attributeType the registered type (e.g. `string`
+      or `boolean`)
+    @returns {any} the serialized form of the value
+  */
+  serializeValue: function(value, attributeType) {
+    var transform = this.transforms ? this.transforms[attributeType] : null;
+
+    Ember.assert("You tried to use an attribute type (" + attributeType + ") that has not been registered", transform);
+    return transform.serialize(value);
+  },
+
+  /**
+    A hook you can use to normalize IDs before adding them to the
+    serialized representation.
+
+    Because the store coerces all IDs to strings for consistency,
+    this is the opportunity for the serializer to, for example,
+    convert numerical IDs back into number form.
+
+    Null or undefined ids will resolve to a null value.
+
+    @method serializeId
+    @param {String} id the id from the record
+    @returns {any} the serialized representation of the id
+  */
+  serializeId: function(id) {
+    if(Ember.isEmpty(id)) { return null; }
+    if(isNaN(+id)) { return id; }
+    return +id;
+  },
+
+  /**
+    A hook you can use to change how attributes are added to the serialized
+    representation of a record.
+
+    By default, `addAttributes` simply loops over all of the attributes of the
+    passed record, maps the attribute name to the key for the serialized form,
+    and invokes any registered transforms on the value. It then invokes the
+    more granular `addAttribute` with the key and transformed value.
+
+    Since you can override `keyForAttributeName`, `addAttribute`, and register
+    custom transforms, you should rarely need to override this hook.
+
+    @method addAttributes
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+  */
+  addAttributes: function(data, record) {
+    record.eachAttribute(function(name, attribute) {
+      this._addAttribute(data, record, name, attribute.type);
+    }, this);
+  },
+
+  /**
+    A hook you can use to customize how the key/value pair is added to
+    the serialized data.
+
+    @method addAttribute
+    @param {any} serialized the serialized form being built
+    @param {String} key the key to add to the serialized data
+    @param {any} value the value to add to the serialized data
+  */
+  addAttribute: mustImplement('addAttribute'),
+
+  /**
+    A hook you can use to customize how the record's id is added to
+    the serialized data.
+
+    The `addId` hook is called with:
+
+    * the serialized representation being built
+    * the resolved primary key (taking configurations and the
+      `primaryKey` hook into consideration)
+    * the serialized id (after calling the `serializeId` hook)
+
+    @method addId
+    @param {any} data the serialized representation that is being built
+    @param {String} key the resolved primary key
+    @param {id} id the serialized id
+  */
+  addId: mustImplement('addId'),
+
+  /**
+    A hook you can use to customize how the record's type is added to
+    the serialized data.
+
+    The `addType` hook is called with:
+
+    * the serialized representation being built
+    * the serialized id (after calling the `serializeId` hook)
+
+    @method addType
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model subclass} type the type of the record
+  */
+  addType: Ember.K,
+
+  /**
+    Creates an empty hash that will be filled in by the hooks called from the
+    `serialize()` method.
+
+    @method createSerializedForm
+    @return {Object}
+  */
+  createSerializedForm: function() {
+    return {};
+  },
+
+  /**
+    A hook you can use to change how relationships are added to the serialized
+    representation of a record.
+
+    By default, `addRelationships` loops over all of the relationships of the
+    passed record, maps the relationship names to the key for the serialized form,
+    and then invokes the public `addBelongsTo` and `addHasMany` hooks.
+
+    Since you can override `keyForBelongsTo`, `keyForHasMany`, `addBelongsTo`,
+    `addHasMany`, and register mappings, you should rarely need to override this
+    hook.
+
+    @method addRelationships
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+  */
+  addRelationships: function(data, record) {
+    record.eachRelationship(function(name, relationship) {
+      if (relationship.kind === 'belongsTo') {
+        this._addBelongsTo(data, record, name, relationship);
+      } else if (relationship.kind === 'hasMany') {
+        this._addHasMany(data, record, name, relationship);
+      }
+    }, this);
+  },
+
+  /**
+    A hook you can use to add a `belongsTo` relationship to the
+    serialized representation.
+
+    The specifics of this hook are very adapter-specific, so there
+    is no default implementation. You can see `DS.JSONSerializer`
+    for an example of an implementation of the `addBelongsTo` hook.
+
+    The `belongsTo` relationship object has the following properties:
+
+    * **type** a subclass of DS.Model that is the type of the
+      relationship. This is the first parameter to DS.belongsTo
+    * **options** the options passed to the call to DS.belongsTo
+    * **kind** always `belongsTo`
+
+    Additional properties may be added in the future.
+
+    @method addBelongsTo
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+    @param {String} key the key for the serialized object
+    @param {Object} relationship an object representing the relationship
+  */
+  addBelongsTo: mustImplement('addBelongsTo'),
+
+  /**
+    A hook you can use to add a `hasMany` relationship to the
+    serialized representation.
+
+    The specifics of this hook are very adapter-specific, so there
+    is no default implementation. You may not need to implement this,
+    for example, if your backend only expects relationships on the
+    child of a one to many relationship.
+
+    The `hasMany` relationship object has the following properties:
+
+    * **type** a subclass of DS.Model that is the type of the
+      relationship. This is the first parameter to DS.hasMany
+    * **options** the options passed to the call to DS.hasMany
+    * **kind** always `hasMany`
+
+    Additional properties may be added in the future.
+
+    @method addHasMany
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+    @param {String} key the key for the serialized object
+    @param {Object} relationship an object representing the relationship
+  */
+  addHasMany: mustImplement('addHasMany'),
+
+  /*
+    NAMING CONVENTIONS
+
+    The most commonly overridden APIs of the serializer are
+    the naming convention methods:
+
+    * `keyForAttributeName`: converts a camelized attribute name
+      into a key in the adapter-provided data hash. For example,
+      if the model's attribute name was `firstName`, and the
+      server used underscored names, you would return `first_name`.
+    * `primaryKey`: returns the key that should be used to
+      extract the id from the adapter-provided data hash. It is
+      also used when serializing a record.
+  */
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how an unmapped attribute name is converted into a key.
+
+    By default, this method returns the `name` parameter.
+
+    For example, if the attribute names in your JSON are underscored,
+    you will want to convert them into JavaScript conventional
+    camelcase:
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+
+      keyForAttributeName: function(type, name) {
+        return name.camelize();
+      }
+    });
+    ```
+
+    @method keyForAttributeName
+    @param {DS.Model subclass} type the type of the record with
+      the attribute name `name`
+    @param {String} name the attribute name to convert into a key
+
+    @returns {String} the key
+  */
+  keyForAttributeName: function(type, name) {
+    return name;
+  },
+
+  /**
+    A hook you can use in your serializer to specify a conventional
+    primary key.
+
+    By default, this method will return the string `id`.
+
+    In general, you should not override this hook to specify a special
+    primary key for an individual type; use `configure` instead.
+
+    For example, if your primary key is always `__id__`:
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+      primaryKey: function(type) {
+        return '__id__';
+      }
+    });
+    ```
+
+    In another example, if the primary key always includes the
+    underscored version of the type before the string `id`:
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+      primaryKey: function(type) {
+        // If the type is `BlogPost`, this will return
+        // `blog_post_id`.
+        var typeString = type.toString().split(".")[1].underscore();
+        return typeString + "_id";
+      }
+    });
+    ```
+
+    @method primaryKey
+    @param {DS.Model subclass} type
+    @returns {String} the primary key for the type
+  */
+  primaryKey: function(type) {
+    return "id";
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how an unmapped `belongsTo` relationship is converted into
+    a key.
+
+    By default, this method calls `keyForAttributeName`, so if
+    your naming convention is uniform across attributes and
+    relationships, you can use the default here and override
+    just `keyForAttributeName` as needed.
+
+    For example, if the `belongsTo` names in your JSON always
+    begin with `BT_` (e.g. `BT_posts`), you can strip out the
+    `BT_` prefix:"
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+      keyForBelongsTo: function(type, name) {
+        return name.match(/^BT_(.*)$/)[1].camelize();
+      }
+    });
+    ```
+
+    @method keyForBelongsTo
+    @param {DS.Model subclass} type the type of the record with
+      the `belongsTo` relationship.
+    @param {String} name the relationship name to convert into a key
+
+    @returns {String} the key
+  */
+  keyForBelongsTo: function(type, name) {
+    return this.keyForAttributeName(type, name);
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how an unmapped `hasMany` relationship is converted into
+    a key.
+
+    By default, this method calls `keyForAttributeName`, so if
+    your naming convention is uniform across attributes and
+    relationships, you can use the default here and override
+    just `keyForAttributeName` as needed.
+
+    For example, if the `hasMany` names in your JSON always
+    begin with the "table name" for the current type (e.g.
+    `post_comments`), you can strip out the prefix:"
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+      keyForHasMany: function(type, name) {
+        // if your App.BlogPost has many App.BlogComment, the key from
+        // the server would look like: `blog_post_blog_comments`
+        //
+        // 1. Convert the type into a string and underscore the
+        //    second part (App.BlogPost -> blog_post)
+        // 2. Extract the part after `blog_post_` (`blog_comments`)
+        // 3. Underscore it, to become `blogComments`
+        var typeString = type.toString().split(".")[1].underscore();
+        return name.match(new RegExp("^" + typeString + "_(.*)$"))[1].camelize();
+      }
+    });
+    ```
+
+    @method keyForHasMany
+    @param {DS.Model subclass} type the type of the record with
+      the `belongsTo` relationship.
+    @param {String} name the relationship name to convert into a key
+
+    @returns {String} the key
+  */
+  keyForHasMany: function(type, name) {
+    return this.keyForAttributeName(type, name);
+  },
+
+  //.........................
+  //. MATERIALIZATION HOOKS
+  //.........................
+
+  materialize: function(record, serialized, prematerialized) {
+    var id;
+    if (Ember.isNone(get(record, 'id'))) {
+      if (prematerialized && prematerialized.hasOwnProperty('id')) {
+        id = prematerialized.id;
+      } else {
+        id = this.extractId(record.constructor, serialized);
+      }
+      record.materializeId(id);
+    }
+
+    this.materializeAttributes(record, serialized, prematerialized);
+    this.materializeRelationships(record, serialized, prematerialized);
+  },
+
+  deserializeValue: function(value, attributeType) {
+    var transform = this.transforms ? this.transforms[attributeType] : null;
+
+    Ember.assert("You tried to use an attribute type (" + attributeType + ") that has not been registered", transform);
+    return transform.deserialize(value);
+  },
+
+  materializeAttributes: function(record, serialized, prematerialized) {
+    record.eachAttribute(function(name, attribute) {
+      if (prematerialized && prematerialized.hasOwnProperty(name)) {
+        record.materializeAttribute(name, prematerialized[name]);
+      } else {
+        this.materializeAttribute(record, serialized, name, attribute.type);
+      }
+    }, this);
+  },
+
+  materializeAttribute: function(record, serialized, attributeName, attributeType) {
+    var value = this.extractAttribute(record.constructor, serialized, attributeName);
+    value = this.deserializeValue(value, attributeType);
+
+    record.materializeAttribute(attributeName, value);
+  },
+
+  materializeRelationships: function(record, serialized, prematerialized) {
+    record.eachRelationship(function(name, relationship) {
+      if (relationship.kind === 'hasMany') {
+        if (prematerialized && prematerialized.hasOwnProperty(name)) {
+          var tuplesOrReferencesOrOpaque = this._convertPrematerializedHasMany(relationship.type, prematerialized[name]);
+          record.materializeHasMany(name, tuplesOrReferencesOrOpaque);
+        } else {
+          this.materializeHasMany(name, record, serialized, relationship, prematerialized);
+        }
+      } else if (relationship.kind === 'belongsTo') {
+        if (prematerialized && prematerialized.hasOwnProperty(name)) {
+          var tupleOrReference = this._convertTuple(relationship.type, prematerialized[name]);
+          record.materializeBelongsTo(name, tupleOrReference);
+        } else {
+          this.materializeBelongsTo(name, record, serialized, relationship, prematerialized);
+        }
+      }
+    }, this);
+  },
+
+  materializeHasMany: function(name, record, hash, relationship) {
+    var type = record.constructor,
+        key = this._keyForHasMany(type, relationship.key),
+        idsOrTuples = this.extractHasMany(type, hash, key),
+        tuples = idsOrTuples;
+
+    if(idsOrTuples && Ember.isArray(idsOrTuples)) {
+      tuples = this._convertTuples(relationship.type, idsOrTuples);
+    }
+
+    record.materializeHasMany(name, tuples);
+  },
+
+  materializeBelongsTo: function(name, record, hash, relationship) {
+    var type = record.constructor,
+        key = this._keyForBelongsTo(type, relationship.key),
+        idOrTuple,
+        tuple = null;
+
+    if(relationship.options && relationship.options.polymorphic) {
+      idOrTuple = this.extractBelongsToPolymorphic(type, hash, key);
+    } else {
+      idOrTuple = this.extractBelongsTo(type, hash, key);
+    }
+
+    if(!isNone(idOrTuple)) {
+      tuple = this._convertTuple(relationship.type, idOrTuple);
+    }
+
+    record.materializeBelongsTo(name, tuple);
+  },
+
+  _convertPrematerializedHasMany: function(type, prematerializedHasMany) {
+    var tuplesOrReferencesOrOpaque;
+    if( typeof prematerializedHasMany === 'string' ) {
+      tuplesOrReferencesOrOpaque = prematerializedHasMany;
+    } else {
+      tuplesOrReferencesOrOpaque = this._convertTuples(type, prematerializedHasMany);
+    }
+    return tuplesOrReferencesOrOpaque;
+  },
+
+  _convertTuples: function(type, idsOrTuples) {
+    return map.call(idsOrTuples, function(idOrTuple) {
+      return this._convertTuple(type, idOrTuple);
+    }, this);
+  },
+
+  _convertTuple: function(type, idOrTuple) {
+    var foundType;
+
+    if (typeof idOrTuple === 'object') {
+      if (DS.Model.detect(idOrTuple.type)) {
+        return idOrTuple;
+      } else {
+        foundType = this.typeFromAlias(idOrTuple.type);
+        Ember.assert("Unable to resolve type " + idOrTuple.type + ".  You may need to configure your serializer aliases.", !!foundType);
+
+        return {id: idOrTuple.id, type: foundType};
+      }
+    }
+    return {id: idOrTuple, type: type};
+  },
+
+  /**
+    This method is called to get the primary key for a given
+    type.
+
+    If a primary key configuration exists for this type, this
+    method will return the configured value. Otherwise, it will
+    call the public `primaryKey` hook.
+
+    @method _primaryKey
+    @private
+    @param {DS.Model subclass} type
+    @returns {String} the primary key for the type
+  */
+  _primaryKey: function(type) {
+    var config = this.configurationForType(type),
+        primaryKey = config && config.primaryKey;
+
+    if (primaryKey) {
+      return primaryKey;
+    } else {
+      return this.primaryKey(type);
+    }
+  },
+
+  /**
+    This method looks up the key for the attribute name and transforms the
+    attribute's value using registered transforms.
+
+    Specifically:
+
+    1. Look up the key for the attribute name. If available, this will use
+       any registered mappings. Otherwise, it will invoke the public
+       `keyForAttributeName` hook.
+    2. Get the value from the record using the `attributeName`.
+    3. Transform the value using registered transforms for the `attributeType`.
+    4. Invoke the public `addAttribute` hook with the hash, key, and
+       transformed value.
+
+    @method _addAttribute
+    @private
+    @param {any} data the serialized representation being built
+    @param {DS.Model} record the record to serialize
+    @param {String} attributeName the name of the attribute on the record
+    @param {String} attributeType the type of the attribute (e.g. `string`
+      or `boolean`)
+  */
+  _addAttribute: function(data, record, attributeName, attributeType) {
+    var key = this._keyForAttributeName(record.constructor, attributeName);
+    var value = get(record, attributeName);
+
+    this.addAttribute(data, key, this.serializeValue(value, attributeType));
+  },
+
+  /**
+    This method looks up the primary key for the `type` and invokes
+    `serializeId` on the `id`.
+
+    It then invokes the public `addId` hook with the primary key and
+    the serialized id.
+
+    @method _addId
+    @private
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model subclass} type
+    @param {any} id the materialized id from the record
+  */
+  _addId: function(hash, type, id) {
+    var primaryKey = this._primaryKey(type);
+
+    this.addId(hash, primaryKey, this.serializeId(id));
+  },
+
+  /**
+    This method is called to get a key used in the data from
+    an attribute name. It first checks for any mappings before
+    calling the public hook `keyForAttributeName`.
+
+    @method _keyForAttributeName
+    @private
+    @param {DS.Model subclass} type the type of the record with
+      the attribute name `name`
+    @param {String} name the attribute name to convert into a key
+
+    @returns {String} the key
+  */
+  _keyForAttributeName: function(type, name) {
+    return this._keyFromMappingOrHook('keyForAttributeName', type, name);
+  },
+
+  /**
+    This method is called to get a key used in the data from
+    a belongsTo relationship. It first checks for any mappings before
+    calling the public hook `keyForBelongsTo`.
+
+    @method _keyForBelongsTo
+    @private
+    @param {DS.Model subclass} type the type of the record with
+      the `belongsTo` relationship.
+    @param {String} name the relationship name to convert into a key
+
+    @returns {String} the key
+  */
+  _keyForBelongsTo: function(type, name) {
+    return this._keyFromMappingOrHook('keyForBelongsTo', type, name);
+  },
+
+  keyFor: function(description) {
+    var type = description.parentType,
+        name = description.key;
+
+    switch (description.kind) {
+      case 'belongsTo':
+        return this._keyForBelongsTo(type, name);
+      case 'hasMany':
+        return this._keyForHasMany(type, name);
+    }
+  },
+
+  /**
+    This method is called to get a key used in the data from
+    a hasMany relationship. It first checks for any mappings before
+    calling the public hook `keyForHasMany`.
+
+    @method _keyForHasMany
+    @private
+    @param {DS.Model subclass} type the type of the record with
+      the `hasMany` relationship.
+    @param {String} name the relationship name to convert into a key
+
+    @returns {String} the key
+  */
+  _keyForHasMany: function(type, name) {
+    return this._keyFromMappingOrHook('keyForHasMany', type, name);
+  },
+
+  /**
+    This method converts the relationship name to a key for serialization,
+    and then invokes the public `addBelongsTo` hook.
+
+    @method _addBelongsTo
+    @private
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+    @param {String} name the relationship name
+    @param {Object} relationship an object representing the relationship
+  */
+  _addBelongsTo: function(data, record, name, relationship) {
+    var key = this._keyForBelongsTo(record.constructor, name);
+    this.addBelongsTo(data, record, key, relationship);
+  },
+
+  /**
+    This method converts the relationship name to a key for serialization,
+    and then invokes the public `addHasMany` hook.
+
+    @method _addHasMany
+    @private
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+    @param {String} name the relationship name
+    @param {Object} relationship an object representing the relationship
+  */
+  _addHasMany: function(data, record, name, relationship) {
+    var key = this._keyForHasMany(record.constructor, name);
+    this.addHasMany(data, record, key, relationship);
+  },
+
+  /**
+    An internal method that handles checking whether a mapping
+    exists for a particular attribute or relationship name before
+    calling the public hooks.
+
+    If a mapping is found, and the mapping has a key defined,
+    use that instead of invoking the hook.
+
+    @method _keyFromMappingOrHook
+    @private
+    @param {String} publicMethod the public hook to invoke if
+      a mapping is not found (e.g. `keyForAttributeName`)
+    @param {DS.Model subclass} type the type of the record with
+      the attribute or relationship name.
+    @param {String} name the attribute or relationship name to
+      convert into a key
+  */
+  _keyFromMappingOrHook: function(publicMethod, type, name) {
+    var key = this.mappingOption(type, name, 'key');
+
+    if (key) {
+      return key;
+    } else {
+      return this[publicMethod](type, name);
+    }
+  },
+
+  /* TRANSFORMS */
+
+  registerTransform: function(type, transform) {
+    this.transforms[type] = transform;
+  },
+
+  registerEnumTransform: function(type, objects) {
+    var transform = {
+      deserialize: function(serialized) {
+        return Ember.A(objects).objectAt(serialized);
+      },
+      serialize: function(deserialized) {
+        return Ember.EnumerableUtils.indexOf(objects, deserialized);
+      },
+      values: objects
+    };
+    this.registerTransform(type, transform);
+  },
+
+  /* MAPPING CONVENIENCE */
+
+  map: function(type, mappings) {
+    this.mappings.set(type, mappings);
+  },
+
+  configure: function(type, configuration) {
+    if (type && !configuration) {
+      Ember.merge(this.globalConfigurations, type);
+      return;
+    }
+
+    var config, alias;
+
+    if (configuration.alias) {
+      alias = configuration.alias;
+      this.aliases.set(alias, type);
+      delete configuration.alias;
+    }
+
+    config = Ember.create(this.globalConfigurations);
+    Ember.merge(config, configuration);
+
+    this.configurations.set(type, config);
+  },
+
+  typeFromAlias: function(alias) {
+    this._completeAliases();
+    return this.aliases.get(alias);
+  },
+
+  mappingForType: function(type) {
+    this._reifyMappings();
+    return this.mappings.get(type) || {};
+  },
+
+  configurationForType: function(type) {
+    this._reifyConfigurations();
+    return this.configurations.get(type) || this.globalConfigurations;
+  },
+
+  _completeAliases: function() {
+    this._pluralizeAliases();
+    this._reifyAliases();
+  },
+
+  _pluralizeAliases: function() {
+    if (this._didPluralizeAliases) { return; }
+
+    var aliases = this.aliases,
+        sideloadMapping = this.aliases.sideloadMapping,
+        plural,
+        self = this;
+
+    aliases.forEach(function(key, type) {
+      plural = self.pluralize(key);
+      Ember.assert("The '" + key + "' alias has already been defined", !aliases.get(plural));
+      aliases.set(plural, type);
+    });
+
+    // This map is only for backward compatibility with the `sideloadAs` option.
+    if (sideloadMapping) {
+      sideloadMapping.forEach(function(key, type) {
+        Ember.assert("The '" + key + "' alias has already been defined", !aliases.get(key) || (aliases.get(key)===type) );
+        aliases.set(key, type);
+      });
+      delete this.aliases.sideloadMapping;
+    }
+
+    this._didPluralizeAliases = true;
+  },
+
+  _reifyAliases: function() {
+    if (this._didReifyAliases) { return; }
+
+    var aliases = this.aliases,
+        reifiedAliases = Ember.Map.create(),
+        foundType;
+
+    aliases.forEach(function(key, type) {
+      if (typeof type === 'string') {
+        foundType = Ember.get(Ember.lookup, type);
+        Ember.assert("Could not find model at path " + key, type);
+
+        reifiedAliases.set(key, foundType);
+      } else {
+        reifiedAliases.set(key, type);
+      }
+    });
+
+    this.aliases = reifiedAliases;
+    this._didReifyAliases = true;
+  },
+
+  _reifyMappings: function() {
+    if (this._didReifyMappings) { return; }
+
+    var mappings = this.mappings,
+        reifiedMappings = Ember.Map.create();
+
+    mappings.forEach(function(key, mapping) {
+      if (typeof key === 'string') {
+        var type = Ember.get(Ember.lookup, key);
+        Ember.assert("Could not find model at path " + key, type);
+
+        reifiedMappings.set(type, mapping);
+      } else {
+        reifiedMappings.set(key, mapping);
+      }
+    });
+
+    this.mappings = reifiedMappings;
+
+    this._didReifyMappings = true;
+  },
+
+  _reifyConfigurations: function() {
+    if (this._didReifyConfigurations) { return; }
+
+    var configurations = this.configurations,
+        reifiedConfigurations = Ember.Map.create();
+
+    configurations.forEach(function(key, mapping) {
+      if (typeof key === 'string' && key !== 'plurals') {
+        var type = Ember.get(Ember.lookup, key);
+        Ember.assert("Could not find model at path " + key, type);
+
+        reifiedConfigurations.set(type, mapping);
+      } else {
+        reifiedConfigurations.set(key, mapping);
+      }
+    });
+
+    this.configurations = reifiedConfigurations;
+
+    this._didReifyConfigurations = true;
+  },
+
+  mappingOption: function(type, name, option) {
+    var mapping = this.mappingForType(type)[name];
+
+    return mapping && mapping[option];
+  },
+
+  configOption: function(type, option) {
+    var config = this.configurationForType(type);
+
+    return config[option];
+  },
+
+  // EMBEDDED HELPERS
+
+  embeddedType: function(type, name) {
+    return this.mappingOption(type, name, 'embedded');
+  },
+
+  eachEmbeddedRecord: function(record, callback, binding) {
+    this.eachEmbeddedBelongsToRecord(record, callback, binding);
+    this.eachEmbeddedHasManyRecord(record, callback, binding);
+  },
+
+  eachEmbeddedBelongsToRecord: function(record, callback, binding) {
+    this.eachEmbeddedBelongsTo(record.constructor, function(name, relationship, embeddedType) {
+      var embeddedRecord = get(record, name);
+      if (embeddedRecord) { callback.call(binding, embeddedRecord, embeddedType); }
+    });
+  },
+
+  eachEmbeddedHasManyRecord: function(record, callback, binding) {
+    this.eachEmbeddedHasMany(record.constructor, function(name, relationship, embeddedType) {
+      var array = get(record, name);
+      for (var i=0, l=get(array, 'length'); i<l; i++) {
+        callback.call(binding, array.objectAt(i), embeddedType);
+      }
+    });
+  },
+
+  eachEmbeddedHasMany: function(type, callback, binding) {
+    this.eachEmbeddedRelationship(type, 'hasMany', callback, binding);
+  },
+
+  eachEmbeddedBelongsTo: function(type, callback, binding) {
+    this.eachEmbeddedRelationship(type, 'belongsTo', callback, binding);
+  },
+
+  eachEmbeddedRelationship: function(type, kind, callback, binding) {
+    type.eachRelationship(function(name, relationship) {
+      var embeddedType = this.embeddedType(type, name);
+
+      if (embeddedType) {
+        if (relationship.kind === kind) {
+          callback.call(binding, name, relationship, embeddedType);
+        }
+      }
+    }, this);
+  },
+
+  // HELPERS
+
+  // define a plurals hash in your subclass to define
+  // special-case pluralization
+  pluralize: function(name) {
+    var plurals = this.configurations.get('plurals');
+    return (plurals && plurals[name]) || name + "s";
+  },
+
+  // use the same plurals hash to determine
+  // special-case singularization
+  singularize: function(name) {
+    var plurals = this.configurations.get('plurals');
+    if (plurals) {
+      for (var i in plurals) {
+        if (plurals[i] === name) {
+          return i;
+        }
+      }
+    }
+    if (name.lastIndexOf('s') === name.length - 1) {
+      return name.substring(0, name.length - 1);
+    } else {
+      return name;
+    }
+  }
+});
+
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var isNone = Ember.isNone, isEmpty = Ember.isEmpty;
+
+/**
+  DS.JSONTransforms is a hash of transforms used by DS.Serializer.
+
+  @class JSONTransforms
+  @static
+  @namespace DS
+*/
+DS.JSONTransforms = {
+  string: {
+    deserialize: function(serialized) {
+      return isNone(serialized) ? null : String(serialized);
+    },
+
+    serialize: function(deserialized) {
+      return isNone(deserialized) ? null : String(deserialized);
+    }
+  },
+
+  number: {
+    deserialize: function(serialized) {
+      return isEmpty(serialized) ? null : Number(serialized);
+    },
+
+    serialize: function(deserialized) {
+      return isEmpty(deserialized) ? null : Number(deserialized);
+    }
+  },
+
+  // Handles the following boolean inputs:
+  // "TrUe", "t", "f", "FALSE", 0, (non-zero), or boolean true/false
+  'boolean': {
+    deserialize: function(serialized) {
+      var type = typeof serialized;
+
+      if (type === "boolean") {
+        return serialized;
+      } else if (type === "string") {
+        return serialized.match(/^true$|^t$|^1$/i) !== null;
+      } else if (type === "number") {
+        return serialized === 1;
+      } else {
+        return false;
+      }
+    },
+
+    serialize: function(deserialized) {
+      return Boolean(deserialized);
+    }
+  },
+
+  date: {
+    deserialize: function(serialized) {
+      var type = typeof serialized;
+
+      if (type === "string") {
+        return new Date(Ember.Date.parse(serialized));
+      } else if (type === "number") {
+        return new Date(serialized);
+      } else if (serialized === null || serialized === undefined) {
+        // if the value is not present in the data,
+        // return undefined, not null.
+        return serialized;
+      } else {
+        return null;
+      }
+    },
+
+    serialize: function(date) {
+      if (date instanceof Date) {
+        var days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+        var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+
+        var pad = function(num) {
+          return num < 10 ? "0"+num : ""+num;
+        };
+
+        var utcYear = date.getUTCFullYear(),
+            utcMonth = date.getUTCMonth(),
+            utcDayOfMonth = date.getUTCDate(),
+            utcDay = date.getUTCDay(),
+            utcHours = date.getUTCHours(),
+            utcMinutes = date.getUTCMinutes(),
+            utcSeconds = date.getUTCSeconds();
+
+
+        var dayOfWeek = days[utcDay];
+        var dayOfMonth = pad(utcDayOfMonth);
+        var month = months[utcMonth];
+
+        return dayOfWeek + ", " + dayOfMonth + " " + month + " " + utcYear + " " +
+               pad(utcHours) + ":" + pad(utcMinutes) + ":" + pad(utcSeconds) + " GMT";
+      } else {
+        return null;
+      }
+    }
+  }
+};
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+/**
+  @class JSONSerializer
+  @namespace DS
+  @extends DS.Serializer
+*/
+DS.JSONSerializer = DS.Serializer.extend({
+  init: function() {
+    this._super();
+
+    if (!get(this, 'transforms')) {
+      this.set('transforms', DS.JSONTransforms);
+    }
+
+    this.sideloadMapping = Ember.Map.create();
+    this.metadataMapping = Ember.Map.create();
+
+    this.configure({
+      meta: 'meta',
+      since: 'since'
+    });
+  },
+
+  /**
+    @method configure
+    @param  type
+    @param  configuration
+  */
+  configure: function(type, configuration) {
+    var key;
+
+    if (type && !configuration) {
+      for(key in type){
+        this.metadataMapping.set(get(type, key), key);
+      }
+
+      return this._super(type);
+    }
+
+    var sideloadAs = configuration.sideloadAs,
+        sideloadMapping;
+
+    if (sideloadAs) {
+      sideloadMapping = this.aliases.sideloadMapping || Ember.Map.create();
+      sideloadMapping.set(sideloadAs, type);
+      this.aliases.sideloadMapping = sideloadMapping;
+      delete configuration.sideloadAs;
+    }
+
+    this._super.apply(this, arguments);
+  },
+
+  /**
+    @method addId
+    @param data
+    @param key
+    @param id
+  */
+  addId: function(data, key, id) {
+    data[key] = id;
+  },
+
+  /**
+    A hook you can use to customize how the key/value pair is added to
+    the serialized data.
+
+    @method addAttribute
+    @param {any} hash the JSON hash being built
+    @param {String} key the key to add to the serialized data
+    @param {any} value the value to add to the serialized data
+  */
+  addAttribute: function(hash, key, value) {
+    hash[key] = value;
+  },
+
+  /**
+    @method extractAttribute
+    @param type
+    @param hash
+    @param attributeName
+  */
+  extractAttribute: function(type, hash, attributeName) {
+    var key = this._keyForAttributeName(type, attributeName);
+    return hash[key];
+  },
+
+  /**
+    @method extractId
+    @param type
+    @param hash
+  */
+  extractId: function(type, hash) {
+    var primaryKey = this._primaryKey(type);
+
+    if (hash.hasOwnProperty(primaryKey)) {
+      // Ensure that we coerce IDs to strings so that record
+      // IDs remain consistent between application runs; especially
+      // if the ID is serialized and later deserialized from the URL,
+      // when type information will have been lost.
+      return hash[primaryKey]+'';
+    } else {
+      return null;
+    }
+  },
+
+  /**
+    @method extractEmbeddedData
+    @param hash
+    @param key
+  */
+  extractEmbeddedData: function(hash, key) {
+    return hash[key];
+  },
+
+  /**
+    @method extractHasMany
+    @param type
+    @param hash
+    @param key
+  */
+  extractHasMany: function(type, hash, key) {
+    return hash[key];
+  },
+
+  /**
+    @method extractBelongsTo
+    @param type
+    @param hash
+    @param key
+  */
+  extractBelongsTo: function(type, hash, key) {
+    return hash[key];
+  },
+
+  /**
+    @method extractBelongsToPolymorphic
+    @param type
+    @param hash
+    @param key
+  */
+  extractBelongsToPolymorphic: function(type, hash, key) {
+    var keyForId = this.keyForPolymorphicId(key),
+        keyForType,
+        id = hash[keyForId];
+
+    if (id) {
+      keyForType = this.keyForPolymorphicType(key);
+      return {id: id, type: hash[keyForType]};
+    }
+
+    return null;
+  },
+
+  /**
+    @method addBelongsTo
+    @param hash
+    @param record
+    @param key
+    @param relationship
+  */
+  addBelongsTo: function(hash, record, key, relationship) {
+    var type = record.constructor,
+        name = relationship.key,
+        value = null,
+        includeType = (relationship.options && relationship.options.polymorphic),
+        embeddedChild,
+        child,
+        id;
+
+    if (this.embeddedType(type, name)) {
+      if (embeddedChild = get(record, name)) {
+        value = this.serialize(embeddedChild, { includeId: true, includeType: includeType });
+      }
+
+      hash[key] = value;
+    } else {
+      child = get(record, relationship.key);
+      id = get(child, 'id');
+
+      if (relationship.options && relationship.options.polymorphic && !Ember.isNone(id)) {
+        this.addBelongsToPolymorphic(hash, key, id, child.constructor);
+      } else {
+        hash[key] = this.serializeId(id);
+      }
+    }
+  },
+
+  /**
+    @method addBelongsToPolymorphic
+    @param hash
+    @param key
+    @param id
+    @param type
+  */
+  addBelongsToPolymorphic: function(hash, key, id, type) {
+    var keyForId = this.keyForPolymorphicId(key),
+        keyForType = this.keyForPolymorphicType(key);
+    hash[keyForId] = id;
+    hash[keyForType] = this.rootForType(type);
+  },
+
+  /**
+    Adds a has-many relationship to the JSON hash being built.
+
+    The default REST semantics are to only add a has-many relationship if it
+    is embedded. If the relationship was initially loaded by ID, we assume that
+    that was done as a performance optimization, and that changes to the
+    has-many should be saved as foreign key changes on the child's belongs-to
+    relationship.
+
+    @method addHasMany
+    @param {Object} hash the JSON being built
+    @param {DS.Model} record the record being serialized
+    @param {String} key the JSON key into which the serialized relationship
+      should be saved
+    @param {Object} relationship metadata about the relationship being serialized
+  */
+
+  addHasMany: function(hash, record, key, relationship) {
+    var type = record.constructor,
+        name = relationship.key,
+        serializedHasMany = [],
+        includeType = (relationship.options && relationship.options.polymorphic),
+        manyArray, embeddedType;
+
+    // If the has-many is not embedded, there is nothing to do.
+    embeddedType = this.embeddedType(type, name);
+    if (embeddedType !== 'always') { return; }
+
+    // Get the DS.ManyArray for the relationship off the record
+    manyArray = get(record, name);
+
+    // Build up the array of serialized records
+    manyArray.forEach(function (record) {
+      serializedHasMany.push(this.serialize(record, { includeId: true, includeType: includeType }));
+    }, this);
+
+    // Set the appropriate property of the serialized JSON to the
+    // array of serialized embedded records
+    hash[key] = serializedHasMany;
+  },
+
+  /**
+    @method addType
+    @param hash
+    @param type
+  */
+  addType: function(hash, type) {
+    var keyForType = this.keyForEmbeddedType();
+    hash[keyForType] = this.rootForType(type);
+  },
+
+  // EXTRACTION
+
+  /**
+    @method extract
+    @param loader
+    @param json
+    @param type
+    @param record
+  */
+  extract: function(loader, json, type, record) {
+    var root = this.rootForType(type);
+
+    this.sideload(loader, type, json, root);
+    this.extractMeta(loader, type, json);
+
+    if (json[root]) {
+      if (record) { loader.updateId(record, json[root]); }
+      this.extractRecordRepresentation(loader, type, json[root]);
+    } else {
+      Ember.Logger.warn("Extract requested, but no data given for " + type + ". This may cause weird problems.");
+    }
+  },
+
+  /**
+    @method extractMany
+    @param loader
+    @param json
+    @param type
+    @param records
+  */
+  extractMany: function(loader, json, type, records) {
+    var root = this.rootForType(type);
+    root = this.pluralize(root);
+
+    this.sideload(loader, type, json, root);
+    this.extractMeta(loader, type, json);
+
+    if (json[root]) {
+      var objects = json[root], references = [];
+      if (records) { records = records.toArray(); }
+
+      for (var i = 0; i < objects.length; i++) {
+        if (records) { loader.updateId(records[i], objects[i]); }
+        var reference = this.extractRecordRepresentation(loader, type, objects[i]);
+        references.push(reference);
+      }
+
+      loader.populateArray(references);
+    }
+  },
+
+  /**
+    @method extractMeta
+    @param loader
+    @param type
+    @param json
+  */
+  extractMeta: function(loader, type, json) {
+    var meta = this.configOption(type, 'meta'),
+        data = json, value;
+
+    if(meta && json[meta]){
+      data = json[meta];
+    }
+
+    this.metadataMapping.forEach(function(property, key){
+      value = data[property];
+      if(!Ember.isNone(value)){
+        loader.metaForType(type, key, value);
+      }
+    });
+  },
+
+  /**
+    @method extractEmbeddedType
+    @param relationship
+    @param data
+  */
+  extractEmbeddedType: function(relationship, data) {
+    var foundType = relationship.type;
+    if(relationship.options && relationship.options.polymorphic) {
+      var key = this.keyFor(relationship),
+          keyForEmbeddedType = this.keyForEmbeddedType(key);
+
+      foundType = this.typeFromAlias(data[keyForEmbeddedType]);
+      delete data[keyForEmbeddedType];
+    }
+
+    return foundType;
+  },
+
+  /**
+    Iterates over the `json` payload and attempts to load any data
+    included alongside `root`.
+
+    The keys expected for sideloaded data are based upon the types related
+    to the root model. Recursion is used to ensure that types related to
+    related types can be loaded as well. Any custom keys specified by
+    `sideloadAs` mappings will also be respected.
+
+    @method sideload
+    @private
+    @param {DS.Store subclass} loader
+    @param {DS.Model subclass} type
+    @param {Object} json
+    @param {String} root
+  */
+  sideload: function(loader, type, json, root) {
+    var sideloadedType;
+
+    this.configureSideloadMappingForType(type);
+
+    for (var prop in json) {
+      if (!json.hasOwnProperty(prop) ||
+          prop === root ||
+          !!this.metadataMapping.get(prop)) {
+        continue;
+      }
+
+      sideloadedType = this.typeFromAlias(prop);
+      Ember.assert("Your server returned a hash with the key " + prop + " but you have no mapping for it", !!sideloadedType);
+
+      this.loadValue(loader, sideloadedType, json[prop]);
+    }
+  },
+
+  /**
+    Configures possible sideload mappings for the types related to a
+    particular model. This recursive method ensures that sideloading
+    works for related models as well.
+
+    @method configureSideloadMappingForType
+    @private
+    @param {DS.Model subclass} type
+    @param {Ember.A} configured an array of types that have already been configured
+  */
+  configureSideloadMappingForType: function(type, configured) {
+    if (!configured) {configured = Ember.A();}
+    configured.pushObject(type);
+
+    type.eachRelatedType(function(relatedType) {
+      if (!configured.contains(relatedType)) {
+        var root = this.defaultSideloadRootForType(relatedType);
+        this.aliases.set(root, relatedType);
+
+        this.configureSideloadMappingForType(relatedType, configured);
+      }
+    }, this);
+  },
+
+  /**
+    @method loadValue
+    @param loader
+    @param type
+    @param value
+  */
+  loadValue: function(loader, type, value) {
+    if (value instanceof Array) {
+      for (var i=0; i < value.length; i++) {
+        loader.sideload(type, value[i]);
+      }
+    } else {
+      loader.sideload(type, value);
+    }
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how a polymorphic association's name is converted into a key for the id.
+
+    @method keyForPolymorphicId
+    @param {String} name the association name to convert into a key
+    @return {String} the key
+  */
+  keyForPolymorphicId: function(key){
+    return key;
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how a polymorphic association's name is converted into a key for the type.
+
+    @method keyForPolymorphicType
+    @param {String} name the association name to convert into a key
+    @return {String} the key
+  */
+  keyForPolymorphicType: function(key){
+    return this.keyForPolymorphicId(key) + '_type';
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    the key used to store the type of a record of an embedded polymorphic association.
+
+    By default, this method return 'type'.
+
+    @method keyForEmbeddedType
+    @return {String} the key
+  */
+  keyForEmbeddedType: function() {
+    return 'type';
+  },
+
+  // HELPERS
+
+  /**
+    Determines the singular root name for a particular type.
+
+    This is an underscored, lowercase version of the model name.
+    For example, the type `App.UserGroup` will have the root
+    `user_group`.
+
+    @method rootForType
+    @private
+    @param {DS.Model subclass} type
+    @return {String} name of the root element
+  */
+  rootForType: function(type) {
+    var typeString = type.toString();
+
+    Ember.assert("Your model must not be anonymous. It was " + type, typeString.charAt(0) !== '(');
+
+    // use the last part of the name as the URL
+    var parts = typeString.split(".");
+    var name = parts[parts.length - 1];
+    return name.replace(/([A-Z])/g, '_$1').toLowerCase().slice(1);
+  },
+
+  /**
+    The default root name for a particular sideloaded type.
+
+    @method defaultSideloadRootForType
+    @private
+    @param {DS.Model subclass} type
+    @return {String} name of the root element
+  */
+  defaultSideloadRootForType: function(type) {
+    return this.pluralize(this.rootForType(type));
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set, merge = Ember.merge;
+var forEach = Ember.EnumerableUtils.forEach;
+
+function loaderFor(store) {
+  return {
+    load: function(type, data, prematerialized) {
+      return store.load(type, data, prematerialized);
+    },
+
+    loadMany: function(type, array) {
+      return store.loadMany(type, array);
+    },
+
+    updateId: function(record, data) {
+      return store.updateId(record, data);
+    },
+
+    populateArray: Ember.K,
+
+    sideload: function(type, data) {
+      return store.adapterForType(type).load(store, type, data);
+    },
+
+    sideloadMany: function(type, array) {
+      return store.loadMany(type, array);
+    },
+
+    prematerialize: function(reference, prematerialized) {
+      reference.prematerialized = prematerialized;
+    },
+
+    metaForType: function(type, property, data) {
+      store.metaForType(type, property, data);
+    }
+  };
+}
+
+DS.loaderFor = loaderFor;
+
+/**
+  An adapter is an object that receives requests from a store and
+  translates them into the appropriate action to take against your
+  persistence layer. The persistence layer is usually an HTTP API, but may
+  be anything, such as the browser's local storage.
+
+  ### Creating an Adapter
+
+  First, create a new subclass of `DS.Adapter`:
+
+      App.MyAdapter = DS.Adapter.extend({
+        // ...your code here
+      });
+
+  To tell your store which adapter to use, set its `adapter` property:
+
+      App.store = DS.Store.create({
+        adapter: App.MyAdapter.create()
+      });
+
+  `DS.Adapter` is an abstract base class that you should override in your
+  application to customize it for your backend. The minimum set of methods
+  that you should implement is:
+
+    * `find()`
+    * `createRecord()`
+    * `updateRecord()`
+    * `deleteRecord()`
+
+  To improve the network performance of your application, you can optimize
+  your adapter by overriding these lower-level methods:
+
+    * `findMany()`
+    * `createRecords()`
+    * `updateRecords()`
+    * `deleteRecords()`
+    * `commit()`
+
+  For an example implementation, see `DS.RestAdapter`, the
+  included REST adapter.
+
+  @class Adapter
+  @namespace DS
+  @extends Ember.Object
+  @uses DS._Mappable
+*/
+
+DS.Adapter = Ember.Object.extend(DS._Mappable, {
+
+  init: function() {
+    var serializer = get(this, 'serializer');
+
+    if (Ember.Object.detect(serializer)) {
+      serializer = serializer.create();
+      set(this, 'serializer', serializer);
+    }
+
+    this._attributesMap = this.createInstanceMapFor('attributes');
+    this._configurationsMap = this.createInstanceMapFor('configurations');
+
+    this._outstandingOperations = new Ember.MapWithDefault({
+      defaultValue: function() { return 0; }
+    });
+
+    this._dependencies = new Ember.MapWithDefault({
+      defaultValue: function() { return new Ember.OrderedSet(); }
+    });
+
+    this.registerSerializerTransforms(this.constructor, serializer, {});
+    this.registerSerializerMappings(serializer);
+  },
+
+  /**
+    Loads a payload for a record into the store.
+
+    This method asks the serializer to break the payload into
+    constituent parts, and then loads them into the store. For example,
+    if you have a payload that contains embedded records, they will be
+    extracted by the serializer and loaded into the store.
+
+    For example:
+
+        adapter.load(store, App.Person, {
+          id: 123,
+          firstName: "Yehuda",
+          lastName: "Katz",
+          occupations: [{
+            id: 345,
+            title: "Tricycle Mechanic"
+          }]
+        });
+
+    This will load the payload for the `App.Person` with ID `123` and
+    the embedded `App.Occupation` with ID `345`.
+
+    @method load
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+  */
+  load: function(store, type, payload) {
+    var loader = loaderFor(store);
+    return get(this, 'serializer').extractRecordRepresentation(loader, type, payload);
+  },
+
+  /**
+    Acknowledges that the adapter has finished creating a record.
+
+    Your adapter should call this method from `createRecord` when
+    it has saved a new record to its persistent storage and received
+    an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    creation, and you want to update the existing record with the
+    new information, pass the payload as the fourth parameter.
+
+    For example, the `RESTAdapter` saves newly created records by
+    making an Ajax request. When the server returns, the adapter
+    calls didCreateRecord. If the server returns a response body,
+    it is passed as the payload.
+
+    @method didCreateRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didCreateRecord: function(store, type, record, payload) {
+    store.didSaveRecord(record);
+
+    if (payload) {
+      var loader = DS.loaderFor(store);
+
+      loader.load = function(type, data, prematerialized) {
+        store.updateId(record, data);
+        return store.load(type, data, prematerialized);
+      };
+
+      get(this, 'serializer').extract(loader, payload, type);
+    }
+  },
+
+  /**
+    Acknowledges that the adapter has finished creating several records.
+
+    Your adapter should call this method from `createRecords` when it
+    has saved multiple created records to its persistent storage
+    received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    creation, and you want to update the existing record with the
+    new information, pass the payload as the fourth parameter.
+
+    @method didCreateRecords
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didCreateRecords: function(store, type, records, payload) {
+    records.forEach(function(record) {
+      store.didSaveRecord(record);
+    }, this);
+
+    if (payload) {
+      var loader = DS.loaderFor(store);
+      get(this, 'serializer').extractMany(loader, payload, type, records);
+    }
+  },
+
+  /**
+    @private
+
+    Acknowledges that the adapter has finished updating or deleting a record.
+
+    Your adapter should call this method from `updateRecord` or `deleteRecord`
+    when it has updated or deleted a record to its persistent storage and
+    received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    update or delete, and you want to update the existing record with the
+    new information, pass the payload as the fourth parameter.
+
+    @method didSaveRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didSaveRecord: function(store, type, record, payload) {
+    store.didSaveRecord(record);
+
+    var serializer = get(this, 'serializer');
+
+    serializer.eachEmbeddedRecord(record, function(embeddedRecord, embeddedType) {
+      if (embeddedType === 'load') { return; }
+
+      this.didSaveRecord(store, embeddedRecord.constructor, embeddedRecord);
+    }, this);
+
+    if (payload) {
+      var loader = DS.loaderFor(store);
+      serializer.extract(loader, payload, type);
+    }
+  },
+
+  /**
+    Acknowledges that the adapter has finished updating a record.
+
+    Your adapter should call this method from `updateRecord` when it
+    has updated a record to its persistent storage and received an
+    acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    update, pass the payload as the fourth parameter.
+
+    @method didUpdateRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didUpdateRecord: function() {
+    this.didSaveRecord.apply(this, arguments);
+  },
+
+  /**
+    Acknowledges that the adapter has finished deleting a record.
+
+    Your adapter should call this method from `deleteRecord` when it
+    has deleted a record from its persistent storage and received an
+    acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    deletion, pass the payload as the fourth parameter.
+
+    @method didDeleteRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didDeleteRecord: function() {
+    this.didSaveRecord.apply(this, arguments);
+  },
+
+  /**
+    Acknowledges that the adapter has finished updating or deleting
+    multiple records.
+
+    Your adapter should call this method from its `updateRecords` or
+    `deleteRecords` when it has updated or deleted multiple records
+    to its persistent storage and received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    creation, pass the payload as the fourth parameter.
+
+    @method didSaveRecords
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} records
+    @param {any} payload
+  */
+  didSaveRecords: function(store, type, records, payload) {
+    records.forEach(function(record) {
+      store.didSaveRecord(record);
+    }, this);
+
+    if (payload) {
+      var loader = DS.loaderFor(store);
+      get(this, 'serializer').extractMany(loader, payload, type);
+    }
+  },
+
+  /**
+    Acknowledges that the adapter has finished updating multiple records.
+
+    Your adapter should call this method from its `updateRecords` when
+    it has updated multiple records to its persistent storage and
+    received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    update, pass the payload as the fourth parameter.
+
+    @method didUpdateRecords
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} records
+    @param {any} payload
+  */
+  didUpdateRecords: function() {
+    this.didSaveRecords.apply(this, arguments);
+  },
+
+  /**
+    Acknowledges that the adapter has finished updating multiple records.
+
+    Your adapter should call this method from its `deleteRecords` when
+    it has deleted multiple records to its persistent storage and
+    received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    deletion, pass the payload as the fourth parameter.
+
+    @method didDeleteRecords
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} records
+    @param {any} payload
+  */
+  didDeleteRecords: function() {
+    this.didSaveRecords.apply(this, arguments);
+  },
+
+  /**
+    Loads the response to a request for a record by ID.
+
+    Your adapter should call this method from its `find` method
+    with the response from the backend.
+
+    You should pass the same ID to this method that was given
+    to your find method so that the store knows which record
+    to associate the new data with.
+
+    @method didFindRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+    @param {String} id
+  */
+  didFindRecord: function(store, type, payload, id) {
+    var loader = DS.loaderFor(store);
+
+    loader.load = function(type, data, prematerialized) {
+      prematerialized = prematerialized || {};
+      prematerialized.id = id;
+
+      return store.load(type, data, prematerialized);
+    };
+
+    get(this, 'serializer').extract(loader, payload, type);
+  },
+
+  /**
+    Loads the response to a request for all records by type.
+
+    You adapter should call this method from its `findAll`
+    method with the response from the backend.
+
+    @method didFindAll
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+  */
+  didFindAll: function(store, type, payload) {
+    var loader = DS.loaderFor(store),
+        serializer = get(this, 'serializer');
+
+    store.didUpdateAll(type);
+
+    serializer.extractMany(loader, payload, type);
+  },
+
+  /**
+    Loads the response to a request for records by query.
+
+    Your adapter should call this method from its `findQuery`
+    method with the response from the backend.
+
+    @method didFindQuery
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+    @param {DS.AdapterPopulatedRecordArray} recordArray
+  */
+  didFindQuery: function(store, type, payload, recordArray) {
+    var loader = DS.loaderFor(store);
+
+    loader.populateArray = function(data) {
+      recordArray.load(data);
+    };
+
+    get(this, 'serializer').extractMany(loader, payload, type);
+  },
+
+  /**
+    Loads the response to a request for many records by ID.
+
+    You adapter should call this method from its `findMany`
+    method with the response from the backend.
+
+    @method didFindMany
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+  */
+  didFindMany: function(store, type, payload) {
+    var loader = DS.loaderFor(store);
+
+    get(this, 'serializer').extractMany(loader, payload, type);
+  },
+
+  /**
+    Notifies the store that a request to the backend returned
+    an error.
+
+    Your adapter should call this method to indicate that the
+    backend returned an error for a request.
+
+    @method didError
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+  */
+  didError: function(store, type, record) {
+    store.recordWasError(record);
+  },
+
+  /**
+    @method dirtyRecordsForAttributeChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+    @param {String} attributeName
+    @param {any} newValue
+    @param {any} oldValue
+  */
+  dirtyRecordsForAttributeChange: function(dirtySet, record, attributeName, newValue, oldValue) {
+    if (newValue !== oldValue) {
+      // If this record is embedded, add its parent
+      // to the dirty set.
+      this.dirtyRecordsForRecordChange(dirtySet, record);
+    }
+  },
+
+  /**
+    @method dirtyRecordsForRecordChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+  */
+  dirtyRecordsForRecordChange: function(dirtySet, record) {
+    dirtySet.add(record);
+  },
+
+  /**
+    @method dirtyRecordsForBelongsToChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} child
+    @param {DS.RelationshipChange} relationship
+  */
+  dirtyRecordsForBelongsToChange: function(dirtySet, child) {
+    this.dirtyRecordsForRecordChange(dirtySet, child);
+  },
+
+  /**
+    @method dirtyRecordsForHasManyChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} parent
+    @param {DS.RelationshipChange} relationship
+  */
+  dirtyRecordsForHasManyChange: function(dirtySet, parent, relationship) {
+    this.dirtyRecordsForRecordChange(dirtySet, parent);
+  },
+
+  /**
+    @private
+
+    This method recursively climbs the superclass hierarchy and
+    registers any class-registered transforms on the adapter's
+    serializer.
+
+    Once it registers a transform for a given type, it ignores
+    subsequent transforms for the same attribute type.
+
+    @method registerSerializerTransforms
+    @param {Class} klass the DS.Adapter subclass to extract the
+      transforms from
+    @param {DS.Serializer} serializer the serializer to register
+      the transforms onto
+    @param {Object} seen a hash of attributes already seen
+  */
+  registerSerializerTransforms: function(klass, serializer, seen) {
+    var transforms = klass._registeredTransforms, superclass, prop;
+    var enumTransforms = klass._registeredEnumTransforms;
+
+    for (prop in transforms) {
+      if (!transforms.hasOwnProperty(prop) || prop in seen) { continue; }
+      seen[prop] = true;
+
+      serializer.registerTransform(prop, transforms[prop]);
+    }
+
+    for (prop in enumTransforms) {
+      if (!enumTransforms.hasOwnProperty(prop) || prop in seen) { continue; }
+      seen[prop] = true;
+
+      serializer.registerEnumTransform(prop, enumTransforms[prop]);
+    }
+
+    if (superclass = klass.superclass) {
+      this.registerSerializerTransforms(superclass, serializer, seen);
+    }
+  },
+
+  /**
+    @private
+
+    This method recursively climbs the superclass hierarchy and
+    registers any class-registered mappings on the adapter's
+    serializer.
+
+    @method registerSerializerMappings
+    @param {Class} klass the DS.Adapter subclass to extract the
+      transforms from
+    @param {DS.Serializer} serializer the serializer to register the
+      mappings onto
+  */
+  registerSerializerMappings: function(serializer) {
+    var mappings = this._attributesMap,
+        configurations = this._configurationsMap;
+
+    mappings.forEach(serializer.map, serializer);
+    configurations.forEach(serializer.configure, serializer);
+  },
+
+  /**
+    The `find()` method is invoked when the store is asked for a record that
+    has not previously been loaded. In response to `find()` being called, you
+    should query your persistence layer for a record with the given ID. Once
+    found, you can asynchronously call the store's `load()` method to load
+    the record.
+
+    Here is an example `find` implementation:
+
+        find: function(store, type, id) {
+          var url = type.url;
+          url = url.fmt(id);
+
+          jQuery.getJSON(url, function(data) {
+              // data is a hash of key/value pairs. If your server returns a
+              // root, simply do something like:
+              // store.load(type, id, data.person)
+              store.load(type, id, data);
+          });
+        }
+
+    @method find
+  */
+  find: Ember.required(Function),
+
+  /**
+    Optional
+
+    @method findAll
+    @param  store
+    @param  type
+    @param  since
+  */
+  findAll: null,
+
+  /**
+    Optional
+
+    @method findQuery
+    @param  store
+    @param  type
+    @param  query
+    @param  recordArray
+  */
+  findQuery: null,
+
+  /**
+    The class of the serializer to be used by this adapter.
+
+    @property serializer
+    @type     DS.Serializer
+    @default  DS.JSONSerializer
+  */
+  serializer: DS.JSONSerializer,
+
+  registerTransform: function(attributeType, transform) {
+    get(this, 'serializer').registerTransform(attributeType, transform);
+  },
+
+  /**
+    A public method that allows you to register an enumerated
+    type on your adapter.  This is useful if you want to utilize
+    a text representation of an integer value.
+
+    Eg: Say you want to utilize "low","medium","high" text strings
+    in your app, but you want to persist those as 0,1,2 in your backend.
+    You would first register the transform on your adapter instance:
+
+        adapter.registerEnumTransform('priority', ['low', 'medium', 'high']);
+
+    You would then refer to the 'priority' DS.attr in your model:
+
+        App.Task = DS.Model.extend({
+          priority: DS.attr('priority')
+        });
+
+    And lastly, you would set/get the text representation on your model instance,
+    but the transformed result will be the index number of the type.
+
+        App:   myTask.get('priority') => 'low'
+        Server Response / Load:  { myTask: {priority: 0} }
+
+    @method registerEnumTransform
+    @param {String} type of the transform
+    @param {Array} array of String objects to use for the enumerated values.
+      This is an ordered list and the index values will be used for the transform.
+  */
+  registerEnumTransform: function(attributeType, objects) {
+    get(this, 'serializer').registerEnumTransform(attributeType, objects);
+  },
+
+  /**
+    If the globally unique IDs for your records should be generated on the client,
+    implement the `generateIdForRecord()` method. This method will be invoked
+    each time you create a new record, and the value returned from it will be
+    assigned to the record's `primaryKey`.
+
+    Most traditional REST-like HTTP APIs will not use this method. Instead, the ID
+    of the record will be set by the server, and your adapter will update the store
+    with the new ID when it calls `didCreateRecord()`. Only implement this method if
+    you intend to generate record IDs on the client-side.
+
+    The `generateIdForRecord()` method will be invoked with the requesting store as
+    the first parameter and the newly created record as the second parameter:
+
+        generateIdForRecord: function(store, record) {
+          var uuid = App.generateUUIDWithStatisticallyLowOddsOfCollision();
+          return uuid;
+        }
+
+    @method generateIdForRecord
+    @param {DS.Store} store
+    @param {DS.Model} record
+  */
+  generateIdForRecord: null,
+
+  /**
+    Proxies to the serializer's `materialize` method.
+
+    @method materialize
+    @param {DS.Model} record
+    @param {Object}   data
+    @param {Object}   prematerialized
+  */
+  materialize: function(record, data, prematerialized) {
+    get(this, 'serializer').materialize(record, data, prematerialized);
+  },
+
+  /**
+    Proxies to the serializer's `serialize` method.
+
+    @method serialize
+    @param {DS.Model} record
+    @param {Object}   options
+  */
+  serialize: function(record, options) {
+    return get(this, 'serializer').serialize(record, options);
+  },
+
+  /**
+    Proxies to the serializer's `extractId` method.
+
+    @method extractId
+    @param {DS.Model} type  the model class
+    @param {Object}   data
+  */
+  extractId: function(type, data) {
+    return get(this, 'serializer').extractId(type, data);
+  },
+
+  /**
+    @method groupByType
+    @private
+    @param  enumerable
+  */
+  groupByType: function(enumerable) {
+    var map = Ember.MapWithDefault.create({
+      defaultValue: function() { return Ember.OrderedSet.create(); }
+    });
+
+    forEach(enumerable, function(item) {
+      map.get(item.constructor).add(item);
+    });
+
+    return map;
+  },
+
+  /**
+    The commit method is called when a transaction is being committed.
+    The `commitDetails` is a map with each record type and a list of
+    committed, updated and deleted records.
+
+    By default, this just calls the adapter's `save` method.
+    If you need more advanced handling of commits, e.g., only sending
+    certain records to the server, you can overwrite this method.
+
+    @method commit
+    @params {DS.Store}  store
+    @params {Ember.Map} commitDetails   see `DS.Transaction#commitDetails`.
+  */
+  commit: function(store, commitDetails) {
+    this.save(store, commitDetails);
+  },
+
+  /**
+    Iterates over each set of records provided in the commit details and
+    filters with `DS.Adapter#shouldSave` and then calls `createRecords`,
+    `updateRecords`, and `deleteRecords` for each set as approriate.
+
+    @method save
+    @params {DS.Store}  store
+    @params {Ember.Map} commitDetails   see `DS.Transaction#commitDetails`.
+  */
+  save: function(store, commitDetails) {
+    var adapter = this;
+
+    function filter(records) {
+      var filteredSet = Ember.OrderedSet.create();
+
+      records.forEach(function(record) {
+        if (adapter.shouldSave(record)) {
+          filteredSet.add(record);
+        }
+      });
+
+      return filteredSet;
+    }
+
+    this.groupByType(commitDetails.created).forEach(function(type, set) {
+      this.createRecords(store, type, filter(set));
+    }, this);
+
+    this.groupByType(commitDetails.updated).forEach(function(type, set) {
+      this.updateRecords(store, type, filter(set));
+    }, this);
+
+    this.groupByType(commitDetails.deleted).forEach(function(type, set) {
+      this.deleteRecords(store, type, filter(set));
+    }, this);
+  },
+
+  /**
+    Called on each record before saving. If false is returned, the record
+    will not be saved.
+
+    @method   shouldSave
+    @property {DS.Model} record
+    @return   {Boolean}  `true` to save, `false` to not. Defaults to true.
+  */
+  shouldSave: function(record) {
+    return true;
+  },
+
+  /**
+    Implement this method in a subclass to handle the creation of
+    new records.
+
+    Serializes the record and send it to the server.
+
+    This implementation should call the adapter's `didCreateRecord`
+    method on success or `didError` method on failure.
+
+    @method createRecord
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the record
+    @property {DS.Model} record
+  */
+  createRecord: Ember.required(Function),
+
+  /**
+    Creates multiple records at once.
+
+    By default, it loops over the supplied array and calls `createRecord`
+    on each. May be overwritten to improve performance and reduce the number
+    of server requests.
+
+    @method createRecords
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the records
+    @property {Array[DS.Model]} records
+  */
+  createRecords: function(store, type, records) {
+    records.forEach(function(record) {
+      this.createRecord(store, type, record);
+    }, this);
+  },
+
+  /**
+    Implement this method in a subclass to handle the updating of
+    a record.
+
+    Serializes the record update and send it to the server.
+
+    @method updateRecord
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the record
+    @property {DS.Model} record
+  */
+  updateRecord: Ember.required(Function),
+
+  /**
+    Updates multiple records at once.
+
+    By default, it loops over the supplied array and calls `updateRecord`
+    on each. May be overwritten to improve performance and reduce the number
+    of server requests.
+
+    @method updateRecords
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the records
+    @property {Array[DS.Model]} records
+  */
+  updateRecords: function(store, type, records) {
+    records.forEach(function(record) {
+      this.updateRecord(store, type, record);
+    }, this);
+  },
+
+  /**
+    Implement this method in a subclass to handle the deletion of
+    a record.
+
+    Sends a delete request for the record to the server.
+
+    @method deleteRecord
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the record
+    @property {DS.Model} record
+  */
+  deleteRecord: Ember.required(Function),
+
+  /**
+    Delete multiple records at once.
+
+    By default, it loops over the supplied array and calls `deleteRecord`
+    on each. May be overwritten to improve performance and reduce the number
+    of server requests.
+
+    @method deleteRecords
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the records
+    @property {Array[DS.Model]} records
+  */
+  deleteRecords: function(store, type, records) {
+    records.forEach(function(record) {
+      this.deleteRecord(store, type, record);
+    }, this);
+  },
+
+  /**
+    Find multiple records at once.
+
+    By default, it loops over the provided ids and calls `find` on each.
+    May be overwritten to improve performance and reduce the number of
+    server requests.
+
+    @method findMany
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the records
+    @property {Array}    ids
+  */
+  findMany: function(store, type, ids) {
+    ids.forEach(function(id) {
+      this.find(store, type, id);
+    }, this);
+  }
+});
+
+DS.Adapter.reopenClass({
+
+  /**
+    Registers a custom attribute transform for the adapter class
+
+    The `transform` property is an object with a `serialize` and
+    `deserialize` property. These are each functions that respectively
+    serialize the data to send to the backend or deserialize it for
+    use on the client.
+
+    @method registerTransform
+    @static
+    @property {DS.String} attributeType
+    @property {Object}    transform
+  */
+  registerTransform: function(attributeType, transform) {
+    var registeredTransforms = this._registeredTransforms || {};
+
+    registeredTransforms[attributeType] = transform;
+
+    this._registeredTransforms = registeredTransforms;
+  },
+
+  /**
+    Registers a custom enumerable transform for the adapter class
+
+    @method registerEnumTransform
+    @static
+    @property {DS.String} attributeType
+    @property objects
+  */
+  registerEnumTransform: function(attributeType, objects) {
+    var registeredEnumTransforms = this._registeredEnumTransforms || {};
+
+    registeredEnumTransforms[attributeType] = objects;
+
+    this._registeredEnumTransforms = registeredEnumTransforms;
+  },
+
+  /**
+    Set adapter attributes for a DS.Model class.
+
+    @method map
+    @static
+    @property {DS.Model} type   the DS.Model class
+    @property {Object}   attributes
+  */
+  map: DS._Mappable.generateMapFunctionFor('attributes', function(key, newValue, map) {
+    var existingValue = map.get(key);
+
+    merge(existingValue, newValue);
+  }),
+
+  /**
+    Set configuration options for a DS.Model class.
+
+    @method configure
+    @static
+    @property {DS.Model} type   the DS.Model class
+    @property {Object}   configuration
+  */
+  configure: DS._Mappable.generateMapFunctionFor('configurations', function(key, newValue, map) {
+    var existingValue = map.get(key);
+
+    // If a mapping configuration is provided, peel it off and apply it
+    // using the DS.Adapter.map API.
+    var mappings = newValue && newValue.mappings;
+    if (mappings) {
+      this.map(key, mappings);
+      delete newValue.mappings;
+    }
+
+    merge(existingValue, newValue);
+  }),
+
+  /**
+    Resolved conflicts in configuration settings.
+
+    Calls `Ember.merge` by default.
+
+    @method resolveMapConflict
+    @static
+    @property oldValue
+    @property newValue
+  */
+  resolveMapConflict: function(oldValue, newValue) {
+    merge(newValue, oldValue);
+
+    return newValue;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+/**
+  @class FixtureSerializer
+  @namespace DS
+  @extends DS.Serializer
+*/
+DS.FixtureSerializer = DS.Serializer.extend({
+
+  /**
+    @method deserializeValue
+    @param  value
+    @param  attributeType
+  */
+  deserializeValue: function(value, attributeType) {
+    return value;
+  },
+
+  /**
+    @method serializeValue
+    @param  value
+    @param  attributeType
+  */
+  serializeValue: function(value, attributeType) {
+    return value;
+  },
+
+  /**
+    @method addId
+    @param  data
+    @param  key
+    @param  id
+  */
+  addId: function(data, key, id) {
+    data[key] = id;
+  },
+
+  /**
+    @method addAttribute
+    @param hash
+    @param key
+    @param value
+  */
+  addAttribute: function(hash, key, value) {
+    hash[key] = value;
+  },
+
+  /**
+    @method addBelongsTo
+    @param hash
+    @param record
+    @param key
+    @param relationship
+  */
+  addBelongsTo: function(hash, record, key, relationship) {
+    var id = get(record, relationship.key+'.id');
+    if (!Ember.isNone(id)) { hash[key] = id; }
+  },
+
+  /**
+    @method addHasMany
+    @param hash
+    @param record
+    @param key
+    @param relationship
+  */
+  addHasMany: function(hash, record, key, relationship) {
+    var ids = get(record, relationship.key).map(function(item) {
+      return item.get('id');
+    });
+
+    hash[relationship.key] = ids;
+  },
+
+  /**
+    @method extract
+    @param loader
+    @param fixture
+    @param type
+    @param record
+  */
+  extract: function(loader, fixture, type, record) {
+    if (record) { loader.updateId(record, fixture); }
+    this.extractRecordRepresentation(loader, type, fixture);
+  },
+
+  /**
+    @method extractMany
+    @param loader
+    @param fixtures
+    @param type
+    @param records
+  */
+  extractMany: function(loader, fixtures, type, records) {
+    var objects = fixtures, references = [];
+    if (records) { records = records.toArray(); }
+
+    for (var i = 0; i < objects.length; i++) {
+      if (records) { loader.updateId(records[i], objects[i]); }
+      var reference = this.extractRecordRepresentation(loader, type, objects[i]);
+      references.push(reference);
+    }
+
+    loader.populateArray(references);
+  },
+
+  /**
+    @method extractId
+    @param type
+    @param hash
+  */
+  extractId: function(type, hash) {
+    var primaryKey = this._primaryKey(type);
+
+    if (hash.hasOwnProperty(primaryKey)) {
+      // Ensure that we coerce IDs to strings so that record
+      // IDs remain consistent between application runs; especially
+      // if the ID is serialized and later deserialized from the URL,
+      // when type information will have been lost.
+      return hash[primaryKey]+'';
+    } else {
+      return null;
+    }
+  },
+
+  /**
+    @method extractAttribute
+    @param type
+    @param hash
+    @param attributeName
+  */
+  extractAttribute: function(type, hash, attributeName) {
+    var key = this._keyForAttributeName(type, attributeName);
+    return hash[key];
+  },
+
+  /**
+    @method extractHasMany
+    @param type
+    @param hash
+    @param key
+  */
+  extractHasMany: function(type, hash, key) {
+    return hash[key];
+  },
+
+  /**
+    @method extractBelongsTo
+    @param type
+    @param hash
+    @param key
+  */
+  extractBelongsTo: function(type, hash, key) {
+    var val = hash[key];
+    if (val != null) {
+      val = val + '';
+    }
+    return val;
+  },
+
+  /**
+    @method extractBelongsToPolymorphic
+    @method type
+    @method hash
+    @method key
+  */
+  extractBelongsToPolymorphic: function(type, hash, key) {
+    var keyForId = this.keyForPolymorphicId(key),
+        keyForType,
+        id = hash[keyForId];
+
+    if (id) {
+      keyForType = this.keyForPolymorphicType(key);
+      return {id: id, type: hash[keyForType]};
+    }
+
+    return null;
+  },
+
+  /**
+    @method keyForPolymorphicId
+    @param key
+  */
+  keyForPolymorphicId: function(key) {
+    return key;
+  },
+
+  /**
+    @method keyForPolymorphicType
+    @param key
+  */
+  keyForPolymorphicType: function(key) {
+    return key + '_type';
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, fmt = Ember.String.fmt,
+    indexOf = Ember.EnumerableUtils.indexOf;
+
+/**
+  `DS.FixtureAdapter` is an adapter that loads records from memory.
+  Its primarily used for development and testing. You can also use
+  `DS.FixtureAdapter` while working on the API but are not ready to
+  integrate yet. It is a fully functioning adapter. All CRUD methods
+  are implemented. You can also implement query logic that a remote
+  system would do. Its possible to do develop your entire application
+  with `DS.FixtureAdapter`.
+
+  @class FixtureAdapter
+  @namespace DS
+  @extends DS.Adapter
+*/
+DS.FixtureAdapter = DS.Adapter.extend({
+
+  simulateRemoteResponse: true,
+
+  latency: 50,
+
+  serializer: DS.FixtureSerializer,
+
+  /**
+    Implement this method in order to provide data associated with a type
+
+    @method fixturesForType
+    @param  type
+  */
+  fixturesForType: function(type) {
+    if (type.FIXTURES) {
+      var fixtures = Ember.A(type.FIXTURES);
+      return fixtures.map(function(fixture){
+        var fixtureIdType = typeof fixture.id;
+        if(fixtureIdType !== "number" && fixtureIdType !== "string"){
+          throw new Error(fmt('the id property must be defined as a number or string for fixture %@', [fixture]));
+        }
+        fixture.id = fixture.id + '';
+        return fixture;
+      });
+    }
+    return null;
+  },
+
+  /**
+    Implement this method in order to query fixtures data
+
+    @method queryFixtures
+    @param  fixture
+    @param  query
+    @param  type
+  */
+  queryFixtures: function(fixtures, query, type) {
+    Ember.assert('Not implemented: You must override the DS.FixtureAdapter::queryFixtures method to support querying the fixture store.');
+  },
+
+  /**
+    @method updateFixtures
+    @param  type
+    @param  fixture
+  */
+  updateFixtures: function(type, fixture) {
+    if(!type.FIXTURES) {
+      type.FIXTURES = [];
+    }
+
+    var fixtures = type.FIXTURES;
+
+    this.deleteLoadedFixture(type, fixture);
+
+    fixtures.push(fixture);
+  },
+
+  /**
+    Implement this method in order to provide provide json for CRUD methods
+
+    @method mockJSON
+    @param  type
+    @param  record
+  */
+  mockJSON: function(type, record) {
+    return this.serialize(record, { includeId: true });
+  },
+
+  /**
+    @method generateIdForRecord
+    @param  store
+    @param  record
+  */
+  generateIdForRecord: function(store, record) {
+    return Ember.guidFor(record);
+  },
+
+  /**
+    @method find
+    @param  store
+    @param  type
+    @param  id
+  */
+  find: function(store, type, id) {
+    var fixtures = this.fixturesForType(type),
+        fixture;
+
+    Ember.warn("Unable to find fixtures for model type " + type.toString(), fixtures);
+
+    if (fixtures) {
+      fixture = Ember.A(fixtures).findProperty('id', id);
+    }
+
+    if (fixture) {
+      this.simulateRemoteCall(function() {
+        this.didFindRecord(store, type, fixture, id);
+      }, this);
+    }
+  },
+
+  /**
+    @method findMany
+    @param  store
+    @param  type
+    @param  ids
+  */
+  findMany: function(store, type, ids) {
+    var fixtures = this.fixturesForType(type);
+
+    Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures);
+
+    if (fixtures) {
+      fixtures = fixtures.filter(function(item) {
+        return indexOf(ids, item.id) !== -1;
+      });
+    }
+
+    if (fixtures) {
+      this.simulateRemoteCall(function() {
+        this.didFindMany(store, type, fixtures);
+      }, this);
+    }
+  },
+
+  /**
+    @method findAll
+    @param  store
+    @param  type
+  */
+  findAll: function(store, type) {
+    var fixtures = this.fixturesForType(type);
+
+    Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures);
+
+    this.simulateRemoteCall(function() {
+      this.didFindAll(store, type, fixtures);
+    }, this);
+  },
+
+  /**
+    @method findQuery
+    @param  store
+    @param  type
+    @param  query
+    @param  array
+  */
+  findQuery: function(store, type, query, array) {
+    var fixtures = this.fixturesForType(type);
+
+    Ember.assert("Unable to find fixtures for model type "+type.toString(), !!fixtures);
+
+    fixtures = this.queryFixtures(fixtures, query, type);
+
+    if (fixtures) {
+      this.simulateRemoteCall(function() {
+        this.didFindQuery(store, type, fixtures, array);
+      }, this);
+    }
+  },
+
+  /**
+    @method createRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  createRecord: function(store, type, record) {
+    var fixture = this.mockJSON(type, record);
+
+    this.updateFixtures(type, fixture);
+
+    this.simulateRemoteCall(function() {
+      this.didCreateRecord(store, type, record, fixture);
+    }, this);
+  },
+
+  /**
+    @method updateRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  updateRecord: function(store, type, record) {
+    var fixture = this.mockJSON(type, record);
+
+    this.updateFixtures(type, fixture);
+
+    this.simulateRemoteCall(function() {
+      this.didUpdateRecord(store, type, record, fixture);
+    }, this);
+  },
+
+  /**
+    @method deleteRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  deleteRecord: function(store, type, record) {
+    var fixture = this.mockJSON(type, record);
+
+    this.deleteLoadedFixture(type, fixture);
+
+    this.simulateRemoteCall(function() {
+      this.didDeleteRecord(store, type, record);
+    }, this);
+  },
+
+  /*
+    @method deleteLoadedFixture
+    @private
+    @param type
+    @param record
+  */
+  deleteLoadedFixture: function(type, record) {
+    var existingFixture = this.findExistingFixture(type, record);
+
+    if(existingFixture) {
+      var index = indexOf(type.FIXTURES, existingFixture);
+      type.FIXTURES.splice(index, 1);
+      return true;
+    }
+  },
+
+  /*
+    @method findExistingFixture
+    @private
+    @param type
+    @param record
+  */
+  findExistingFixture: function(type, record) {
+    var fixtures = this.fixturesForType(type);
+    var id = this.extractId(type, record);
+
+    return this.findFixtureById(fixtures, id);
+  },
+
+  /*
+    @method findFixtureById
+    @private
+    @param type
+    @param record
+  */
+  findFixtureById: function(fixtures, id) {
+    return Ember.A(fixtures).find(function(r) {
+      if(''+get(r, 'id') === ''+id) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+  },
+
+  /*
+    @method simulateRemoteCall
+    @private
+    @param callback
+    @param context
+  */
+  simulateRemoteCall: function(callback, context) {
+    if (get(this, 'simulateRemoteResponse')) {
+      // Schedule with setTimeout
+      Ember.run.later(context, callback, get(this, 'latency'));
+    } else {
+      // Asynchronous, but at the of the runloop with zero latency
+      Ember.run.once(context, callback);
+    }
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get;
+
+/**
+  @class RESTSerializer
+  @namespace DS
+  @extends DS.Serializer
+*/
+DS.RESTSerializer = DS.JSONSerializer.extend({
+
+  /**
+    @method keyForAttributeName
+    @param type
+    @param name
+  */
+  keyForAttributeName: function(type, name) {
+    return Ember.String.decamelize(name);
+  },
+
+  /**
+    @method keyForBelongsTo
+    @param type
+    @param name
+  */
+  keyForBelongsTo: function(type, name) {
+    var key = this.keyForAttributeName(type, name);
+
+    if (this.embeddedType(type, name)) {
+      return key;
+    }
+
+    return key + "_id";
+  },
+
+  /**
+    @method keyForHasMany
+    @param type
+    @param name
+  */
+  keyForHasMany: function(type, name) {
+    var key = this.keyForAttributeName(type, name);
+
+    if (this.embeddedType(type, name)) {
+      return key;
+    }
+
+    return this.singularize(key) + "_ids";
+  },
+
+  /**
+    @method keyForPolymorphicId
+    @param key
+  */
+  keyForPolymorphicId: function(key) {
+    return key;
+  },
+
+  /**
+    @method keyForPolymorphicType
+    @param key
+  */
+  keyForPolymorphicType: function(key) {
+    return key.replace(/_id$/, '_type');
+  },
+
+  /**
+    @method extractValidationErrors
+    @param type
+    @param json
+  */
+  extractValidationErrors: function(type, json) {
+    var errors = {};
+
+    get(type, 'attributes').forEach(function(name) {
+      var key = this._keyForAttributeName(type, name);
+      if (json['errors'].hasOwnProperty(key)) {
+        errors[name] = json['errors'][key];
+      }
+    }, this);
+
+    return errors;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+DS.rejectionHandler = function(reason) {
+  Ember.Logger.assert([reason, reason.message, reason.stack]);
+
+  throw reason;
+};
+
+/**
+  The REST adapter allows your store to communicate with an HTTP server by
+  transmitting JSON via XHR. Most Ember.js apps that consume a JSON API
+  should use the REST adapter.
+
+  This adapter is designed around the idea that the JSON exchanged with
+  the server should be conventional.
+
+  ## JSON Structure
+
+  The REST adapter expects the JSON returned from your server to follow
+  these conventions.
+
+  ### Object Root
+
+  The JSON payload should be an object that contains the record inside a
+  root property. For example, in response to a `GET` request for
+  `/posts/1`, the JSON should look like this:
+
+  ```js
+  {
+    "post": {
+      title: "I'm Running to Reform the W3C's Tag",
+      author: "Yehuda Katz"
+    }
+  }
+  ```
+
+  ### Conventional Names
+
+  Attribute names in your JSON payload should be the underscored versions of
+  the attributes in your Ember.js models.
+
+  For example, if you have a `Person` model:
+
+  ```js
+  App.Person = DS.Model.extend({
+    firstName: DS.attr('string'),
+    lastName: DS.attr('string'),
+    occupation: DS.attr('string')
+  });
+  ```
+
+  The JSON returned should look like this:
+
+  ```js
+  {
+    "person": {
+      "first_name": "Barack",
+      "last_name": "Obama",
+      "occupation": "President"
+    }
+  }
+  ```
+
+  ## Customization
+
+  ### Endpoint path customization
+
+  Endpoint paths can be prefixed with a `namespace` by setting the namespace
+  property on the adapter:
+
+  ```js
+  DS.RESTAdapter.reopen({
+    namespace: 'api/1'
+  });
+  ```
+  Requests for `App.Person` would now target `/api/1/people/1`.
+
+  ### Host customization
+
+  An adapter can target other hosts by setting the `url` property.
+
+  ```js
+  DS.RESTAdapter.reopen({
+    url: 'https://api.example.com'
+  });
+  ```
+
+  ### Headers customization
+
+  Some APIs require HTTP headers, eg to provide an API key. An array of
+  headers can be added to the adapter which are passed with every request:
+
+  ```js
+  DS.RESTAdapter.reopen({
+    headers: {
+      "API_KEY": "secret key",
+      "ANOTHER_HEADER": "asdsada"
+    }
+  });
+  ```
+
+  @class RESTAdapter
+  @constructor
+  @namespace DS
+  @extends DS.Adapter
+*/
+DS.RESTAdapter = DS.Adapter.extend({
+  namespace: null,
+  bulkCommit: false,
+  since: 'since',
+
+  serializer: DS.RESTSerializer,
+
+  /**
+    Called on each record before saving. If false is returned, the record
+    will not be saved.
+
+    By default, this method returns `true` except when the record is embedded.
+
+    @method   shouldSave
+    @property {DS.Model} record
+    @return   {Boolean}  `true` to save, `false` to not. Defaults to true.
+  */
+  shouldSave: function(record) {
+    var reference = get(record, '_reference');
+
+    return !reference.parent;
+  },
+
+  /**
+    @method dirtyRecordsForRecordChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+  */
+  dirtyRecordsForRecordChange: function(dirtySet, record) {
+    this._dirtyTree(dirtySet, record);
+  },
+
+  /**
+    @method dirtyRecordsForHasManyChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+    @param {DS.RelationshipChange} relationship
+  */
+  dirtyRecordsForHasManyChange: function(dirtySet, record, relationship) {
+    var embeddedType = get(this, 'serializer').embeddedType(record.constructor, relationship.secondRecordName);
+
+    if (embeddedType === 'always') {
+      relationship.childReference.parent = relationship.parentReference;
+      this._dirtyTree(dirtySet, record);
+    }
+  },
+
+  /**
+    @method _dirtyTree
+    @private
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+  */
+  _dirtyTree: function(dirtySet, record) {
+    dirtySet.add(record);
+
+    get(this, 'serializer').eachEmbeddedRecord(record, function(embeddedRecord, embeddedType) {
+      if (embeddedType !== 'always') { return; }
+      if (dirtySet.has(embeddedRecord)) { return; }
+      this._dirtyTree(dirtySet, embeddedRecord);
+    }, this);
+
+    var reference = record.get('_reference');
+
+    if (reference.parent) {
+      var store = get(record, 'store');
+      var parent = store.recordForReference(reference.parent);
+      this._dirtyTree(dirtySet, parent);
+    }
+  },
+
+  /**
+    Serializes the record and sends it to the server.
+
+    By default, the record is serialized with the adapter's `serialize`
+    method and assigned to a root obtained by the `rootForType` method.
+
+    The url is created with `buildURL` and then called as a 'POST' request
+    with the adapter's `ajax` method.
+
+    If successful, the adapter's `didCreateRecord` method is called,
+    otherwise `didError`
+
+    @method createRecord
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the record
+    @property {DS.Model} record
+  */
+  createRecord: function(store, type, record) {
+    var root = this.rootForType(type);
+    var adapter = this;
+    var data = {};
+
+    data[root] = this.serialize(record, { includeId: true });
+
+    return this.ajax(this.buildURL(root), "POST", {
+      data: data
+    }).then(function(json){
+      adapter.didCreateRecord(store, type, record, json);
+    }, function(xhr) {
+      adapter.didError(store, type, record, xhr);
+      throw xhr;
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method createRecords
+    @param  store
+    @param  type
+    @param  records
+  */
+  createRecords: function(store, type, records) {
+    var adapter = this;
+
+    if (get(this, 'bulkCommit') === false) {
+      return this._super(store, type, records);
+    }
+
+    var root = this.rootForType(type),
+        plural = this.pluralize(root);
+
+    var data = {};
+    data[plural] = [];
+    records.forEach(function(record) {
+      data[plural].push(this.serialize(record, { includeId: true }));
+    }, this);
+
+    return this.ajax(this.buildURL(root), "POST", {
+      data: data
+    }).then(function(json) {
+      adapter.didCreateRecords(store, type, records, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method updateRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  updateRecord: function(store, type, record) {
+    var id, root, adapter, data;
+
+    id = get(record, 'id');
+    root = this.rootForType(type);
+    adapter = this;
+
+    data = {};
+    data[root] = this.serialize(record);
+
+    return this.ajax(this.buildURL(root, id, record), "PUT",{
+      data: data
+    }).then(function(json){
+      adapter.didUpdateRecord(store, type, record, json);
+    }, function(xhr) {
+      adapter.didError(store, type, record, xhr);
+      throw xhr;
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method updateRecords
+    @param  store
+    @param  type
+    @param  records
+  */
+  updateRecords: function(store, type, records) {
+    var root, plural, adapter, data;
+
+    if (get(this, 'bulkCommit') === false) {
+      return this._super(store, type, records);
+    }
+
+    root = this.rootForType(type);
+    plural = this.pluralize(root);
+    adapter = this;
+
+    data = {};
+
+    data[plural] = [];
+
+    records.forEach(function(record) {
+      data[plural].push(this.serialize(record, { includeId: true }));
+    }, this);
+
+    return this.ajax(this.buildURL(root, "bulk"), "PUT", {
+      data: data
+    }).then(function(json) {
+      adapter.didUpdateRecords(store, type, records, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method deleteRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  deleteRecord: function(store, type, record) {
+    var id, root, adapter;
+
+    id = get(record, 'id');
+    root = this.rootForType(type);
+    adapter = this;
+
+    return this.ajax(this.buildURL(root, id, record), "DELETE").then(function(json){
+      adapter.didDeleteRecord(store, type, record, json);
+    }, function(xhr){
+      adapter.didError(store, type, record, xhr);
+      throw xhr;
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method deleteRecords
+    @param  store
+    @param  type
+    @param  records
+  */
+  deleteRecords: function(store, type, records) {
+    var root, plural, serializer, adapter, data;
+
+    if (get(this, 'bulkCommit') === false) {
+      return this._super(store, type, records);
+    }
+
+    root = this.rootForType(type);
+    plural = this.pluralize(root);
+    serializer = get(this, 'serializer');
+    adapter = this;
+
+    data = {};
+
+    data[plural] = [];
+    records.forEach(function(record) {
+      data[plural].push(serializer.serializeId( get(record, 'id') ));
+    });
+
+    return this.ajax(this.buildURL(root, 'bulk'), "DELETE", {
+      data: data
+    }).then(function(json){
+      adapter.didDeleteRecords(store, type, records, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method find
+    @param  store
+    @param  type
+    @param  id
+  */
+  find: function(store, type, id) {
+    var root = this.rootForType(type), adapter = this;
+
+    return this.ajax(this.buildURL(root, id), "GET").
+      then(function(json){
+        adapter.didFindRecord(store, type, json, id);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method findAll
+    @param  store
+    @param  type
+    @param  since
+  */
+  findAll: function(store, type, since) {
+    var root, adapter;
+
+    root = this.rootForType(type);
+    adapter = this;
+
+    return this.ajax(this.buildURL(root), "GET",{
+      data: this.sinceQuery(since)
+    }).then(function(json) {
+      adapter.didFindAll(store, type, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method findQuery
+    @param  store
+    @param  type
+    @param  query
+    @param  recordArray
+  */
+  findQuery: function(store, type, query, recordArray) {
+    var root = this.rootForType(type),
+        adapter = this;
+
+    return this.ajax(this.buildURL(root), "GET", {
+      data: query
+    }).then(function(json){
+      adapter.didFindQuery(store, type, json, recordArray);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method findMany
+    @param  store
+    @param  type
+    @param  ids
+    @param  owner
+  */
+  findMany: function(store, type, ids, owner) {
+    var root = this.rootForType(type),
+    adapter = this;
+
+    ids = this.serializeIds(ids);
+
+    return this.ajax(this.buildURL(root), "GET", {
+      data: {ids: ids}
+    }).then(function(json) {
+      adapter.didFindMany(store, type, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    This method serializes a list of IDs using `serializeId`
+
+    @method serializeIds
+    @private
+    @param  ids
+    @return {Array} an array of serialized IDs
+  */
+  serializeIds: function(ids) {
+    var serializer = get(this, 'serializer');
+
+    return Ember.EnumerableUtils.map(ids, function(id) {
+      return serializer.serializeId(id);
+    });
+  },
+
+  /**
+    @method didError
+    @private
+    @param  store
+    @param  type
+    @param  record
+    @param  xhr
+  */
+  didError: function(store, type, record, xhr) {
+    if (xhr.status === 422) {
+      var json = JSON.parse(xhr.responseText),
+          serializer = get(this, 'serializer'),
+          errors = serializer.extractValidationErrors(type, json);
+
+      store.recordWasInvalid(record, errors);
+    } else {
+      this._super.apply(this, arguments);
+    }
+  },
+
+  /**
+    @method ajax
+    @private
+    @param  url
+    @param  type
+    @param  hash
+  */
+  ajax: function(url, type, hash) {
+    var adapter = this;
+
+    return new Ember.RSVP.Promise(function(resolve, reject) {
+      hash = hash || {};
+      hash.url = url;
+      hash.type = type;
+      hash.dataType = 'json';
+      hash.context = adapter;
+
+      if (hash.data && type !== 'GET') {
+        hash.contentType = 'application/json; charset=utf-8';
+        hash.data = JSON.stringify(hash.data);
+      }
+
+      if (adapter.headers !== undefined) {
+        var headers = adapter.headers;
+        hash.beforeSend = function (xhr) {
+          Ember.keys(headers).forEach(function(key) {
+            xhr.setRequestHeader(key, headers[key]);
+          });
+        };
+      }
+
+      hash.success = function(json) {
+        Ember.run(null, resolve, json);
+      };
+
+      hash.error = function(jqXHR, textStatus, errorThrown) {
+        if (jqXHR) {
+          jqXHR.then = null;
+        }
+
+        Ember.run(null, reject, jqXHR);
+      };
+
+      Ember.$.ajax(hash);
+    });
+  },
+
+  /**
+    @property url
+    @default ''
+  */
+  url: "",
+
+  /**
+    @method rootForType
+    @private
+    @param type
+  */
+  rootForType: function(type) {
+    var serializer = get(this, 'serializer');
+    return serializer.rootForType(type);
+  },
+
+  /**
+    @method pluralize
+    @private
+    @param string
+  */
+  pluralize: function(string) {
+    var serializer = get(this, 'serializer');
+    return serializer.pluralize(string);
+  },
+
+  /**
+    @method buildURL
+    @private
+    @param root
+    @param suffix
+    @param record
+  */
+  buildURL: function(root, suffix, record) {
+    var url = [this.url];
+
+    Ember.assert("Namespace URL (" + this.namespace + ") must not start with slash", !this.namespace || this.namespace.toString().charAt(0) !== "/");
+    Ember.assert("Root URL (" + root + ") must not start with slash", !root || root.toString().charAt(0) !== "/");
+    Ember.assert("URL suffix (" + suffix + ") must not start with slash", !suffix || suffix.toString().charAt(0) !== "/");
+
+    if (!Ember.isNone(this.namespace)) {
+      url.push(this.namespace);
+    }
+
+    url.push(this.pluralize(root));
+    if (suffix !== undefined) {
+      url.push(suffix);
+    }
+
+    return url.join("/");
+  },
+
+  /**
+    @method sinceQuery
+    @private
+    @param since
+  */
+  sinceQuery: function(since) {
+    var query = {};
+    query[get(this, 'since')] = since;
+    return since ? query : null;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+DS.Model.reopen({
+
+  /**
+   Provides info about the model for debugging purposes
+   by grouping the properties into more semantic groups.
+
+   Meant to be used by debugging tools such as the Chrome Ember Extension.
+
+   - Groups all attributes in "Attributes" group.
+   - Groups all belongsTo relationships in "Belongs To" group.
+   - Groups all hasMany relationships in "Has Many" group.
+   - Groups all flags in "Flags" group.
+   - Flags relationship CPs as expensive properties.
+  */
+  _debugInfo: function() {
+    var attributes = ['id'],
+        relationships = { belongsTo: [], hasMany: [] },
+        expensiveProperties = [];
+
+    this.eachAttribute(function(name, meta) {
+      attributes.push(name);
+    }, this);
+
+    this.eachRelationship(function(name, relationship) {
+      relationships[relationship.kind].push(name);
+      expensiveProperties.push(name);
+    });
+
+    var groups = [
+      {
+        name: 'Attributes',
+        properties: attributes,
+        expand: true,
+      },
+      {
+        name: 'Belongs To',
+        properties: relationships.belongsTo,
+        expand: true
+      },
+      {
+        name: 'Has Many',
+        properties: relationships.hasMany,
+        expand: true
+      },
+      {
+        name: 'Flags',
+        properties: ['isLoaded', 'isDirty', 'isSaving', 'isDeleted', 'isError', 'isNew', 'isValid']
+      }
+    ];
+
+    return {
+      propertyInfo: {
+        // include all other mixins / properties (not just the grouped ones)
+        includeOtherProperties: true,
+        groups: groups,
+        // don't pre-calculate unless cached
+        expensiveProperties: expensiveProperties
+      }
+    };
+  }
+
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+//Copyright (C) 2011 by Living Social, Inc.
+
+//Permission is hereby granted, free of charge, to any person obtaining a copy of
+//this software and associated documentation files (the "Software"), to deal in
+//the Software without restriction, including without limitation the rights to
+//use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+//of the Software, and to permit persons to whom the Software is furnished to do
+//so, subject to the following conditions:
+
+//The above copyright notice and this permission notice shall be included in all
+//copies or substantial portions of the Software.
+
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//SOFTWARE.
+
+/**
+  Ember Data
+
+  @module ember-data
+  @main ember-data
+*/
+
+})();
+
+
+})();
diff --git a/vendor/assets/ember/development/ember-template-compiler.js b/vendor/assets/ember/development/ember-template-compiler.js
new file mode 100644
index 000000000..780391b49
--- /dev/null
+++ b/vendor/assets/ember/development/ember-template-compiler.js
@@ -0,0 +1,338 @@
+// Fetched from channel: tags/v1.6.1, with url http://builds.emberjs.com/tags/v1.6.1/ember-template-compiler.js
+// Fetched on: 2024-01-19T09:48:19Z
+/*!
+ * @overview  Ember - JavaScript Application Framework
+ * @copyright Copyright 2011-2014 Tilde Inc. and contributors
+ *            Portions Copyright 2006-2011 Strobe Inc.
+ *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
+ * @license   Licensed under MIT license
+ *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
+ * @version   1.6.1
+ */
+
+
+(function() {
+var Ember = { assert: function() {}, FEATURES: { isEnabled: function() {} } };
+/**
+@module ember
+@submodule ember-handlebars-compiler
+*/
+
+
+
+// ES6Todo: you'll need to import debugger once debugger is es6'd.
+if (typeof Ember.assert === 'undefined')   { Ember.assert = function(){}; };
+if (typeof Ember.FEATURES === 'undefined') { Ember.FEATURES = { isEnabled: function(){} }; };
+
+var objectCreate = Object.create || function(parent) {
+  function F() {}
+  F.prototype = parent;
+  return new F();
+};
+
+// set up for circular references later
+var View, Component;
+
+// ES6Todo: when ember-debug is es6'ed import this.
+// var emberAssert = Ember.assert;
+var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
+if (!Handlebars && typeof require === 'function') {
+  Handlebars = require('handlebars');
+}
+
+Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include " +
+             "a SCRIPT tag in the HTML HEAD linking to the Handlebars file " +
+             "before you link to Ember.", Handlebars);
+
+Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1, " +
+             "COMPILER_REVISION expected: 4, got: " +  Handlebars.COMPILER_REVISION +
+             " - Please note: Builds of master may have other COMPILER_REVISION values.",
+             Handlebars.COMPILER_REVISION === 4);
+
+/**
+  Prepares the Handlebars templating library for use inside Ember's view
+  system.
+
+  The `Ember.Handlebars` object is the standard Handlebars library, extended to
+  use Ember's `get()` method instead of direct property access, which allows
+  computed properties to be used inside templates.
+
+  To create an `Ember.Handlebars` template, call `Ember.Handlebars.compile()`.
+  This will return a function that can be used by `Ember.View` for rendering.
+
+  @class Handlebars
+  @namespace Ember
+*/
+var EmberHandlebars = Ember.Handlebars = objectCreate(Handlebars);
+
+/**
+  Register a bound helper or custom view helper.
+
+  ## Simple bound helper example
+
+  ```javascript
+  Ember.Handlebars.helper('capitalize', function(value) {
+    return value.toUpperCase();
+  });
+  ```
+
+  The above bound helper can be used inside of templates as follows:
+
+  ```handlebars
+  {{capitalize name}}
+  ```
+
+  In this case, when the `name` property of the template's context changes,
+  the rendered value of the helper will update to reflect this change.
+
+  For more examples of bound helpers, see documentation for
+  `Ember.Handlebars.registerBoundHelper`.
+
+  ## Custom view helper example
+
+  Assuming a view subclass named `App.CalendarView` were defined, a helper
+  for rendering instances of this view could be registered as follows:
+
+  ```javascript
+  Ember.Handlebars.helper('calendar', App.CalendarView):
+  ```
+
+  The above bound helper can be used inside of templates as follows:
+
+  ```handlebars
+  {{calendar}}
+  ```
+
+  Which is functionally equivalent to:
+
+  ```handlebars
+  {{view App.CalendarView}}
+  ```
+
+  Options in the helper will be passed to the view in exactly the same
+  manner as with the `view` helper.
+
+  @method helper
+  @for Ember.Handlebars
+  @param {String} name
+  @param {Function|Ember.View} function or view class constructor
+  @param {String} dependentKeys*
+*/
+EmberHandlebars.helper = function(name, value) {
+  if (!View) { View = requireModule('ember-views/views/view')['View']; } // ES6TODO: stupid circular dep
+  if (!Component) { Component = requireModule('ember-views/views/component')['default']; } // ES6TODO: stupid circular dep
+
+  Ember.assert("You tried to register a component named '" + name + "', but component names must include a '-'", !Component.detect(value) || name.match(/-/));
+
+  if (View.detect(value)) {
+    EmberHandlebars.registerHelper(name, EmberHandlebars.makeViewHelper(value));
+  } else {
+    EmberHandlebars.registerBoundHelper.apply(null, arguments);
+  }
+};
+
+/**
+  Returns a helper function that renders the provided ViewClass.
+
+  Used internally by Ember.Handlebars.helper and other methods
+  involving helper/component registration.
+
+  @private
+  @method makeViewHelper
+  @for Ember.Handlebars
+  @param {Function} ViewClass view class constructor
+  @since 1.2.0
+*/
+EmberHandlebars.makeViewHelper = function(ViewClass) {
+  return function(options) {
+    Ember.assert("You can only pass attributes (such as name=value) not bare values to a helper for a View found in '" + ViewClass.toString() + "'", arguments.length < 2);
+    return EmberHandlebars.helpers.view.call(this, ViewClass, options);
+  };
+};
+
+/**
+@class helpers
+@namespace Ember.Handlebars
+*/
+EmberHandlebars.helpers = objectCreate(Handlebars.helpers);
+
+/**
+  Override the the opcode compiler and JavaScript compiler for Handlebars.
+
+  @class Compiler
+  @namespace Ember.Handlebars
+  @private
+  @constructor
+*/
+EmberHandlebars.Compiler = function() {};
+
+// Handlebars.Compiler doesn't exist in runtime-only
+if (Handlebars.Compiler) {
+  EmberHandlebars.Compiler.prototype = objectCreate(Handlebars.Compiler.prototype);
+}
+
+EmberHandlebars.Compiler.prototype.compiler = EmberHandlebars.Compiler;
+
+/**
+  @class JavaScriptCompiler
+  @namespace Ember.Handlebars
+  @private
+  @constructor
+*/
+EmberHandlebars.JavaScriptCompiler = function() {};
+
+// Handlebars.JavaScriptCompiler doesn't exist in runtime-only
+if (Handlebars.JavaScriptCompiler) {
+  EmberHandlebars.JavaScriptCompiler.prototype = objectCreate(Handlebars.JavaScriptCompiler.prototype);
+  EmberHandlebars.JavaScriptCompiler.prototype.compiler = EmberHandlebars.JavaScriptCompiler;
+}
+
+
+EmberHandlebars.JavaScriptCompiler.prototype.namespace = "Ember.Handlebars";
+
+EmberHandlebars.JavaScriptCompiler.prototype.initializeBuffer = function() {
+  return "''";
+};
+
+/**
+  Override the default buffer for Ember Handlebars. By default, Handlebars
+  creates an empty String at the beginning of each invocation and appends to
+  it. Ember's Handlebars overrides this to append to a single shared buffer.
+
+  @private
+  @method appendToBuffer
+  @param string {String}
+*/
+EmberHandlebars.JavaScriptCompiler.prototype.appendToBuffer = function(string) {
+  return "data.buffer.push("+string+");";
+};
+
+// Hacks ahead:
+// Handlebars presently has a bug where the `blockHelperMissing` hook
+// doesn't get passed the name of the missing helper name, but rather
+// gets passed the value of that missing helper evaluated on the current
+// context, which is most likely `undefined` and totally useless.
+//
+// So we alter the compiled template function to pass the name of the helper
+// instead, as expected.
+//
+// This can go away once the following is closed:
+// https://github.com/wycats/handlebars.js/issues/634
+
+var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
+    BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
+    INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+
+EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
+  var helperInvocation = source[source.length - 1],
+      helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
+      matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+
+  source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
+};
+
+var stringifyBlockHelperMissing = EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation;
+
+var originalBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.blockValue;
+EmberHandlebars.JavaScriptCompiler.prototype.blockValue = function() {
+  originalBlockValue.apply(this, arguments);
+  stringifyBlockHelperMissing(this.source);
+};
+
+var originalAmbiguousBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue;
+EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue = function() {
+  originalAmbiguousBlockValue.apply(this, arguments);
+  stringifyBlockHelperMissing(this.source);
+};
+
+/**
+  Rewrite simple mustaches from `{{foo}}` to `{{bind "foo"}}`. This means that
+  all simple mustaches in Ember's Handlebars will also set up an observer to
+  keep the DOM up to date when the underlying property changes.
+
+  @private
+  @method mustache
+  @for Ember.Handlebars.Compiler
+  @param mustache
+*/
+EmberHandlebars.Compiler.prototype.mustache = function(mustache) {
+  if (!(mustache.params.length || mustache.hash)) {
+    var id = new Handlebars.AST.IdNode([{ part: '_triageMustache' }]);
+
+    // Update the mustache node to include a hash value indicating whether the original node
+    // was escaped. This will allow us to properly escape values when the underlying value
+    // changes and we need to re-render the value.
+    if (!mustache.escaped) {
+      mustache.hash = mustache.hash || new Handlebars.AST.HashNode([]);
+      mustache.hash.pairs.push(["unescaped", new Handlebars.AST.StringNode("true")]);
+    }
+    mustache = new Handlebars.AST.MustacheNode([id].concat([mustache.id]), mustache.hash, !mustache.escaped);
+  }
+
+  return Handlebars.Compiler.prototype.mustache.call(this, mustache);
+};
+
+/**
+  Used for precompilation of Ember Handlebars templates. This will not be used
+  during normal app execution.
+
+  @method precompile
+  @for Ember.Handlebars
+  @static
+  @param {String} string The template to precompile
+  @param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
+                            compiled template should be returned as an Object or a String
+*/
+EmberHandlebars.precompile = function(string, asObject) {
+  var ast = Handlebars.parse(string);
+
+  var options = {
+    knownHelpers: {
+      action: true,
+      unbound: true,
+      'bind-attr': true,
+      template: true,
+      view: true,
+      _triageMustache: true
+    },
+    data: true,
+    stringParams: true
+  };
+
+  asObject = asObject === undefined ? true : asObject;
+
+  var environment = new EmberHandlebars.Compiler().compile(ast, options);
+  return new EmberHandlebars.JavaScriptCompiler().compile(environment, options, undefined, asObject);
+};
+
+// We don't support this for Handlebars runtime-only
+if (Handlebars.compile) {
+  /**
+    The entry point for Ember Handlebars. This replaces the default
+    `Handlebars.compile` and turns on template-local data and String
+    parameters.
+
+    @method compile
+    @for Ember.Handlebars
+    @static
+    @param {String} string The template to compile
+    @return {Function}
+  */
+  EmberHandlebars.compile = function(string) {
+    var ast = Handlebars.parse(string);
+    var options = { data: true, stringParams: true };
+    var environment = new EmberHandlebars.Compiler().compile(ast, options);
+    var templateSpec = new EmberHandlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
+
+    var template = EmberHandlebars.template(templateSpec);
+    template.isMethod = false; //Make sure we don't wrap templates with ._super
+
+    return template;
+  };
+}
+
+
+
+exports.precompile = EmberHandlebars.precompile;
+exports.EmberHandlebars = EmberHandlebars;
+})();
diff --git a/vendor/assets/ember/development/ember.js b/vendor/assets/ember/development/ember.js
new file mode 100644
index 000000000..5ac39fa92
--- /dev/null
+++ b/vendor/assets/ember/development/ember.js
@@ -0,0 +1,46764 @@
+// Fetched from channel: tags/v1.6.1, with url http://builds.emberjs.com/tags/v1.6.1/ember.js
+// Fetched on: 2024-01-19T09:48:13Z
+/*!
+ * @overview  Ember - JavaScript Application Framework
+ * @copyright Copyright 2011-2014 Tilde Inc. and contributors
+ *            Portions Copyright 2006-2011 Strobe Inc.
+ *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
+ * @license   Licensed under MIT license
+ *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
+ * @version   1.6.1
+ */
+
+
+(function() {
+var define, requireModule, require, requirejs, Ember;
+
+(function() {
+  Ember = this.Ember = this.Ember || {};
+  if (typeof Ember === 'undefined') { Ember = {} };
+
+  if (typeof Ember.__loader === 'undefined') {
+    var registry = {}, seen = {};
+
+    define = function(name, deps, callback) {
+      registry[name] = { deps: deps, callback: callback };
+    };
+
+    requirejs = require = requireModule = function(name) {
+      if (seen.hasOwnProperty(name)) { return seen[name]; }
+      seen[name] = {};
+
+      if (!registry[name]) {
+        throw new Error("Could not find module " + name);
+      }
+
+      var mod = registry[name],
+      deps = mod.deps,
+      callback = mod.callback,
+      reified = [],
+      exports;
+
+      for (var i=0, l=deps.length; i<l; i++) {
+        if (deps[i] === 'exports') {
+          reified.push(exports = {});
+        } else {
+          reified.push(requireModule(resolve(deps[i])));
+        }
+      }
+
+      var value = callback.apply(this, reified);
+      return seen[name] = exports || value;
+
+      function resolve(child) {
+        if (child.charAt(0) !== '.') { return child; }
+        var parts = child.split("/");
+        var parentBase = name.split("/").slice(0, -1);
+
+        for (var i=0, l=parts.length; i<l; i++) {
+          var part = parts[i];
+
+          if (part === '..') { parentBase.pop(); }
+          else if (part === '.') { continue; }
+          else { parentBase.push(part); }
+        }
+
+        return parentBase.join("/");
+      }
+    };
+    requirejs._eak_seen = registry;
+
+    Ember.__loader = {define: define, require: require, registry: registry};
+  } else {
+    define = Ember.__loader.define;
+    requirejs = require = requireModule = Ember.__loader.require;
+  }
+})();
+(function() {
+define("ember-debug",
+  ["ember-metal/core","ember-metal/error","ember-metal/logger"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
+    "use strict";
+    /*global __fail__*/
+
+    var Ember = __dependency1__["default"];
+    var EmberError = __dependency2__["default"];
+    var Logger = __dependency3__["default"];
+
+    /**
+    Ember Debug
+
+    @module ember
+    @submodule ember-debug
+    */
+
+    /**
+    @class Ember
+    */
+
+    /**
+      Define an assertion that will throw an exception if the condition is not
+      met. Ember build tools will remove any calls to `Ember.assert()` when
+      doing a production build. Example:
+
+      ```javascript
+      // Test for truthiness
+      Ember.assert('Must pass a valid object', obj);
+
+      // Fail unconditionally
+      Ember.assert('This code path should never be run');
+      ```
+
+      @method assert
+      @param {String} desc A description of the assertion. This will become
+        the text of the Error thrown if the assertion fails.
+      @param {Boolean} test Must be truthy for the assertion to pass. If
+        falsy, an exception will be thrown.
+    */
+    Ember.assert = function(desc, test) {
+      if (!test) {
+        throw new EmberError("Assertion Failed: " + desc);
+      }
+    };
+
+
+    /**
+      Display a warning with the provided message. Ember build tools will
+      remove any calls to `Ember.warn()` when doing a production build.
+
+      @method warn
+      @param {String} message A warning to display.
+      @param {Boolean} test An optional boolean. If falsy, the warning
+        will be displayed.
+    */
+    Ember.warn = function(message, test) {
+      if (!test) {
+        Logger.warn("WARNING: "+message);
+        if ('trace' in Logger) Logger.trace();
+      }
+    };
+
+    /**
+      Display a debug notice. Ember build tools will remove any calls to
+      `Ember.debug()` when doing a production build.
+
+      ```javascript
+      Ember.debug('I\'m a debug notice!');
+      ```
+
+      @method debug
+      @param {String} message A debug message to display.
+    */
+    Ember.debug = function(message) {
+      Logger.debug("DEBUG: "+message);
+    };
+
+    /**
+      Display a deprecation warning with the provided message and a stack trace
+      (Chrome and Firefox only). Ember build tools will remove any calls to
+      `Ember.deprecate()` when doing a production build.
+
+      @method deprecate
+      @param {String} message A description of the deprecation.
+      @param {Boolean} test An optional boolean. If falsy, the deprecation
+        will be displayed.
+    */
+    Ember.deprecate = function(message, test) {
+      if (test) { return; }
+
+      if (Ember.ENV.RAISE_ON_DEPRECATION) { throw new EmberError(message); }
+
+      var error;
+
+      // When using new Error, we can't do the arguments check for Chrome. Alternatives are welcome
+      try { __fail__.fail(); } catch (e) { error = e; }
+
+      if (Ember.LOG_STACKTRACE_ON_DEPRECATION && error.stack) {
+        var stack, stackStr = '';
+        if (error['arguments']) {
+          // Chrome
+          stack = error.stack.replace(/^\s+at\s+/gm, '').
+                              replace(/^([^\(]+?)([\n$])/gm, '{anonymous}($1)$2').
+                              replace(/^Object.<anonymous>\s*\(([^\)]+)\)/gm, '{anonymous}($1)').split('\n');
+          stack.shift();
+        } else {
+          // Firefox
+          stack = error.stack.replace(/(?:\n@:0)?\s+$/m, '').
+                              replace(/^\(/gm, '{anonymous}(').split('\n');
+        }
+
+        stackStr = "\n    " + stack.slice(2).join("\n    ");
+        message = message + stackStr;
+      }
+
+      Logger.warn("DEPRECATION: "+message);
+    };
+
+
+
+    /**
+      Alias an old, deprecated method with its new counterpart.
+
+      Display a deprecation warning with the provided message and a stack trace
+      (Chrome and Firefox only) when the assigned method is called.
+
+      Ember build tools will not remove calls to `Ember.deprecateFunc()`, though
+      no warnings will be shown in production.
+
+      ```javascript
+      Ember.oldMethod = Ember.deprecateFunc('Please use the new, updated method', Ember.newMethod);
+      ```
+
+      @method deprecateFunc
+      @param {String} message A description of the deprecation.
+      @param {Function} func The new function called to replace its deprecated counterpart.
+      @return {Function} a new function that wrapped the original function with a deprecation warning
+    */
+    Ember.deprecateFunc = function(message, func) {
+      return function() {
+        Ember.deprecate(message);
+        return func.apply(this, arguments);
+      };
+    };
+
+
+    /**
+      Run a function meant for debugging. Ember build tools will remove any calls to
+      `Ember.runInDebug()` when doing a production build.
+
+      ```javascript
+      Ember.runInDebug(function() {
+        Ember.Handlebars.EachView.reopen({
+          didInsertElement: function() {
+            console.log('I\'m happy');
+          }
+        });
+      });
+      ```
+
+      @method runInDebug
+      @param {Function} func The function to be executed.
+      @since 1.5.0
+    */
+    Ember.runInDebug = function(func) {
+      func()
+    };
+
+    // Inform the developer about the Ember Inspector if not installed.
+    if (!Ember.testing) {
+      var isFirefox = typeof InstallTrigger !== 'undefined';
+      var isChrome = !!window.chrome && !window.opera;
+
+      if (typeof window !== 'undefined' && (isFirefox || isChrome) && window.addEventListener) {
+        window.addEventListener("load", function() {
+          if (document.documentElement && document.documentElement.dataset && !document.documentElement.dataset.emberExtension) {
+            var downloadURL;
+
+            if(isChrome) {
+              downloadURL = 'https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi';
+            } else if(isFirefox) {
+              downloadURL = 'https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/';
+            }
+
+            Ember.debug('For more advanced debugging, install the Ember Inspector from ' + downloadURL);
+          }
+        }, false);
+      }
+    }
+  });
+})();
+
+(function() {
+define("ember-metal/array",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /*jshint newcap:false*/
+    /**
+    @module ember-metal
+    */
+
+    var ArrayPrototype = Array.prototype;
+
+    // NOTE: There is a bug in jshint that doesn't recognize `Object()` without `new`
+    // as being ok unless both `newcap:false` and not `use strict`.
+    // https://github.com/jshint/jshint/issues/392
+
+    // Testing this is not ideal, but we want to use native functions
+    // if available, but not to use versions created by libraries like Prototype
+    var isNativeFunc = function(func) {
+      // This should probably work in all browsers likely to have ES5 array methods
+      return func && Function.prototype.toString.call(func).indexOf('[native code]') > -1;
+    };
+
+    // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/map
+    var map = isNativeFunc(ArrayPrototype.map) ? ArrayPrototype.map : function(fun /*, thisp */) {
+      //"use strict";
+
+      if (this === void 0 || this === null) {
+        throw new TypeError();
+      }
+
+      var t = Object(this);
+      var len = t.length >>> 0;
+      if (typeof fun !== "function") {
+        throw new TypeError();
+      }
+
+      var res = new Array(len);
+      var thisp = arguments[1];
+      for (var i = 0; i < len; i++) {
+        if (i in t) {
+          res[i] = fun.call(thisp, t[i], i, t);
+        }
+      }
+
+      return res;
+    };
+
+    // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
+    var forEach = isNativeFunc(ArrayPrototype.forEach) ? ArrayPrototype.forEach : function(fun /*, thisp */) {
+      //"use strict";
+
+      if (this === void 0 || this === null) {
+        throw new TypeError();
+      }
+
+      var t = Object(this);
+      var len = t.length >>> 0;
+      if (typeof fun !== "function") {
+        throw new TypeError();
+      }
+
+      var thisp = arguments[1];
+      for (var i = 0; i < len; i++) {
+        if (i in t) {
+          fun.call(thisp, t[i], i, t);
+        }
+      }
+    };
+
+    var indexOf = isNativeFunc(ArrayPrototype.indexOf) ? ArrayPrototype.indexOf : function (obj, fromIndex) {
+      if (fromIndex === null || fromIndex === undefined) { fromIndex = 0; }
+      else if (fromIndex < 0) { fromIndex = Math.max(0, this.length + fromIndex); }
+      for (var i = fromIndex, j = this.length; i < j; i++) {
+        if (this[i] === obj) { return i; }
+      }
+      return -1;
+    };
+
+    var filter = isNativeFunc(ArrayPrototype.filter) ? ArrayPrototype.filter : function (fn, context) {
+      var i,
+      value,
+      result = [],
+      length = this.length;
+
+      for (i = 0; i < length; i++) {
+        if (this.hasOwnProperty(i)) {
+          value = this[i];
+          if (fn.call(context, value, i, this)) {
+            result.push(value);
+          }
+        }
+      }
+      return result;
+    };
+
+
+    if (Ember.SHIM_ES5) {
+      if (!ArrayPrototype.map) {
+        ArrayPrototype.map = map;
+      }
+
+      if (!ArrayPrototype.forEach) {
+        ArrayPrototype.forEach = forEach;
+      }
+
+      if (!ArrayPrototype.filter) {
+        ArrayPrototype.filter = filter;
+      }
+
+      if (!ArrayPrototype.indexOf) {
+        ArrayPrototype.indexOf = indexOf;
+      }
+    }
+
+    /**
+      Array polyfills to support ES5 features in older browsers.
+
+      @namespace Ember
+      @property ArrayPolyfills
+    */
+    __exports__.map = map;
+    __exports__.forEach = forEach;
+    __exports__.filter = filter;
+    __exports__.indexOf = indexOf;
+  });
+define("ember-metal/binding",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/map","ember-metal/observer","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.Logger, Ember.LOG_BINDINGS, assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var trySet = __dependency3__.trySet;
+    var guidFor = __dependency4__.guidFor;
+    var Map = __dependency5__.Map;
+    var addObserver = __dependency6__.addObserver;
+    var removeObserver = __dependency6__.removeObserver;
+    var _suspendObserver = __dependency6__._suspendObserver;
+    var run = __dependency7__["default"];
+
+    // ES6TODO: where is Ember.lookup defined?
+    /**
+    @module ember-metal
+    */
+
+    // ..........................................................
+    // CONSTANTS
+    //
+
+    /**
+      Debug parameter you can turn on. This will log all bindings that fire to
+      the console. This should be disabled in production code. Note that you
+      can also enable this from the console or temporarily.
+
+      @property LOG_BINDINGS
+      @for Ember
+      @type Boolean
+      @default false
+    */
+    Ember.LOG_BINDINGS = false || !!Ember.ENV.LOG_BINDINGS;
+
+    var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
+
+    /**
+      Returns true if the provided path is global (e.g., `MyApp.fooController.bar`)
+      instead of local (`foo.bar.baz`).
+
+      @method isGlobalPath
+      @for Ember
+      @private
+      @param {String} path
+      @return Boolean
+    */
+    function isGlobalPath(path) {
+      return IS_GLOBAL.test(path);
+    };
+
+    function getWithGlobals(obj, path) {
+      return get(isGlobalPath(path) ? Ember.lookup : obj, path);
+    }
+
+    // ..........................................................
+    // BINDING
+    //
+
+    var Binding = function(toPath, fromPath) {
+      this._direction = 'fwd';
+      this._from = fromPath;
+      this._to   = toPath;
+      this._directionMap = Map.create();
+    };
+
+    /**
+    @class Binding
+    @namespace Ember
+    */
+
+    Binding.prototype = {
+      /**
+        This copies the Binding so it can be connected to another object.
+
+        @method copy
+        @return {Ember.Binding} `this`
+      */
+      copy: function () {
+        var copy = new Binding(this._to, this._from);
+        if (this._oneWay) { copy._oneWay = true; }
+        return copy;
+      },
+
+      // ..........................................................
+      // CONFIG
+      //
+
+      /**
+        This will set `from` property path to the specified value. It will not
+        attempt to resolve this property path to an actual object until you
+        connect the binding.
+
+        The binding will search for the property path starting at the root object
+        you pass when you `connect()` the binding. It follows the same rules as
+        `get()` - see that method for more information.
+
+        @method from
+        @param {String} path the property path to connect to
+        @return {Ember.Binding} `this`
+      */
+      from: function(path) {
+        this._from = path;
+        return this;
+      },
+
+      /**
+        This will set the `to` property path to the specified value. It will not
+        attempt to resolve this property path to an actual object until you
+        connect the binding.
+
+        The binding will search for the property path starting at the root object
+        you pass when you `connect()` the binding. It follows the same rules as
+        `get()` - see that method for more information.
+
+        @method to
+        @param {String|Tuple} path A property path or tuple
+        @return {Ember.Binding} `this`
+      */
+      to: function(path) {
+        this._to = path;
+        return this;
+      },
+
+      /**
+        Configures the binding as one way. A one-way binding will relay changes
+        on the `from` side to the `to` side, but not the other way around. This
+        means that if you change the `to` side directly, the `from` side may have
+        a different value.
+
+        @method oneWay
+        @return {Ember.Binding} `this`
+      */
+      oneWay: function() {
+        this._oneWay = true;
+        return this;
+      },
+
+      /**
+        @method toString
+        @return {String} string representation of binding
+      */
+      toString: function() {
+        var oneWay = this._oneWay ? '[oneWay]' : '';
+        return "Ember.Binding<" + guidFor(this) + ">(" + this._from + " -> " + this._to + ")" + oneWay;
+      },
+
+      // ..........................................................
+      // CONNECT AND SYNC
+      //
+
+      /**
+        Attempts to connect this binding instance so that it can receive and relay
+        changes. This method will raise an exception if you have not set the
+        from/to properties yet.
+
+        @method connect
+        @param {Object} obj The root object for this binding.
+        @return {Ember.Binding} `this`
+      */
+      connect: function(obj) {
+        Ember.assert('Must pass a valid object to Ember.Binding.connect()', !!obj);
+
+        var fromPath = this._from, toPath = this._to;
+        trySet(obj, toPath, getWithGlobals(obj, fromPath));
+
+        // add an observer on the object to be notified when the binding should be updated
+        addObserver(obj, fromPath, this, this.fromDidChange);
+
+        // if the binding is a two-way binding, also set up an observer on the target
+        if (!this._oneWay) { addObserver(obj, toPath, this, this.toDidChange); }
+
+        this._readyToSync = true;
+
+        return this;
+      },
+
+      /**
+        Disconnects the binding instance. Changes will no longer be relayed. You
+        will not usually need to call this method.
+
+        @method disconnect
+        @param {Object} obj The root object you passed when connecting the binding.
+        @return {Ember.Binding} `this`
+      */
+      disconnect: function(obj) {
+        Ember.assert('Must pass a valid object to Ember.Binding.disconnect()', !!obj);
+
+        var twoWay = !this._oneWay;
+
+        // remove an observer on the object so we're no longer notified of
+        // changes that should update bindings.
+        removeObserver(obj, this._from, this, this.fromDidChange);
+
+        // if the binding is two-way, remove the observer from the target as well
+        if (twoWay) { removeObserver(obj, this._to, this, this.toDidChange); }
+
+        this._readyToSync = false; // disable scheduled syncs...
+        return this;
+      },
+
+      // ..........................................................
+      // PRIVATE
+      //
+
+      /* called when the from side changes */
+      fromDidChange: function(target) {
+        this._scheduleSync(target, 'fwd');
+      },
+
+      /* called when the to side changes */
+      toDidChange: function(target) {
+        this._scheduleSync(target, 'back');
+      },
+
+      _scheduleSync: function(obj, dir) {
+        var directionMap = this._directionMap;
+        var existingDir = directionMap.get(obj);
+
+        // if we haven't scheduled the binding yet, schedule it
+        if (!existingDir) {
+          run.schedule('sync', this, this._sync, obj);
+          directionMap.set(obj, dir);
+        }
+
+        // If both a 'back' and 'fwd' sync have been scheduled on the same object,
+        // default to a 'fwd' sync so that it remains deterministic.
+        if (existingDir === 'back' && dir === 'fwd') {
+          directionMap.set(obj, 'fwd');
+        }
+      },
+
+      _sync: function(obj) {
+        var log = Ember.LOG_BINDINGS;
+
+        // don't synchronize destroyed objects or disconnected bindings
+        if (obj.isDestroyed || !this._readyToSync) { return; }
+
+        // get the direction of the binding for the object we are
+        // synchronizing from
+        var directionMap = this._directionMap;
+        var direction = directionMap.get(obj);
+
+        var fromPath = this._from, toPath = this._to;
+
+        directionMap.remove(obj);
+
+        // if we're synchronizing from the remote object...
+        if (direction === 'fwd') {
+          var fromValue = getWithGlobals(obj, this._from);
+          if (log) {
+            Ember.Logger.log(' ', this.toString(), '->', fromValue, obj);
+          }
+          if (this._oneWay) {
+            trySet(obj, toPath, fromValue);
+          } else {
+            _suspendObserver(obj, toPath, this, this.toDidChange, function () {
+              trySet(obj, toPath, fromValue);
+            });
+          }
+        // if we're synchronizing *to* the remote object
+        } else if (direction === 'back') {
+          var toValue = get(obj, this._to);
+          if (log) {
+            Ember.Logger.log(' ', this.toString(), '<-', toValue, obj);
+          }
+          _suspendObserver(obj, fromPath, this, this.fromDidChange, function () {
+            trySet(isGlobalPath(fromPath) ? Ember.lookup : obj, fromPath, toValue);
+          });
+        }
+      }
+
+    };
+
+    function mixinProperties(to, from) {
+      for (var key in from) {
+        if (from.hasOwnProperty(key)) {
+          to[key] = from[key];
+        }
+      }
+    }
+
+    mixinProperties(Binding, {
+
+      /*
+        See `Ember.Binding.from`.
+
+        @method from
+        @static
+      */
+      from: function() {
+        var C = this, binding = new C();
+        return binding.from.apply(binding, arguments);
+      },
+
+      /*
+        See `Ember.Binding.to`.
+
+        @method to
+        @static
+      */
+      to: function() {
+        var C = this, binding = new C();
+        return binding.to.apply(binding, arguments);
+      },
+
+      /**
+        Creates a new Binding instance and makes it apply in a single direction.
+        A one-way binding will relay changes on the `from` side object (supplied
+        as the `from` argument) the `to` side, but not the other way around.
+        This means that if you change the "to" side directly, the "from" side may have
+        a different value.
+
+        See `Binding.oneWay`.
+
+        @method oneWay
+        @param {String} from from path.
+        @param {Boolean} [flag] (Optional) passing nothing here will make the
+          binding `oneWay`. You can instead pass `false` to disable `oneWay`, making the
+          binding two way again.
+        @return {Ember.Binding} `this`
+      */
+      oneWay: function(from, flag) {
+        var C = this, binding = new C(null, from);
+        return binding.oneWay(flag);
+      }
+
+    });
+
+    /**
+      An `Ember.Binding` connects the properties of two objects so that whenever
+      the value of one property changes, the other property will be changed also.
+
+      ## Automatic Creation of Bindings with `/^*Binding/`-named Properties
+
+      You do not usually create Binding objects directly but instead describe
+      bindings in your class or object definition using automatic binding
+      detection.
+
+      Properties ending in a `Binding` suffix will be converted to `Ember.Binding`
+      instances. The value of this property should be a string representing a path
+      to another object or a custom binding instanced created using Binding helpers
+      (see "One Way Bindings"):
+
+      ```
+      valueBinding: "MyApp.someController.title"
+      ```
+
+      This will create a binding from `MyApp.someController.title` to the `value`
+      property of your object instance automatically. Now the two values will be
+      kept in sync.
+
+      ## One Way Bindings
+
+      One especially useful binding customization you can use is the `oneWay()`
+      helper. This helper tells Ember that you are only interested in
+      receiving changes on the object you are binding from. For example, if you
+      are binding to a preference and you want to be notified if the preference
+      has changed, but your object will not be changing the preference itself, you
+      could do:
+
+      ```
+      bigTitlesBinding: Ember.Binding.oneWay("MyApp.preferencesController.bigTitles")
+      ```
+
+      This way if the value of `MyApp.preferencesController.bigTitles` changes the
+      `bigTitles` property of your object will change also. However, if you
+      change the value of your `bigTitles` property, it will not update the
+      `preferencesController`.
+
+      One way bindings are almost twice as fast to setup and twice as fast to
+      execute because the binding only has to worry about changes to one side.
+
+      You should consider using one way bindings anytime you have an object that
+      may be created frequently and you do not intend to change a property; only
+      to monitor it for changes (such as in the example above).
+
+      ## Adding Bindings Manually
+
+      All of the examples above show you how to configure a custom binding, but the
+      result of these customizations will be a binding template, not a fully active
+      Binding instance. The binding will actually become active only when you
+      instantiate the object the binding belongs to. It is useful however, to
+      understand what actually happens when the binding is activated.
+
+      For a binding to function it must have at least a `from` property and a `to`
+      property. The `from` property path points to the object/key that you want to
+      bind from while the `to` path points to the object/key you want to bind to.
+
+      When you define a custom binding, you are usually describing the property
+      you want to bind from (such as `MyApp.someController.value` in the examples
+      above). When your object is created, it will automatically assign the value
+      you want to bind `to` based on the name of your binding key. In the
+      examples above, during init, Ember objects will effectively call
+      something like this on your binding:
+
+      ```javascript
+      binding = Ember.Binding.from(this.valueBinding).to("value");
+      ```
+
+      This creates a new binding instance based on the template you provide, and
+      sets the to path to the `value` property of the new object. Now that the
+      binding is fully configured with a `from` and a `to`, it simply needs to be
+      connected to become active. This is done through the `connect()` method:
+
+      ```javascript
+      binding.connect(this);
+      ```
+
+      Note that when you connect a binding you pass the object you want it to be
+      connected to. This object will be used as the root for both the from and
+      to side of the binding when inspecting relative paths. This allows the
+      binding to be automatically inherited by subclassed objects as well.
+
+      Now that the binding is connected, it will observe both the from and to side
+      and relay changes.
+
+      If you ever needed to do so (you almost never will, but it is useful to
+      understand this anyway), you could manually create an active binding by
+      using the `Ember.bind()` helper method. (This is the same method used by
+      to setup your bindings on objects):
+
+      ```javascript
+      Ember.bind(MyApp.anotherObject, "value", "MyApp.someController.value");
+      ```
+
+      Both of these code fragments have the same effect as doing the most friendly
+      form of binding creation like so:
+
+      ```javascript
+      MyApp.anotherObject = Ember.Object.create({
+        valueBinding: "MyApp.someController.value",
+
+        // OTHER CODE FOR THIS OBJECT...
+      });
+      ```
+
+      Ember's built in binding creation method makes it easy to automatically
+      create bindings for you. You should always use the highest-level APIs
+      available, even if you understand how it works underneath.
+
+      @class Binding
+      @namespace Ember
+      @since Ember 0.9
+    */
+    // Ember.Binding = Binding; ES6TODO: where to put this?
+
+
+    /**
+      Global helper method to create a new binding. Just pass the root object
+      along with a `to` and `from` path to create and connect the binding.
+
+      @method bind
+      @for Ember
+      @param {Object} obj The root object of the transform.
+      @param {String} to The path to the 'to' side of the binding.
+        Must be relative to obj.
+      @param {String} from The path to the 'from' side of the binding.
+        Must be relative to obj or a global path.
+      @return {Ember.Binding} binding instance
+    */
+    function bind(obj, to, from) {
+      return new Binding(to, from).connect(obj);
+    };
+
+    /**
+      @method oneWay
+      @for Ember
+      @param {Object} obj The root object of the transform.
+      @param {String} to The path to the 'to' side of the binding.
+        Must be relative to obj.
+      @param {String} from The path to the 'from' side of the binding.
+        Must be relative to obj or a global path.
+      @return {Ember.Binding} binding instance
+    */
+    function oneWay(obj, to, from) {
+      return new Binding(to, from).oneWay().connect(obj);
+    };
+
+    __exports__.Binding = Binding;
+    __exports__.bind = bind;
+    __exports__.oneWay = oneWay;
+    __exports__.isGlobalPath = isGlobalPath;
+  });
+define("ember-metal/chains",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/array","ember-metal/watch_key","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // warn, assert, etc;
+    var get = __dependency2__.get;
+    var normalizeTuple = __dependency2__.normalizeTuple;
+    var meta = __dependency3__.meta;
+    var META_KEY = __dependency3__.META_KEY;
+    var forEach = __dependency4__.forEach;
+    var watchKey = __dependency5__.watchKey;
+    var unwatchKey = __dependency5__.unwatchKey;
+
+    var metaFor = meta,
+        warn = Ember.warn,
+        FIRST_KEY = /^([^\.]+)/;
+
+    function firstKey(path) {
+      return path.match(FIRST_KEY)[0];
+    }
+
+    var pendingQueue = [];
+
+    // attempts to add the pendingQueue chains again. If some of them end up
+    // back in the queue and reschedule is true, schedules a timeout to try
+    // again.
+    function flushPendingChains() {
+      if (pendingQueue.length === 0) { return; } // nothing to do
+
+      var queue = pendingQueue;
+      pendingQueue = [];
+
+      forEach.call(queue, function(q) { q[0].add(q[1]); });
+
+      warn('Watching an undefined global, Ember expects watched globals to be setup by the time the run loop is flushed, check for typos', pendingQueue.length === 0);
+    };
+
+
+    function addChainWatcher(obj, keyName, node) {
+      if (!obj || ('object' !== typeof obj)) { return; } // nothing to do
+
+      var m = metaFor(obj), nodes = m.chainWatchers;
+
+      if (!m.hasOwnProperty('chainWatchers')) {
+        nodes = m.chainWatchers = {};
+      }
+
+      if (!nodes[keyName]) { nodes[keyName] = []; }
+      nodes[keyName].push(node);
+      watchKey(obj, keyName, m);
+    }
+
+    function removeChainWatcher(obj, keyName, node) {
+      if (!obj || 'object' !== typeof obj) { return; } // nothing to do
+
+      var m = obj[META_KEY];
+      if (m && !m.hasOwnProperty('chainWatchers')) { return; } // nothing to do
+
+      var nodes = m && m.chainWatchers;
+
+      if (nodes && nodes[keyName]) {
+        nodes = nodes[keyName];
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          if (nodes[i] === node) { nodes.splice(i, 1); }
+        }
+      }
+      unwatchKey(obj, keyName, m);
+    };
+
+    // A ChainNode watches a single key on an object. If you provide a starting
+    // value for the key then the node won't actually watch it. For a root node
+    // pass null for parent and key and object for value.
+    function ChainNode(parent, key, value) {
+      this._parent = parent;
+      this._key    = key;
+
+      // _watching is true when calling get(this._parent, this._key) will
+      // return the value of this node.
+      //
+      // It is false for the root of a chain (because we have no parent)
+      // and for global paths (because the parent node is the object with
+      // the observer on it)
+      this._watching = value===undefined;
+
+      this._value  = value;
+      this._paths = {};
+      if (this._watching) {
+        this._object = parent.value();
+        if (this._object) { addChainWatcher(this._object, this._key, this); }
+      }
+
+      // Special-case: the EachProxy relies on immediate evaluation to
+      // establish its observers.
+      //
+      // TODO: Replace this with an efficient callback that the EachProxy
+      // can implement.
+      if (this._parent && this._parent._key === '@each') {
+        this.value();
+      }
+    };
+
+    var ChainNodePrototype = ChainNode.prototype;
+
+    function lazyGet(obj, key) {
+      if (!obj) return undefined;
+
+      var meta = obj[META_KEY];
+      // check if object meant only to be a prototype
+      if (meta && meta.proto === obj) return undefined;
+
+      if (key === "@each") return get(obj, key);
+
+      // if a CP only return cached value
+      var desc = meta && meta.descs[key];
+      if (desc && desc._cacheable) {
+        if (key in meta.cache) {
+          return meta.cache[key];
+        } else {
+          return undefined;
+        }
+      }
+
+      return get(obj, key);
+    }
+
+    ChainNodePrototype.value = function() {
+      if (this._value === undefined && this._watching) {
+        var obj = this._parent.value();
+        this._value = lazyGet(obj, this._key);
+      }
+      return this._value;
+    };
+
+    ChainNodePrototype.destroy = function() {
+      if (this._watching) {
+        var obj = this._object;
+        if (obj) { removeChainWatcher(obj, this._key, this); }
+        this._watching = false; // so future calls do nothing
+      }
+    };
+
+    // copies a top level object only
+    ChainNodePrototype.copy = function(obj) {
+      var ret = new ChainNode(null, null, obj),
+          paths = this._paths, path;
+      for (path in paths) {
+        if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
+        ret.add(path);
+      }
+      return ret;
+    };
+
+    // called on the root node of a chain to setup watchers on the specified
+    // path.
+    ChainNodePrototype.add = function(path) {
+      var obj, tuple, key, src, paths;
+
+      paths = this._paths;
+      paths[path] = (paths[path] || 0) + 1;
+
+      obj = this.value();
+      tuple = normalizeTuple(obj, path);
+
+      // the path was a local path
+      if (tuple[0] && tuple[0] === obj) {
+        path = tuple[1];
+        key  = firstKey(path);
+        path = path.slice(key.length+1);
+
+      // global path, but object does not exist yet.
+      // put into a queue and try to connect later.
+      } else if (!tuple[0]) {
+        pendingQueue.push([this, path]);
+        tuple.length = 0;
+        return;
+
+      // global path, and object already exists
+      } else {
+        src  = tuple[0];
+        key  = path.slice(0, 0-(tuple[1].length+1));
+        path = tuple[1];
+      }
+
+      tuple.length = 0;
+      this.chain(key, path, src);
+    };
+
+    // called on the root node of a chain to teardown watcher on the specified
+    // path
+    ChainNodePrototype.remove = function(path) {
+      var obj, tuple, key, src, paths;
+
+      paths = this._paths;
+      if (paths[path] > 0) { paths[path]--; }
+
+      obj = this.value();
+      tuple = normalizeTuple(obj, path);
+      if (tuple[0] === obj) {
+        path = tuple[1];
+        key  = firstKey(path);
+        path = path.slice(key.length+1);
+      } else {
+        src  = tuple[0];
+        key  = path.slice(0, 0-(tuple[1].length+1));
+        path = tuple[1];
+      }
+
+      tuple.length = 0;
+      this.unchain(key, path);
+    };
+
+    ChainNodePrototype.count = 0;
+
+    ChainNodePrototype.chain = function(key, path, src) {
+      var chains = this._chains, node;
+      if (!chains) { chains = this._chains = {}; }
+
+      node = chains[key];
+      if (!node) { node = chains[key] = new ChainNode(this, key, src); }
+      node.count++; // count chains...
+
+      // chain rest of path if there is one
+      if (path && path.length>0) {
+        key = firstKey(path);
+        path = path.slice(key.length+1);
+        node.chain(key, path); // NOTE: no src means it will observe changes...
+      }
+    };
+
+    ChainNodePrototype.unchain = function(key, path) {
+      var chains = this._chains, node = chains[key];
+
+      // unchain rest of path first...
+      if (path && path.length>1) {
+        key  = firstKey(path);
+        path = path.slice(key.length+1);
+        node.unchain(key, path);
+      }
+
+      // delete node if needed.
+      node.count--;
+      if (node.count<=0) {
+        delete chains[node._key];
+        node.destroy();
+      }
+
+    };
+
+    ChainNodePrototype.willChange = function(events) {
+      var chains = this._chains;
+      if (chains) {
+        for(var key in chains) {
+          if (!chains.hasOwnProperty(key)) { continue; }
+          chains[key].willChange(events);
+        }
+      }
+
+      if (this._parent) { this._parent.chainWillChange(this, this._key, 1, events); }
+    };
+
+    ChainNodePrototype.chainWillChange = function(chain, path, depth, events) {
+      if (this._key) { path = this._key + '.' + path; }
+
+      if (this._parent) {
+        this._parent.chainWillChange(this, path, depth+1, events);
+      } else {
+        if (depth > 1) {
+          events.push(this.value(), path);
+        }
+        path = 'this.' + path;
+        if (this._paths[path] > 0) {
+          events.push(this.value(), path);
+        }
+      }
+    };
+
+    ChainNodePrototype.chainDidChange = function(chain, path, depth, events) {
+      if (this._key) { path = this._key + '.' + path; }
+      if (this._parent) {
+        this._parent.chainDidChange(this, path, depth+1, events);
+      } else {
+        if (depth > 1) {
+          events.push(this.value(), path);
+        }
+        path = 'this.' + path;
+        if (this._paths[path] > 0) {
+          events.push(this.value(), path);
+        }
+      }
+    };
+
+    ChainNodePrototype.didChange = function(events) {
+      // invalidate my own value first.
+      if (this._watching) {
+        var obj = this._parent.value();
+        if (obj !== this._object) {
+          removeChainWatcher(this._object, this._key, this);
+          this._object = obj;
+          addChainWatcher(obj, this._key, this);
+        }
+        this._value  = undefined;
+
+        // Special-case: the EachProxy relies on immediate evaluation to
+        // establish its observers.
+        if (this._parent && this._parent._key === '@each')
+          this.value();
+      }
+
+      // then notify chains...
+      var chains = this._chains;
+      if (chains) {
+        for(var key in chains) {
+          if (!chains.hasOwnProperty(key)) { continue; }
+          chains[key].didChange(events);
+        }
+      }
+
+      // if no events are passed in then we only care about the above wiring update
+      if (events === null) { return; }
+
+      // and finally tell parent about my path changing...
+      if (this._parent) { this._parent.chainDidChange(this, this._key, 1, events); }
+    };
+
+    function finishChains(obj) {
+      // We only create meta if we really have to
+      var m = obj[META_KEY], chains = m && m.chains;
+      if (chains) {
+        if (chains.value() !== obj) {
+          metaFor(obj).chains = chains = chains.copy(obj);
+        } else {
+          chains.didChange(null);
+        }
+      }
+    };
+
+    __exports__.flushPendingChains = flushPendingChains;
+    __exports__.removeChainWatcher = removeChainWatcher;
+    __exports__.ChainNode = ChainNode;
+    __exports__.finishChains = finishChains;
+  });
+define("ember-metal/computed",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/watching","ember-metal/expand_properties","ember-metal/error","ember-metal/properties","ember-metal/property_events","ember-metal/is_empty","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var meta = __dependency4__.meta;
+    var META_KEY = __dependency4__.META_KEY;
+    var guidFor = __dependency4__.guidFor;
+    var typeOf = __dependency4__.typeOf;
+    var inspect = __dependency4__.inspect;
+    var EnumerableUtils = __dependency5__["default"];
+    var create = __dependency6__.create;
+    var watch = __dependency7__.watch;
+    var unwatch = __dependency7__.unwatch;
+    var expandProperties = __dependency8__["default"];
+    var EmberError = __dependency9__["default"];
+    var Descriptor = __dependency10__.Descriptor;
+    var defineProperty = __dependency10__.defineProperty;
+    var propertyWillChange = __dependency11__.propertyWillChange;
+    var propertyDidChange = __dependency11__.propertyDidChange;
+    var isEmpty = __dependency12__["default"];
+    var isNone = __dependency13__.isNone;
+
+    /**
+    @module ember-metal
+    */
+
+    Ember.warn("The CP_DEFAULT_CACHEABLE flag has been removed and computed properties are always cached by default. Use `volatile` if you don't want caching.", Ember.ENV.CP_DEFAULT_CACHEABLE !== false);
+
+
+    var metaFor = meta,
+        a_slice = [].slice,
+        o_create = create;
+
+    function UNDEFINED() { }
+
+    var lengthPattern = /\.(length|\[\])$/;
+
+    // ..........................................................
+    // DEPENDENT KEYS
+    //
+
+    // data structure:
+    //  meta.deps = {
+    //    'depKey': {
+    //      'keyName': count,
+    //    }
+    //  }
+
+    /*
+      This function returns a map of unique dependencies for a
+      given object and key.
+    */
+    function keysForDep(depsMeta, depKey) {
+      var keys = depsMeta[depKey];
+      if (!keys) {
+        // if there are no dependencies yet for a the given key
+        // create a new empty list of dependencies for the key
+        keys = depsMeta[depKey] = {};
+      } else if (!depsMeta.hasOwnProperty(depKey)) {
+        // otherwise if the dependency list is inherited from
+        // a superclass, clone the hash
+        keys = depsMeta[depKey] = o_create(keys);
+      }
+      return keys;
+    }
+
+    function metaForDeps(meta) {
+      return keysForDep(meta, 'deps');
+    }
+
+    function addDependentKeys(desc, obj, keyName, meta) {
+      // the descriptor has a list of dependent keys, so
+      // add all of its dependent keys.
+      var depKeys = desc._dependentKeys, depsMeta, idx, len, depKey, keys;
+      if (!depKeys) return;
+
+      depsMeta = metaForDeps(meta);
+
+      for(idx = 0, len = depKeys.length; idx < len; idx++) {
+        depKey = depKeys[idx];
+        // Lookup keys meta for depKey
+        keys = keysForDep(depsMeta, depKey);
+        // Increment the number of times depKey depends on keyName.
+        keys[keyName] = (keys[keyName] || 0) + 1;
+        // Watch the depKey
+        watch(obj, depKey, meta);
+      }
+    }
+
+    function removeDependentKeys(desc, obj, keyName, meta) {
+      // the descriptor has a list of dependent keys, so
+      // add all of its dependent keys.
+      var depKeys = desc._dependentKeys, depsMeta, idx, len, depKey, keys;
+      if (!depKeys) return;
+
+      depsMeta = metaForDeps(meta);
+
+      for(idx = 0, len = depKeys.length; idx < len; idx++) {
+        depKey = depKeys[idx];
+        // Lookup keys meta for depKey
+        keys = keysForDep(depsMeta, depKey);
+        // Increment the number of times depKey depends on keyName.
+        keys[keyName] = (keys[keyName] || 0) - 1;
+        // Watch the depKey
+        unwatch(obj, depKey, meta);
+      }
+    }
+
+    // ..........................................................
+    // COMPUTED PROPERTY
+    //
+
+    /**
+      A computed property transforms an objects function into a property.
+
+      By default the function backing the computed property will only be called
+      once and the result will be cached. You can specify various properties
+      that your computed property is dependent on. This will force the cached
+      result to be recomputed if the dependencies are modified.
+
+      In the following example we declare a computed property (by calling
+      `.property()` on the fullName function) and setup the properties
+      dependencies (depending on firstName and lastName). The fullName function
+      will be called once (regardless of how many times it is accessed) as long
+      as it's dependencies have not been changed. Once firstName or lastName are updated
+      any future calls (or anything bound) to fullName will incorporate the new
+      values.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        // these will be supplied by `create`
+        firstName: null,
+        lastName: null,
+
+        fullName: function() {
+          var firstName = this.get('firstName');
+          var lastName = this.get('lastName');
+
+         return firstName + ' ' + lastName;
+        }.property('firstName', 'lastName')
+      });
+
+      var tom = Person.create({
+        firstName: 'Tom',
+        lastName: 'Dale'
+      });
+
+      tom.get('fullName') // 'Tom Dale'
+      ```
+
+      You can also define what Ember should do when setting a computed property.
+      If you try to set a computed property, it will be invoked with the key and
+      value you want to set it to. You can also accept the previous value as the
+      third parameter.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        // these will be supplied by `create`
+        firstName: null,
+        lastName: null,
+
+        fullName: function(key, value, oldValue) {
+          // getter
+          if (arguments.length === 1) {
+            var firstName = this.get('firstName');
+            var lastName = this.get('lastName');
+
+            return firstName + ' ' + lastName;
+
+          // setter
+          } else {
+            var name = value.split(' ');
+
+            this.set('firstName', name[0]);
+            this.set('lastName', name[1]);
+
+            return value;
+          }
+        }.property('firstName', 'lastName')
+      });
+
+      var person = Person.create();
+
+      person.set('fullName', 'Peter Wagenet');
+      person.get('firstName'); // 'Peter'
+      person.get('lastName');  // 'Wagenet'
+      ```
+
+      @class ComputedProperty
+      @namespace Ember
+      @extends Ember.Descriptor
+      @constructor
+    */
+    function ComputedProperty(func, opts) {
+      func.__ember_arity__ = func.length;
+      this.func = func;
+
+      this._cacheable = (opts && opts.cacheable !== undefined) ? opts.cacheable : true;
+      this._dependentKeys = opts && opts.dependentKeys;
+      this._readOnly = opts && (opts.readOnly !== undefined || !!opts.readOnly) || false;
+    }
+
+    ComputedProperty.prototype = new Descriptor();
+
+    var ComputedPropertyPrototype = ComputedProperty.prototype;
+    ComputedPropertyPrototype._dependentKeys = undefined;
+    ComputedPropertyPrototype._suspended = undefined;
+    ComputedPropertyPrototype._meta = undefined;
+
+    /**
+      Properties are cacheable by default. Computed property will automatically
+      cache the return value of your function until one of the dependent keys changes.
+
+      Call `volatile()` to set it into non-cached mode. When in this mode
+      the computed property will not automatically cache the return value.
+
+      However, if a property is properly observable, there is no reason to disable
+      caching.
+
+      @method cacheable
+      @param {Boolean} aFlag optional set to `false` to disable caching
+      @return {Ember.ComputedProperty} this
+      @chainable
+    */
+    ComputedPropertyPrototype.cacheable = function(aFlag) {
+      this._cacheable = aFlag !== false;
+      return this;
+    };
+
+    /**
+      Call on a computed property to set it into non-cached mode. When in this
+      mode the computed property will not automatically cache the return value.
+
+      ```javascript
+      var outsideService = Ember.Object.extend({
+        value: function() {
+          return OutsideService.getValue();
+        }.property().volatile()
+      }).create();
+      ```
+
+      @method volatile
+      @return {Ember.ComputedProperty} this
+      @chainable
+    */
+    ComputedPropertyPrototype.volatile = function() {
+      return this.cacheable(false);
+    };
+
+    /**
+      Call on a computed property to set it into read-only mode. When in this
+      mode the computed property will throw an error when set.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        guid: function() {
+          return 'guid-guid-guid';
+        }.property().readOnly()
+      });
+
+      var person = Person.create();
+
+      person.set('guid', 'new-guid'); // will throw an exception
+      ```
+
+      @method readOnly
+      @return {Ember.ComputedProperty} this
+      @chainable
+    */
+    ComputedPropertyPrototype.readOnly = function(readOnly) {
+      this._readOnly = readOnly === undefined || !!readOnly;
+      return this;
+    };
+
+    /**
+      Sets the dependent keys on this computed property. Pass any number of
+      arguments containing key paths that this computed property depends on.
+
+      ```javascript
+      var President = Ember.Object.extend({
+        fullName: computed(function() {
+          return this.get('firstName') + ' ' + this.get('lastName');
+
+          // Tell Ember that this computed property depends on firstName
+          // and lastName
+        }).property('firstName', 'lastName')
+      });
+
+      var president = President.create({
+        firstName: 'Barack',
+        lastName: 'Obama',
+      });
+
+      president.get('fullName'); // 'Barack Obama'
+      ```
+
+      @method property
+      @param {String} path* zero or more property paths
+      @return {Ember.ComputedProperty} this
+      @chainable
+    */
+    ComputedPropertyPrototype.property = function() {
+      var args;
+
+      var addArg = function (property) {
+        args.push(property);
+      };
+
+      args = [];
+      for (var i = 0, l = arguments.length; i < l; i++) {
+        expandProperties(arguments[i], addArg);
+      }
+
+      this._dependentKeys = args;
+      return this;
+    };
+
+    /**
+      In some cases, you may want to annotate computed properties with additional
+      metadata about how they function or what values they operate on. For example,
+      computed property functions may close over variables that are then no longer
+      available for introspection.
+
+      You can pass a hash of these values to a computed property like this:
+
+      ```
+      person: function() {
+        var personId = this.get('personId');
+        return App.Person.create({ id: personId });
+      }.property().meta({ type: App.Person })
+      ```
+
+      The hash that you pass to the `meta()` function will be saved on the
+      computed property descriptor under the `_meta` key. Ember runtime
+      exposes a public API for retrieving these values from classes,
+      via the `metaForProperty()` function.
+
+      @method meta
+      @param {Hash} meta
+      @chainable
+    */
+
+    ComputedPropertyPrototype.meta = function(meta) {
+      if (arguments.length === 0) {
+        return this._meta || {};
+      } else {
+        this._meta = meta;
+        return this;
+      }
+    };
+
+    /* impl descriptor API */
+    ComputedPropertyPrototype.didChange = function(obj, keyName) {
+      // _suspended is set via a CP.set to ensure we don't clear
+      // the cached value set by the setter
+      if (this._cacheable && this._suspended !== obj) {
+        var meta = metaFor(obj);
+        if (meta.cache[keyName] !== undefined) {
+          meta.cache[keyName] = undefined;
+          removeDependentKeys(this, obj, keyName, meta);
+        }
+      }
+    };
+
+    function finishChains(chainNodes)
+    {
+      for (var i=0, l=chainNodes.length; i<l; i++) {
+        chainNodes[i].didChange(null);
+      }
+    }
+
+    /**
+      Access the value of the function backing the computed property.
+      If this property has already been cached, return the cached result.
+      Otherwise, call the function passing the property name as an argument.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        fullName: function(keyName) {
+          // the keyName parameter is 'fullName' in this case.
+          return this.get('firstName') + ' ' + this.get('lastName');
+        }.property('firstName', 'lastName')
+      });
+
+
+      var tom = Person.create({
+        firstName: 'Tom',
+        lastName: 'Dale'
+      });
+
+      tom.get('fullName') // 'Tom Dale'
+      ```
+
+      @method get
+      @param {String} keyName The key being accessed.
+      @return {Object} The return value of the function backing the CP.
+    */
+    ComputedPropertyPrototype.get = function(obj, keyName) {
+      var ret, cache, meta, chainNodes;
+      if (this._cacheable) {
+        meta = metaFor(obj);
+        cache = meta.cache;
+
+        var result = cache[keyName];
+
+        if (result === UNDEFINED) {
+          return undefined;
+        }  else if (result !== undefined) {
+          return result;
+        }
+
+        ret = this.func.call(obj, keyName);
+        if (ret === undefined) {
+          cache[keyName] = UNDEFINED;
+        } else {
+          cache[keyName] = ret;
+        }
+
+        chainNodes = meta.chainWatchers && meta.chainWatchers[keyName];
+        if (chainNodes) { finishChains(chainNodes); }
+        addDependentKeys(this, obj, keyName, meta);
+      } else {
+        ret = this.func.call(obj, keyName);
+      }
+      return ret;
+    };
+
+    /**
+      Set the value of a computed property. If the function that backs your
+      computed property does not accept arguments then the default action for
+      setting would be to define the property on the current object, and set
+      the value of the property to the value being set.
+
+      Generally speaking if you intend for your computed property to be set
+      your backing function should accept either two or three arguments.
+
+      @method set
+      @param {String} keyName The key being accessed.
+      @param {Object} newValue The new value being assigned.
+      @param {String} oldValue The old value being replaced.
+      @return {Object} The return value of the function backing the CP.
+    */
+    ComputedPropertyPrototype.set = function(obj, keyName, value) {
+      var cacheable = this._cacheable,
+          func = this.func,
+          meta = metaFor(obj, cacheable),
+          oldSuspended = this._suspended,
+          hadCachedValue = false,
+          cache = meta.cache,
+          funcArgLength, cachedValue, ret;
+
+      if (this._readOnly) {
+        throw new EmberError('Cannot set read-only property "' + keyName + '" on object: ' + inspect(obj));
+      }
+
+      this._suspended = obj;
+
+      try {
+
+        if (cacheable && cache[keyName] !== undefined) {
+          cachedValue = cache[keyName];
+          hadCachedValue = true;
+        }
+
+        // Check if the CP has been wrapped. If it has, use the
+        // length from the wrapped function.
+
+        funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
+
+        // For backwards-compatibility with computed properties
+        // that check for arguments.length === 2 to determine if
+        // they are being get or set, only pass the old cached
+        // value if the computed property opts into a third
+        // argument.
+        if (funcArgLength === 3) {
+          ret = func.call(obj, keyName, value, cachedValue);
+        } else if (funcArgLength === 2) {
+          ret = func.call(obj, keyName, value);
+        } else {
+          defineProperty(obj, keyName, null, cachedValue);
+          set(obj, keyName, value);
+          return;
+        }
+
+        if (hadCachedValue && cachedValue === ret) { return; }
+
+        var watched = meta.watching[keyName];
+        if (watched) { propertyWillChange(obj, keyName); }
+
+        if (hadCachedValue) {
+          cache[keyName] = undefined;
+        }
+
+        if (cacheable) {
+          if (!hadCachedValue) {
+            addDependentKeys(this, obj, keyName, meta);
+          }
+          if (ret === undefined) {
+            cache[keyName] = UNDEFINED;
+          } else {
+            cache[keyName] = ret;
+          }
+        }
+
+        if (watched) { propertyDidChange(obj, keyName); }
+      } finally {
+        this._suspended = oldSuspended;
+      }
+      return ret;
+    };
+
+    /* called before property is overridden */
+    ComputedPropertyPrototype.teardown = function(obj, keyName) {
+      var meta = metaFor(obj);
+
+      if (keyName in meta.cache) {
+        removeDependentKeys(this, obj, keyName, meta);
+      }
+
+      if (this._cacheable) { delete meta.cache[keyName]; }
+
+      return null; // no value to restore
+    };
+
+
+    /**
+      This helper returns a new property descriptor that wraps the passed
+      computed property function. You can use this helper to define properties
+      with mixins or via `Ember.defineProperty()`.
+
+      The function you pass will be used to both get and set property values.
+      The function should accept two parameters, key and value. If value is not
+      undefined you should set the value first. In either case return the
+      current value of the property.
+
+      @method computed
+      @for Ember
+      @param {Function} func The computed property function.
+      @return {Ember.ComputedProperty} property descriptor instance
+    */
+    function computed(func) {
+      var args;
+
+      if (arguments.length > 1) {
+        args = a_slice.call(arguments, 0, -1);
+        func = a_slice.call(arguments, -1)[0];
+      }
+
+      if (typeof func !== "function") {
+        throw new EmberError("Computed Property declared without a property function");
+      }
+
+      var cp = new ComputedProperty(func);
+
+      if (args) {
+        cp.property.apply(cp, args);
+      }
+
+      return cp;
+    };
+
+    /**
+      Returns the cached value for a property, if one exists.
+      This can be useful for peeking at the value of a computed
+      property that is generated lazily, without accidentally causing
+      it to be created.
+
+      @method cacheFor
+      @for Ember
+      @param {Object} obj the object whose property you want to check
+      @param {String} key the name of the property whose cached value you want
+        to return
+      @return {Object} the cached value
+    */
+    function cacheFor(obj, key) {
+      var meta = obj[META_KEY],
+          cache = meta && meta.cache,
+          ret = cache && cache[key];
+
+      if (ret === UNDEFINED) { return undefined; }
+      return ret;
+    };
+
+    cacheFor.set = function(cache, key, value) {
+      if (value === undefined) {
+        cache[key] = UNDEFINED;
+      } else {
+        cache[key] = value;
+      }
+    };
+
+    cacheFor.get = function(cache, key) {
+      var ret = cache[key];
+      if (ret === UNDEFINED) { return undefined; }
+      return ret;
+    };
+
+    cacheFor.remove = function(cache, key) {
+      cache[key] = undefined;
+    };
+
+    function getProperties(self, propertyNames) {
+      var ret = {};
+      for(var i = 0; i < propertyNames.length; i++) {
+        ret[propertyNames[i]] = get(self, propertyNames[i]);
+      }
+      return ret;
+    }
+
+    function registerComputed(name, macro) {
+      computed[name] = function(dependentKey) {
+        var args = a_slice.call(arguments);
+        return computed(dependentKey, function() {
+          return macro.apply(this, args);
+        });
+      };
+    };
+
+    function registerComputedWithProperties(name, macro) {
+      computed[name] = function() {
+        var properties = a_slice.call(arguments);
+
+        var computedFunc = computed(function() {
+          return macro.apply(this, [getProperties(this, properties)]);
+        });
+
+        return computedFunc.property.apply(computedFunc, properties);
+      };
+    };
+
+    /**
+      A computed property that returns true if the value of the dependent
+      property is null, an empty string, empty array, or empty function.
+
+      Example
+
+      ```javascript
+      var ToDoList = Ember.Object.extend({
+        done: Ember.computed.empty('todos')
+      });
+
+      var todoList = ToDoList.create({
+        todos: ['Unit Test', 'Documentation', 'Release']
+      });
+
+      todoList.get('done'); // false
+      todoList.get('todos').clear();
+      todoList.get('done'); // true
+      ```
+
+      @since 1.6.0
+      @method computed.empty
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which negate
+      the original value for property
+    */
+    computed.empty = function (dependentKey) {
+      return computed(dependentKey + '.length', function () {
+        return isEmpty(get(this, dependentKey));
+      });
+    };
+
+    /**
+      A computed property that returns true if the value of the dependent
+      property is NOT null, an empty string, empty array, or empty function.
+
+      Note: When using `computed.notEmpty` to watch an array make sure to
+      use the `array.[]` syntax so the computed can subscribe to transitions
+      from empty to non-empty states.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasStuff: Ember.computed.notEmpty('backpack.[]')
+      });
+
+      var hamster = Hamster.create({ backpack: ['Food', 'Sleeping Bag', 'Tent'] });
+
+      hamster.get('hasStuff');         // true
+      hamster.get('backpack').clear(); // []
+      hamster.get('hasStuff');         // false
+      ```
+
+      @method computed.notEmpty
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which returns true if
+      original value for property is not empty.
+    */
+    registerComputed('notEmpty', function(dependentKey) {
+      return !isEmpty(get(this, dependentKey));
+    });
+
+    /**
+      A computed property that returns true if the value of the dependent
+      property is null or undefined. This avoids errors from JSLint complaining
+      about use of ==, which can be technically confusing.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        isHungry: Ember.computed.none('food')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('isHungry'); // true
+      hamster.set('food', 'Banana');
+      hamster.get('isHungry'); // false
+      hamster.set('food', null);
+      hamster.get('isHungry'); // true
+      ```
+
+      @method computed.none
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which
+      returns true if original value for property is null or undefined.
+    */
+    registerComputed('none', function(dependentKey) {
+      return isNone(get(this, dependentKey));
+    });
+
+    /**
+      A computed property that returns the inverse boolean value
+      of the original value for the dependent property.
+
+      Example
+
+      ```javascript
+      var User = Ember.Object.extend({
+        isAnonymous: Ember.computed.not('loggedIn')
+      });
+
+      var user = User.create({loggedIn: false});
+
+      user.get('isAnonymous'); // true
+      user.set('loggedIn', true);
+      user.get('isAnonymous'); // false
+      ```
+
+      @method computed.not
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which returns
+      inverse of the original value for property
+    */
+    registerComputed('not', function(dependentKey) {
+      return !get(this, dependentKey);
+    });
+
+    /**
+      A computed property that converts the provided dependent property
+      into a boolean value.
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasBananas: Ember.computed.bool('numBananas')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('hasBananas'); // false
+      hamster.set('numBananas', 0);
+      hamster.get('hasBananas'); // false
+      hamster.set('numBananas', 1);
+      hamster.get('hasBananas'); // true
+      hamster.set('numBananas', null);
+      hamster.get('hasBananas'); // false
+      ```
+
+      @method computed.bool
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which converts
+      to boolean the original value for property
+    */
+    registerComputed('bool', function(dependentKey) {
+      return !!get(this, dependentKey);
+    });
+
+    /**
+      A computed property which matches the original value for the
+      dependent property against a given RegExp, returning `true`
+      if they values matches the RegExp and `false` if it does not.
+
+      Example
+
+      ```javascript
+      var User = Ember.Object.extend({
+        hasValidEmail: Ember.computed.match('email', /^.+@.+\..+$/)
+      });
+
+      var user = User.create({loggedIn: false});
+
+      user.get('hasValidEmail'); // false
+      user.set('email', '');
+      user.get('hasValidEmail'); // false
+      user.set('email', 'ember_hamster@example.com');
+      user.get('hasValidEmail'); // true
+      ```
+
+      @method computed.match
+      @for Ember
+      @param {String} dependentKey
+      @param {RegExp} regexp
+      @return {Ember.ComputedProperty} computed property which match
+      the original value for property against a given RegExp
+    */
+    registerComputed('match', function(dependentKey, regexp) {
+      var value = get(this, dependentKey);
+      return typeof value === 'string' ? regexp.test(value) : false;
+    });
+
+    /**
+      A computed property that returns true if the provided dependent property
+      is equal to the given value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        napTime: Ember.computed.equal('state', 'sleepy')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('napTime'); // false
+      hamster.set('state', 'sleepy');
+      hamster.get('napTime'); // true
+      hamster.set('state', 'hungry');
+      hamster.get('napTime'); // false
+      ```
+
+      @method computed.equal
+      @for Ember
+      @param {String} dependentKey
+      @param {String|Number|Object} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is equal to the given value.
+    */
+    registerComputed('equal', function(dependentKey, value) {
+      return get(this, dependentKey) === value;
+    });
+
+    /**
+      A computed property that returns true if the provied dependent property
+      is greater than the provided value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasTooManyBananas: Ember.computed.gt('numBananas', 10)
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('hasTooManyBananas'); // false
+      hamster.set('numBananas', 3);
+      hamster.get('hasTooManyBananas'); // false
+      hamster.set('numBananas', 11);
+      hamster.get('hasTooManyBananas'); // true
+      ```
+
+      @method computed.gt
+      @for Ember
+      @param {String} dependentKey
+      @param {Number} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is greater then given value.
+    */
+    registerComputed('gt', function(dependentKey, value) {
+      return get(this, dependentKey) > value;
+    });
+
+    /**
+      A computed property that returns true if the provided dependent property
+      is greater than or equal to the provided value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasTooManyBananas: Ember.computed.gte('numBananas', 10)
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('hasTooManyBananas'); // false
+      hamster.set('numBananas', 3);
+      hamster.get('hasTooManyBananas'); // false
+      hamster.set('numBananas', 10);
+      hamster.get('hasTooManyBananas'); // true
+      ```
+
+      @method computed.gte
+      @for Ember
+      @param {String} dependentKey
+      @param {Number} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is greater or equal then given value.
+    */
+    registerComputed('gte', function(dependentKey, value) {
+      return get(this, dependentKey) >= value;
+    });
+
+    /**
+      A computed property that returns true if the provided dependent property
+      is less than the provided value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        needsMoreBananas: Ember.computed.lt('numBananas', 3)
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('needsMoreBananas'); // true
+      hamster.set('numBananas', 3);
+      hamster.get('needsMoreBananas'); // false
+      hamster.set('numBananas', 2);
+      hamster.get('needsMoreBananas'); // true
+      ```
+
+      @method computed.lt
+      @for Ember
+      @param {String} dependentKey
+      @param {Number} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is less then given value.
+    */
+    registerComputed('lt', function(dependentKey, value) {
+      return get(this, dependentKey) < value;
+    });
+
+    /**
+      A computed property that returns true if the provided dependent property
+      is less than or equal to the provided value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        needsMoreBananas: Ember.computed.lte('numBananas', 3)
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('needsMoreBananas'); // true
+      hamster.set('numBananas', 5);
+      hamster.get('needsMoreBananas'); // false
+      hamster.set('numBananas', 3);
+      hamster.get('needsMoreBananas'); // true
+      ```
+
+      @method computed.lte
+      @for Ember
+      @param {String} dependentKey
+      @param {Number} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is less or equal then given value.
+    */
+    registerComputed('lte', function(dependentKey, value) {
+      return get(this, dependentKey) <= value;
+    });
+
+    /**
+      A computed property that performs a logical `and` on the
+      original values for the provided dependent properties.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        readyForCamp: Ember.computed.and('hasTent', 'hasBackpack')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('readyForCamp'); // false
+      hamster.set('hasTent', true);
+      hamster.get('readyForCamp'); // false
+      hamster.set('hasBackpack', true);
+      hamster.get('readyForCamp'); // true
+      ```
+
+      @method computed.and
+      @for Ember
+      @param {String} dependentKey*
+      @return {Ember.ComputedProperty} computed property which performs
+      a logical `and` on the values of all the original values for properties.
+    */
+    registerComputedWithProperties('and', function(properties) {
+      for (var key in properties) {
+        if (properties.hasOwnProperty(key) && !properties[key]) {
+          return false;
+        }
+      }
+      return true;
+    });
+
+    /**
+      A computed property which performs a logical `or` on the
+      original values for the provided dependent properties.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        readyForRain: Ember.computed.or('hasJacket', 'hasUmbrella')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('readyForRain'); // false
+      hamster.set('hasJacket', true);
+      hamster.get('readyForRain'); // true
+      ```
+
+      @method computed.or
+      @for Ember
+      @param {String} dependentKey*
+      @return {Ember.ComputedProperty} computed property which performs
+      a logical `or` on the values of all the original values for properties.
+    */
+    registerComputedWithProperties('or', function(properties) {
+      for (var key in properties) {
+        if (properties.hasOwnProperty(key) && properties[key]) {
+          return true;
+        }
+      }
+      return false;
+    });
+
+    /**
+      A computed property that returns the first truthy value
+      from a list of dependent properties.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasClothes: Ember.computed.any('hat', 'shirt')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('hasClothes'); // null
+      hamster.set('shirt', 'Hawaiian Shirt');
+      hamster.get('hasClothes'); // 'Hawaiian Shirt'
+      ```
+
+      @method computed.any
+      @for Ember
+      @param {String} dependentKey*
+      @return {Ember.ComputedProperty} computed property which returns
+      the first truthy value of given list of properties.
+    */
+    registerComputedWithProperties('any', function(properties) {
+      for (var key in properties) {
+        if (properties.hasOwnProperty(key) && properties[key]) {
+          return properties[key];
+        }
+      }
+      return null;
+    });
+
+    /**
+      A computed property that returns the array of values
+      for the provided dependent properties.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        clothes: Ember.computed.collect('hat', 'shirt')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('clothes'); // [null, null]
+      hamster.set('hat', 'Camp Hat');
+      hamster.set('shirt', 'Camp Shirt');
+      hamster.get('clothes'); // ['Camp Hat', 'Camp Shirt']
+      ```
+
+      @method computed.collect
+      @for Ember
+      @param {String} dependentKey*
+      @return {Ember.ComputedProperty} computed property which maps
+      values of all passed properties in to an array.
+    */
+    registerComputedWithProperties('collect', function(properties) {
+      var res = [];
+      for (var key in properties) {
+        if (properties.hasOwnProperty(key)) {
+          if (isNone(properties[key])) {
+            res.push(null);
+          } else {
+            res.push(properties[key]);
+          }
+        }
+      }
+      return res;
+    });
+
+    /**
+      Creates a new property that is an alias for another property
+      on an object. Calls to `get` or `set` this property behave as
+      though they were called on the original property.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        name: 'Alex Matchneer',
+        nomen: Ember.computed.alias('name')
+      });
+
+      var alex = Person.create();
+
+      alex.get('nomen'); // 'Alex Matchneer'
+      alex.get('name');  // 'Alex Matchneer'
+
+      alex.set('nomen', '@machty');
+      alex.get('name');  // '@machty'
+      ```
+
+      @method computed.alias
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which creates an
+      alias to the original value for property.
+    */
+    computed.alias = function(dependentKey) {
+      return computed(dependentKey, function(key, value) {
+        if (arguments.length > 1) {
+          set(this, dependentKey, value);
+          return get(this, dependentKey);
+        } else {
+          return get(this, dependentKey);
+        }
+      });
+    };
+
+    /**
+      Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
+      data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
+      not mutate the upstream property, rather causes the current property to
+      become the value set. This causes the downstream property to permanently
+      diverge from the upstream property.
+
+      Example
+
+      ```javascript
+      var User = Ember.Object.extend({
+        firstName: null,
+        lastName: null,
+        nickName: Ember.computed.oneWay('firstName')
+      });
+
+      var teddy = User.create({
+        firstName: 'Teddy',
+        lastName:  'Zeenny'
+      });
+
+      teddy.get('nickName');              // 'Teddy'
+      teddy.set('nickName', 'TeddyBear'); // 'TeddyBear'
+      teddy.get('firstName');             // 'Teddy'
+      ```
+
+      @method computed.oneWay
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which creates a
+      one way computed property to the original value for property.
+    */
+    computed.oneWay = function(dependentKey) {
+      return computed(dependentKey, function() {
+        return get(this, dependentKey);
+      });
+    };
+
+    
+    /**
+      Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
+      a readOnly one way binding. Very often when using `computed.oneWay` one does
+      not also want changes to propogate back up, as they will replace the value.
+
+      This prevents the reverse flow, and also throws an exception when it occurs.
+
+      Example
+
+      ```javascript
+      var User = Ember.Object.extend({
+        firstName: null,
+        lastName: null,
+        nickName: Ember.computed.readOnly('firstName')
+      });
+
+      var teddy = User.create({
+        firstName: 'Teddy',
+        lastName:  'Zeenny'
+      });
+
+      teddy.get('nickName');              // 'Teddy'
+      teddy.set('nickName', 'TeddyBear'); // throws Exception
+      // throw new Ember.Error('Cannot Set: nickName on: <User:ember27288>' );`
+      teddy.get('firstName');             // 'Teddy'
+      ```
+
+      @method computed.readOnly
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which creates a
+      one way computed property to the original value for property.
+      @since 1.5.0
+    */
+    computed.readOnly = function(dependentKey) {
+      return computed(dependentKey, function() {
+        return get(this, dependentKey);
+      }).readOnly();
+    };
+    /**
+      A computed property that acts like a standard getter and setter,
+      but returns the value at the provided `defaultPath` if the
+      property itself has not been set to a value
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        wishList: Ember.computed.defaultTo('favoriteFood')
+      });
+
+      var hamster = Hamster.create({ favoriteFood: 'Banana' });
+
+      hamster.get('wishList');                     // 'Banana'
+      hamster.set('wishList', 'More Unit Tests');
+      hamster.get('wishList');                     // 'More Unit Tests'
+      hamster.get('favoriteFood');                 // 'Banana'
+      ```
+
+      @method computed.defaultTo
+      @for Ember
+      @param {String} defaultPath
+      @return {Ember.ComputedProperty} computed property which acts like
+      a standard getter and setter, but defaults to the value from `defaultPath`.
+    */
+    // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
+    computed.defaultTo = function(defaultPath) {
+      return computed(function(key, newValue, cachedValue) {
+        if (arguments.length === 1) {
+          return get(this, defaultPath);
+        }
+        return newValue != null ? newValue : get(this, defaultPath);
+      });
+    };
+
+    __exports__.ComputedProperty = ComputedProperty;
+    __exports__.computed = computed;
+    __exports__.cacheFor = cacheFor;
+  });
+define("ember-metal/core",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /*globals Em:true ENV EmberENV MetamorphENV:true */
+
+    /**
+    @module ember
+    @submodule ember-metal
+    */
+
+    /**
+      All Ember methods and functions are defined inside of this namespace. You
+      generally should not add new properties to this namespace as it may be
+      overwritten by future versions of Ember.
+
+      You can also use the shorthand `Em` instead of `Ember`.
+
+      Ember-Runtime is a framework that provides core functions for Ember including
+      cross-platform functions, support for property observing and objects. Its
+      focus is on small size and performance. You can use this in place of or
+      along-side other cross-platform libraries such as jQuery.
+
+      The core Runtime framework is based on the jQuery API with a number of
+      performance optimizations.
+
+      @class Ember
+      @static
+      @version 1.6.1
+    */
+
+    if ('undefined' === typeof Ember) {
+      // Create core object. Make it act like an instance of Ember.Namespace so that
+      // objects assigned to it are given a sane string representation.
+      Ember = {};
+    }
+
+    // Default imports, exports and lookup to the global object;
+    var imports = Ember.imports = Ember.imports || this;
+    var exports = Ember.exports = Ember.exports || this;
+    var lookup  = Ember.lookup  = Ember.lookup  || this;
+
+    // aliases needed to keep minifiers from removing the global context
+    exports.Em = exports.Ember = Ember;
+
+    // Make sure these are set whether Ember was already defined or not
+
+    Ember.isNamespace = true;
+
+    Ember.toString = function() { return "Ember"; };
+
+
+    /**
+      @property VERSION
+      @type String
+      @default '1.6.1'
+      @static
+    */
+    Ember.VERSION = '1.6.1';
+
+    /**
+      Standard environmental variables. You can define these in a global `EmberENV`
+      variable before loading Ember to control various configuration settings.
+
+      For backwards compatibility with earlier versions of Ember the global `ENV`
+      variable will be used if `EmberENV` is not defined.
+
+      @property ENV
+      @type Hash
+    */
+
+    if (Ember.ENV) {
+      // do nothing if Ember.ENV is already setup
+    } else if ('undefined' !== typeof EmberENV) {
+      Ember.ENV = EmberENV;
+    } else if('undefined' !== typeof ENV) {
+      Ember.ENV = ENV;
+    } else {
+      Ember.ENV = {};
+    }
+
+    Ember.config = Ember.config || {};
+
+    // We disable the RANGE API by default for performance reasons
+    if ('undefined' === typeof Ember.ENV.DISABLE_RANGE_API) {
+      Ember.ENV.DISABLE_RANGE_API = true;
+    }
+
+    if ("undefined" === typeof MetamorphENV) {
+      exports.MetamorphENV = {};
+    }
+
+    MetamorphENV.DISABLE_RANGE_API = Ember.ENV.DISABLE_RANGE_API;
+
+    /**
+      Hash of enabled Canary features. Add to before creating your application.
+
+      You can also define `ENV.FEATURES` if you need to enable features flagged at runtime.
+
+      @class FEATURES
+      @namespace Ember
+      @static
+      @since 1.1.0
+    */
+
+    Ember.FEATURES = Ember.ENV.FEATURES || {};
+
+    /**
+      Test that a feature is enabled. Parsed by Ember's build tools to leave
+      experimental features out of beta/stable builds.
+
+      You can define the following configuration options:
+
+      * `ENV.ENABLE_ALL_FEATURES` - force all features to be enabled.
+      * `ENV.ENABLE_OPTIONAL_FEATURES` - enable any features that have not been explicitly
+        enabled/disabled.
+
+      @method isEnabled
+      @param {String} feature
+      @return {Boolean}
+      @for Ember.FEATURES
+      @since 1.1.0
+    */
+
+    Ember.FEATURES.isEnabled = function(feature) {
+      var featureValue = Ember.FEATURES[feature];
+
+      if (Ember.ENV.ENABLE_ALL_FEATURES) {
+        return true;
+      } else if (featureValue === true || featureValue === false || featureValue === undefined) {
+        return featureValue;
+      } else if (Ember.ENV.ENABLE_OPTIONAL_FEATURES) {
+        return true;
+      } else {
+        return false;
+      }
+    };
+
+    // ..........................................................
+    // BOOTSTRAP
+    //
+
+    /**
+      Determines whether Ember should enhance some built-in object prototypes to
+      provide a more friendly API. If enabled, a few methods will be added to
+      `Function`, `String`, and `Array`. `Object.prototype` will not be enhanced,
+      which is the one that causes most trouble for people.
+
+      In general we recommend leaving this option set to true since it rarely
+      conflicts with other code. If you need to turn it off however, you can
+      define an `ENV.EXTEND_PROTOTYPES` config to disable it.
+
+      @property EXTEND_PROTOTYPES
+      @type Boolean
+      @default true
+      @for Ember
+    */
+    Ember.EXTEND_PROTOTYPES = Ember.ENV.EXTEND_PROTOTYPES;
+
+    if (typeof Ember.EXTEND_PROTOTYPES === 'undefined') {
+      Ember.EXTEND_PROTOTYPES = true;
+    }
+
+    /**
+      Determines whether Ember logs a full stack trace during deprecation warnings
+
+      @property LOG_STACKTRACE_ON_DEPRECATION
+      @type Boolean
+      @default true
+    */
+    Ember.LOG_STACKTRACE_ON_DEPRECATION = (Ember.ENV.LOG_STACKTRACE_ON_DEPRECATION !== false);
+
+    /**
+      Determines whether Ember should add ECMAScript 5 shims to older browsers.
+
+      @property SHIM_ES5
+      @type Boolean
+      @default Ember.EXTEND_PROTOTYPES
+    */
+    Ember.SHIM_ES5 = (Ember.ENV.SHIM_ES5 === false) ? false : Ember.EXTEND_PROTOTYPES;
+
+    /**
+      Determines whether Ember logs info about version of used libraries
+
+      @property LOG_VERSION
+      @type Boolean
+      @default true
+    */
+    Ember.LOG_VERSION = (Ember.ENV.LOG_VERSION === false) ? false : true;
+
+    /**
+      Empty function. Useful for some operations. Always returns `this`.
+
+      @method K
+      @private
+      @return {Object}
+    */
+    Ember.K = function() { return this; };
+
+
+    // Stub out the methods defined by the ember-debug package in case it's not loaded
+
+    if ('undefined' === typeof Ember.assert) { Ember.assert = Ember.K; }
+    if ('undefined' === typeof Ember.warn) { Ember.warn = Ember.K; }
+    if ('undefined' === typeof Ember.debug) { Ember.debug = Ember.K; }
+    if ('undefined' === typeof Ember.runInDebug) { Ember.runInDebug = Ember.K; }
+    if ('undefined' === typeof Ember.deprecate) { Ember.deprecate = Ember.K; }
+    if ('undefined' === typeof Ember.deprecateFunc) {
+      Ember.deprecateFunc = function(_, func) { return func; };
+    }
+
+    /**
+      Previously we used `Ember.$.uuid`, however `$.uuid` has been removed from
+      jQuery master. We'll just bootstrap our own uuid now.
+
+      @property uuid
+      @type Number
+      @private
+    */
+    Ember.uuid = 0;
+
+    __exports__["default"] = Ember;
+  });
+define("ember-metal/enumerable_utils",
+  ["ember-metal/array","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var map, forEach, indexOf, splice, filter;
+
+    var map = __dependency1__.map;
+    var forEach = __dependency1__.forEach;
+    var indexOf = __dependency1__.indexOf;
+    var filter = __dependency1__.filter;
+
+    // ES6TODO: doesn't array polyfills already do this?
+    map     = Array.prototype.map     || map;
+    forEach = Array.prototype.forEach || forEach;
+    indexOf = Array.prototype.indexOf || indexOf;
+    filter  = Array.prototype.filter   || filter;
+    splice  = Array.prototype.splice;
+
+    /**
+     * Defines some convenience methods for working with Enumerables.
+     * `Ember.EnumerableUtils` uses `Ember.ArrayPolyfills` when necessary.
+     *
+     * @class EnumerableUtils
+     * @namespace Ember
+     * @static
+     * */
+    var utils = {
+      /**
+       * Calls the map function on the passed object with a specified callback. This
+       * uses `Ember.ArrayPolyfill`'s-map method when necessary.
+       *
+       * @method map
+       * @param {Object} obj The object that should be mapped
+       * @param {Function} callback The callback to execute
+       * @param {Object} thisArg Value to use as this when executing *callback*
+       *
+       * @return {Array} An array of mapped values.
+       */
+      map: function(obj, callback, thisArg) {
+        return obj.map ? obj.map.call(obj, callback, thisArg) : map.call(obj, callback, thisArg);
+      },
+
+      /**
+       * Calls the forEach function on the passed object with a specified callback. This
+       * uses `Ember.ArrayPolyfill`'s-forEach method when necessary.
+       *
+       * @method forEach
+       * @param {Object} obj The object to call forEach on
+       * @param {Function} callback The callback to execute
+       * @param {Object} thisArg Value to use as this when executing *callback*
+       *
+       */
+      forEach: function(obj, callback, thisArg) {
+        return obj.forEach ? obj.forEach.call(obj, callback, thisArg) : forEach.call(obj, callback, thisArg);
+      },
+
+      /**
+       * Calls the filter function on the passed object with a specified callback. This
+       * uses `Ember.ArrayPolyfill`'s-filter method when necessary.
+       *
+       * @method filter
+       * @param {Object} obj The object to call filter on
+       * @param {Function} callback The callback to execute
+       * @param {Object} thisArg Value to use as this when executing *callback*
+       *
+       * @return {Array} An array containing the filtered values
+       * @since 1.4.0
+       */
+      filter: function(obj, callback, thisArg) {
+        return obj.filter ? obj.filter.call(obj, callback, thisArg) : filter.call(obj, callback, thisArg);
+      },
+
+      /**
+       * Calls the indexOf function on the passed object with a specified callback. This
+       * uses `Ember.ArrayPolyfill`'s-indexOf method when necessary.
+       *
+       * @method indexOf
+       * @param {Object} obj The object to call indexOn on
+       * @param {Function} callback The callback to execute
+       * @param {Object} index The index to start searching from
+       *
+       */
+      indexOf: function(obj, element, index) {
+        return obj.indexOf ? obj.indexOf.call(obj, element, index) : indexOf.call(obj, element, index);
+      },
+
+      /**
+       * Returns an array of indexes of the first occurrences of the passed elements
+       * on the passed object.
+       *
+       * ```javascript
+       *  var array = [1, 2, 3, 4, 5];
+       *  Ember.EnumerableUtils.indexesOf(array, [2, 5]); // [1, 4]
+       *
+       *  var fubar = "Fubarr";
+       *  Ember.EnumerableUtils.indexesOf(fubar, ['b', 'r']); // [2, 4]
+       * ```
+       *
+       * @method indexesOf
+       * @param {Object} obj The object to check for element indexes
+       * @param {Array} elements The elements to search for on *obj*
+       *
+       * @return {Array} An array of indexes.
+       *
+       */
+      indexesOf: function(obj, elements) {
+        return elements === undefined ? [] : utils.map(elements, function(item) {
+          return utils.indexOf(obj, item);
+        });
+      },
+
+      /**
+       * Adds an object to an array. If the array already includes the object this
+       * method has no effect.
+       *
+       * @method addObject
+       * @param {Array} array The array the passed item should be added to
+       * @param {Object} item The item to add to the passed array
+       *
+       * @return 'undefined'
+       */
+      addObject: function(array, item) {
+        var index = utils.indexOf(array, item);
+        if (index === -1) { array.push(item); }
+      },
+
+      /**
+       * Removes an object from an array. If the array does not contain the passed
+       * object this method has no effect.
+       *
+       * @method removeObject
+       * @param {Array} array The array to remove the item from.
+       * @param {Object} item The item to remove from the passed array.
+       *
+       * @return 'undefined'
+       */
+      removeObject: function(array, item) {
+        var index = utils.indexOf(array, item);
+        if (index !== -1) { array.splice(index, 1); }
+      },
+
+      _replace: function(array, idx, amt, objects) {
+        var args = [].concat(objects), chunk, ret = [],
+            // https://code.google.com/p/chromium/issues/detail?id=56588
+            size = 60000, start = idx, ends = amt, count;
+
+        while (args.length) {
+          count = ends > size ? size : ends;
+          if (count <= 0) { count = 0; }
+
+          chunk = args.splice(0, size);
+          chunk = [start, count].concat(chunk);
+
+          start += size;
+          ends -= count;
+
+          ret = ret.concat(splice.apply(array, chunk));
+        }
+        return ret;
+      },
+
+      /**
+       * Replaces objects in an array with the passed objects.
+       *
+       * ```javascript
+       *   var array = [1,2,3];
+       *   Ember.EnumerableUtils.replace(array, 1, 2, [4, 5]); // [1, 4, 5]
+       *
+       *   var array = [1,2,3];
+       *   Ember.EnumerableUtils.replace(array, 1, 1, [4, 5]); // [1, 4, 5, 3]
+       *
+       *   var array = [1,2,3];
+       *   Ember.EnumerableUtils.replace(array, 10, 1, [4, 5]); // [1, 2, 3, 4, 5]
+       * ```
+       *
+       * @method replace
+       * @param {Array} array The array the objects should be inserted into.
+       * @param {Number} idx Starting index in the array to replace. If *idx* >=
+       * length, then append to the end of the array.
+       * @param {Number} amt Number of elements that should be removed from the array,
+       * starting at *idx*
+       * @param {Array} objects An array of zero or more objects that should be
+       * inserted into the array at *idx*
+       *
+       * @return {Array} The modified array.
+       */
+      replace: function(array, idx, amt, objects) {
+        if (array.replace) {
+          return array.replace(idx, amt, objects);
+        } else {
+          return utils._replace(array, idx, amt, objects);
+        }
+      },
+
+      /**
+       * Calculates the intersection of two arrays. This method returns a new array
+       * filled with the records that the two passed arrays share with each other.
+       * If there is no intersection, an empty array will be returned.
+       *
+       * ```javascript
+       * var array1 = [1, 2, 3, 4, 5];
+       * var array2 = [1, 3, 5, 6, 7];
+       *
+       * Ember.EnumerableUtils.intersection(array1, array2); // [1, 3, 5]
+       *
+       * var array1 = [1, 2, 3];
+       * var array2 = [4, 5, 6];
+       *
+       * Ember.EnumerableUtils.intersection(array1, array2); // []
+       * ```
+       *
+       * @method intersection
+       * @param {Array} array1 The first array
+       * @param {Array} array2 The second array
+       *
+       * @return {Array} The intersection of the two passed arrays.
+       */
+      intersection: function(array1, array2) {
+        var intersection = [];
+
+        utils.forEach(array1, function(element) {
+          if (utils.indexOf(array2, element) >= 0) {
+            intersection.push(element);
+          }
+        });
+
+        return intersection;
+      }
+    };
+
+    __exports__["default"] = utils;
+  });
+define("ember-metal/error",
+  ["ember-metal/platform","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+
+    var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
+
+    /**
+      A subclass of the JavaScript Error object for use in Ember.
+
+      @class Error
+      @namespace Ember
+      @extends Error
+      @constructor
+    */
+    var EmberError = function() {
+      var tmp = Error.apply(this, arguments);
+
+      // Adds a `stack` property to the given error object that will yield the
+      // stack trace at the time captureStackTrace was called.
+      // When collecting the stack trace all frames above the topmost call
+      // to this function, including that call, will be left out of the
+      // stack trace.
+      // This is useful because we can hide Ember implementation details
+      // that are not very helpful for the user.
+      if (Error.captureStackTrace) {
+        Error.captureStackTrace(this, Ember.Error);
+      }
+      // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
+      for (var idx = 0; idx < errorProps.length; idx++) {
+        this[errorProps[idx]] = tmp[errorProps[idx]];
+      }
+    };
+
+    EmberError.prototype = create(Error.prototype);
+
+    __exports__["default"] = EmberError;
+  });
+define("ember-metal/events",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+    var Ember = __dependency1__["default"];
+    var meta = __dependency2__.meta;
+    var META_KEY = __dependency2__.META_KEY;
+    var tryFinally = __dependency2__.tryFinally;
+    var apply = __dependency2__.apply;
+    var applyStr = __dependency2__.applyStr;
+    var create = __dependency3__.create;
+
+    var a_slice = [].slice,
+        metaFor = meta,
+        /* listener flags */
+        ONCE = 1, SUSPENDED = 2;
+
+
+    /*
+      The event system uses a series of nested hashes to store listeners on an
+      object. When a listener is registered, or when an event arrives, these
+      hashes are consulted to determine which target and action pair to invoke.
+
+      The hashes are stored in the object's meta hash, and look like this:
+
+          // Object's meta hash
+          {
+            listeners: {       // variable name: `listenerSet`
+              "foo:changed": [ // variable name: `actions`
+                target, method, flags
+              ]
+            }
+          }
+
+    */
+
+    function indexOf(array, target, method) {
+      var index = -1;
+      // hashes are added to the end of the event array
+      // so it makes sense to start searching at the end
+      // of the array and search in reverse
+      for (var i = array.length - 3 ; i >=0; i -= 3) {
+        if (target === array[i] && method === array[i + 1]) {
+             index = i; break;
+        }
+      }
+      return index;
+    }
+
+    function actionsFor(obj, eventName) {
+      var meta = metaFor(obj, true),
+          actions;
+
+      if (!meta.listeners) { meta.listeners = {}; }
+
+      if (!meta.hasOwnProperty('listeners')) {
+        // setup inherited copy of the listeners object
+        meta.listeners = create(meta.listeners);
+      }
+
+      actions = meta.listeners[eventName];
+
+      // if there are actions, but the eventName doesn't exist in our listeners, then copy them from the prototype
+      if (actions && !meta.listeners.hasOwnProperty(eventName)) {
+        actions = meta.listeners[eventName] = meta.listeners[eventName].slice();
+      } else if (!actions) {
+        actions = meta.listeners[eventName] = [];
+      }
+
+      return actions;
+    }
+
+    function listenersUnion(obj, eventName, otherActions) {
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
+
+      if (!actions) { return; }
+      for (var i = actions.length - 3; i >= 0; i -= 3) {
+        var target = actions[i],
+            method = actions[i+1],
+            flags = actions[i+2],
+            actionIndex = indexOf(otherActions, target, method);
+
+        if (actionIndex === -1) {
+          otherActions.push(target, method, flags);
+        }
+      }
+    }
+
+    function listenersDiff(obj, eventName, otherActions) {
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName],
+          diffActions = [];
+
+      if (!actions) { return; }
+      for (var i = actions.length - 3; i >= 0; i -= 3) {
+        var target = actions[i],
+            method = actions[i+1],
+            flags = actions[i+2],
+            actionIndex = indexOf(otherActions, target, method);
+
+        if (actionIndex !== -1) { continue; }
+
+        otherActions.push(target, method, flags);
+        diffActions.push(target, method, flags);
+      }
+
+      return diffActions;
+    }
+
+    /**
+      Add an event listener
+
+      @method addListener
+      @for Ember
+      @param obj
+      @param {String} eventName
+      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Function|String} method A function or the name of a function to be called on `target`
+      @param {Boolean} once A flag whether a function should only be called once
+    */
+    function addListener(obj, eventName, target, method, once) {
+      Ember.assert("You must pass at least an object and event name to Ember.addListener", !!obj && !!eventName);
+
+      if (!method && 'function' === typeof target) {
+        method = target;
+        target = null;
+      }
+
+      var actions = actionsFor(obj, eventName),
+          actionIndex = indexOf(actions, target, method),
+          flags = 0;
+
+      if (once) flags |= ONCE;
+
+      if (actionIndex !== -1) { return; }
+
+      actions.push(target, method, flags);
+
+      if ('function' === typeof obj.didAddListener) {
+        obj.didAddListener(eventName, target, method);
+      }
+    }
+
+    /**
+      Remove an event listener
+
+      Arguments should match those passed to `Ember.addListener`.
+
+      @method removeListener
+      @for Ember
+      @param obj
+      @param {String} eventName
+      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Function|String} method A function or the name of a function to be called on `target`
+    */
+    function removeListener(obj, eventName, target, method) {
+      Ember.assert("You must pass at least an object and event name to Ember.removeListener", !!obj && !!eventName);
+
+      if (!method && 'function' === typeof target) {
+        method = target;
+        target = null;
+      }
+
+      function _removeListener(target, method) {
+        var actions = actionsFor(obj, eventName),
+            actionIndex = indexOf(actions, target, method);
+
+        // action doesn't exist, give up silently
+        if (actionIndex === -1) { return; }
+
+        actions.splice(actionIndex, 3);
+
+        if ('function' === typeof obj.didRemoveListener) {
+          obj.didRemoveListener(eventName, target, method);
+        }
+      }
+
+      if (method) {
+        _removeListener(target, method);
+      } else {
+        var meta = obj[META_KEY],
+            actions = meta && meta.listeners && meta.listeners[eventName];
+
+        if (!actions) { return; }
+        for (var i = actions.length - 3; i >= 0; i -= 3) {
+          _removeListener(actions[i], actions[i+1]);
+        }
+      }
+    }
+
+    /**
+      Suspend listener during callback.
+
+      This should only be used by the target of the event listener
+      when it is taking an action that would cause the event, e.g.
+      an object might suspend its property change listener while it is
+      setting that property.
+
+      @method suspendListener
+      @for Ember
+
+      @private
+      @param obj
+      @param {String} eventName
+      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Function|String} method A function or the name of a function to be called on `target`
+      @param {Function} callback
+    */
+    function suspendListener(obj, eventName, target, method, callback) {
+      if (!method && 'function' === typeof target) {
+        method = target;
+        target = null;
+      }
+
+      var actions = actionsFor(obj, eventName),
+          actionIndex = indexOf(actions, target, method);
+
+      if (actionIndex !== -1) {
+        actions[actionIndex+2] |= SUSPENDED; // mark the action as suspended
+      }
+
+      function tryable()   { return callback.call(target); }
+      function finalizer() { if (actionIndex !== -1) { actions[actionIndex+2] &= ~SUSPENDED; } }
+
+      return tryFinally(tryable, finalizer);
+    }
+
+    /**
+      Suspends multiple listeners during a callback.
+
+      @method suspendListeners
+      @for Ember
+
+      @private
+      @param obj
+      @param {Array} eventName Array of event names
+      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Function|String} method A function or the name of a function to be called on `target`
+      @param {Function} callback
+    */
+    function suspendListeners(obj, eventNames, target, method, callback) {
+      if (!method && 'function' === typeof target) {
+        method = target;
+        target = null;
+      }
+
+      var suspendedActions = [],
+          actionsList = [],
+          eventName, actions, i, l;
+
+      for (i=0, l=eventNames.length; i<l; i++) {
+        eventName = eventNames[i];
+        actions = actionsFor(obj, eventName);
+        var actionIndex = indexOf(actions, target, method);
+
+        if (actionIndex !== -1) {
+          actions[actionIndex+2] |= SUSPENDED;
+          suspendedActions.push(actionIndex);
+          actionsList.push(actions);
+        }
+      }
+
+      function tryable() { return callback.call(target); }
+
+      function finalizer() {
+        for (var i = 0, l = suspendedActions.length; i < l; i++) {
+          var actionIndex = suspendedActions[i];
+          actionsList[i][actionIndex+2] &= ~SUSPENDED;
+        }
+      }
+
+      return tryFinally(tryable, finalizer);
+    }
+
+    /**
+      Return a list of currently watched events
+
+      @private
+      @method watchedEvents
+      @for Ember
+      @param obj
+    */
+    function watchedEvents(obj) {
+      var listeners = obj[META_KEY].listeners, ret = [];
+
+      if (listeners) {
+        for(var eventName in listeners) {
+          if (listeners[eventName]) { ret.push(eventName); }
+        }
+      }
+      return ret;
+    }
+
+    /**
+      Send an event. The execution of suspended listeners
+      is skipped, and once listeners are removed. A listener without
+      a target is executed on the passed object. If an array of actions
+      is not passed, the actions stored on the passed object are invoked.
+
+      @method sendEvent
+      @for Ember
+      @param obj
+      @param {String} eventName
+      @param {Array} params Optional parameters for each listener.
+      @param {Array} actions Optional array of actions (listeners).
+      @return true
+    */
+    function sendEvent(obj, eventName, params, actions) {
+      // first give object a chance to handle it
+      if (obj !== Ember && 'function' === typeof obj.sendEvent) {
+        obj.sendEvent(eventName, params);
+      }
+
+      if (!actions) {
+        var meta = obj[META_KEY];
+        actions = meta && meta.listeners && meta.listeners[eventName];
+      }
+
+      if (!actions) { return; }
+
+      for (var i = actions.length - 3; i >= 0; i -= 3) { // looping in reverse for once listeners
+        var target = actions[i], method = actions[i+1], flags = actions[i+2];
+        if (!method) { continue; }
+        if (flags & SUSPENDED) { continue; }
+        if (flags & ONCE) { removeListener(obj, eventName, target, method); }
+        if (!target) { target = obj; }
+        if ('string' === typeof method) {
+          if (params) {
+            applyStr(target, method, params);
+          } else {
+            target[method]();
+          }
+        } else {
+          if (params) {
+            apply(target, method, params);
+          } else {
+            method.call(target);
+          }
+        }
+      }
+      return true;
+    }
+
+    /**
+      @private
+      @method hasListeners
+      @for Ember
+      @param obj
+      @param {String} eventName
+    */
+    function hasListeners(obj, eventName) {
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
+
+      return !!(actions && actions.length);
+    }
+
+    /**
+      @private
+      @method listenersFor
+      @for Ember
+      @param obj
+      @param {String} eventName
+    */
+    function listenersFor(obj, eventName) {
+      var ret = [];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
+
+      if (!actions) { return ret; }
+
+      for (var i = 0, l = actions.length; i < l; i += 3) {
+        var target = actions[i],
+            method = actions[i+1];
+        ret.push([target, method]);
+      }
+
+      return ret;
+    }
+
+    /**
+      Define a property as a function that should be executed when
+      a specified event or events are triggered.
+
+
+      ``` javascript
+      var Job = Ember.Object.extend({
+        logCompleted: Ember.on('completed', function() {
+          console.log('Job completed!');
+        })
+      });
+
+      var job = Job.create();
+
+      Ember.sendEvent(job, 'completed'); // Logs 'Job completed!'
+     ```
+
+      @method on
+      @for Ember
+      @param {String} eventNames*
+      @param {Function} func
+      @return func
+    */
+    function on(){
+      var func = a_slice.call(arguments, -1)[0],
+          events = a_slice.call(arguments, 0, -1);
+      func.__ember_listens__ = events;
+      return func;
+    };
+
+    __exports__.on = on;
+    __exports__.addListener = addListener;
+    __exports__.removeListener = removeListener;
+    __exports__.suspendListener = suspendListener;
+    __exports__.suspendListeners = suspendListeners;
+    __exports__.sendEvent = sendEvent;
+    __exports__.hasListeners = hasListeners;
+    __exports__.watchedEvents = watchedEvents;
+    __exports__.listenersFor = listenersFor;
+    __exports__.listenersDiff = listenersDiff;
+    __exports__.listenersUnion = listenersUnion;
+  });
+define("ember-metal/expand_properties",
+  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var EmberError = __dependency1__["default"];
+    var EnumerableUtils = __dependency2__["default"];
+
+    /**
+      @module ember-metal
+      */
+
+    var forEach = EnumerableUtils.forEach,
+      BRACE_EXPANSION = /^((?:[^\.]*\.)*)\{(.*)\}$/;
+
+    /**
+      Expands `pattern`, invoking `callback` for each expansion.
+
+      The only pattern supported is brace-expansion, anything else will be passed
+      once to `callback` directly. Brace expansion can only appear at the end of a
+      pattern, for an example see the last call below.
+
+      Example
+      ```js
+      function echo(arg){ console.log(arg); }
+
+      Ember.expandProperties('foo.bar', echo);        //=> 'foo.bar'
+      Ember.expandProperties('{foo,bar}', echo);      //=> 'foo', 'bar'
+      Ember.expandProperties('foo.{bar,baz}', echo);  //=> 'foo.bar', 'foo.baz'
+      Ember.expandProperties('{foo,bar}.baz', echo);  //=> '{foo,bar}.baz'
+      ```
+
+      @method
+      @private
+      @param {string} pattern The property pattern to expand.
+      @param {function} callback The callback to invoke.  It is invoked once per
+      expansion, and is passed the expansion.
+      */
+    function expandProperties(pattern, callback) {
+      var match, prefix, list;
+
+      if (pattern.indexOf(' ') > -1) {
+        throw new EmberError('Brace expanded properties cannot contain spaces, ' + 
+          'e.g. `user.{firstName, lastName}` should be `user.{firstName,lastName}`');
+      }
+
+      if (match = BRACE_EXPANSION.exec(pattern)) {
+        prefix = match[1];
+        list = match[2];
+
+        forEach(list.split(','), function (suffix) {
+            callback(prefix + suffix);
+        });
+      } else {
+        callback(pattern);
+      }
+    };
+
+    __exports__["default"] = expandProperties;
+  });
+define("ember-metal/get_properties",
+  ["ember-metal/property_get","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var typeOf = __dependency2__.typeOf;
+
+    /**
+      To get multiple properties at once, call `Ember.getProperties`
+      with an object followed by a list of strings or an array:
+
+      ```javascript
+      Ember.getProperties(record, 'firstName', 'lastName', 'zipCode');
+      // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+      ```
+
+      is equivalent to:
+
+      ```javascript
+      Ember.getProperties(record, ['firstName', 'lastName', 'zipCode']);
+      // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+      ```
+
+      @method getProperties
+      @param obj
+      @param {String...|Array} list of keys to get
+      @return {Hash}
+    */
+    function getProperties(obj) {
+      var ret = {},
+          propertyNames = arguments,
+          i = 1;
+
+      if (arguments.length === 2 && typeOf(arguments[1]) === 'array') {
+        i = 0;
+        propertyNames = arguments[1];
+      }
+      for(var len = propertyNames.length; i < len; i++) {
+        ret[propertyNames[i]] = get(obj, propertyNames[i]);
+      }
+      return ret;
+    };
+
+    __exports__["default"] = getProperties;
+  });
+define("ember-metal/instrumentation",
+  ["ember-metal/core","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var tryCatchFinally = __dependency2__.tryCatchFinally;
+
+    /**
+      The purpose of the Ember Instrumentation module is
+      to provide efficient, general-purpose instrumentation
+      for Ember.
+
+      Subscribe to a listener by using `Ember.subscribe`:
+
+      ```javascript
+      Ember.subscribe("render", {
+        before: function(name, timestamp, payload) {
+
+        },
+
+        after: function(name, timestamp, payload) {
+
+        }
+      });
+      ```
+
+      If you return a value from the `before` callback, that same
+      value will be passed as a fourth parameter to the `after`
+      callback.
+
+      Instrument a block of code by using `Ember.instrument`:
+
+      ```javascript
+      Ember.instrument("render.handlebars", payload, function() {
+        // rendering logic
+      }, binding);
+      ```
+
+      Event names passed to `Ember.instrument` are namespaced
+      by periods, from more general to more specific. Subscribers
+      can listen for events by whatever level of granularity they
+      are interested in.
+
+      In the above example, the event is `render.handlebars`,
+      and the subscriber listened for all events beginning with
+      `render`. It would receive callbacks for events named
+      `render`, `render.handlebars`, `render.container`, or
+      even `render.handlebars.layout`.
+
+      @class Instrumentation
+      @namespace Ember
+      @static
+    */
+    var subscribers = [], cache = {};
+
+    var populateListeners = function(name) {
+      var listeners = [], subscriber;
+
+      for (var i=0, l=subscribers.length; i<l; i++) {
+        subscriber = subscribers[i];
+        if (subscriber.regex.test(name)) {
+          listeners.push(subscriber.object);
+        }
+      }
+
+      cache[name] = listeners;
+      return listeners;
+    };
+
+    var time = (function() {
+      var perf = 'undefined' !== typeof window ? window.performance || {} : {};
+      var fn = perf.now || perf.mozNow || perf.webkitNow || perf.msNow || perf.oNow;
+      // fn.bind will be available in all the browsers that support the advanced window.performance... ;-)
+      return fn ? fn.bind(perf) : function() { return +new Date(); };
+    })();
+
+    /**
+      Notifies event's subscribers, calls `before` and `after` hooks.
+
+      @method instrument
+      @namespace Ember.Instrumentation
+
+      @param {String} [name] Namespaced event name.
+      @param {Object} payload
+      @param {Function} callback Function that you're instrumenting.
+      @param {Object} binding Context that instrument function is called with.
+    */
+    function instrument(name, payload, callback, binding) {
+      var listeners = cache[name], timeName, ret;
+
+      // ES6TODO: Docs. What is this?
+      if (Ember.STRUCTURED_PROFILE) {
+        timeName = name + ": " + payload.object;
+        console.time(timeName);
+      }
+
+      if (!listeners) {
+        listeners = populateListeners(name);
+      }
+
+      if (listeners.length === 0) {
+        ret = callback.call(binding);
+        if (Ember.STRUCTURED_PROFILE) { console.timeEnd(timeName); }
+        return ret;
+      }
+
+      var beforeValues = [], listener, i, l;
+
+      function tryable() {
+        for (i=0, l=listeners.length; i<l; i++) {
+          listener = listeners[i];
+          beforeValues[i] = listener.before(name, time(), payload);
+        }
+
+        return callback.call(binding);
+      }
+
+      function catchable(e) {
+        payload = payload || {};
+        payload.exception = e;
+      }
+
+      function finalizer() {
+        for (i=0, l=listeners.length; i<l; i++) {
+          listener = listeners[i];
+          listener.after(name, time(), payload, beforeValues[i]);
+        }
+
+        if (Ember.STRUCTURED_PROFILE) {
+          console.timeEnd(timeName);
+        }
+      }
+
+      return tryCatchFinally(tryable, catchable, finalizer);
+    };
+
+    /**
+      Subscribes to a particular event or instrumented block of code.
+
+      @method subscribe
+      @namespace Ember.Instrumentation
+
+      @param {String} [pattern] Namespaced event name.
+      @param {Object} [object] Before and After hooks.
+
+      @return {Subscriber}
+    */
+    function subscribe(pattern, object) {
+      var paths = pattern.split("."), path, regex = [];
+
+      for (var i=0, l=paths.length; i<l; i++) {
+        path = paths[i];
+        if (path === "*") {
+          regex.push("[^\\.]*");
+        } else {
+          regex.push(path);
+        }
+      }
+
+      regex = regex.join("\\.");
+      regex = regex + "(\\..*)?";
+
+      var subscriber = {
+        pattern: pattern,
+        regex: new RegExp("^" + regex + "$"),
+        object: object
+      };
+
+      subscribers.push(subscriber);
+      cache = {};
+
+      return subscriber;
+    };
+
+    /**
+      Unsubscribes from a particular event or instrumented block of code.
+
+      @method unsubscribe
+      @namespace Ember.Instrumentation
+
+      @param {Object} [subscriber]
+    */
+    function unsubscribe(subscriber) {
+      var index;
+
+      for (var i=0, l=subscribers.length; i<l; i++) {
+        if (subscribers[i] === subscriber) {
+          index = i;
+        }
+      }
+
+      subscribers.splice(index, 1);
+      cache = {};
+    };
+
+    /**
+      Resets `Ember.Instrumentation` by flushing list of subscribers.
+
+      @method reset
+      @namespace Ember.Instrumentation
+    */
+    function reset() {
+      subscribers = [];
+      cache = {};
+    };
+
+    __exports__.instrument = instrument;
+    __exports__.subscribe = subscribe;
+    __exports__.unsubscribe = unsubscribe;
+    __exports__.reset = reset;
+  });
+define("ember-metal/is_blank",
+  ["ember-metal/core","ember-metal/is_empty","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // deprecateFunc
+    var isEmpty = __dependency2__["default"];
+
+    /**
+      A value is blank if it is empty or a whitespace string.
+
+      ```javascript
+      Ember.isBlank();                // true
+      Ember.isBlank(null);            // true
+      Ember.isBlank(undefined);       // true
+      Ember.isBlank('');              // true
+      Ember.isBlank([]);              // true
+      Ember.isBlank('\n\t');          // true
+      Ember.isBlank('  ');            // true
+      Ember.isBlank({});              // false
+      Ember.isBlank('\n\t Hello');    // false
+      Ember.isBlank('Hello world');   // false
+      Ember.isBlank([1,2,3]);         // false
+      ```
+
+      @method isBlank
+      @for Ember
+      @param {Object} obj Value to test
+      @return {Boolean}
+      @since 1.5.0
+      */
+    function isBlank(obj) {
+      return isEmpty(obj) || (typeof obj === 'string' && obj.match(/\S/) === null);
+    };
+
+    __exports__["default"] = isBlank;
+  });
+define("ember-metal/is_empty",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // deprecateFunc
+    var get = __dependency2__.get;
+    var isNone = __dependency3__["default"];
+
+    /**
+      Verifies that a value is `null` or an empty string, empty array,
+      or empty function.
+
+      Constrains the rules on `Ember.isNone` by returning false for empty
+      string and empty arrays.
+
+      ```javascript
+      Ember.isEmpty();                // true
+      Ember.isEmpty(null);            // true
+      Ember.isEmpty(undefined);       // true
+      Ember.isEmpty('');              // true
+      Ember.isEmpty([]);              // true
+      Ember.isEmpty('Adam Hawkins');  // false
+      Ember.isEmpty([0,1,2]);         // false
+      ```
+
+      @method isEmpty
+      @for Ember
+      @param {Object} obj Value to test
+      @return {Boolean}
+    */
+    var isEmpty = function(obj) {
+      return isNone(obj) || (obj.length === 0 && typeof obj !== 'function') || (typeof obj === 'object' && get(obj, 'length') === 0);
+    };
+    var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
+
+    __exports__["default"] = isEmpty;
+    __exports__.isEmpty = isEmpty;
+    __exports__.empty = empty;
+  });
+define("ember-metal/is_none",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // deprecateFunc
+
+    /**
+      Returns true if the passed value is null or undefined. This avoids errors
+      from JSLint complaining about use of ==, which can be technically
+      confusing.
+
+      ```javascript
+      Ember.isNone();              // true
+      Ember.isNone(null);          // true
+      Ember.isNone(undefined);     // true
+      Ember.isNone('');            // false
+      Ember.isNone([]);            // false
+      Ember.isNone(function() {});  // false
+      ```
+
+      @method isNone
+      @for Ember
+      @param {Object} obj Value to test
+      @return {Boolean}
+    */
+    var isNone = function(obj) {
+      return obj === null || obj === undefined;
+    };
+    var none = Ember.deprecateFunc("Ember.none is deprecated. Please use Ember.isNone instead.", isNone);
+
+    __exports__["default"] = isNone;
+    __exports__.isNone = isNone;
+    __exports__.none = none;
+  });
+define("ember-metal/libraries",
+  ["ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    // Provides a way to register library versions with ember.
+    var EnumerableUtils = __dependency1__["default"];
+
+    var forEach = EnumerableUtils.forEach,
+        indexOf = EnumerableUtils.indexOf;
+
+    var libraries = function() {
+      var _libraries   = [];
+      var coreLibIndex = 0;
+
+      var getLibrary = function(name) {
+        for (var i = 0; i < _libraries.length; i++) {
+          if (_libraries[i].name === name) {
+            return _libraries[i];
+          }
+        }
+      };
+
+      _libraries.register = function(name, version) {
+        if (!getLibrary(name)) {
+          _libraries.push({name: name, version: version});
+        }
+      };
+
+      _libraries.registerCoreLibrary = function(name, version) {
+        if (!getLibrary(name)) {
+          _libraries.splice(coreLibIndex++, 0, {name: name, version: version});
+        }
+      };
+
+      _libraries.deRegister = function(name) {
+        var lib = getLibrary(name);
+        if (lib) _libraries.splice(indexOf(_libraries, lib), 1);
+      };
+
+      _libraries.each = function (callback) {
+        forEach(_libraries, function(lib) {
+          callback(lib.name, lib.version);
+        });
+      };
+
+      return _libraries;
+    }();
+
+    __exports__["default"] = libraries;
+  });
+define("ember-metal/logger",
+  ["ember-metal/core","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var EmberError = __dependency2__["default"];
+
+    function consoleMethod(name) {
+      var consoleObj, logToConsole;
+      if (Ember.imports.console) {
+        consoleObj = Ember.imports.console;
+      } else if (typeof console !== 'undefined') {
+        consoleObj = console;
+      }
+
+      var method = typeof consoleObj === 'object' ? consoleObj[name] : null;
+
+      if (method) {
+        // Older IE doesn't support apply, but Chrome needs it
+        if (typeof method.apply === 'function') {
+          logToConsole = function() {
+            method.apply(consoleObj, arguments);
+          };
+          logToConsole.displayName = 'console.' + name;
+          return logToConsole;
+        } else {
+          return function() {
+            var message = Array.prototype.join.call(arguments, ', ');
+            method(message);
+          };
+        }
+      }
+    }
+
+    function assertPolyfill(test, message) {
+      if (!test) {
+        try {
+          // attempt to preserve the stack
+          throw new EmberError("assertion failed: " + message);
+        } catch(error) {
+          setTimeout(function() {
+            throw error;
+          }, 0);
+        }
+      }
+    }
+
+    /**
+      Inside Ember-Metal, simply uses the methods from `imports.console`.
+      Override this to provide more robust logging functionality.
+
+      @class Logger
+      @namespace Ember
+    */
+    var Logger = {
+      /**
+       Logs the arguments to the console.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        var foo = 1;
+        Ember.Logger.log('log value of foo:', foo);
+        // "log value of foo: 1" will be printed to the console
+        ```
+
+       @method log
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      log:   consoleMethod('log')   || Ember.K,
+
+      /**
+       Prints the arguments to the console with a warning icon.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        Ember.Logger.warn('Something happened!');
+        // "Something happened!" will be printed to the console with a warning icon.
+        ```
+
+       @method warn
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      warn:  consoleMethod('warn')  || Ember.K,
+
+      /**
+       Prints the arguments to the console with an error icon, red text and a stack trace.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        Ember.Logger.error('Danger! Danger!');
+        // "Danger! Danger!" will be printed to the console in red text.
+        ```
+
+       @method error
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      error: consoleMethod('error') || Ember.K,
+
+      /**
+       Logs the arguments to the console.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        var foo = 1;
+        Ember.Logger.info('log value of foo:', foo);
+        // "log value of foo: 1" will be printed to the console
+        ```
+
+       @method info
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      info:  consoleMethod('info')  || Ember.K,
+
+      /**
+       Logs the arguments to the console in blue text.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        var foo = 1;
+        Ember.Logger.debug('log value of foo:', foo);
+        // "log value of foo: 1" will be printed to the console
+        ```
+
+       @method debug
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      debug: consoleMethod('debug') || consoleMethod('info') || Ember.K,
+
+      /**
+       If the value passed into `Ember.Logger.assert` is not truthy it will throw an error with a stack trace.
+
+        ```javascript
+        Ember.Logger.assert(true); // undefined
+        Ember.Logger.assert(true === false); // Throws an Assertion failed error.
+        ```
+
+       @method assert
+       @for Ember.Logger
+       @param {Boolean} bool Value to test
+      */
+      assert: consoleMethod('assert') || assertPolyfill
+    };
+
+    __exports__["default"] = Logger;
+  });
+define("ember-metal",
+  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __exports__) {
+    "use strict";
+    /**
+    Ember Metal
+
+    @module ember
+    @submodule ember-metal
+    */
+
+    // BEGIN EXPORTS
+    var EmberInstrumentation = Ember.Instrumentation = {};
+    EmberInstrumentation.instrument = __dependency3__.instrument;
+    EmberInstrumentation.subscribe = __dependency3__.subscribe;
+    EmberInstrumentation.unsubscribe = __dependency3__.unsubscribe;
+    EmberInstrumentation.reset  = __dependency3__.reset;
+
+    Ember.instrument = __dependency3__.instrument;
+    Ember.subscribe = __dependency3__.subscribe;
+
+    Ember.generateGuid    = __dependency4__.generateGuid;
+    Ember.GUID_KEY        = __dependency4__.GUID_KEY;
+    Ember.GUID_PREFIX     = __dependency4__.GUID_PREFIX;
+    Ember.create          = __dependency7__.create;
+    Ember.platform        = __dependency7__.platform;
+
+    var EmberArrayPolyfills = Ember.ArrayPolyfills = {};
+
+    EmberArrayPolyfills.map = __dependency8__.map;
+    EmberArrayPolyfills.forEach = __dependency8__.forEach;
+    EmberArrayPolyfills.filter = __dependency8__.filter;
+    EmberArrayPolyfills.indexOf = __dependency8__.indexOf;
+
+    Ember.Error           = __dependency5__["default"];
+    Ember.guidFor         = __dependency4__.guidFor;
+    Ember.META_DESC       = __dependency4__.META_DESC;
+    Ember.EMPTY_META      = __dependency4__.EMPTY_META;
+    Ember.meta            = __dependency4__.meta;
+    Ember.getMeta         = __dependency4__.getMeta;
+    Ember.setMeta         = __dependency4__.setMeta;
+    Ember.metaPath        = __dependency4__.metaPath;
+    Ember.inspect         = __dependency4__.inspect;
+    Ember.typeOf          = __dependency4__.typeOf;
+    Ember.tryCatchFinally = __dependency4__.tryCatchFinally;
+    Ember.isArray         = __dependency4__.isArray;
+    Ember.makeArray       = __dependency4__.makeArray;
+    Ember.canInvoke       = __dependency4__.canInvoke;
+    Ember.tryInvoke       = __dependency4__.tryInvoke;
+    Ember.tryFinally      = __dependency4__.tryFinally;
+    Ember.wrap            = __dependency4__.wrap;
+    Ember.apply           = __dependency4__.apply;
+    Ember.applyStr        = __dependency4__.applyStr;
+
+    Ember.Logger = __dependency9__["default"];
+
+    Ember.get            = __dependency10__.get;
+    Ember.getWithDefault = __dependency10__.getWithDefault;
+    Ember.normalizeTuple = __dependency10__.normalizeTuple;
+    Ember._getPath       = __dependency10__._getPath;
+
+    Ember.EnumerableUtils = __dependency6__["default"];
+
+    Ember.on                = __dependency11__.on;
+    Ember.addListener       = __dependency11__.addListener;
+    Ember.removeListener    = __dependency11__.removeListener;
+    Ember._suspendListener  = __dependency11__.suspendListener;
+    Ember._suspendListeners = __dependency11__.suspendListeners;
+    Ember.sendEvent         = __dependency11__.sendEvent;
+    Ember.hasListeners      = __dependency11__.hasListeners;
+    Ember.watchedEvents     = __dependency11__.watchedEvents;
+    Ember.listenersFor      = __dependency11__.listenersFor;
+    Ember.listenersDiff     = __dependency11__.listenersDiff;
+    Ember.listenersUnion    = __dependency11__.listenersUnion;
+
+    Ember._ObserverSet = __dependency12__["default"];
+
+    Ember.propertyWillChange = __dependency13__.propertyWillChange;
+    Ember.propertyDidChange = __dependency13__.propertyDidChange;
+    Ember.overrideChains = __dependency13__.overrideChains;
+    Ember.beginPropertyChanges = __dependency13__.beginPropertyChanges;
+    Ember.endPropertyChanges = __dependency13__.endPropertyChanges;
+    Ember.changeProperties = __dependency13__.changeProperties;
+
+    Ember.Descriptor     = __dependency14__.Descriptor;
+    Ember.defineProperty = __dependency14__.defineProperty;
+
+    Ember.set    = __dependency15__.set;
+    Ember.trySet = __dependency15__.trySet;
+
+    Ember.OrderedSet = __dependency16__.OrderedSet;
+    Ember.Map = __dependency16__.Map;
+    Ember.MapWithDefault = __dependency16__.MapWithDefault;
+
+    Ember.getProperties = __dependency17__["default"];
+    Ember.setProperties = __dependency18__["default"];
+
+    Ember.watchKey   = __dependency19__.watchKey;
+    Ember.unwatchKey = __dependency19__.unwatchKey;
+
+    Ember.flushPendingChains = __dependency20__.flushPendingChains;
+    Ember.removeChainWatcher = __dependency20__.removeChainWatcher;
+    Ember._ChainNode = __dependency20__.ChainNode;
+    Ember.finishChains = __dependency20__.finishChains;
+
+    Ember.watchPath = __dependency21__.watchPath;
+    Ember.unwatchPath = __dependency21__.unwatchPath;
+
+    Ember.watch = __dependency22__.watch;
+    Ember.isWatching = __dependency22__.isWatching;
+    Ember.unwatch = __dependency22__.unwatch;
+    Ember.rewatch = __dependency22__.rewatch;
+    Ember.destroy = __dependency22__.destroy;
+
+    Ember.expandProperties = __dependency23__["default"];
+
+    Ember.ComputedProperty = __dependency24__.ComputedProperty;
+    Ember.computed = __dependency24__.computed;
+    Ember.cacheFor = __dependency24__.cacheFor;
+
+    Ember.addObserver = __dependency25__.addObserver;
+    Ember.observersFor = __dependency25__.observersFor;
+    Ember.removeObserver = __dependency25__.removeObserver;
+    Ember.addBeforeObserver = __dependency25__.addBeforeObserver;
+    Ember._suspendBeforeObserver = __dependency25__._suspendBeforeObserver;
+    Ember._suspendBeforeObservers = __dependency25__._suspendBeforeObservers;
+    Ember._suspendObserver = __dependency25__._suspendObserver;
+    Ember._suspendObservers = __dependency25__._suspendObservers;
+    Ember.beforeObserversFor = __dependency25__.beforeObserversFor;
+    Ember.removeBeforeObserver = __dependency25__.removeBeforeObserver;
+
+    Ember.IS_BINDING = __dependency26__.IS_BINDING;
+    Ember.required = __dependency26__.required;
+    Ember.aliasMethod = __dependency26__.aliasMethod;
+    Ember.observer = __dependency26__.observer;
+    Ember.immediateObserver = __dependency26__.immediateObserver;
+    Ember.beforeObserver = __dependency26__.beforeObserver;
+    Ember.mixin = __dependency26__.mixin;
+    Ember.Mixin = __dependency26__.Mixin;
+
+    Ember.oneWay = __dependency27__.oneWay;
+    Ember.bind = __dependency27__.bind;
+    Ember.Binding = __dependency27__.Binding;
+    Ember.isGlobalPath = __dependency27__.isGlobalPath;
+
+    Ember.run = __dependency28__["default"];
+
+    Ember.libraries = __dependency29__["default"];
+    Ember.libraries.registerCoreLibrary('Ember', Ember.VERSION);
+
+    Ember.isNone = __dependency30__.isNone;
+    Ember.none = __dependency30__.none;
+
+    Ember.isEmpty = __dependency31__.isEmpty;
+    Ember.empty = __dependency31__.empty;
+
+    Ember.isBlank = __dependency32__["default"];
+
+    Ember.merge = __dependency2__["default"];
+
+    /**
+      A function may be assigned to `Ember.onerror` to be called when Ember
+      internals encounter an error. This is useful for specialized error handling
+      and reporting code.
+
+      ```javascript
+      Ember.onerror = function(error) {
+        Em.$.ajax('/report-error', 'POST', {
+          stack: error.stack,
+          otherInformation: 'whatever app state you want to provide'
+        });
+      };
+      ```
+
+      Internally, `Ember.onerror` is used as Backburner's error handler.
+
+      @event onerror
+      @for Ember
+      @param {Exception} error the error object
+    */
+    Ember.onerror = null;
+    // END EXPORTS
+
+    // do this for side-effects of updating Ember.assert, warn, etc when
+    // ember-debug is present
+    if (Ember.__loader.registry['ember-debug']) {
+      requireModule('ember-debug');
+    }
+
+    __exports__["default"] = Ember;
+  });
+define("ember-metal/map",
+  ["ember-metal/property_set","ember-metal/utils","ember-metal/array","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    /*
+      JavaScript (before ES6) does not have a Map implementation. Objects,
+      which are often used as dictionaries, may only have Strings as keys.
+
+      Because Ember has a way to get a unique identifier for every object
+      via `Ember.guidFor`, we can implement a performant Map with arbitrary
+      keys. Because it is commonly used in low-level bookkeeping, Map is
+      implemented as a pure JavaScript object for performance.
+
+      This implementation follows the current iteration of the ES6 proposal for
+      maps (http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets),
+      with two exceptions. First, because we need our implementation to be pleasant
+      on older browsers, we do not use the `delete` name (using `remove` instead).
+      Second, as we do not have the luxury of in-VM iteration, we implement a
+      forEach method for iteration.
+
+      Map is mocked out to look like an Ember object, so you can do
+      `Ember.Map.create()` for symmetry with other Ember classes.
+    */
+
+    var set = __dependency1__.set;
+    var guidFor = __dependency2__.guidFor;
+    var indexOf = __dependency3__.indexOf;var create = __dependency4__.create;
+
+    var copy = function(obj) {
+      var output = {};
+
+      for (var prop in obj) {
+        if (obj.hasOwnProperty(prop)) { output[prop] = obj[prop]; }
+      }
+
+      return output;
+    };
+
+    var copyMap = function(original, newObject) {
+      var keys = original.keys.copy(),
+          values = copy(original.values);
+
+      newObject.keys = keys;
+      newObject.values = values;
+      newObject.length = original.length;
+
+      return newObject;
+    };
+
+    /**
+      This class is used internally by Ember and Ember Data.
+      Please do not use it at this time. We plan to clean it up
+      and add many tests soon.
+
+      @class OrderedSet
+      @namespace Ember
+      @constructor
+      @private
+    */
+    function OrderedSet() {
+      this.clear();
+    };
+
+    /**
+      @method create
+      @static
+      @return {Ember.OrderedSet}
+    */
+    OrderedSet.create = function() {
+      return new OrderedSet();
+    };
+
+
+    OrderedSet.prototype = {
+      /**
+        @method clear
+      */
+      clear: function() {
+        this.presenceSet = {};
+        this.list = [];
+      },
+
+      /**
+        @method add
+        @param obj
+      */
+      add: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet,
+            list = this.list;
+
+        if (guid in presenceSet) { return; }
+
+        presenceSet[guid] = true;
+        list.push(obj);
+      },
+
+      /**
+        @method remove
+        @param obj
+      */
+      remove: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet,
+            list = this.list;
+
+        delete presenceSet[guid];
+
+        var index = indexOf.call(list, obj);
+        if (index > -1) {
+          list.splice(index, 1);
+        }
+      },
+
+      /**
+        @method isEmpty
+        @return {Boolean}
+      */
+      isEmpty: function() {
+        return this.list.length === 0;
+      },
+
+      /**
+        @method has
+        @param obj
+        @return {Boolean}
+      */
+      has: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet;
+
+        return guid in presenceSet;
+      },
+
+      /**
+        @method forEach
+        @param {Function} fn
+        @param self
+      */
+      forEach: function(fn, self) {
+        // allow mutation during iteration
+        var list = this.toArray();
+
+        for (var i = 0, j = list.length; i < j; i++) {
+          fn.call(self, list[i]);
+        }
+      },
+
+      /**
+        @method toArray
+        @return {Array}
+      */
+      toArray: function() {
+        return this.list.slice();
+      },
+
+      /**
+        @method copy
+        @return {Ember.OrderedSet}
+      */
+      copy: function() {
+        var set = new OrderedSet();
+
+        set.presenceSet = copy(this.presenceSet);
+        set.list = this.toArray();
+
+        return set;
+      }
+    };
+
+    /**
+      A Map stores values indexed by keys. Unlike JavaScript's
+      default Objects, the keys of a Map can be any JavaScript
+      object.
+
+      Internally, a Map has two data structures:
+
+      1. `keys`: an OrderedSet of all of the existing keys
+      2. `values`: a JavaScript Object indexed by the `Ember.guidFor(key)`
+
+      When a key/value pair is added for the first time, we
+      add the key to the `keys` OrderedSet, and create or
+      replace an entry in `values`. When an entry is deleted,
+      we delete its entry in `keys` and `values`.
+
+      @class Map
+      @namespace Ember
+      @private
+      @constructor
+    */
+    var Map = Ember.Map = function() {
+      this.keys = OrderedSet.create();
+      this.values = {};
+    };
+
+    /**
+      @method create
+      @static
+    */
+    Map.create = function() {
+      return new Map();
+    };
+
+    Map.prototype = {
+      /**
+        This property will change as the number of objects in the map changes.
+
+        @property length
+        @type number
+        @default 0
+      */
+      length: 0,
+
+
+      /**
+        Retrieve the value associated with a given key.
+
+        @method get
+        @param {*} key
+        @return {*} the value associated with the key, or `undefined`
+      */
+      get: function(key) {
+        var values = this.values,
+            guid = guidFor(key);
+
+        return values[guid];
+      },
+
+      /**
+        Adds a value to the map. If a value for the given key has already been
+        provided, the new value will replace the old value.
+
+        @method set
+        @param {*} key
+        @param {*} value
+      */
+      set: function(key, value) {
+        var keys = this.keys,
+            values = this.values,
+            guid = guidFor(key);
+
+        keys.add(key);
+        values[guid] = value;
+        set(this, 'length', keys.list.length);
+      },
+
+      /**
+        Removes a value from the map for an associated key.
+
+        @method remove
+        @param {*} key
+        @return {Boolean} true if an item was removed, false otherwise
+      */
+      remove: function(key) {
+        // don't use ES6 "delete" because it will be annoying
+        // to use in browsers that are not ES6 friendly;
+        var keys = this.keys,
+            values = this.values,
+            guid = guidFor(key);
+
+        if (values.hasOwnProperty(guid)) {
+          keys.remove(key);
+          delete values[guid];
+          set(this, 'length', keys.list.length);
+          return true;
+        } else {
+          return false;
+        }
+      },
+
+      /**
+        Check whether a key is present.
+
+        @method has
+        @param {*} key
+        @return {Boolean} true if the item was present, false otherwise
+      */
+      has: function(key) {
+        var values = this.values,
+            guid = guidFor(key);
+
+        return values.hasOwnProperty(guid);
+      },
+
+      /**
+        Iterate over all the keys and values. Calls the function once
+        for each key, passing in the key and value, in that order.
+
+        The keys are guaranteed to be iterated over in insertion order.
+
+        @method forEach
+        @param {Function} callback
+        @param {*} self if passed, the `this` value inside the
+          callback. By default, `this` is the map.
+      */
+      forEach: function(callback, self) {
+        var keys = this.keys,
+            values = this.values;
+
+        keys.forEach(function(key) {
+          var guid = guidFor(key);
+          callback.call(self, key, values[guid]);
+        });
+      },
+
+      /**
+        @method copy
+        @return {Ember.Map}
+      */
+      copy: function() {
+        return copyMap(this, new Map());
+      }
+    };
+
+    /**
+      @class MapWithDefault
+      @namespace Ember
+      @extends Ember.Map
+      @private
+      @constructor
+      @param [options]
+        @param {*} [options.defaultValue]
+    */
+    function MapWithDefault(options) {
+      Map.call(this);
+      this.defaultValue = options.defaultValue;
+    };
+
+    /**
+      @method create
+      @static
+      @param [options]
+        @param {*} [options.defaultValue]
+      @return {Ember.MapWithDefault|Ember.Map} If options are passed, returns
+        `Ember.MapWithDefault` otherwise returns `Ember.Map`
+    */
+    MapWithDefault.create = function(options) {
+      if (options) {
+        return new MapWithDefault(options);
+      } else {
+        return new Map();
+      }
+    };
+
+    MapWithDefault.prototype = create(Map.prototype);
+
+    /**
+      Retrieve the value associated with a given key.
+
+      @method get
+      @param {*} key
+      @return {*} the value associated with the key, or the default value
+    */
+    MapWithDefault.prototype.get = function(key) {
+      var hasValue = this.has(key);
+
+      if (hasValue) {
+        return Map.prototype.get.call(this, key);
+      } else {
+        var defaultValue = this.defaultValue(key);
+        this.set(key, defaultValue);
+        return defaultValue;
+      }
+    };
+
+    /**
+      @method copy
+      @return {Ember.MapWithDefault}
+    */
+    MapWithDefault.prototype.copy = function() {
+      return copyMap(this, new MapWithDefault({
+        defaultValue: this.defaultValue
+      }));
+    };
+
+    __exports__.OrderedSet = OrderedSet;
+    __exports__.Map = Map;
+    __exports__.MapWithDefault = MapWithDefault;
+  });
+define("ember-metal/merge",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      Merge the contents of two objects together into the first object.
+
+      ```javascript
+      Ember.merge({first: 'Tom'}, {last: 'Dale'}); // {first: 'Tom', last: 'Dale'}
+      var a = {first: 'Yehuda'}, b = {last: 'Katz'};
+      Ember.merge(a, b); // a == {first: 'Yehuda', last: 'Katz'}, b == {last: 'Katz'}
+      ```
+
+      @method merge
+      @for Ember
+      @param {Object} original The object to merge into
+      @param {Object} updates The object to copy properties from
+      @return {Object}
+    */
+    function merge(original, updates) {
+      for (var prop in updates) {
+        if (!updates.hasOwnProperty(prop)) { continue; }
+        original[prop] = updates[prop];
+      }
+      return original;
+    };
+
+    __exports__["default"] = merge;
+  });
+define("ember-metal/mixin",
+  ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/utils","ember-metal/expand_properties","ember-metal/properties","ember-metal/computed","ember-metal/binding","ember-metal/observer","ember-metal/events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-metal
+    */
+
+    var Ember = __dependency1__["default"];
+    // warn, assert, wrap, et;
+    var merge = __dependency2__["default"];
+    var map = __dependency3__.map;
+    var indexOf = __dependency3__.indexOf;
+    var forEach = __dependency3__.forEach;
+    var create = __dependency4__.create;
+    var guidFor = __dependency5__.guidFor;
+    var meta = __dependency5__.meta;
+    var META_KEY = __dependency5__.META_KEY;
+    var wrap = __dependency5__.wrap;
+    var makeArray = __dependency5__.makeArray;
+    var apply = __dependency5__.apply;
+    var expandProperties = __dependency6__["default"];
+    var Descriptor = __dependency7__.Descriptor;
+    var defineProperty = __dependency7__.defineProperty;
+    var ComputedProperty = __dependency8__.ComputedProperty;
+    var Binding = __dependency9__.Binding;
+    var addObserver = __dependency10__.addObserver;
+    var removeObserver = __dependency10__.removeObserver;
+    var addBeforeObserver = __dependency10__.addBeforeObserver;
+    var removeBeforeObserver = __dependency10__.removeBeforeObserver;
+    var addListener = __dependency11__.addListener;
+    var removeListener = __dependency11__.removeListener;
+
+    var REQUIRED, Alias,
+        a_map = map,
+        a_indexOf = indexOf,
+        a_forEach = forEach,
+        a_slice = [].slice,
+        o_create = create,
+        defineProperty = defineProperty,
+        metaFor = meta;
+
+    function superFunction(){
+      var ret, func = this.__nextSuper;
+      if (func) {
+        this.__nextSuper = null;
+        ret = apply(this, func, arguments);
+        this.__nextSuper = func;
+      }
+      return ret;
+    }
+
+    function mixinsMeta(obj) {
+      var m = metaFor(obj, true), ret = m.mixins;
+      if (!ret) {
+        ret = m.mixins = {};
+      } else if (!m.hasOwnProperty('mixins')) {
+        ret = m.mixins = o_create(ret);
+      }
+      return ret;
+    }
+
+    function initMixin(mixin, args) {
+      if (args && args.length > 0) {
+        mixin.mixins = a_map.call(args, function(x) {
+          if (x instanceof Mixin) { return x; }
+
+          // Note: Manually setup a primitive mixin here. This is the only
+          // way to actually get a primitive mixin. This way normal creation
+          // of mixins will give you combined mixins...
+          var mixin = new Mixin();
+          mixin.properties = x;
+          return mixin;
+        });
+      }
+      return mixin;
+    }
+
+    function isMethod(obj) {
+      return 'function' === typeof obj &&
+             obj.isMethod !== false &&
+             obj !== Boolean && obj !== Object && obj !== Number && obj !== Array && obj !== Date && obj !== String;
+    }
+
+    var CONTINUE = {};
+
+    function mixinProperties(mixinsMeta, mixin) {
+      var guid;
+
+      if (mixin instanceof Mixin) {
+        guid = guidFor(mixin);
+        if (mixinsMeta[guid]) { return CONTINUE; }
+        mixinsMeta[guid] = mixin;
+        return mixin.properties;
+      } else {
+        return mixin; // apply anonymous mixin properties
+      }
+    }
+
+    function concatenatedMixinProperties(concatProp, props, values, base) {
+      var concats;
+
+      // reset before adding each new mixin to pickup concats from previous
+      concats = values[concatProp] || base[concatProp];
+      if (props[concatProp]) {
+        concats = concats ? concats.concat(props[concatProp]) : props[concatProp];
+      }
+
+      return concats;
+    }
+
+    function giveDescriptorSuper(meta, key, property, values, descs) {
+      var superProperty;
+
+      // Computed properties override methods, and do not call super to them
+      if (values[key] === undefined) {
+        // Find the original descriptor in a parent mixin
+        superProperty = descs[key];
+      }
+
+      // If we didn't find the original descriptor in a parent mixin, find
+      // it on the original object.
+      superProperty = superProperty || meta.descs[key];
+
+      if (!superProperty || !(superProperty instanceof ComputedProperty)) {
+        return property;
+      }
+
+      // Since multiple mixins may inherit from the same parent, we need
+      // to clone the computed property so that other mixins do not receive
+      // the wrapped version.
+      property = o_create(property);
+      property.func = wrap(property.func, superProperty.func);
+
+      return property;
+    }
+
+    function giveMethodSuper(obj, key, method, values, descs) {
+      var superMethod;
+
+      // Methods overwrite computed properties, and do not call super to them.
+      if (descs[key] === undefined) {
+        // Find the original method in a parent mixin
+        superMethod = values[key];
+      }
+
+      // If we didn't find the original value in a parent mixin, find it in
+      // the original object
+      superMethod = superMethod || obj[key];
+
+      // Only wrap the new method if the original method was a function
+      if ('function' !== typeof superMethod) {
+        return method;
+      }
+
+      return wrap(method, superMethod);
+    }
+
+    function applyConcatenatedProperties(obj, key, value, values) {
+      var baseValue = values[key] || obj[key];
+
+      if (baseValue) {
+        if ('function' === typeof baseValue.concat) {
+          return baseValue.concat(value);
+        } else {
+          return makeArray(baseValue).concat(value);
+        }
+      } else {
+        return makeArray(value);
+      }
+    }
+
+    function applyMergedProperties(obj, key, value, values) {
+      var baseValue = values[key] || obj[key];
+
+      if (!baseValue) { return value; }
+
+      var newBase = merge({}, baseValue),
+          hasFunction = false;
+
+      for (var prop in value) {
+        if (!value.hasOwnProperty(prop)) { continue; }
+
+        var propValue = value[prop];
+        if (isMethod(propValue)) {
+          // TODO: support for Computed Properties, etc?
+          hasFunction = true;
+          newBase[prop] = giveMethodSuper(obj, prop, propValue, baseValue, {});
+        } else {
+          newBase[prop] = propValue;
+        }
+      }
+
+      if (hasFunction) {
+        newBase._super = superFunction;
+      }
+
+      return newBase;
+    }
+
+    function addNormalizedProperty(base, key, value, meta, descs, values, concats, mergings) {
+      if (value instanceof Descriptor) {
+        if (value === REQUIRED && descs[key]) { return CONTINUE; }
+
+        // Wrap descriptor function to implement
+        // __nextSuper() if needed
+        if (value.func) {
+          value = giveDescriptorSuper(meta, key, value, values, descs);
+        }
+
+        descs[key]  = value;
+        values[key] = undefined;
+      } else {
+        if ((concats && a_indexOf.call(concats, key) >= 0) ||
+                    key === 'concatenatedProperties' ||
+                    key === 'mergedProperties') {
+          value = applyConcatenatedProperties(base, key, value, values);
+        } else if ((mergings && a_indexOf.call(mergings, key) >= 0)) {
+          value = applyMergedProperties(base, key, value, values);
+        } else if (isMethod(value)) {
+          value = giveMethodSuper(base, key, value, values, descs);
+        }
+
+        descs[key] = undefined;
+        values[key] = value;
+      }
+    }
+
+    function mergeMixins(mixins, m, descs, values, base, keys) {
+      var mixin, props, key, concats, mergings, meta;
+
+      function removeKeys(keyName) {
+        delete descs[keyName];
+        delete values[keyName];
+      }
+
+      for(var i=0, l=mixins.length; i<l; i++) {
+        mixin = mixins[i];
+        Ember.assert('Expected hash or Mixin instance, got ' + Object.prototype.toString.call(mixin),
+                     typeof mixin === 'object' && mixin !== null && Object.prototype.toString.call(mixin) !== '[object Array]');
+
+        props = mixinProperties(m, mixin);
+        if (props === CONTINUE) { continue; }
+
+        if (props) {
+          meta = metaFor(base);
+          if (base.willMergeMixin) { base.willMergeMixin(props); }
+          concats = concatenatedMixinProperties('concatenatedProperties', props, values, base);
+          mergings = concatenatedMixinProperties('mergedProperties', props, values, base);
+
+          for (key in props) {
+            if (!props.hasOwnProperty(key)) { continue; }
+            keys.push(key);
+            addNormalizedProperty(base, key, props[key], meta, descs, values, concats, mergings);
+          }
+
+          // manually copy toString() because some JS engines do not enumerate it
+          if (props.hasOwnProperty('toString')) { base.toString = props.toString; }
+        } else if (mixin.mixins) {
+          mergeMixins(mixin.mixins, m, descs, values, base, keys);
+          if (mixin._without) { a_forEach.call(mixin._without, removeKeys); }
+        }
+      }
+    }
+
+    var IS_BINDING = /^.+Binding$/;
+
+    function detectBinding(obj, key, value, m) {
+      if (IS_BINDING.test(key)) {
+        var bindings = m.bindings;
+        if (!bindings) {
+          bindings = m.bindings = {};
+        } else if (!m.hasOwnProperty('bindings')) {
+          bindings = m.bindings = o_create(m.bindings);
+        }
+        bindings[key] = value;
+      }
+    }
+
+    function connectBindings(obj, m) {
+      // TODO Mixin.apply(instance) should disconnect binding if exists
+      var bindings = m.bindings, key, binding, to;
+      if (bindings) {
+        for (key in bindings) {
+          binding = bindings[key];
+          if (binding) {
+            to = key.slice(0, -7); // strip Binding off end
+            if (binding instanceof Binding) {
+              binding = binding.copy(); // copy prototypes' instance
+              binding.to(to);
+            } else { // binding is string path
+              binding = new Binding(to, binding);
+            }
+            binding.connect(obj);
+            obj[key] = binding;
+          }
+        }
+        // mark as applied
+        m.bindings = {};
+      }
+    }
+
+    function finishPartial(obj, m) {
+      connectBindings(obj, m || metaFor(obj));
+      return obj;
+    }
+
+    function followAlias(obj, desc, m, descs, values) {
+      var altKey = desc.methodName, value;
+      if (descs[altKey] || values[altKey]) {
+        value = values[altKey];
+        desc  = descs[altKey];
+      } else if (m.descs[altKey]) {
+        desc  = m.descs[altKey];
+        value = undefined;
+      } else {
+        desc = undefined;
+        value = obj[altKey];
+      }
+
+      return { desc: desc, value: value };
+    }
+
+    function updateObserversAndListeners(obj, key, observerOrListener, pathsKey, updateMethod) {
+      var paths = observerOrListener[pathsKey];
+
+      if (paths) {
+        for (var i=0, l=paths.length; i<l; i++) {
+          updateMethod(obj, paths[i], null, key);
+        }
+      }
+    }
+
+    function replaceObserversAndListeners(obj, key, observerOrListener) {
+      var prev = obj[key];
+
+      if ('function' === typeof prev) {
+        updateObserversAndListeners(obj, key, prev, '__ember_observesBefore__', removeBeforeObserver);
+        updateObserversAndListeners(obj, key, prev, '__ember_observes__', removeObserver);
+        updateObserversAndListeners(obj, key, prev, '__ember_listens__', removeListener);
+      }
+
+      if ('function' === typeof observerOrListener) {
+        updateObserversAndListeners(obj, key, observerOrListener, '__ember_observesBefore__', addBeforeObserver);
+        updateObserversAndListeners(obj, key, observerOrListener, '__ember_observes__', addObserver);
+        updateObserversAndListeners(obj, key, observerOrListener, '__ember_listens__', addListener);
+      }
+    }
+
+    function applyMixin(obj, mixins, partial) {
+      var descs = {}, values = {}, m = metaFor(obj),
+          key, value, desc, keys = [];
+
+      obj._super = superFunction;
+
+      // Go through all mixins and hashes passed in, and:
+      //
+      // * Handle concatenated properties
+      // * Handle merged properties
+      // * Set up _super wrapping if necessary
+      // * Set up computed property descriptors
+      // * Copying `toString` in broken browsers
+      mergeMixins(mixins, mixinsMeta(obj), descs, values, obj, keys);
+
+      for(var i = 0, l = keys.length; i < l; i++) {
+        key = keys[i];
+        if (key === 'constructor' || !values.hasOwnProperty(key)) { continue; }
+
+        desc = descs[key];
+        value = values[key];
+
+        if (desc === REQUIRED) { continue; }
+
+        while (desc && desc instanceof Alias) {
+          var followed = followAlias(obj, desc, m, descs, values);
+          desc = followed.desc;
+          value = followed.value;
+        }
+
+        if (desc === undefined && value === undefined) { continue; }
+
+        replaceObserversAndListeners(obj, key, value);
+        detectBinding(obj, key, value, m);
+        defineProperty(obj, key, desc, value, m);
+      }
+
+      if (!partial) { // don't apply to prototype
+        finishPartial(obj, m);
+      }
+
+      return obj;
+    }
+
+    /**
+      @method mixin
+      @for Ember
+      @param obj
+      @param mixins*
+      @return obj
+    */
+    function mixin(obj) {
+      var args = a_slice.call(arguments, 1);
+      applyMixin(obj, args, false);
+      return obj;
+    };
+
+    /**
+      The `Ember.Mixin` class allows you to create mixins, whose properties can be
+      added to other classes. For instance,
+
+      ```javascript
+      App.Editable = Ember.Mixin.create({
+        edit: function() {
+          console.log('starting to edit');
+          this.set('isEditing', true);
+        },
+        isEditing: false
+      });
+
+      // Mix mixins into classes by passing them as the first arguments to
+      // .extend.
+      App.CommentView = Ember.View.extend(App.Editable, {
+        template: Ember.Handlebars.compile('{{#if view.isEditing}}...{{else}}...{{/if}}')
+      });
+
+      commentView = App.CommentView.create();
+      commentView.edit(); // outputs 'starting to edit'
+      ```
+
+      Note that Mixins are created with `Ember.Mixin.create`, not
+      `Ember.Mixin.extend`.
+
+      Note that mixins extend a constructor's prototype so arrays and object literals
+      defined as properties will be shared amongst objects that implement the mixin.
+      If you want to define a property in a mixin that is not shared, you can define
+      it either as a computed property or have it be created on initialization of the object.
+
+      ```javascript
+      //filters array will be shared amongst any object implementing mixin
+      App.Filterable = Ember.Mixin.create({
+        filters: Ember.A()
+      });
+
+      //filters will be a separate  array for every object implementing the mixin
+      App.Filterable = Ember.Mixin.create({
+        filters: Ember.computed(function(){return Ember.A();})
+      });
+
+      //filters will be created as a separate array during the object's initialization
+      App.Filterable = Ember.Mixin.create({
+        init: function() {
+          this._super();
+          this.set("filters", Ember.A());
+        }
+      });
+      ```
+
+      @class Mixin
+      @namespace Ember
+    */
+    function Mixin() { return initMixin(this, arguments); };
+
+    Mixin.prototype = {
+      properties: null,
+      mixins: null,
+      ownerConstructor: null
+    };
+
+    Mixin._apply = applyMixin;
+
+    Mixin.applyPartial = function(obj) {
+      var args = a_slice.call(arguments, 1);
+      return applyMixin(obj, args, true);
+    };
+
+    Mixin.finishPartial = finishPartial;
+
+    // ES6TODO: this relies on a global state?
+    Ember.anyUnprocessedMixins = false;
+
+    /**
+      @method create
+      @static
+      @param arguments*
+    */
+    Mixin.create = function() {
+      // ES6TODO: this relies on a global state?
+      Ember.anyUnprocessedMixins = true;
+      var M = this;
+      return initMixin(new M(), arguments);
+    };
+
+    var MixinPrototype = Mixin.prototype;
+
+    /**
+      @method reopen
+      @param arguments*
+    */
+    MixinPrototype.reopen = function() {
+      var mixin, tmp;
+
+      if (this.properties) {
+        mixin = Mixin.create();
+        mixin.properties = this.properties;
+        delete this.properties;
+        this.mixins = [mixin];
+      } else if (!this.mixins) {
+        this.mixins = [];
+      }
+
+      var len = arguments.length, mixins = this.mixins, idx;
+
+      for(idx=0; idx < len; idx++) {
+        mixin = arguments[idx];
+        Ember.assert('Expected hash or Mixin instance, got ' + Object.prototype.toString.call(mixin),
+                     typeof mixin === 'object' && mixin !== null && Object.prototype.toString.call(mixin) !== '[object Array]');
+
+        if (mixin instanceof Mixin) {
+          mixins.push(mixin);
+        } else {
+          tmp = Mixin.create();
+          tmp.properties = mixin;
+          mixins.push(tmp);
+        }
+      }
+
+      return this;
+    };
+
+    /**
+      @method apply
+      @param obj
+      @return applied object
+    */
+    MixinPrototype.apply = function(obj) {
+      return applyMixin(obj, [this], false);
+    };
+
+    MixinPrototype.applyPartial = function(obj) {
+      return applyMixin(obj, [this], true);
+    };
+
+    function _detect(curMixin, targetMixin, seen) {
+      var guid = guidFor(curMixin);
+
+      if (seen[guid]) { return false; }
+      seen[guid] = true;
+
+      if (curMixin === targetMixin) { return true; }
+      var mixins = curMixin.mixins, loc = mixins ? mixins.length : 0;
+      while (--loc >= 0) {
+        if (_detect(mixins[loc], targetMixin, seen)) { return true; }
+      }
+      return false;
+    }
+
+    /**
+      @method detect
+      @param obj
+      @return {Boolean}
+    */
+    MixinPrototype.detect = function(obj) {
+      if (!obj) { return false; }
+      if (obj instanceof Mixin) { return _detect(obj, this, {}); }
+      var m = obj[META_KEY],
+          mixins = m && m.mixins;
+      if (mixins) {
+        return !!mixins[guidFor(this)];
+      }
+      return false;
+    };
+
+    MixinPrototype.without = function() {
+      var ret = new Mixin(this);
+      ret._without = a_slice.call(arguments);
+      return ret;
+    };
+
+    function _keys(ret, mixin, seen) {
+      if (seen[guidFor(mixin)]) { return; }
+      seen[guidFor(mixin)] = true;
+
+      if (mixin.properties) {
+        var props = mixin.properties;
+        for (var key in props) {
+          if (props.hasOwnProperty(key)) { ret[key] = true; }
+        }
+      } else if (mixin.mixins) {
+        a_forEach.call(mixin.mixins, function(x) { _keys(ret, x, seen); });
+      }
+    }
+
+    MixinPrototype.keys = function() {
+      var keys = {}, seen = {}, ret = [];
+      _keys(keys, this, seen);
+      for(var key in keys) {
+        if (keys.hasOwnProperty(key)) { ret.push(key); }
+      }
+      return ret;
+    };
+
+    // returns the mixins currently applied to the specified object
+    // TODO: Make Ember.mixin
+    Mixin.mixins = function(obj) {
+      var m = obj[META_KEY],
+          mixins = m && m.mixins, ret = [];
+
+      if (!mixins) { return ret; }
+
+      for (var key in mixins) {
+        var mixin = mixins[key];
+
+        // skip primitive mixins since these are always anonymous
+        if (!mixin.properties) { ret.push(mixin); }
+      }
+
+      return ret;
+    };
+
+    REQUIRED = new Descriptor();
+    REQUIRED.toString = function() { return '(Required Property)'; };
+
+    /**
+      Denotes a required property for a mixin
+
+      @method required
+      @for Ember
+    */
+    function required() {
+      return REQUIRED;
+    };
+
+    Alias = function(methodName) {
+      this.methodName = methodName;
+    };
+    Alias.prototype = new Descriptor();
+
+    /**
+      Makes a method available via an additional name.
+
+      ```javascript
+      App.Person = Ember.Object.extend({
+        name: function() {
+          return 'Tomhuda Katzdale';
+        },
+        moniker: Ember.aliasMethod('name')
+      });
+
+      var goodGuy = App.Person.create();
+      
+      goodGuy.name();    // 'Tomhuda Katzdale'
+      goodGuy.moniker(); // 'Tomhuda Katzdale'
+      ```
+
+      @method aliasMethod
+      @for Ember
+      @param {String} methodName name of the method to alias
+      @return {Ember.Descriptor}
+    */
+    function aliasMethod(methodName) {
+      return new Alias(methodName);
+    };
+
+    // ..........................................................
+    // OBSERVER HELPER
+    //
+
+    /**
+      Specify a method that observes property changes.
+
+      ```javascript
+      Ember.Object.extend({
+        valueObserver: Ember.observer('value', function() {
+          // Executes whenever the "value" property changes
+        })
+      });
+      ```
+
+      In the future this method may become asynchronous. If you want to ensure
+      synchronous behavior, use `immediateObserver`.
+
+      Also available as `Function.prototype.observes` if prototype extensions are
+      enabled.
+
+      @method observer
+      @for Ember
+      @param {String} propertyNames*
+      @param {Function} func
+      @return func
+    */
+    function observer() {
+      var func  = a_slice.call(arguments, -1)[0];
+      var paths;
+
+      var addWatchedProperty = function (path) { paths.push(path); };
+      var _paths = a_slice.call(arguments, 0, -1);
+
+      if (typeof func !== "function") {
+        // revert to old, soft-deprecated argument ordering
+
+        func  = arguments[0];
+        _paths = a_slice.call(arguments, 1);
+      }
+
+      paths = [];
+
+      for (var i=0; i<_paths.length; ++i) {
+        expandProperties(_paths[i], addWatchedProperty);
+      }
+
+      if (typeof func !== "function") {
+        throw new Ember.Error("Ember.observer called without a function");
+      }
+
+      func.__ember_observes__ = paths;
+      return func;
+    };
+
+    /**
+      Specify a method that observes property changes.
+
+      ```javascript
+      Ember.Object.extend({
+        valueObserver: Ember.immediateObserver('value', function() {
+          // Executes whenever the "value" property changes
+        })
+      });
+      ```
+
+      In the future, `Ember.observer` may become asynchronous. In this event,
+      `Ember.immediateObserver` will maintain the synchronous behavior.
+
+      Also available as `Function.prototype.observesImmediately` if prototype extensions are
+      enabled.
+
+      @method immediateObserver
+      @for Ember
+      @param {String} propertyNames*
+      @param {Function} func
+      @return func
+    */
+    function immediateObserver() {
+      for (var i=0, l=arguments.length; i<l; i++) {
+        var arg = arguments[i];
+        Ember.assert("Immediate observers must observe internal properties only, not properties on other objects.", typeof arg !== "string" || arg.indexOf('.') === -1);
+      }
+
+      return observer.apply(this, arguments);
+    };
+
+    /**
+      When observers fire, they are called with the arguments `obj`, `keyName`.
+
+      Note, `@each.property` observer is called per each add or replace of an element
+      and it's not called with a specific enumeration item.
+
+      A `beforeObserver` fires before a property changes.
+
+      A `beforeObserver` is an alternative form of `.observesBefore()`.
+
+      ```javascript
+      App.PersonView = Ember.View.extend({
+        friends: [{ name: 'Tom' }, { name: 'Stefan' }, { name: 'Kris' }],
+
+        valueWillChange: Ember.beforeObserver('content.value', function(obj, keyName) {
+          this.changingFrom = obj.get(keyName);
+        }),
+
+        valueDidChange: Ember.observer('content.value', function(obj, keyName) {
+            // only run if updating a value already in the DOM
+            if (this.get('state') === 'inDOM') {
+              var color = obj.get(keyName) > this.changingFrom ? 'green' : 'red';
+              // logic
+            }
+        }),
+
+        friendsDidChange: Ember.observer('friends.@each.name', function(obj, keyName) {
+          // some logic
+          // obj.get(keyName) returns friends array
+        })
+      });
+      ```
+
+      Also available as `Function.prototype.observesBefore` if prototype extensions are
+      enabled.
+
+      @method beforeObserver
+      @for Ember
+      @param {String} propertyNames*
+      @param {Function} func
+      @return func
+    */
+    function beforeObserver() {
+      var func  = a_slice.call(arguments, -1)[0];
+      var paths;
+
+      var addWatchedProperty = function(path) { paths.push(path); };
+
+      var _paths = a_slice.call(arguments, 0, -1);
+
+      if (typeof func !== "function") {
+        // revert to old, soft-deprecated argument ordering
+
+        func  = arguments[0];
+        _paths = a_slice.call(arguments, 1);
+      }
+
+      paths = [];
+
+      for (var i=0; i<_paths.length; ++i) {
+        expandProperties(_paths[i], addWatchedProperty);
+      }
+
+      if (typeof func !== "function") {
+        throw new Ember.Error("Ember.beforeObserver called without a function");
+      }
+
+      func.__ember_observesBefore__ = paths;
+      return func;
+    };
+
+    __exports__.IS_BINDING = IS_BINDING;
+    __exports__.mixin = mixin;
+    __exports__.Mixin = Mixin;
+    __exports__.required = required;
+    __exports__.aliasMethod = aliasMethod;
+    __exports__.observer = observer;
+    __exports__.immediateObserver = immediateObserver;
+    __exports__.beforeObserver = beforeObserver;
+  });
+define("ember-metal/observer",
+  ["ember-metal/watching","ember-metal/array","ember-metal/events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var watch = __dependency1__.watch;
+    var unwatch = __dependency1__.unwatch;
+    var map = __dependency2__.map;
+    var listenersFor = __dependency3__.listenersFor;
+    var addListener = __dependency3__.addListener;
+    var removeListener = __dependency3__.removeListener;
+    var suspendListeners = __dependency3__.suspendListeners;
+    var suspendListener = __dependency3__.suspendListener;
+    /**
+    @module ember-metal
+    */
+
+    var AFTER_OBSERVERS = ':change',
+        BEFORE_OBSERVERS = ':before';
+
+    function changeEvent(keyName) {
+      return keyName+AFTER_OBSERVERS;
+    }
+
+    function beforeEvent(keyName) {
+      return keyName+BEFORE_OBSERVERS;
+    }
+
+    /**
+      @method addObserver
+      @for Ember
+      @param obj
+      @param {String} path
+      @param {Object|Function} targetOrMethod
+      @param {Function|String} [method]
+    */
+    function addObserver(obj, _path, target, method) {
+      addListener(obj, changeEvent(_path), target, method);
+      watch(obj, _path);
+
+      return this;
+    };
+
+    function observersFor(obj, path) {
+      return listenersFor(obj, changeEvent(path));
+    };
+
+    /**
+      @method removeObserver
+      @for Ember
+      @param obj
+      @param {String} path
+      @param {Object|Function} targetOrMethod
+      @param {Function|String} [method]
+    */
+    function removeObserver(obj, _path, target, method) {
+      unwatch(obj, _path);
+      removeListener(obj, changeEvent(_path), target, method);
+
+      return this;
+    };
+
+    /**
+      @method addBeforeObserver
+      @for Ember
+      @param obj
+      @param {String} path
+      @param {Object|Function} targetOrMethod
+      @param {Function|String} [method]
+    */
+    function addBeforeObserver(obj, _path, target, method) {
+      addListener(obj, beforeEvent(_path), target, method);
+      watch(obj, _path);
+
+      return this;
+    };
+
+    // Suspend observer during callback.
+    //
+    // This should only be used by the target of the observer
+    // while it is setting the observed path.
+    function _suspendBeforeObserver(obj, path, target, method, callback) {
+      return suspendListener(obj, beforeEvent(path), target, method, callback);
+    };
+
+    function _suspendObserver(obj, path, target, method, callback) {
+      return suspendListener(obj, changeEvent(path), target, method, callback);
+    };
+
+    function _suspendBeforeObservers(obj, paths, target, method, callback) {
+      var events = map.call(paths, beforeEvent);
+      return suspendListeners(obj, events, target, method, callback);
+    };
+
+    function _suspendObservers(obj, paths, target, method, callback) {
+      var events = map.call(paths, changeEvent);
+      return suspendListeners(obj, events, target, method, callback);
+    };
+
+    function beforeObserversFor(obj, path) {
+      return listenersFor(obj, beforeEvent(path));
+    };
+
+    /**
+      @method removeBeforeObserver
+      @for Ember
+      @param obj
+      @param {String} path
+      @param {Object|Function} targetOrMethod
+      @param {Function|String} [method]
+    */
+    function removeBeforeObserver(obj, _path, target, method) {
+      unwatch(obj, _path);
+      removeListener(obj, beforeEvent(_path), target, method);
+
+      return this;
+    };
+
+    __exports__.addObserver = addObserver;
+    __exports__.observersFor = observersFor;
+    __exports__.removeObserver = removeObserver;
+    __exports__.addBeforeObserver = addBeforeObserver;
+    __exports__._suspendBeforeObserver = _suspendBeforeObserver;
+    __exports__._suspendObserver = _suspendObserver;
+    __exports__._suspendBeforeObservers = _suspendBeforeObservers;
+    __exports__._suspendObservers = _suspendObservers;
+    __exports__.beforeObserversFor = beforeObserversFor;
+    __exports__.removeBeforeObserver = removeBeforeObserver;
+  });
+define("ember-metal/observer_set",
+  ["ember-metal/utils","ember-metal/events","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var guidFor = __dependency1__.guidFor;
+    var sendEvent = __dependency2__.sendEvent;
+
+    /*
+      this.observerSet = {
+        [senderGuid]: { // variable name: `keySet`
+          [keyName]: listIndex
+        }
+      },
+      this.observers = [
+        {
+          sender: obj,
+          keyName: keyName,
+          eventName: eventName,
+          listeners: [
+            [target, method, flags]
+          ]
+        },
+        ...
+      ]
+    */
+    function ObserverSet() {
+      this.clear();
+    };
+
+    ObserverSet.prototype.add = function(sender, keyName, eventName) {
+      var observerSet = this.observerSet,
+          observers = this.observers,
+          senderGuid = guidFor(sender),
+          keySet = observerSet[senderGuid],
+          index;
+
+      if (!keySet) {
+        observerSet[senderGuid] = keySet = {};
+      }
+      index = keySet[keyName];
+      if (index === undefined) {
+        index = observers.push({
+          sender: sender,
+          keyName: keyName,
+          eventName: eventName,
+          listeners: []
+        }) - 1;
+        keySet[keyName] = index;
+      }
+      return observers[index].listeners;
+    };
+
+    ObserverSet.prototype.flush = function() {
+      var observers = this.observers, i, len, observer, sender;
+      this.clear();
+      for (i=0, len=observers.length; i < len; ++i) {
+        observer = observers[i];
+        sender = observer.sender;
+        if (sender.isDestroying || sender.isDestroyed) { continue; }
+        sendEvent(sender, observer.eventName, [sender, observer.keyName], observer.listeners);
+      }
+    };
+
+    ObserverSet.prototype.clear = function() {
+      this.observerSet = {};
+      this.observers = [];
+    };
+
+    __exports__["default"] = ObserverSet;
+  });
+define("ember-metal/platform",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    /*globals Node */
+
+    var Ember = __dependency1__["default"];
+
+    /**
+    @module ember-metal
+    */
+
+    /**
+      Platform specific methods and feature detectors needed by the framework.
+
+      @class platform
+      @namespace Ember
+      @static
+    */
+    // TODO remove this
+    var platform = {};
+
+    /**
+      Identical to `Object.create()`. Implements if not available natively.
+
+      @method create
+      @for Ember
+    */
+    var create = Object.create;
+
+    // IE8 has Object.create but it couldn't treat property descriptors.
+    if (create) {
+      if (create({a: 1}, {a: {value: 2}}).a !== 2) {
+        create = null;
+      }
+    }
+
+    // STUB_OBJECT_CREATE allows us to override other libraries that stub
+    // Object.create different than we would prefer
+    if (!create || Ember.ENV.STUB_OBJECT_CREATE) {
+      var K = function() {};
+
+      create = function(obj, props) {
+        K.prototype = obj;
+        obj = new K();
+        if (props) {
+          K.prototype = obj;
+          for (var prop in props) {
+            K.prototype[prop] = props[prop].value;
+          }
+          obj = new K();
+        }
+        K.prototype = null;
+
+        return obj;
+      };
+
+      create.isSimulated = true;
+    }
+
+    var defineProperty = Object.defineProperty;
+    var canRedefineProperties, canDefinePropertyOnDOM;
+
+    // Catch IE8 where Object.defineProperty exists but only works on DOM elements
+    if (defineProperty) {
+      try {
+        defineProperty({}, 'a',{get:function() {}});
+      } catch (e) {
+        defineProperty = null;
+      }
+    }
+
+    if (defineProperty) {
+      // Detects a bug in Android <3.2 where you cannot redefine a property using
+      // Object.defineProperty once accessors have already been set.
+      canRedefineProperties = (function() {
+        var obj = {};
+
+        defineProperty(obj, 'a', {
+          configurable: true,
+          enumerable: true,
+          get: function() { },
+          set: function() { }
+        });
+
+        defineProperty(obj, 'a', {
+          configurable: true,
+          enumerable: true,
+          writable: true,
+          value: true
+        });
+
+        return obj.a === true;
+      })();
+
+      // This is for Safari 5.0, which supports Object.defineProperty, but not
+      // on DOM nodes.
+      canDefinePropertyOnDOM = (function() {
+        try {
+          defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
+          return true;
+        } catch(e) { }
+
+        return false;
+      })();
+
+      if (!canRedefineProperties) {
+        defineProperty = null;
+      } else if (!canDefinePropertyOnDOM) {
+        defineProperty = function(obj, keyName, desc) {
+          var isNode;
+
+          if (typeof Node === "object") {
+            isNode = obj instanceof Node;
+          } else {
+            isNode = typeof obj === "object" && typeof obj.nodeType === "number" && typeof obj.nodeName === "string";
+          }
+
+          if (isNode) {
+            // TODO: Should we have a warning here?
+            return (obj[keyName] = desc.value);
+          } else {
+            return Object.defineProperty(obj, keyName, desc);
+          }
+        };
+      }
+    }
+
+    /**
+    @class platform
+    @namespace Ember
+    */
+
+    /**
+      Identical to `Object.defineProperty()`. Implements as much functionality
+      as possible if not available natively.
+
+      @method defineProperty
+      @param {Object} obj The object to modify
+      @param {String} keyName property name to modify
+      @param {Object} desc descriptor hash
+      @return {void}
+    */
+    platform.defineProperty = defineProperty;
+
+    /**
+      Set to true if the platform supports native getters and setters.
+
+      @property hasPropertyAccessors
+      @final
+    */
+    platform.hasPropertyAccessors = true;
+
+    if (!platform.defineProperty) {
+      platform.hasPropertyAccessors = false;
+
+      platform.defineProperty = function(obj, keyName, desc) {
+        if (!desc.get) { obj[keyName] = desc.value; }
+      };
+
+      platform.defineProperty.isSimulated = true;
+    }
+
+    if (Ember.ENV.MANDATORY_SETTER && !platform.hasPropertyAccessors) {
+      Ember.ENV.MANDATORY_SETTER = false;
+    }
+
+    __exports__.create = create;
+    __exports__.platform = platform;
+  });
+define("ember-metal/properties",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    var Ember = __dependency1__["default"];
+    var META_KEY = __dependency2__.META_KEY;
+    var meta = __dependency2__.meta;
+    var platform = __dependency3__.platform;
+    var overrideChains = __dependency4__.overrideChains;
+    var metaFor = meta,
+        objectDefineProperty = platform.defineProperty;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    // ..........................................................
+    // DESCRIPTOR
+    //
+
+    /**
+      Objects of this type can implement an interface to respond to requests to
+      get and set. The default implementation handles simple properties.
+
+      You generally won't need to create or subclass this directly.
+
+      @class Descriptor
+      @namespace Ember
+      @private
+      @constructor
+    */
+    function Descriptor() {};
+
+    // ..........................................................
+    // DEFINING PROPERTIES API
+    //
+
+    var MANDATORY_SETTER_FUNCTION = Ember.MANDATORY_SETTER_FUNCTION = function(value) {
+      Ember.assert("You must use Ember.set() to access this property (of " + this + ")", false);
+    };
+
+    var DEFAULT_GETTER_FUNCTION = Ember.DEFAULT_GETTER_FUNCTION = function(name) {
+      return function() {
+        var meta = this[META_KEY];
+        return meta && meta.values[name];
+      };
+    };
+
+    /**
+      NOTE: This is a low-level method used by other parts of the API. You almost
+      never want to call this method directly. Instead you should use
+      `Ember.mixin()` to define new properties.
+
+      Defines a property on an object. This method works much like the ES5
+      `Object.defineProperty()` method except that it can also accept computed
+      properties and other special descriptors.
+
+      Normally this method takes only three parameters. However if you pass an
+      instance of `Ember.Descriptor` as the third param then you can pass an
+      optional value as the fourth parameter. This is often more efficient than
+      creating new descriptor hashes for each property.
+
+      ## Examples
+
+      ```javascript
+      // ES5 compatible mode
+      Ember.defineProperty(contact, 'firstName', {
+        writable: true,
+        configurable: false,
+        enumerable: true,
+        value: 'Charles'
+      });
+
+      // define a simple property
+      Ember.defineProperty(contact, 'lastName', undefined, 'Jolley');
+
+      // define a computed property
+      Ember.defineProperty(contact, 'fullName', Ember.computed(function() {
+        return this.firstName+' '+this.lastName;
+      }).property('firstName', 'lastName'));
+      ```
+
+      @private
+      @method defineProperty
+      @for Ember
+      @param {Object} obj the object to define this property on. This may be a prototype.
+      @param {String} keyName the name of the property
+      @param {Ember.Descriptor} [desc] an instance of `Ember.Descriptor` (typically a
+        computed property) or an ES5 descriptor.
+        You must provide this or `data` but not both.
+      @param {*} [data] something other than a descriptor, that will
+        become the explicit value of this property.
+    */
+    function defineProperty(obj, keyName, desc, data, meta) {
+      var descs, existingDesc, watching, value;
+
+      if (!meta) meta = metaFor(obj);
+      descs = meta.descs;
+      existingDesc = meta.descs[keyName];
+      watching = meta.watching[keyName] > 0;
+
+      if (existingDesc instanceof Descriptor) {
+        existingDesc.teardown(obj, keyName);
+      }
+
+      if (desc instanceof Descriptor) {
+        value = desc;
+
+        descs[keyName] = desc;
+        if (MANDATORY_SETTER && watching) {
+          objectDefineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: true,
+            writable: true,
+            value: undefined // make enumerable
+          });
+        } else {
+          obj[keyName] = undefined; // make enumerable
+        }
+      } else {
+        descs[keyName] = undefined; // shadow descriptor in proto
+        if (desc == null) {
+          value = data;
+
+          if (MANDATORY_SETTER && watching) {
+            meta.values[keyName] = data;
+            objectDefineProperty(obj, keyName, {
+              configurable: true,
+              enumerable: true,
+              set: MANDATORY_SETTER_FUNCTION,
+              get: DEFAULT_GETTER_FUNCTION(keyName)
+            });
+          } else {
+            obj[keyName] = data;
+          }
+        } else {
+          value = desc;
+
+          // compatibility with ES5
+          objectDefineProperty(obj, keyName, desc);
+        }
+      }
+
+      // if key is being watched, override chains that
+      // were initialized with the prototype
+      if (watching) { overrideChains(obj, keyName, meta); }
+
+      // The `value` passed to the `didDefineProperty` hook is
+      // either the descriptor or data, whichever was passed.
+      if (obj.didDefineProperty) { obj.didDefineProperty(obj, keyName, value); }
+
+      return this;
+    };
+
+    __exports__.Descriptor = Descriptor;
+    __exports__.defineProperty = defineProperty;
+  });
+define("ember-metal/property_events",
+  ["ember-metal/utils","ember-metal/events","ember-metal/observer_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var META_KEY = __dependency1__.META_KEY;
+    var guidFor = __dependency1__.guidFor;
+    var tryFinally = __dependency1__.tryFinally;
+    var sendEvent = __dependency2__.sendEvent;
+    var listenersUnion = __dependency2__.listenersUnion;
+    var listenersDiff = __dependency2__.listenersDiff;
+    var ObserverSet = __dependency3__["default"];
+
+    var beforeObserverSet = new ObserverSet(),
+        observerSet = new ObserverSet(),
+        deferred = 0;
+
+    // ..........................................................
+    // PROPERTY CHANGES
+    //
+
+    /**
+      This function is called just before an object property is about to change.
+      It will notify any before observers and prepare caches among other things.
+
+      Normally you will not need to call this method directly but if for some
+      reason you can't directly watch a property you can invoke this method
+      manually along with `Ember.propertyDidChange()` which you should call just
+      after the property value changes.
+
+      @method propertyWillChange
+      @for Ember
+      @param {Object} obj The object with the property that will change
+      @param {String} keyName The property key (or path) that will change.
+      @return {void}
+    */
+    function propertyWillChange(obj, keyName) {
+      var m = obj[META_KEY],
+          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
+          proto = m && m.proto,
+          desc = m && m.descs[keyName];
+
+      if (!watching) { return; }
+      if (proto === obj) { return; }
+      if (desc && desc.willChange) { desc.willChange(obj, keyName); }
+      dependentKeysWillChange(obj, keyName, m);
+      chainsWillChange(obj, keyName, m);
+      notifyBeforeObservers(obj, keyName);
+    }
+
+    /**
+      This function is called just after an object property has changed.
+      It will notify any observers and clear caches among other things.
+
+      Normally you will not need to call this method directly but if for some
+      reason you can't directly watch a property you can invoke this method
+      manually along with `Ember.propertyWillChange()` which you should call just
+      before the property value changes.
+
+      @method propertyDidChange
+      @for Ember
+      @param {Object} obj The object with the property that will change
+      @param {String} keyName The property key (or path) that will change.
+      @return {void}
+    */
+    function propertyDidChange(obj, keyName) {
+      var m = obj[META_KEY],
+          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
+          proto = m && m.proto,
+          desc = m && m.descs[keyName];
+
+      if (proto === obj) { return; }
+
+      // shouldn't this mean that we're watching this key?
+      if (desc && desc.didChange) { desc.didChange(obj, keyName); }
+      if (!watching && keyName !== 'length') { return; }
+
+      dependentKeysDidChange(obj, keyName, m);
+      chainsDidChange(obj, keyName, m, false);
+      notifyObservers(obj, keyName);
+    }
+
+    var WILL_SEEN, DID_SEEN;
+
+    // called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
+    function dependentKeysWillChange(obj, depKey, meta) {
+      if (obj.isDestroying) { return; }
+
+      var seen = WILL_SEEN, top = !seen;
+      if (top) { seen = WILL_SEEN = {}; }
+      iterDeps(propertyWillChange, obj, depKey, seen, meta);
+      if (top) { WILL_SEEN = null; }
+    }
+
+    // called whenever a property has just changed to update dependent keys
+    function dependentKeysDidChange(obj, depKey, meta) {
+      if (obj.isDestroying) { return; }
+
+      var seen = DID_SEEN, top = !seen;
+      if (top) { seen = DID_SEEN = {}; }
+      iterDeps(propertyDidChange, obj, depKey, seen, meta);
+      if (top) { DID_SEEN = null; }
+    }
+
+    function iterDeps(method, obj, depKey, seen, meta) {
+      var guid = guidFor(obj);
+      if (!seen[guid]) seen[guid] = {};
+      if (seen[guid][depKey]) return;
+      seen[guid][depKey] = true;
+
+      var deps = meta.deps;
+      deps = deps && deps[depKey];
+      if (deps) {
+        for(var key in deps) {
+          var desc = meta.descs[key];
+          if (desc && desc._suspended === obj) continue;
+          method(obj, key);
+        }
+      }
+    }
+
+    function chainsWillChange(obj, keyName, m) {
+      if (!(m.hasOwnProperty('chainWatchers') &&
+            m.chainWatchers[keyName])) {
+        return;
+      }
+
+      var nodes = m.chainWatchers[keyName],
+          events = [],
+          i, l;
+
+      for(i = 0, l = nodes.length; i < l; i++) {
+        nodes[i].willChange(events);
+      }
+
+      for (i = 0, l = events.length; i < l; i += 2) {
+        propertyWillChange(events[i], events[i+1]);
+      }
+    }
+
+    function chainsDidChange(obj, keyName, m, suppressEvents) {
+      if (!(m && m.hasOwnProperty('chainWatchers') &&
+            m.chainWatchers[keyName])) {
+        return;
+      }
+
+      var nodes = m.chainWatchers[keyName],
+          events = suppressEvents ? null : [],
+          i, l;
+
+      for(i = 0, l = nodes.length; i < l; i++) {
+        nodes[i].didChange(events);
+      }
+
+      if (suppressEvents) {
+        return;
+      }
+
+      for (i = 0, l = events.length; i < l; i += 2) {
+        propertyDidChange(events[i], events[i+1]);
+      }
+    }
+
+    function overrideChains(obj, keyName, m) {
+      chainsDidChange(obj, keyName, m, true);
+    };
+
+    /**
+      @method beginPropertyChanges
+      @chainable
+      @private
+    */
+    function beginPropertyChanges() {
+      deferred++;
+    }
+
+    /**
+      @method endPropertyChanges
+      @private
+    */
+    function endPropertyChanges() {
+      deferred--;
+      if (deferred<=0) {
+        beforeObserverSet.clear();
+        observerSet.flush();
+      }
+    }
+
+    /**
+      Make a series of property changes together in an
+      exception-safe way.
+
+      ```javascript
+      Ember.changeProperties(function() {
+        obj1.set('foo', mayBlowUpWhenSet);
+        obj2.set('bar', baz);
+      });
+      ```
+
+      @method changeProperties
+      @param {Function} callback
+      @param [binding]
+    */
+    function changeProperties(cb, binding) {
+      beginPropertyChanges();
+      tryFinally(cb, endPropertyChanges, binding);
+    };
+
+    function notifyBeforeObservers(obj, keyName) {
+      if (obj.isDestroying) { return; }
+
+      var eventName = keyName + ':before', listeners, diff;
+      if (deferred) {
+        listeners = beforeObserverSet.add(obj, keyName, eventName);
+        diff = listenersDiff(obj, eventName, listeners);
+        sendEvent(obj, eventName, [obj, keyName], diff);
+      } else {
+        sendEvent(obj, eventName, [obj, keyName]);
+      }
+    }
+
+    function notifyObservers(obj, keyName) {
+      if (obj.isDestroying) { return; }
+
+      var eventName = keyName + ':change', listeners;
+      if (deferred) {
+        listeners = observerSet.add(obj, keyName, eventName);
+        listenersUnion(obj, eventName, listeners);
+      } else {
+        sendEvent(obj, eventName, [obj, keyName]);
+      }
+    }
+
+    __exports__.propertyWillChange = propertyWillChange;
+    __exports__.propertyDidChange = propertyDidChange;
+    __exports__.overrideChains = overrideChains;
+    __exports__.beginPropertyChanges = beginPropertyChanges;
+    __exports__.endPropertyChanges = endPropertyChanges;
+    __exports__.changeProperties = changeProperties;
+  });
+define("ember-metal/property_get",
+  ["ember-metal/core","ember-metal/utils","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    var Ember = __dependency1__["default"];
+    var META_KEY = __dependency2__.META_KEY;
+    var EmberError = __dependency3__["default"];
+
+    var get;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
+    var HAS_THIS  = 'this.';
+    var FIRST_KEY = /^([^\.]+)/;
+
+    // ..........................................................
+    // GET AND SET
+    //
+    // If we are on a platform that supports accessors we can use those.
+    // Otherwise simulate accessors by looking up the property directly on the
+    // object.
+
+    /**
+      Gets the value of a property on an object. If the property is computed,
+      the function will be invoked. If the property is not defined but the
+      object implements the `unknownProperty` method then that will be invoked.
+
+      If you plan to run on IE8 and older browsers then you should use this
+      method anytime you want to retrieve a property on an object that you don't
+      know for sure is private. (Properties beginning with an underscore '_'
+      are considered private.)
+
+      On all newer browsers, you only need to use this method to retrieve
+      properties if the property might not be defined on the object and you want
+      to respect the `unknownProperty` handler. Otherwise you can ignore this
+      method.
+
+      Note that if the object itself is `undefined`, this method will throw
+      an error.
+
+      @method get
+      @for Ember
+      @param {Object} obj The object to retrieve from.
+      @param {String} keyName The property key to retrieve
+      @return {Object} the property value or `null`.
+    */
+    get = function get(obj, keyName) {
+      // Helpers that operate with 'this' within an #each
+      if (keyName === '') {
+        return obj;
+      }
+
+      if (!keyName && 'string'===typeof obj) {
+        keyName = obj;
+        obj = null;
+      }
+
+      Ember.assert("Cannot call get with "+ keyName +" key.", !!keyName);
+      Ember.assert("Cannot call get with '"+ keyName +"' on an undefined object.", obj !== undefined);
+
+      if (obj === null) { return _getPath(obj, keyName);  }
+
+      var meta = obj[META_KEY], desc = meta && meta.descs[keyName], ret;
+
+      if (desc === undefined && keyName.indexOf('.') !== -1) {
+        return _getPath(obj, keyName);
+      }
+
+      if (desc) {
+        return desc.get(obj, keyName);
+      } else {
+        if (MANDATORY_SETTER && meta && meta.watching[keyName] > 0) {
+          ret = meta.values[keyName];
+        } else {
+          ret = obj[keyName];
+        }
+
+        if (ret === undefined &&
+            'object' === typeof obj && !(keyName in obj) && 'function' === typeof obj.unknownProperty) {
+          return obj.unknownProperty(keyName);
+        }
+
+        return ret;
+      }
+    };
+
+    // Currently used only by Ember Data tests
+    if (Ember.config.overrideAccessors) {
+      Ember.get = get;
+      Ember.config.overrideAccessors();
+      get = Ember.get;
+    }
+
+    /**
+      Normalizes a target/path pair to reflect that actual target/path that should
+      be observed, etc. This takes into account passing in global property
+      paths (i.e. a path beginning with a captial letter not defined on the
+      target).
+
+      @private
+      @method normalizeTuple
+      @for Ember
+      @param {Object} target The current target. May be `null`.
+      @param {String} path A path on the target or a global property path.
+      @return {Array} a temporary array with the normalized target/path pair.
+    */
+    function normalizeTuple(target, path) {
+      var hasThis  = path.indexOf(HAS_THIS) === 0,
+          isGlobal = !hasThis && IS_GLOBAL_PATH.test(path),
+          key;
+
+      if (!target || isGlobal) target = Ember.lookup;
+      if (hasThis) path = path.slice(5);
+
+      if (target === Ember.lookup) {
+        key = path.match(FIRST_KEY)[0];
+        target = get(target, key);
+        path   = path.slice(key.length+1);
+      }
+
+      // must return some kind of path to be valid else other things will break.
+      if (!path || path.length===0) throw new EmberError('Path cannot be empty');
+
+      return [ target, path ];
+    };
+
+    function _getPath(root, path) {
+      var hasThis, parts, tuple, idx, len;
+
+      // If there is no root and path is a key name, return that
+      // property from the global object.
+      // E.g. get('Ember') -> Ember
+      if (root === null && path.indexOf('.') === -1) { return get(Ember.lookup, path); }
+
+      // detect complicated paths and normalize them
+      hasThis = path.indexOf(HAS_THIS) === 0;
+
+      if (!root || hasThis) {
+        tuple = normalizeTuple(root, path);
+        root = tuple[0];
+        path = tuple[1];
+        tuple.length = 0;
+      }
+
+      parts = path.split(".");
+      len = parts.length;
+      for (idx = 0; root != null && idx < len; idx++) {
+        root = get(root, parts[idx], true);
+        if (root && root.isDestroyed) { return undefined; }
+      }
+      return root;
+    };
+
+    function getWithDefault(root, key, defaultValue) {
+      var value = get(root, key);
+
+      if (value === undefined) { return defaultValue; }
+      return value;
+    };
+
+    __exports__["default"] = get;
+    __exports__.get = get;
+    __exports__.getWithDefault = getWithDefault;
+    __exports__.normalizeTuple = normalizeTuple;
+    __exports__._getPath = _getPath;
+  });
+define("ember-metal/property_set",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/property_events","ember-metal/properties","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var getPath = __dependency2__._getPath;
+    var META_KEY = __dependency3__.META_KEY;
+    var propertyWillChange = __dependency4__.propertyWillChange;
+    var propertyDidChange = __dependency4__.propertyDidChange;
+    var defineProperty = __dependency5__.defineProperty;
+    var EmberError = __dependency6__["default"];
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER,
+        IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
+
+    /**
+      Sets the value of a property on an object, respecting computed properties
+      and notifying observers and other listeners of the change. If the
+      property is not defined but the object implements the `setUnknownProperty`
+      method then that will be invoked as well.
+
+      @method set
+      @for Ember
+      @param {Object} obj The object to modify.
+      @param {String} keyName The property key to set
+      @param {Object} value The value to set
+      @return {Object} the passed value.
+    */
+    var set = function set(obj, keyName, value, tolerant) {
+      if (typeof obj === 'string') {
+        Ember.assert("Path '" + obj + "' must be global if no obj is given.", IS_GLOBAL.test(obj));
+        value = keyName;
+        keyName = obj;
+        obj = null;
+      }
+
+      Ember.assert("Cannot call set with "+ keyName +" key.", !!keyName);
+
+      if (!obj) {
+        return setPath(obj, keyName, value, tolerant);
+      }
+
+      var meta = obj[META_KEY], desc = meta && meta.descs[keyName],
+          isUnknown, currentValue;
+
+      if (desc === undefined && keyName.indexOf('.') !== -1) {
+        return setPath(obj, keyName, value, tolerant);
+      }
+
+      Ember.assert("You need to provide an object and key to `set`.", !!obj && keyName !== undefined);
+      Ember.assert('calling set on destroyed object', !obj.isDestroyed);
+
+      if (desc !== undefined) {
+        desc.set(obj, keyName, value);
+      } else {
+
+        if (typeof obj === 'object' && obj !== null && value !== undefined && obj[keyName] === value) {
+          return value;
+        }
+
+        isUnknown = 'object' === typeof obj && !(keyName in obj);
+
+        // setUnknownProperty is called if `obj` is an object,
+        // the property does not already exist, and the
+        // `setUnknownProperty` method exists on the object
+        if (isUnknown && 'function' === typeof obj.setUnknownProperty) {
+          obj.setUnknownProperty(keyName, value);
+        } else if (meta && meta.watching[keyName] > 0) {
+          if (MANDATORY_SETTER) {
+            currentValue = meta.values[keyName];
+          } else {
+            currentValue = obj[keyName];
+          }
+          // only trigger a change if the value has changed
+          if (value !== currentValue) {
+            propertyWillChange(obj, keyName);
+            if (MANDATORY_SETTER) {
+              if ((currentValue === undefined && !(keyName in obj)) || !obj.propertyIsEnumerable(keyName)) {
+                defineProperty(obj, keyName, null, value); // setup mandatory setter
+              } else {
+                meta.values[keyName] = value;
+              }
+            } else {
+              obj[keyName] = value;
+            }
+            propertyDidChange(obj, keyName);
+          }
+        } else {
+          obj[keyName] = value;
+        }
+      }
+      return value;
+    };
+
+    // Currently used only by Ember Data tests
+    // ES6TODO: Verify still true
+    if (Ember.config.overrideAccessors) {
+      Ember.set = set;
+      Ember.config.overrideAccessors();
+      set = Ember.set;
+    }
+
+    function setPath(root, path, value, tolerant) {
+      var keyName;
+
+      // get the last part of the path
+      keyName = path.slice(path.lastIndexOf('.') + 1);
+
+      // get the first part of the part
+      path    = (path === keyName) ? keyName : path.slice(0, path.length-(keyName.length+1));
+
+      // unless the path is this, look up the first part to
+      // get the root
+      if (path !== 'this') {
+        root = getPath(root, path);
+      }
+
+      if (!keyName || keyName.length === 0) {
+        throw new EmberError('Property set failed: You passed an empty path');
+      }
+
+      if (!root) {
+        if (tolerant) { return; }
+        else { throw new EmberError('Property set failed: object in path "'+path+'" could not be found or was destroyed.'); }
+      }
+
+      return set(root, keyName, value);
+    }
+
+    /**
+      Error-tolerant form of `Ember.set`. Will not blow up if any part of the
+      chain is `undefined`, `null`, or destroyed.
+
+      This is primarily used when syncing bindings, which may try to update after
+      an object has been destroyed.
+
+      @method trySet
+      @for Ember
+      @param {Object} obj The object to modify.
+      @param {String} path The property path to set
+      @param {Object} value The value to set
+    */
+    function trySet(root, path, value) {
+      return set(root, path, value, true);
+    };
+
+    __exports__.set = set;
+    __exports__.trySet = trySet;
+  });
+define("ember-metal/run_loop",
+  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var apply = __dependency2__.apply;
+    var indexOf = __dependency3__.indexOf;
+    var beginPropertyChanges = __dependency4__.beginPropertyChanges;
+    var endPropertyChanges = __dependency4__.endPropertyChanges;
+
+    var onBegin = function(current) {
+      run.currentRunLoop = current;
+    };
+
+    var onEnd = function(current, next) {
+      run.currentRunLoop = next;
+    };
+
+    // ES6TODO: should Backburner become es6?
+    var Backburner = requireModule('backburner').Backburner,
+        backburner = new Backburner(['sync', 'actions', 'destroy'], {
+          sync: {
+            before: beginPropertyChanges,
+            after: endPropertyChanges
+          },
+          defaultQueue: 'actions',
+          onBegin: onBegin,
+          onEnd: onEnd,
+          onErrorTarget: Ember,
+          onErrorMethod: 'onerror'
+        }),
+        slice = [].slice,
+        concat = [].concat;
+
+    // ..........................................................
+    // run - this is ideally the only public API the dev sees
+    //
+
+    /**
+      Runs the passed target and method inside of a RunLoop, ensuring any
+      deferred actions including bindings and views updates are flushed at the
+      end.
+
+      Normally you should not need to invoke this method yourself. However if
+      you are implementing raw event handlers when interfacing with other
+      libraries or plugins, you should probably wrap all of your code inside this
+      call.
+
+      ```javascript
+      run(function() {
+        // code to be execute within a RunLoop
+      });
+      ```
+
+      @class run
+      @namespace Ember
+      @static
+      @constructor
+      @param {Object} [target] target of method to call
+      @param {Function|String} method Method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Any additional arguments you wish to pass to the method.
+      @return {Object} return value from invoking the passed function.
+    */
+    var run = function() {
+      return apply(backburner, backburner.run, arguments);
+    };
+
+    /**
+      If no run-loop is present, it creates a new one. If a run loop is
+      present it will queue itself to run on the existing run-loops action
+      queue.
+
+      Please note: This is not for normal usage, and should be used sparingly.
+
+      If invoked when not within a run loop:
+
+      ```javascript
+      run.join(function() {
+        // creates a new run-loop
+      });
+      ```
+
+      Alternatively, if called within an existing run loop:
+
+      ```javascript
+      run(function() {
+        // creates a new run-loop
+        run.join(function() {
+          // joins with the existing run-loop, and queues for invocation on
+          // the existing run-loops action queue.
+        });
+      });
+      ```
+
+      @method join
+      @namespace Ember
+      @param {Object} [target] target of method to call
+      @param {Function|String} method Method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Any additional arguments you wish to pass to the method.
+      @return {Object} Return value from invoking the passed function. Please note,
+      when called within an existing loop, no return value is possible.
+    */
+    run.join = function(target, method /* args */) {
+      if (!run.currentRunLoop) {
+        return apply(Ember, run, arguments);
+      }
+
+      var args = slice.call(arguments);
+      args.unshift('actions');
+      apply(run, run.schedule, args);
+    };
+
+    /**
+      Provides a useful utility for when integrating with non-Ember libraries
+      that provide asynchronous callbacks.
+
+      Ember utilizes a run-loop to batch and coalesce changes. This works by
+      marking the start and end of Ember-related Javascript execution.
+
+      When using events such as a View's click handler, Ember wraps the event
+      handler in a run-loop, but when integrating with non-Ember libraries this
+      can be tedious.
+
+      For example, the following is rather verbose but is the correct way to combine
+      third-party events and Ember code.
+
+      ```javascript
+      var that = this;
+      jQuery(window).on('resize', function(){
+        run(function(){
+          that.handleResize();
+        });
+      });
+      ```
+
+      To reduce the boilerplate, the following can be used to construct a
+      run-loop-wrapped callback handler.
+
+      ```javascript
+      jQuery(window).on('resize', run.bind(this, this.handleResize));
+      ```
+
+      @method bind
+      @namespace run
+      @param {Object} [target] target of method to call
+      @param {Function|String} method Method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Any additional arguments you wish to pass to the method.
+      @return {Object} return value from invoking the passed function. Please note,
+      when called within an existing loop, no return value is possible.
+      @since 1.4.0
+    */
+    run.bind = function(target, method /* args*/) {
+      var args = slice.call(arguments);
+      return function() {
+        return apply(run, run.join, args.concat(slice.call(arguments)));
+      };
+    };
+
+    run.backburner = backburner;
+    run.currentRunLoop = null;
+    run.queues = backburner.queueNames;
+
+    /**
+      Begins a new RunLoop. Any deferred actions invoked after the begin will
+      be buffered until you invoke a matching call to `run.end()`. This is
+      a lower-level way to use a RunLoop instead of using `run()`.
+
+      ```javascript
+      run.begin();
+      // code to be execute within a RunLoop
+      run.end();
+      ```
+
+      @method begin
+      @return {void}
+    */
+    run.begin = function() {
+      backburner.begin();
+    };
+
+    /**
+      Ends a RunLoop. This must be called sometime after you call
+      `run.begin()` to flush any deferred actions. This is a lower-level way
+      to use a RunLoop instead of using `run()`.
+
+      ```javascript
+      run.begin();
+      // code to be execute within a RunLoop
+      run.end();
+      ```
+
+      @method end
+      @return {void}
+    */
+    run.end = function() {
+      backburner.end();
+    };
+
+    /**
+      Array of named queues. This array determines the order in which queues
+      are flushed at the end of the RunLoop. You can define your own queues by
+      simply adding the queue name to this array. Normally you should not need
+      to inspect or modify this property.
+
+      @property queues
+      @type Array
+      @default ['sync', 'actions', 'destroy']
+    */
+
+    /**
+      Adds the passed target/method and any optional arguments to the named
+      queue to be executed at the end of the RunLoop. If you have not already
+      started a RunLoop when calling this method one will be started for you
+      automatically.
+
+      At the end of a RunLoop, any methods scheduled in this way will be invoked.
+      Methods will be invoked in an order matching the named queues defined in
+      the `run.queues` property.
+
+      ```javascript
+      run.schedule('sync', this, function() {
+        // this will be executed in the first RunLoop queue, when bindings are synced
+        console.log("scheduled on sync queue");
+      });
+
+      run.schedule('actions', this, function() {
+        // this will be executed in the 'actions' queue, after bindings have synced.
+        console.log("scheduled on actions queue");
+      });
+
+      // Note the functions will be run in order based on the run queues order.
+      // Output would be:
+      //   scheduled on sync queue
+      //   scheduled on actions queue
+      ```
+
+      @method schedule
+      @param {String} queue The name of the queue to schedule against.
+        Default queues are 'sync' and 'actions'
+      @param {Object} [target] target object to use as the context when invoking a method.
+      @param {String|Function} method The method to invoke. If you pass a string it
+        will be resolved on the target object at the time the scheduled item is
+        invoked allowing you to change the target function.
+      @param {Object} [arguments*] Optional arguments to be passed to the queued method.
+      @return {void}
+    */
+    run.schedule = function(queue, target, method) {
+      checkAutoRun();
+      apply(backburner, backburner.schedule, arguments);
+    };
+
+    // Used by global test teardown
+    run.hasScheduledTimers = function() {
+      return backburner.hasTimers();
+    };
+
+    // Used by global test teardown
+    run.cancelTimers = function () {
+      backburner.cancelTimers();
+    };
+
+    /**
+      Immediately flushes any events scheduled in the 'sync' queue. Bindings
+      use this queue so this method is a useful way to immediately force all
+      bindings in the application to sync.
+
+      You should call this method anytime you need any changed state to propagate
+      throughout the app immediately without repainting the UI (which happens
+      in the later 'render' queue added by the `ember-views` package).
+
+      ```javascript
+      run.sync();
+      ```
+
+      @method sync
+      @return {void}
+    */
+    run.sync = function() {
+      if (backburner.currentInstance) {
+        backburner.currentInstance.queues.sync.flush();
+      }
+    };
+
+    /**
+      Invokes the passed target/method and optional arguments after a specified
+      period if time. The last parameter of this method must always be a number
+      of milliseconds.
+
+      You should use this method whenever you need to run some action after a
+      period of time instead of using `setTimeout()`. This method will ensure that
+      items that expire during the same script execution cycle all execute
+      together, which is often more efficient than using a real setTimeout.
+
+      ```javascript
+      run.later(myContext, function() {
+        // code here will execute within a RunLoop in about 500ms with this == myContext
+      }, 500);
+      ```
+
+      @method later
+      @param {Object} [target] target of method to invoke
+      @param {Function|String} method The method to invoke.
+        If you pass a string it will be resolved on the
+        target at the time the method is invoked.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @param {Number} wait Number of milliseconds to wait.
+      @return {String} a string you can use to cancel the timer in
+        `run.cancel` later.
+    */
+    run.later = function(target, method) {
+      return apply(backburner, backburner.later, arguments);
+    };
+
+    /**
+      Schedule a function to run one time during the current RunLoop. This is equivalent
+      to calling `scheduleOnce` with the "actions" queue.
+
+      @method once
+      @param {Object} [target] The target of the method to invoke.
+      @param {Function|String} method The method to invoke.
+        If you pass a string it will be resolved on the
+        target at the time the method is invoked.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.once = function(target, method) {
+      checkAutoRun();
+      var args = slice.call(arguments);
+      args.unshift('actions');
+      return apply(backburner, backburner.scheduleOnce, args);
+    };
+
+    /**
+      Schedules a function to run one time in a given queue of the current RunLoop.
+      Calling this method with the same queue/target/method combination will have
+      no effect (past the initial call).
+
+      Note that although you can pass optional arguments these will not be
+      considered when looking for duplicates. New arguments will replace previous
+      calls.
+
+      ```javascript
+      run(function() {
+        var sayHi = function() { console.log('hi'); }
+        run.scheduleOnce('afterRender', myContext, sayHi);
+        run.scheduleOnce('afterRender', myContext, sayHi);
+        // sayHi will only be executed once, in the afterRender queue of the RunLoop
+      });
+      ```
+
+      Also note that passing an anonymous function to `run.scheduleOnce` will
+      not prevent additional calls with an identical anonymous function from
+      scheduling the items multiple times, e.g.:
+
+      ```javascript
+      function scheduleIt() {
+        run.scheduleOnce('actions', myContext, function() { console.log("Closure"); });
+      }
+      scheduleIt();
+      scheduleIt();
+      // "Closure" will print twice, even though we're using `run.scheduleOnce`,
+      // because the function we pass to it is anonymous and won't match the
+      // previously scheduled operation.
+      ```
+
+      Available queues, and their order, can be found at `run.queues`
+
+      @method scheduleOnce
+      @param {String} [queue] The name of the queue to schedule against. Default queues are 'sync' and 'actions'.
+      @param {Object} [target] The target of the method to invoke.
+      @param {Function|String} method The method to invoke.
+        If you pass a string it will be resolved on the
+        target at the time the method is invoked.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.scheduleOnce = function(queue, target, method) {
+      checkAutoRun();
+      return apply(backburner, backburner.scheduleOnce, arguments);
+    };
+
+    /**
+      Schedules an item to run from within a separate run loop, after
+      control has been returned to the system. This is equivalent to calling
+      `run.later` with a wait time of 1ms.
+
+      ```javascript
+      run.next(myContext, function() {
+        // code to be executed in the next run loop,
+        // which will be scheduled after the current one
+      });
+      ```
+
+      Multiple operations scheduled with `run.next` will coalesce
+      into the same later run loop, along with any other operations
+      scheduled by `run.later` that expire right around the same
+      time that `run.next` operations will fire.
+
+      Note that there are often alternatives to using `run.next`.
+      For instance, if you'd like to schedule an operation to happen
+      after all DOM element operations have completed within the current
+      run loop, you can make use of the `afterRender` run loop queue (added
+      by the `ember-views` package, along with the preceding `render` queue
+      where all the DOM element operations happen). Example:
+
+      ```javascript
+      App.MyCollectionView = Ember.CollectionView.extend({
+        didInsertElement: function() {
+          run.scheduleOnce('afterRender', this, 'processChildElements');
+        },
+        processChildElements: function() {
+          // ... do something with collectionView's child view
+          // elements after they've finished rendering, which
+          // can't be done within the CollectionView's
+          // `didInsertElement` hook because that gets run
+          // before the child elements have been added to the DOM.
+        }
+      });
+      ```
+
+      One benefit of the above approach compared to using `run.next` is
+      that you will be able to perform DOM/CSS operations before unprocessed
+      elements are rendered to the screen, which may prevent flickering or
+      other artifacts caused by delaying processing until after rendering.
+
+      The other major benefit to the above approach is that `run.next`
+      introduces an element of non-determinism, which can make things much
+      harder to test, due to its reliance on `setTimeout`; it's much harder
+      to guarantee the order of scheduled operations when they are scheduled
+      outside of the current run loop, i.e. with `run.next`.
+
+      @method next
+      @param {Object} [target] target of method to invoke
+      @param {Function|String} method The method to invoke.
+        If you pass a string it will be resolved on the
+        target at the time the method is invoked.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.next = function() {
+      var args = slice.call(arguments);
+      args.push(1);
+      return apply(backburner, backburner.later, args);
+    };
+
+    /**
+      Cancels a scheduled item. Must be a value returned by `run.later()`,
+      `run.once()`, `run.next()`, `run.debounce()`, or
+      `run.throttle()`.
+
+      ```javascript
+      var runNext = run.next(myContext, function() {
+        // will not be executed
+      });
+      run.cancel(runNext);
+
+      var runLater = run.later(myContext, function() {
+        // will not be executed
+      }, 500);
+      run.cancel(runLater);
+
+      var runOnce = run.once(myContext, function() {
+        // will not be executed
+      });
+      run.cancel(runOnce);
+
+      var throttle = run.throttle(myContext, function() {
+        // will not be executed
+      }, 1, false);
+      run.cancel(throttle);
+
+      var debounce = run.debounce(myContext, function() {
+        // will not be executed
+      }, 1);
+      run.cancel(debounce);
+
+      var debounceImmediate = run.debounce(myContext, function() {
+        // will be executed since we passed in true (immediate)
+      }, 100, true);
+      // the 100ms delay until this method can be called again will be cancelled
+      run.cancel(debounceImmediate);
+      ```
+
+      @method cancel
+      @param {Object} timer Timer object to cancel
+      @return {Boolean} true if cancelled or false/undefined if it wasn't found
+    */
+    run.cancel = function(timer) {
+      return backburner.cancel(timer);
+    };
+
+    /**
+      Delay calling the target method until the debounce period has elapsed
+      with no additional debounce calls. If `debounce` is called again before
+      the specified time has elapsed, the timer is reset and the entire period
+      must pass again before the target method is called.
+
+      This method should be used when an event may be called multiple times
+      but the action should only be called once when the event is done firing.
+      A common example is for scroll events where you only want updates to
+      happen once scrolling has ceased.
+
+      ```javascript
+        var myFunc = function() { console.log(this.name + ' ran.'); };
+        var myContext = {name: 'debounce'};
+
+        run.debounce(myContext, myFunc, 150);
+
+        // less than 150ms passes
+
+        run.debounce(myContext, myFunc, 150);
+
+        // 150ms passes
+        // myFunc is invoked with context myContext
+        // console logs 'debounce ran.' one time.
+      ```
+
+      Immediate allows you to run the function immediately, but debounce
+      other calls for this function until the wait time has elapsed. If
+      `debounce` is called again before the specified time has elapsed,
+      the timer is reset and the entire period must pass again before
+      the method can be called again.
+
+      ```javascript
+        var myFunc = function() { console.log(this.name + ' ran.'); };
+        var myContext = {name: 'debounce'};
+
+        run.debounce(myContext, myFunc, 150, true);
+
+        // console logs 'debounce ran.' one time immediately.
+        // 100ms passes
+
+        run.debounce(myContext, myFunc, 150, true);
+
+        // 150ms passes and nothing else is logged to the console and
+        // the debouncee is no longer being watched
+
+        run.debounce(myContext, myFunc, 150, true);
+
+        // console logs 'debounce ran.' one time immediately.
+        // 150ms passes and nothing else is logged to the console and
+        // the debouncee is no longer being watched
+
+      ```
+
+      @method debounce
+      @param {Object} [target] target of method to invoke
+      @param {Function|String} method The method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @param {Number} wait Number of milliseconds to wait.
+      @param {Boolean} immediate Trigger the function on the leading instead
+        of the trailing edge of the wait interval. Defaults to false.
+      @return {Array} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.debounce = function() {
+      return apply(backburner, backburner.debounce, arguments);
+    };
+
+    /**
+      Ensure that the target method is never called more frequently than
+      the specified spacing period. The target method is called immediately.
+
+      ```javascript
+        var myFunc = function() { console.log(this.name + ' ran.'); };
+        var myContext = {name: 'throttle'};
+
+        run.throttle(myContext, myFunc, 150);
+        // myFunc is invoked with context myContext
+        // console logs 'throttle ran.'
+
+        // 50ms passes
+        run.throttle(myContext, myFunc, 150);
+
+        // 50ms passes
+        run.throttle(myContext, myFunc, 150);
+
+        // 150ms passes
+        run.throttle(myContext, myFunc, 150);
+        // myFunc is invoked with context myContext
+        // console logs 'throttle ran.'
+      ```
+
+      @method throttle
+      @param {Object} [target] target of method to invoke
+      @param {Function|String} method The method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @param {Number} spacing Number of milliseconds to space out requests.
+      @param {Boolean} immediate Trigger the function on the leading instead
+        of the trailing edge of the wait interval. Defaults to true.
+      @return {Array} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.throttle = function() {
+      return apply(backburner, backburner.throttle, arguments);
+    };
+
+    // Make sure it's not an autorun during testing
+    function checkAutoRun() {
+      if (!run.currentRunLoop) {
+        Ember.assert("You have turned on testing mode, which disabled the run-loop's autorun. You will need to wrap any code with asynchronous side-effects in an run", !Ember.testing);
+      }
+    }
+
+    /**
+      Add a new named queue after the specified queue.
+
+      The queue to add will only be added once.
+
+      @method _addQueue
+      @param {String} name the name of the queue to add.
+      @param {String} after the name of the queue to add after.
+      @private
+    */
+    run._addQueue = function(name, after) {
+      if (indexOf.call(run.queues, name) === -1) {
+        run.queues.splice(indexOf.call(run.queues, after)+1, 0, name);
+      }
+    }
+
+    __exports__["default"] = run
+  });
+define("ember-metal/set_properties",
+  ["ember-metal/property_events","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var changeProperties = __dependency1__.changeProperties;
+    var set = __dependency2__.set;
+
+    /**
+      Set a list of properties on an object. These properties are set inside
+      a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+      observers will be buffered.
+
+      ```javascript
+      var anObject = Ember.Object.create();
+
+      anObject.setProperties({
+        firstName: 'Stanley',
+        lastName: 'Stuart',
+        age: 21
+      });
+      ```
+
+      @method setProperties
+      @param self
+      @param {Object} hash
+      @return self
+    */
+    function setProperties(self, hash) {
+      changeProperties(function() {
+        for(var prop in hash) {
+          if (hash.hasOwnProperty(prop)) { set(self, prop, hash[prop]); }
+        }
+      });
+      return self;
+    };
+
+    __exports__["default"] = setProperties;
+  });
+define("ember-metal/utils",
+  ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var platform = __dependency2__.platform;
+    var create = __dependency2__.create;
+    var forEach = __dependency3__.forEach;
+
+    /**
+    @module ember-metal
+    */
+
+    /**
+      Prefix used for guids through out Ember.
+      @private
+      @property GUID_PREFIX
+      @for Ember
+      @type String
+      @final
+    */
+    var GUID_PREFIX = 'ember';
+
+
+    var o_defineProperty = platform.defineProperty,
+        o_create = create,
+        // Used for guid generation...
+        numberCache  = [],
+        stringCache  = {},
+        uuid = 0;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    /**
+      A unique key used to assign guids and other private metadata to objects.
+      If you inspect an object in your browser debugger you will often see these.
+      They can be safely ignored.
+
+      On browsers that support it, these properties are added with enumeration
+      disabled so they won't show up when you iterate over your properties.
+
+      @private
+      @property GUID_KEY
+      @for Ember
+      @type String
+      @final
+    */
+    var GUID_KEY = '__ember' + (+ new Date());
+
+    var GUID_DESC = {
+      writable:    false,
+      configurable: false,
+      enumerable:  false,
+      value: null
+    };
+
+    /**
+      Generates a new guid, optionally saving the guid to the object that you
+      pass in. You will rarely need to use this method. Instead you should
+      call `Ember.guidFor(obj)`, which return an existing guid if available.
+
+      @private
+      @method generateGuid
+      @for Ember
+      @param {Object} [obj] Object the guid will be used for. If passed in, the guid will
+        be saved on the object and reused whenever you pass the same object
+        again.
+
+        If no object is passed, just generate a new guid.
+      @param {String} [prefix] Prefix to place in front of the guid. Useful when you want to
+        separate the guid into separate namespaces.
+      @return {String} the guid
+    */
+    function generateGuid(obj, prefix) {
+      if (!prefix) prefix = GUID_PREFIX;
+      var ret = (prefix + (uuid++));
+      if (obj) {
+        if (obj[GUID_KEY] === null) {
+          obj[GUID_KEY] = ret;
+        } else {
+          GUID_DESC.value = ret;
+          o_defineProperty(obj, GUID_KEY, GUID_DESC);
+        }
+      }
+      return ret;
+    }
+
+    /**
+      Returns a unique id for the object. If the object does not yet have a guid,
+      one will be assigned to it. You can call this on any object,
+      `Ember.Object`-based or not, but be aware that it will add a `_guid`
+      property.
+
+      You can also use this method on DOM Element objects.
+
+      @private
+      @method guidFor
+      @for Ember
+      @param {Object} obj any object, string, number, Element, or primitive
+      @return {String} the unique guid for this instance.
+    */
+    function guidFor(obj) {
+
+      // special cases where we don't want to add a key to object
+      if (obj === undefined) return "(undefined)";
+      if (obj === null) return "(null)";
+
+      var ret;
+      var type = typeof obj;
+
+      // Don't allow prototype changes to String etc. to change the guidFor
+      switch(type) {
+        case 'number':
+          ret = numberCache[obj];
+          if (!ret) ret = numberCache[obj] = 'nu'+obj;
+          return ret;
+
+        case 'string':
+          ret = stringCache[obj];
+          if (!ret) ret = stringCache[obj] = 'st'+(uuid++);
+          return ret;
+
+        case 'boolean':
+          return obj ? '(true)' : '(false)';
+
+        default:
+          if (obj[GUID_KEY]) return obj[GUID_KEY];
+          if (obj === Object) return '(Object)';
+          if (obj === Array)  return '(Array)';
+          ret = 'ember' + (uuid++);
+
+          if (obj[GUID_KEY] === null) {
+            obj[GUID_KEY] = ret;
+          } else {
+            GUID_DESC.value = ret;
+            o_defineProperty(obj, GUID_KEY, GUID_DESC);
+          }
+          return ret;
+      }
+    };
+
+    // ..........................................................
+    // META
+    //
+
+    var META_DESC = {
+      writable:    true,
+      configurable: false,
+      enumerable:  false,
+      value: null
+    };
+
+
+    /**
+      The key used to store meta information on object for property observing.
+
+      @property META_KEY
+      @for Ember
+      @private
+      @final
+      @type String
+    */
+    var META_KEY = '__ember_meta__';
+
+    var isDefinePropertySimulated = platform.defineProperty.isSimulated;
+
+    function Meta(obj) {
+      this.descs = {};
+      this.watching = {};
+      this.cache = {};
+      this.cacheMeta = {};
+      this.source = obj;
+    }
+
+    Meta.prototype = {
+      descs: null,
+      deps: null,
+      watching: null,
+      listeners: null,
+      cache: null,
+      cacheMeta: null,
+      source: null,
+      mixins: null,
+      bindings: null,
+      chains: null,
+      chainWatchers: null,
+      values: null,
+      proto: null
+    };
+
+    if (isDefinePropertySimulated) {
+      // on platforms that don't support enumerable false
+      // make meta fail jQuery.isPlainObject() to hide from
+      // jQuery.extend() by having a property that fails
+      // hasOwnProperty check.
+      Meta.prototype.__preventPlainObject__ = true;
+
+      // Without non-enumerable properties, meta objects will be output in JSON
+      // unless explicitly suppressed
+      Meta.prototype.toJSON = function () { };
+    }
+
+    // Placeholder for non-writable metas.
+    var EMPTY_META = new Meta(null);
+
+    if (MANDATORY_SETTER) { EMPTY_META.values = {}; }
+
+    /**
+      Retrieves the meta hash for an object. If `writable` is true ensures the
+      hash is writable for this object as well.
+
+      The meta object contains information about computed property descriptors as
+      well as any watched properties and other information. You generally will
+      not access this information directly but instead work with higher level
+      methods that manipulate this hash indirectly.
+
+      @method meta
+      @for Ember
+      @private
+
+      @param {Object} obj The object to retrieve meta for
+      @param {Boolean} [writable=true] Pass `false` if you do not intend to modify
+        the meta hash, allowing the method to avoid making an unnecessary copy.
+      @return {Object} the meta hash for an object
+    */
+    function meta(obj, writable) {
+
+      var ret = obj[META_KEY];
+      if (writable===false) return ret || EMPTY_META;
+
+      if (!ret) {
+        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
+
+        ret = new Meta(obj);
+
+        if (MANDATORY_SETTER) { ret.values = {}; }
+
+        obj[META_KEY] = ret;
+
+        // make sure we don't accidentally try to create constructor like desc
+        ret.descs.constructor = null;
+
+      } else if (ret.source !== obj) {
+        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
+
+        ret = o_create(ret);
+        ret.descs     = o_create(ret.descs);
+        ret.watching  = o_create(ret.watching);
+        ret.cache     = {};
+        ret.cacheMeta = {};
+        ret.source    = obj;
+
+        if (MANDATORY_SETTER) { ret.values = o_create(ret.values); }
+
+        obj[META_KEY] = ret;
+      }
+      return ret;
+    };
+
+    function getMeta(obj, property) {
+      var _meta = meta(obj, false);
+      return _meta[property];
+    };
+
+    function setMeta(obj, property, value) {
+      var _meta = meta(obj, true);
+      _meta[property] = value;
+      return value;
+    };
+
+    /**
+      @deprecated
+      @private
+
+      In order to store defaults for a class, a prototype may need to create
+      a default meta object, which will be inherited by any objects instantiated
+      from the class's constructor.
+
+      However, the properties of that meta object are only shallow-cloned,
+      so if a property is a hash (like the event system's `listeners` hash),
+      it will by default be shared across all instances of that class.
+
+      This method allows extensions to deeply clone a series of nested hashes or
+      other complex objects. For instance, the event system might pass
+      `['listeners', 'foo:change', 'ember157']` to `prepareMetaPath`, which will
+      walk down the keys provided.
+
+      For each key, if the key does not exist, it is created. If it already
+      exists and it was inherited from its constructor, the constructor's
+      key is cloned.
+
+      You can also pass false for `writable`, which will simply return
+      undefined if `prepareMetaPath` discovers any part of the path that
+      shared or undefined.
+
+      @method metaPath
+      @for Ember
+      @param {Object} obj The object whose meta we are examining
+      @param {Array} path An array of keys to walk down
+      @param {Boolean} writable whether or not to create a new meta
+        (or meta property) if one does not already exist or if it's
+        shared with its constructor
+    */
+    function metaPath(obj, path, writable) {
+      Ember.deprecate("Ember.metaPath is deprecated and will be removed from future releases.");
+      var _meta = meta(obj, writable), keyName, value;
+
+      for (var i=0, l=path.length; i<l; i++) {
+        keyName = path[i];
+        value = _meta[keyName];
+
+        if (!value) {
+          if (!writable) { return undefined; }
+          value = _meta[keyName] = { __ember_source__: obj };
+        } else if (value.__ember_source__ !== obj) {
+          if (!writable) { return undefined; }
+          value = _meta[keyName] = o_create(value);
+          value.__ember_source__ = obj;
+        }
+
+        _meta = value;
+      }
+
+      return value;
+    };
+
+    /**
+      Wraps the passed function so that `this._super` will point to the superFunc
+      when the function is invoked. This is the primitive we use to implement
+      calls to super.
+
+      @private
+      @method wrap
+      @for Ember
+      @param {Function} func The function to call
+      @param {Function} superFunc The super function.
+      @return {Function} wrapped function.
+    */
+    function wrap(func, superFunc) {
+      function superWrapper() {
+        var ret, sup = this.__nextSuper;
+        this.__nextSuper = superFunc;
+        ret = apply(this, func, arguments);
+        this.__nextSuper = sup;
+        return ret;
+      }
+
+      superWrapper.wrappedFunction = func;
+      superWrapper.wrappedFunction.__ember_arity__ = func.length;
+      superWrapper.__ember_observes__ = func.__ember_observes__;
+      superWrapper.__ember_observesBefore__ = func.__ember_observesBefore__;
+      superWrapper.__ember_listens__ = func.__ember_listens__;
+
+      return superWrapper;
+    };
+
+    var EmberArray;
+
+    /**
+      Returns true if the passed object is an array or Array-like.
+
+      Ember Array Protocol:
+
+        - the object has an objectAt property
+        - the object is a native Array
+        - the object is an Object, and has a length property
+
+      Unlike `Ember.typeOf` this method returns true even if the passed object is
+      not formally array but appears to be array-like (i.e. implements `Ember.Array`)
+
+      ```javascript
+      Ember.isArray();                                          // false
+      Ember.isArray([]);                                        // true
+      Ember.isArray(Ember.ArrayProxy.create({ content: [] }));  // true
+      ```
+
+      @method isArray
+      @for Ember
+      @param {Object} obj The object to test
+      @return {Boolean} true if the passed object is an array or Array-like
+    */
+    // ES6TODO: Move up to runtime? This is only use in ember-metal by concatenatedProperties
+    function isArray(obj) {
+      var modulePath, type;
+
+      if (typeof EmberArray === "undefined") {
+        modulePath = 'ember-runtime/mixins/array';
+        if (requirejs._eak_seen[modulePath]) {
+          EmberArray = requireModule(modulePath)['default'];
+        }
+      }
+
+      if (!obj || obj.setInterval) { return false; }
+      if (Array.isArray && Array.isArray(obj)) { return true; }
+      if (EmberArray && EmberArray.detect(obj)) { return true; }
+
+      type = typeOf(obj);
+      if ('array' === type) { return true; }
+      if ((obj.length !== undefined) && 'object' === type) { return true; }
+      return false;
+    };
+
+    /**
+      Forces the passed object to be part of an array. If the object is already
+      an array or array-like, returns the object. Otherwise adds the object to
+      an array. If obj is `null` or `undefined`, returns an empty array.
+
+      ```javascript
+      Ember.makeArray();            // []
+      Ember.makeArray(null);        // []
+      Ember.makeArray(undefined);   // []
+      Ember.makeArray('lindsay');   // ['lindsay']
+      Ember.makeArray([1, 2, 42]);  // [1, 2, 42]
+
+      var controller = Ember.ArrayProxy.create({ content: [] });
+
+      Ember.makeArray(controller) === controller;  // true
+      ```
+
+      @method makeArray
+      @for Ember
+      @param {Object} obj the object
+      @return {Array}
+    */
+    function makeArray(obj) {
+      if (obj === null || obj === undefined) { return []; }
+      return isArray(obj) ? obj : [obj];
+    };
+
+    /**
+      Checks to see if the `methodName` exists on the `obj`.
+
+      ```javascript
+      var foo = { bar: Ember.K, baz: null };
+
+      Ember.canInvoke(foo, 'bar'); // true
+      Ember.canInvoke(foo, 'baz'); // false
+      Ember.canInvoke(foo, 'bat'); // false
+      ```
+
+      @method canInvoke
+      @for Ember
+      @param {Object} obj The object to check for the method
+      @param {String} methodName The method name to check for
+      @return {Boolean}
+    */
+    function canInvoke(obj, methodName) {
+      return !!(obj && typeof obj[methodName] === 'function');
+    }
+
+    /**
+      Checks to see if the `methodName` exists on the `obj`,
+      and if it does, invokes it with the arguments passed.
+
+      ```javascript
+      var d = new Date('03/15/2013');
+
+      Ember.tryInvoke(d, 'getTime');              // 1363320000000
+      Ember.tryInvoke(d, 'setFullYear', [2014]);  // 1394856000000
+      Ember.tryInvoke(d, 'noSuchMethod', [2014]); // undefined
+      ```
+
+      @method tryInvoke
+      @for Ember
+      @param {Object} obj The object to check for the method
+      @param {String} methodName The method name to check for
+      @param {Array} [args] The arguments to pass to the method
+      @return {*} the return value of the invoked method or undefined if it cannot be invoked
+    */
+    function tryInvoke(obj, methodName, args) {
+      if (canInvoke(obj, methodName)) {
+        return args ? applyStr(obj, methodName, args) : applyStr(obj, methodName);
+      }
+    };
+
+    // https://github.com/emberjs/ember.js/pull/1617
+    var needsFinallyFix = (function() {
+      var count = 0;
+      try{
+        try { }
+        finally {
+          count++;
+          throw new Error('needsFinallyFixTest');
+        }
+      } catch (e) {}
+
+      return count !== 1;
+    })();
+
+    /**
+      Provides try/finally functionality, while working
+      around Safari's double finally bug.
+
+      ```javascript
+      var tryable = function() {
+        someResource.lock();
+        runCallback(); // May throw error.
+      };
+
+      var finalizer = function() {
+        someResource.unlock();
+      };
+
+      Ember.tryFinally(tryable, finalizer);
+      ```
+
+      @method tryFinally
+      @for Ember
+      @param {Function} tryable The function to run the try callback
+      @param {Function} finalizer The function to run the finally callback
+      @param {Object} [binding] The optional calling object. Defaults to 'this'
+      @return {*} The return value is the that of the finalizer,
+      unless that value is undefined, in which case it is the return value
+      of the tryable
+    */
+
+    var tryFinally;
+    if (needsFinallyFix) {
+      tryFinally = function(tryable, finalizer, binding) {
+        var result, finalResult, finalError;
+
+        binding = binding || this;
+
+        try {
+          result = tryable.call(binding);
+        } finally {
+          try {
+            finalResult = finalizer.call(binding);
+          } catch (e) {
+            finalError = e;
+          }
+        }
+
+        if (finalError) { throw finalError; }
+
+        return (finalResult === undefined) ? result : finalResult;
+      };
+    } else {
+      tryFinally = function(tryable, finalizer, binding) {
+        var result, finalResult;
+
+        binding = binding || this;
+
+        try {
+          result = tryable.call(binding);
+        } finally {
+          finalResult = finalizer.call(binding);
+        }
+
+        return (finalResult === undefined) ? result : finalResult;
+      };
+    }
+
+    /**
+      Provides try/catch/finally functionality, while working
+      around Safari's double finally bug.
+
+      ```javascript
+      var tryable = function() {
+        for (i = 0, l = listeners.length; i < l; i++) {
+          listener = listeners[i];
+          beforeValues[i] = listener.before(name, time(), payload);
+        }
+
+        return callback.call(binding);
+      };
+
+      var catchable = function(e) {
+        payload = payload || {};
+        payload.exception = e;
+      };
+
+      var finalizer = function() {
+        for (i = 0, l = listeners.length; i < l; i++) {
+          listener = listeners[i];
+          listener.after(name, time(), payload, beforeValues[i]);
+        }
+      };
+
+      Ember.tryCatchFinally(tryable, catchable, finalizer);
+      ```
+
+      @method tryCatchFinally
+      @for Ember
+      @param {Function} tryable The function to run the try callback
+      @param {Function} catchable The function to run the catchable callback
+      @param {Function} finalizer The function to run the finally callback
+      @param {Object} [binding] The optional calling object. Defaults to 'this'
+      @return {*} The return value is the that of the finalizer,
+      unless that value is undefined, in which case it is the return value
+      of the tryable.
+    */
+    var tryCatchFinally;
+    if (needsFinallyFix) {
+      tryCatchFinally = function(tryable, catchable, finalizer, binding) {
+        var result, finalResult, finalError;
+
+        binding = binding || this;
+
+        try {
+          result = tryable.call(binding);
+        } catch(error) {
+          result = catchable.call(binding, error);
+        } finally {
+          try {
+            finalResult = finalizer.call(binding);
+          } catch (e) {
+            finalError = e;
+          }
+        }
+
+        if (finalError) { throw finalError; }
+
+        return (finalResult === undefined) ? result : finalResult;
+      };
+    } else {
+      tryCatchFinally = function(tryable, catchable, finalizer, binding) {
+        var result, finalResult;
+
+        binding = binding || this;
+
+        try {
+          result = tryable.call(binding);
+        } catch(error) {
+          result = catchable.call(binding, error);
+        } finally {
+          finalResult = finalizer.call(binding);
+        }
+
+        return (finalResult === undefined) ? result : finalResult;
+      };
+    }
+
+    // ........................................
+    // TYPING & ARRAY MESSAGING
+    //
+
+    var TYPE_MAP = {};
+    var t = "Boolean Number String Function Array Date RegExp Object".split(" ");
+    forEach.call(t, function(name) {
+      TYPE_MAP[ "[object " + name + "]" ] = name.toLowerCase();
+    });
+
+    var toString = Object.prototype.toString;
+
+    var EmberObject;
+
+    /**
+      Returns a consistent type for the passed item.
+
+      Use this instead of the built-in `typeof` to get the type of an item.
+      It will return the same result across all browsers and includes a bit
+      more detail. Here is what will be returned:
+
+          | Return Value  | Meaning                                              |
+          |---------------|------------------------------------------------------|
+          | 'string'      | String primitive or String object.                   |
+          | 'number'      | Number primitive or Number object.                   |
+          | 'boolean'     | Boolean primitive or Boolean object.                 |
+          | 'null'        | Null value                                           |
+          | 'undefined'   | Undefined value                                      |
+          | 'function'    | A function                                           |
+          | 'array'       | An instance of Array                                 |
+          | 'regexp'      | An instance of RegExp                                |
+          | 'date'        | An instance of Date                                  |
+          | 'class'       | An Ember class (created using Ember.Object.extend()) |
+          | 'instance'    | An Ember object instance                             |
+          | 'error'       | An instance of the Error object                      |
+          | 'object'      | A JavaScript object not inheriting from Ember.Object |
+
+      Examples:
+
+      ```javascript
+      Ember.typeOf();                       // 'undefined'
+      Ember.typeOf(null);                   // 'null'
+      Ember.typeOf(undefined);              // 'undefined'
+      Ember.typeOf('michael');              // 'string'
+      Ember.typeOf(new String('michael'));  // 'string'
+      Ember.typeOf(101);                    // 'number'
+      Ember.typeOf(new Number(101));        // 'number'
+      Ember.typeOf(true);                   // 'boolean'
+      Ember.typeOf(new Boolean(true));      // 'boolean'
+      Ember.typeOf(Ember.makeArray);        // 'function'
+      Ember.typeOf([1, 2, 90]);             // 'array'
+      Ember.typeOf(/abc/);                  // 'regexp'
+      Ember.typeOf(new Date());             // 'date'
+      Ember.typeOf(Ember.Object.extend());  // 'class'
+      Ember.typeOf(Ember.Object.create());  // 'instance'
+      Ember.typeOf(new Error('teamocil'));  // 'error'
+
+      // 'normal' JavaScript object
+      Ember.typeOf({ a: 'b' });             // 'object'
+      ```
+
+      @method typeOf
+      @for Ember
+      @param {Object} item the item to check
+      @return {String} the type
+    */
+    function typeOf(item) {
+      var ret, modulePath;
+
+      // ES6TODO: Depends on Ember.Object which is defined in runtime.
+      if (typeof EmberObject === "undefined") {
+        modulePath = 'ember-runtime/system/object';
+        if (requirejs._eak_seen[modulePath]) {
+          EmberObject = requireModule(modulePath)['default'];
+        }
+      }
+
+      ret = (item === null || item === undefined) ? String(item) : TYPE_MAP[toString.call(item)] || 'object';
+
+      if (ret === 'function') {
+        if (EmberObject && EmberObject.detect(item)) ret = 'class';
+      } else if (ret === 'object') {
+        if (item instanceof Error) ret = 'error';
+        else if (EmberObject && item instanceof EmberObject) ret = 'instance';
+        else if (item instanceof Date) ret = 'date';
+      }
+
+      return ret;
+    };
+
+    /**
+      Convenience method to inspect an object. This method will attempt to
+      convert the object into a useful string description.
+
+      It is a pretty simple implementation. If you want something more robust,
+      use something like JSDump: https://github.com/NV/jsDump
+
+      @method inspect
+      @for Ember
+      @param {Object} obj The object you want to inspect.
+      @return {String} A description of the object
+      @since 1.4.0
+    */
+    function inspect(obj) {
+      var type = typeOf(obj);
+      if (type === 'array') {
+        return '[' + obj + ']';
+      }
+      if (type !== 'object') {
+        return obj + '';
+      }
+
+      var v, ret = [];
+      for(var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          v = obj[key];
+          if (v === 'toString') { continue; } // ignore useless items
+          if (typeOf(v) === 'function') { v = "function() { ... }"; }
+          ret.push(key + ": " + v);
+        }
+      }
+      return "{" + ret.join(", ") + "}";
+    };
+
+    // The following functions are intentionally minified to keep the functions
+    // below Chrome's function body size inlining limit of 600 chars.
+
+    function apply(t /* target */, m /* method */, a /* args */) {
+      var l = a && a.length;
+      if (!a || !l) { return m.call(t); }
+      switch (l) {
+        case 1:  return m.call(t, a[0]);
+        case 2:  return m.call(t, a[0], a[1]);
+        case 3:  return m.call(t, a[0], a[1], a[2]);
+        case 4:  return m.call(t, a[0], a[1], a[2], a[3]);
+        case 5:  return m.call(t, a[0], a[1], a[2], a[3], a[4]);
+        default: return m.apply(t, a);
+      }
+    };
+
+    function applyStr(t /* target */, m /* method */, a /* args */) {
+      var l = a && a.length;
+      if (!a || !l) { return t[m](); }
+      switch (l) {
+        case 1:  return t[m](a[0]);
+        case 2:  return t[m](a[0], a[1]);
+        case 3:  return t[m](a[0], a[1], a[2]);
+        case 4:  return t[m](a[0], a[1], a[2], a[3]);
+        case 5:  return t[m](a[0], a[1], a[2], a[3], a[4]);
+        default: return t[m].apply(t, a);
+      }
+    };
+
+    __exports__.generateGuid = generateGuid;
+    __exports__.GUID_KEY = GUID_KEY;
+    __exports__.GUID_PREFIX = GUID_PREFIX;
+    __exports__.guidFor = guidFor;
+    __exports__.META_DESC = META_DESC;
+    __exports__.EMPTY_META = EMPTY_META;
+    __exports__.META_KEY = META_KEY;
+    __exports__.meta = meta;
+    __exports__.getMeta = getMeta;
+    __exports__.setMeta = setMeta;
+    __exports__.metaPath = metaPath;
+    __exports__.inspect = inspect;
+    __exports__.typeOf = typeOf;
+    __exports__.tryCatchFinally = tryCatchFinally;
+    __exports__.isArray = isArray;
+    __exports__.makeArray = makeArray;
+    __exports__.canInvoke = canInvoke;
+    __exports__.tryInvoke = tryInvoke;
+    __exports__.tryFinally = tryFinally;
+    __exports__.wrap = wrap;
+    __exports__.applyStr = applyStr;
+    __exports__.apply = apply;
+  });
+define("backburner",
+  ["backburner/utils","backburner/deferred_action_queues","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Utils = __dependency1__["default"];
+    var DeferredActionQueues = __dependency2__.DeferredActionQueues;
+
+    var slice = [].slice,
+        pop = [].pop,
+        each = Utils.each,
+        isString = Utils.isString,
+        isFunction = Utils.isFunction,
+        isNumber = Utils.isNumber,
+        timers = [],
+        global = this,
+        NUMBER = /\d+/;
+
+    // In IE 6-8, try/finally doesn't work without a catch.
+    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
+    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
+    var needsIETryCatchFix = (function(e,x){
+      try{ x(); }
+      catch(e) { } // jshint ignore:line
+      return !!e;
+    })();
+
+    function isCoercableNumber(number) {
+      return isNumber(number) || NUMBER.test(number);
+    }
+
+    function Backburner(queueNames, options) {
+      this.queueNames = queueNames;
+      this.options = options || {};
+      if (!this.options.defaultQueue) {
+        this.options.defaultQueue = queueNames[0];
+      }
+      this.instanceStack = [];
+      this._debouncees = [];
+      this._throttlers = [];
+    }
+
+    Backburner.prototype = {
+      queueNames: null,
+      options: null,
+      currentInstance: null,
+      instanceStack: null,
+
+      begin: function() {
+        var options = this.options,
+            onBegin = options && options.onBegin,
+            previousInstance = this.currentInstance;
+
+        if (previousInstance) {
+          this.instanceStack.push(previousInstance);
+        }
+
+        this.currentInstance = new DeferredActionQueues(this.queueNames, options);
+        if (onBegin) {
+          onBegin(this.currentInstance, previousInstance);
+        }
+      },
+
+      end: function() {
+        var options = this.options,
+            onEnd = options && options.onEnd,
+            currentInstance = this.currentInstance,
+            nextInstance = null;
+
+        // Prevent double-finally bug in Safari 6.0.2 and iOS 6
+        // This bug appears to be resolved in Safari 6.0.5 and iOS 7
+        var finallyAlreadyCalled = false;
+        try {
+          currentInstance.flush();
+        } finally {
+          if (!finallyAlreadyCalled) {
+            finallyAlreadyCalled = true;
+
+            this.currentInstance = null;
+
+            if (this.instanceStack.length) {
+              nextInstance = this.instanceStack.pop();
+              this.currentInstance = nextInstance;
+            }
+
+            if (onEnd) {
+              onEnd(currentInstance, nextInstance);
+            }
+          }
+        }
+      },
+
+      run: function(target, method /*, args */) {
+        var onError = getOnError(this.options);
+
+        this.begin();
+
+        if (!method) {
+          method = target;
+          target = null;
+        }
+
+        if (isString(method)) {
+          method = target[method];
+        }
+
+        var args = slice.call(arguments, 2);
+
+        // guard against Safari 6's double-finally bug
+        var didFinally = false;
+
+        if (onError) {
+          try {
+            return method.apply(target, args);
+          } catch(error) {
+            onError(error);
+          } finally {
+            if (!didFinally) {
+              didFinally = true;
+              this.end();
+            }
+          }
+        } else {
+          try {
+            return method.apply(target, args);
+          } finally {
+            if (!didFinally) {
+              didFinally = true;
+              this.end();
+            }
+          }
+        }
+      },
+
+      defer: function(queueName, target, method /* , args */) {
+        if (!method) {
+          method = target;
+          target = null;
+        }
+
+        if (isString(method)) {
+          method = target[method];
+        }
+
+        var stack = this.DEBUG ? new Error() : undefined,
+            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
+        if (!this.currentInstance) { createAutorun(this); }
+        return this.currentInstance.schedule(queueName, target, method, args, false, stack);
+      },
+
+      deferOnce: function(queueName, target, method /* , args */) {
+        if (!method) {
+          method = target;
+          target = null;
+        }
+
+        if (isString(method)) {
+          method = target[method];
+        }
+
+        var stack = this.DEBUG ? new Error() : undefined,
+            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
+        if (!this.currentInstance) { createAutorun(this); }
+        return this.currentInstance.schedule(queueName, target, method, args, true, stack);
+      },
+
+      setTimeout: function() {
+        var args = slice.call(arguments),
+            length = args.length,
+            method, wait, target,
+            methodOrTarget, methodOrWait, methodOrArgs;
+
+        if (length === 0) {
+          return;
+        } else if (length === 1) {
+          method = args.shift();
+          wait = 0;
+        } else if (length === 2) {
+          methodOrTarget = args[0];
+          methodOrWait = args[1];
+
+          if (isFunction(methodOrWait) || isFunction(methodOrTarget[methodOrWait])) {
+            target = args.shift();
+            method = args.shift();
+            wait = 0;
+          } else if (isCoercableNumber(methodOrWait)) {
+            method = args.shift();
+            wait = args.shift();
+          } else {
+            method = args.shift();
+            wait =  0;
+          }
+        } else {
+          var last = args[args.length - 1];
+
+          if (isCoercableNumber(last)) {
+            wait = args.pop();
+          } else {
+            wait = 0;
+          }
+
+          methodOrTarget = args[0];
+          methodOrArgs = args[1];
+
+          if (isFunction(methodOrArgs) || (isString(methodOrArgs) &&
+                                          methodOrTarget !== null &&
+                                          methodOrArgs in methodOrTarget)) {
+            target = args.shift();
+            method = args.shift();
+          } else {
+            method = args.shift();
+          }
+        }
+
+        var executeAt = (+new Date()) + parseInt(wait, 10);
+
+        if (isString(method)) {
+          method = target[method];
+        }
+
+        var onError = getOnError(this.options);
+
+        function fn() {
+          if (onError) {
+            try {
+              method.apply(target, args);
+            } catch (e) {
+              onError(e);
+            }
+          } else {
+            method.apply(target, args);
+          }
+        }
+
+        // find position to insert
+        var i = searchTimer(executeAt, timers);
+
+        timers.splice(i, 0, executeAt, fn);
+
+        updateLaterTimer(this, executeAt, wait);
+
+        return fn;
+      },
+
+      throttle: function(target, method /* , args, wait, [immediate] */) {
+        var self = this,
+            args = arguments,
+            immediate = pop.call(args),
+            wait,
+            throttler,
+            index,
+            timer;
+
+        if (isNumber(immediate) || isString(immediate)) {
+          wait = immediate;
+          immediate = true;
+        } else {
+          wait = pop.call(args);
+        }
+
+        wait = parseInt(wait, 10);
+
+        index = findThrottler(target, method, this._throttlers);
+        if (index > -1) { return this._throttlers[index]; } // throttled
+
+        timer = global.setTimeout(function() {
+          if (!immediate) {
+            self.run.apply(self, args);
+          }
+          var index = findThrottler(target, method, self._throttlers);
+          if (index > -1) {
+            self._throttlers.splice(index, 1);
+          }
+        }, wait);
+
+        if (immediate) {
+          self.run.apply(self, args);
+        }
+
+        throttler = [target, method, timer];
+
+        this._throttlers.push(throttler);
+
+        return throttler;
+      },
+
+      debounce: function(target, method /* , args, wait, [immediate] */) {
+        var self = this,
+            args = arguments,
+            immediate = pop.call(args),
+            wait,
+            index,
+            debouncee,
+            timer;
+
+        if (isNumber(immediate) || isString(immediate)) {
+          wait = immediate;
+          immediate = false;
+        } else {
+          wait = pop.call(args);
+        }
+
+        wait = parseInt(wait, 10);
+        // Remove debouncee
+        index = findDebouncee(target, method, this._debouncees);
+
+        if (index > -1) {
+          debouncee = this._debouncees[index];
+          this._debouncees.splice(index, 1);
+          clearTimeout(debouncee[2]);
+        }
+
+        timer = global.setTimeout(function() {
+          if (!immediate) {
+            self.run.apply(self, args);
+          }
+          var index = findDebouncee(target, method, self._debouncees);
+          if (index > -1) {
+            self._debouncees.splice(index, 1);
+          }
+        }, wait);
+
+        if (immediate && index === -1) {
+          self.run.apply(self, args);
+        }
+
+        debouncee = [target, method, timer];
+
+        self._debouncees.push(debouncee);
+
+        return debouncee;
+      },
+
+      cancelTimers: function() {
+        var clearItems = function(item) {
+          clearTimeout(item[2]);
+        };
+
+        each(this._throttlers, clearItems);
+        this._throttlers = [];
+
+        each(this._debouncees, clearItems);
+        this._debouncees = [];
+
+        if (this._laterTimer) {
+          clearTimeout(this._laterTimer);
+          this._laterTimer = null;
+        }
+        timers = [];
+
+        if (this._autorun) {
+          clearTimeout(this._autorun);
+          this._autorun = null;
+        }
+      },
+
+      hasTimers: function() {
+        return !!timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
+      },
+
+      cancel: function(timer) {
+        var timerType = typeof timer;
+
+        if (timer && timerType === 'object' && timer.queue && timer.method) { // we're cancelling a deferOnce
+          return timer.queue.cancel(timer);
+        } else if (timerType === 'function') { // we're cancelling a setTimeout
+          for (var i = 0, l = timers.length; i < l; i += 2) {
+            if (timers[i + 1] === timer) {
+              timers.splice(i, 2); // remove the two elements
+              return true;
+            }
+          }
+        } else if (Object.prototype.toString.call(timer) === "[object Array]"){ // we're cancelling a throttle or debounce
+          return this._cancelItem(findThrottler, this._throttlers, timer) ||
+                   this._cancelItem(findDebouncee, this._debouncees, timer);
+        } else {
+          return; // timer was null or not a timer
+        }
+      },
+
+      _cancelItem: function(findMethod, array, timer){
+        var item,
+            index;
+
+        if (timer.length < 3) { return false; }
+
+        index = findMethod(timer[0], timer[1], array);
+
+        if(index > -1) {
+
+          item = array[index];
+
+          if(item[2] === timer[2]){
+            array.splice(index, 1);
+            clearTimeout(timer[2]);
+            return true;
+          }
+        }
+
+        return false;
+      }
+    };
+
+    Backburner.prototype.schedule = Backburner.prototype.defer;
+    Backburner.prototype.scheduleOnce = Backburner.prototype.deferOnce;
+    Backburner.prototype.later = Backburner.prototype.setTimeout;
+
+    if (needsIETryCatchFix) {
+      var originalRun = Backburner.prototype.run;
+      Backburner.prototype.run = wrapInTryCatch(originalRun);
+
+      var originalEnd = Backburner.prototype.end;
+      Backburner.prototype.end = wrapInTryCatch(originalEnd);
+    }
+
+    function wrapInTryCatch(func) {
+      return function () {
+        try {
+          return func.apply(this, arguments);
+        } catch (e) {
+          throw e;
+        }
+      };
+    }
+
+    function getOnError(options) {
+      return options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
+    }
+
+
+    function createAutorun(backburner) {
+      backburner.begin();
+      backburner._autorun = global.setTimeout(function() {
+        backburner._autorun = null;
+        backburner.end();
+      });
+    }
+
+    function updateLaterTimer(self, executeAt, wait) {
+      if (!self._laterTimer || executeAt < self._laterTimerExpiresAt) {
+        self._laterTimer = global.setTimeout(function() {
+          self._laterTimer = null;
+          self._laterTimerExpiresAt = null;
+          executeTimers(self);
+        }, wait);
+        self._laterTimerExpiresAt = executeAt;
+      }
+    }
+
+    function executeTimers(self) {
+      var now = +new Date(),
+          time, fns, i, l;
+
+      self.run(function() {
+        i = searchTimer(now, timers);
+
+        fns = timers.splice(0, i);
+
+        for (i = 1, l = fns.length; i < l; i += 2) {
+          self.schedule(self.options.defaultQueue, null, fns[i]);
+        }
+      });
+
+      if (timers.length) {
+        updateLaterTimer(self, timers[0], timers[0] - now);
+      }
+    }
+
+    function findDebouncee(target, method, debouncees) {
+      return findItem(target, method, debouncees);
+    }
+
+    function findThrottler(target, method, throttlers) {
+      return findItem(target, method, throttlers);
+    }
+
+    function findItem(target, method, collection) {
+      var item,
+          index = -1;
+
+      for (var i = 0, l = collection.length; i < l; i++) {
+        item = collection[i];
+        if (item[0] === target && item[1] === method) {
+          index = i;
+          break;
+        }
+      }
+
+      return index;
+    }
+
+    function searchTimer(time, timers) {
+      var start = 0,
+          end = timers.length - 2,
+          middle, l;
+
+      while (start < end) {
+        // since timers is an array of pairs 'l' will always
+        // be an integer
+        l = (end - start) / 2;
+
+        // compensate for the index in case even number
+        // of pairs inside timers
+        middle = start + l - (l % 2);
+
+        if (time >= timers[middle]) {
+          start = middle + 2;
+        } else {
+          end = middle;
+        }
+      }
+
+      return (time >= timers[start]) ? start + 2 : start;
+    }
+
+    __exports__.Backburner = Backburner;
+  });
+define("backburner/deferred_action_queues",
+  ["backburner/utils","backburner/queue","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Utils = __dependency1__["default"];
+    var Queue = __dependency2__.Queue;
+
+    var each = Utils.each,
+        isString = Utils.isString;
+
+    function DeferredActionQueues(queueNames, options) {
+      var queues = this.queues = {};
+      this.queueNames = queueNames = queueNames || [];
+
+      this.options = options;
+
+      each(queueNames, function(queueName) {
+        queues[queueName] = new Queue(this, queueName, options);
+      });
+    }
+
+    DeferredActionQueues.prototype = {
+      queueNames: null,
+      queues: null,
+      options: null,
+
+      schedule: function(queueName, target, method, args, onceFlag, stack) {
+        var queues = this.queues,
+            queue = queues[queueName];
+
+        if (!queue) { throw new Error("You attempted to schedule an action in a queue (" + queueName + ") that doesn't exist"); }
+
+        if (onceFlag) {
+          return queue.pushUnique(target, method, args, stack);
+        } else {
+          return queue.push(target, method, args, stack);
+        }
+      },
+
+      invoke: function(target, method, args, _) {
+        if (args && args.length > 0) {
+          method.apply(target, args);
+        } else {
+          method.call(target);
+        }
+      },
+
+      invokeWithOnError: function(target, method, args, onError) {
+        try {
+          if (args && args.length > 0) {
+            method.apply(target, args);
+          } else {
+            method.call(target);
+          }
+        } catch(error) {
+          onError(error);
+        }
+      },
+
+      flush: function() {
+        var queues = this.queues,
+            queueNames = this.queueNames,
+            queueName, queue, queueItems, priorQueueNameIndex,
+            queueNameIndex = 0, numberOfQueues = queueNames.length,
+            options = this.options,
+            onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]),
+            invoke = onError ? this.invokeWithOnError : this.invoke;
+
+        outerloop:
+        while (queueNameIndex < numberOfQueues) {
+          queueName = queueNames[queueNameIndex];
+          queue = queues[queueName];
+          queueItems = queue._queueBeingFlushed = queue._queue.slice();
+          queue._queue = [];
+
+          var queueOptions = queue.options, // TODO: write a test for this
+              before = queueOptions && queueOptions.before,
+              after = queueOptions && queueOptions.after,
+              target, method, args, stack,
+              queueIndex = 0, numberOfQueueItems = queueItems.length;
+
+          if (numberOfQueueItems && before) { before(); }
+
+          while (queueIndex < numberOfQueueItems) {
+            target = queueItems[queueIndex];
+            method = queueItems[queueIndex+1];
+            args   = queueItems[queueIndex+2];
+            stack  = queueItems[queueIndex+3]; // Debugging assistance
+
+            if (isString(method)) { method = target[method]; }
+
+            // method could have been nullified / canceled during flush
+            if (method) {
+              invoke(target, method, args, onError);
+            }
+
+            queueIndex += 4;
+          }
+
+          queue._queueBeingFlushed = null;
+          if (numberOfQueueItems && after) { after(); }
+
+          if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
+            queueNameIndex = priorQueueNameIndex;
+            continue outerloop;
+          }
+
+          queueNameIndex++;
+        }
+      }
+    };
+
+    function indexOfPriorQueueWithActions(daq, currentQueueIndex) {
+      var queueName, queue;
+
+      for (var i = 0, l = currentQueueIndex; i <= l; i++) {
+        queueName = daq.queueNames[i];
+        queue = daq.queues[queueName];
+        if (queue._queue.length) { return i; }
+      }
+
+      return -1;
+    }
+
+    __exports__.DeferredActionQueues = DeferredActionQueues;
+  });
+define("backburner/queue",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function Queue(daq, name, options) {
+      this.daq = daq;
+      this.name = name;
+      this.globalOptions = options;
+      this.options = options[name];
+      this._queue = [];
+    }
+
+    Queue.prototype = {
+      daq: null,
+      name: null,
+      options: null,
+      onError: null,
+      _queue: null,
+
+      push: function(target, method, args, stack) {
+        var queue = this._queue;
+        queue.push(target, method, args, stack);
+        return {queue: this, target: target, method: method};
+      },
+
+      pushUnique: function(target, method, args, stack) {
+        var queue = this._queue, currentTarget, currentMethod, i, l;
+
+        for (i = 0, l = queue.length; i < l; i += 4) {
+          currentTarget = queue[i];
+          currentMethod = queue[i+1];
+
+          if (currentTarget === target && currentMethod === method) {
+            queue[i+2] = args; // replace args
+            queue[i+3] = stack; // replace stack
+            return {queue: this, target: target, method: method};
+          }
+        }
+
+        queue.push(target, method, args, stack);
+        return {queue: this, target: target, method: method};
+      },
+
+      // TODO: remove me, only being used for Ember.run.sync
+      flush: function() {
+        var queue = this._queue,
+            globalOptions = this.globalOptions,
+            options = this.options,
+            before = options && options.before,
+            after = options && options.after,
+            onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]),
+            target, method, args, stack, i, l = queue.length;
+
+        if (l && before) { before(); }
+        for (i = 0; i < l; i += 4) {
+          target = queue[i];
+          method = queue[i+1];
+          args   = queue[i+2];
+          stack  = queue[i+3]; // Debugging assistance
+
+          // TODO: error handling
+          if (args && args.length > 0) {
+            if (onError) {
+              try {
+                method.apply(target, args);
+              } catch (e) {
+                onError(e);
+              }
+            } else {
+              method.apply(target, args);
+            }
+          } else {
+            if (onError) {
+              try {
+                method.call(target);
+              } catch(e) {
+                onError(e);
+              }
+            } else {
+              method.call(target);
+            }
+          }
+        }
+        if (l && after) { after(); }
+
+        // check if new items have been added
+        if (queue.length > l) {
+          this._queue = queue.slice(l);
+          this.flush();
+        } else {
+          this._queue.length = 0;
+        }
+      },
+
+      cancel: function(actionToCancel) {
+        var queue = this._queue, currentTarget, currentMethod, i, l;
+
+        for (i = 0, l = queue.length; i < l; i += 4) {
+          currentTarget = queue[i];
+          currentMethod = queue[i+1];
+
+          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+            queue.splice(i, 4);
+            return true;
+          }
+        }
+
+        // if not found in current queue
+        // could be in the queue that is being flushed
+        queue = this._queueBeingFlushed;
+        if (!queue) {
+          return;
+        }
+        for (i = 0, l = queue.length; i < l; i += 4) {
+          currentTarget = queue[i];
+          currentMethod = queue[i+1];
+
+          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+            // don't mess with array during flush
+            // just nullify the method
+            queue[i+1] = null;
+            return true;
+          }
+        }
+      }
+    };
+
+    __exports__.Queue = Queue;
+  });
+define("backburner/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    __exports__["default"] = {
+      each: function(collection, callback) {
+        for (var i = 0; i < collection.length; i++) {
+          callback(collection[i]);
+        }
+      },
+
+      isString: function(suspect) {
+        return typeof suspect === 'string';
+      },
+
+      isFunction: function(suspect) {
+        return typeof suspect === 'function';
+      },
+
+      isNumber: function(suspect) {
+        return typeof suspect === 'number';
+      }
+    };
+  });
+
+define("ember-metal/watch_key",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var meta = __dependency2__.meta;
+    var typeOf = __dependency2__.typeOf;
+    var platform = __dependency3__.platform;
+
+    var metaFor = meta, // utils.js
+        MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER,
+        o_defineProperty = platform.defineProperty;
+
+    function watchKey(obj, keyName, meta) {
+      // can't watch length on Array - it is special...
+      if (keyName === 'length' && typeOf(obj) === 'array') { return; }
+
+      var m = meta || metaFor(obj), watching = m.watching;
+
+      // activate watching first time
+      if (!watching[keyName]) {
+        watching[keyName] = 1;
+
+        if ('function' === typeof obj.willWatchProperty) {
+          obj.willWatchProperty(keyName);
+        }
+
+        if (MANDATORY_SETTER && keyName in obj) {
+          m.values[keyName] = obj[keyName];
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: obj.propertyIsEnumerable(keyName),
+            set: Ember.MANDATORY_SETTER_FUNCTION,
+            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
+      } else {
+        watching[keyName] = (watching[keyName] || 0) + 1;
+      }
+    };
+
+    function unwatchKey(obj, keyName, meta) {
+      var m = meta || metaFor(obj), watching = m.watching;
+
+      if (watching[keyName] === 1) {
+        watching[keyName] = 0;
+
+        if ('function' === typeof obj.didUnwatchProperty) {
+          obj.didUnwatchProperty(keyName);
+        }
+
+        if (MANDATORY_SETTER && keyName in obj) {
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: obj.propertyIsEnumerable(keyName),
+            set: function(val) {
+              // redefine to set as enumerable
+              o_defineProperty(obj, keyName, {
+                configurable: true,
+                writable: true,
+                enumerable: true,
+                value: val
+              });
+              delete m.values[keyName];
+            },
+            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
+      } else if (watching[keyName] > 1) {
+        watching[keyName]--;
+      }
+    };
+
+    __exports__.watchKey = watchKey;
+    __exports__.unwatchKey = unwatchKey;
+  });
+define("ember-metal/watch_path",
+  ["ember-metal/utils","ember-metal/chains","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var meta = __dependency1__.meta;
+    var typeOf = __dependency1__.typeOf;
+    var ChainNode = __dependency2__.ChainNode;
+
+    var metaFor = meta;
+
+    // get the chains for the current object. If the current object has
+    // chains inherited from the proto they will be cloned and reconfigured for
+    // the current object.
+    function chainsFor(obj, meta) {
+      var m = meta || metaFor(obj), ret = m.chains;
+      if (!ret) {
+        ret = m.chains = new ChainNode(null, null, obj);
+      } else if (ret.value() !== obj) {
+        ret = m.chains = ret.copy(obj);
+      }
+      return ret;
+    }
+
+    function watchPath(obj, keyPath, meta) {
+      // can't watch length on Array - it is special...
+      if (keyPath === 'length' && typeOf(obj) === 'array') { return; }
+
+      var m = meta || metaFor(obj), watching = m.watching;
+
+      if (!watching[keyPath]) { // activate watching first time
+        watching[keyPath] = 1;
+        chainsFor(obj, m).add(keyPath);
+      } else {
+        watching[keyPath] = (watching[keyPath] || 0) + 1;
+      }
+    };
+
+    function unwatchPath(obj, keyPath, meta) {
+      var m = meta || metaFor(obj), watching = m.watching;
+
+      if (watching[keyPath] === 1) {
+        watching[keyPath] = 0;
+        chainsFor(obj, m).remove(keyPath);
+      } else if (watching[keyPath] > 1) {
+        watching[keyPath]--;
+      }
+    };
+
+    __exports__.watchPath = watchPath;
+    __exports__.unwatchPath = unwatchPath;
+  });
+define("ember-metal/watching",
+  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    var meta = __dependency1__.meta;
+    var META_KEY = __dependency1__.META_KEY;
+    var GUID_KEY = __dependency1__.GUID_KEY;
+    var typeOf = __dependency1__.typeOf;
+    var generateGuid = __dependency1__.generateGuid;
+    var removeChainWatcher = __dependency2__.removeChainWatcher;
+    var flushPendingChains = __dependency2__.flushPendingChains;
+    var watchKey = __dependency3__.watchKey;
+    var unwatchKey = __dependency3__.unwatchKey;
+    var watchPath = __dependency4__.watchPath;
+    var unwatchPath = __dependency4__.unwatchPath;
+
+    var metaFor = meta; // utils.js
+
+    // returns true if the passed path is just a keyName
+    function isKeyName(path) {
+      return path.indexOf('.') === -1;
+    }
+
+    /**
+      Starts watching a property on an object. Whenever the property changes,
+      invokes `Ember.propertyWillChange` and `Ember.propertyDidChange`. This is the
+      primitive used by observers and dependent keys; usually you will never call
+      this method directly but instead use higher level methods like
+      `Ember.addObserver()`
+
+      @private
+      @method watch
+      @for Ember
+      @param obj
+      @param {String} keyName
+    */
+    function watch(obj, _keyPath, m) {
+      // can't watch length on Array - it is special...
+      if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
+
+      if (isKeyName(_keyPath)) {
+        watchKey(obj, _keyPath, m);
+      } else {
+        watchPath(obj, _keyPath, m);
+      }
+    };
+
+    function isWatching(obj, key) {
+      var meta = obj[META_KEY];
+      return (meta && meta.watching[key]) > 0;
+    };
+
+    watch.flushPending = flushPendingChains;
+
+    function unwatch(obj, _keyPath, m) {
+      // can't watch length on Array - it is special...
+      if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
+
+      if (isKeyName(_keyPath)) {
+        unwatchKey(obj, _keyPath, m);
+      } else {
+        unwatchPath(obj, _keyPath, m);
+      }
+    };
+
+    /**
+      Call on an object when you first beget it from another object. This will
+      setup any chained watchers on the object instance as needed. This method is
+      safe to call multiple times.
+
+      @private
+      @method rewatch
+      @for Ember
+      @param obj
+    */
+    function rewatch(obj) {
+      var m = obj[META_KEY], chains = m && m.chains;
+
+      // make sure the object has its own guid.
+      if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
+        generateGuid(obj);
+      }
+
+      // make sure any chained watchers update.
+      if (chains && chains.value() !== obj) {
+        m.chains = chains.copy(obj);
+      }
+    };
+
+    var NODE_STACK = [];
+
+    /**
+      Tears down the meta on an object so that it can be garbage collected.
+      Multiple calls will have no effect.
+
+      @method destroy
+      @for Ember
+      @param {Object} obj  the object to destroy
+      @return {void}
+    */
+    function destroy(obj) {
+      var meta = obj[META_KEY], node, nodes, key, nodeObject;
+      if (meta) {
+        obj[META_KEY] = null;
+        // remove chainWatchers to remove circular references that would prevent GC
+        node = meta.chains;
+        if (node) {
+          NODE_STACK.push(node);
+          // process tree
+          while (NODE_STACK.length > 0) {
+            node = NODE_STACK.pop();
+            // push children
+            nodes = node._chains;
+            if (nodes) {
+              for (key in nodes) {
+                if (nodes.hasOwnProperty(key)) {
+                  NODE_STACK.push(nodes[key]);
+                }
+              }
+            }
+            // remove chainWatcher in node object
+            if (node._watching) {
+              nodeObject = node._object;
+              if (nodeObject) {
+                removeChainWatcher(nodeObject, node._key, node);
+              }
+            }
+          }
+        }
+      }
+    };
+
+    __exports__.watch = watch;
+    __exports__.isWatching = isWatching;
+    __exports__.unwatch = unwatch;
+    __exports__.rewatch = rewatch;
+    __exports__.destroy = destroy;
+  });
+})();
+
+(function() {
+/**
+  @class RSVP
+  @module RSVP
+  */
+define("rsvp/all",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      This is a convenient alias for `RSVP.Promise.all`.
+
+      @method all
+      @for RSVP
+      @param {Array} array Array of promises.
+      @param {String} label An optional label. This is useful
+      for tooling.
+      @static
+    */
+    __exports__["default"] = function all(array, label) {
+      return Promise.all(array, label);
+    };
+  });
+define("rsvp/all_settled",
+  ["./promise","./utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var isArray = __dependency2__.isArray;
+    var isNonThenable = __dependency2__.isNonThenable;
+
+    /**
+      `RSVP.allSettled` is similar to `RSVP.all`, but instead of implementing
+      a fail-fast method, it waits until all the promises have returned and
+      shows you all the results. This is useful if you want to handle multiple
+      promises' failure states together as a set.
+
+      Returns a promise that is fulfilled when all the given promises have been
+      settled. The return promise is fulfilled with an array of the states of
+      the promises passed into the `promises` array argument.
+
+      Each state object will either indicate fulfillment or rejection, and
+      provide the corresponding value or reason. The states will take one of
+      the following formats:
+
+      ```javascript
+      { state: 'fulfilled', value: value }
+        or
+      { state: 'rejected', reason: reason }
+      ```
+
+      Example:
+
+      ```javascript
+      var promise1 = RSVP.Promise.resolve(1);
+      var promise2 = RSVP.Promise.reject(new Error('2'));
+      var promise3 = RSVP.Promise.reject(new Error('3'));
+      var promises = [ promise1, promise2, promise3 ];
+
+      RSVP.allSettled(promises).then(function(array){
+        // array == [
+        //   { state: 'fulfilled', value: 1 },
+        //   { state: 'rejected', reason: Error },
+        //   { state: 'rejected', reason: Error }
+        // ]
+        // Note that for the second item, reason.message will be "2", and for the
+        // third item, reason.message will be "3".
+      }, function(error) {
+        // Not run. (This block would only be called if allSettled had failed,
+        // for instance if passed an incorrect argument type.)
+      });
+      ```
+
+      @method allSettled
+      @for RSVP
+      @param {Array} promises
+      @param {String} label - optional string that describes the promise.
+      Useful for tooling.
+      @return {Promise} promise that is fulfilled with an array of the settled
+      states of the constituent promises.
+      @static
+    */
+
+    __exports__["default"] = function allSettled(entries, label) {
+      return new Promise(function(resolve, reject) {
+        if (!isArray(entries)) {
+          throw new TypeError('You must pass an array to allSettled.');
+        }
+
+        var remaining = entries.length;
+        var entry;
+
+        if (remaining === 0) {
+          resolve([]);
+          return;
+        }
+
+        var results = new Array(remaining);
+
+        function fulfilledResolver(index) {
+          return function(value) {
+            resolveAll(index, fulfilled(value));
+          };
+        }
+
+        function rejectedResolver(index) {
+          return function(reason) {
+            resolveAll(index, rejected(reason));
+          };
+        }
+
+        function resolveAll(index, value) {
+          results[index] = value;
+          if (--remaining === 0) {
+            resolve(results);
+          }
+        }
+
+        for (var index = 0; index < entries.length; index++) {
+          entry = entries[index];
+
+          if (isNonThenable(entry)) {
+            resolveAll(index, fulfilled(entry));
+          } else {
+            Promise.cast(entry).then(fulfilledResolver(index), rejectedResolver(index));
+          }
+        }
+      }, label);
+    };
+
+    function fulfilled(value) {
+      return { state: 'fulfilled', value: value };
+    }
+
+    function rejected(reason) {
+      return { state: 'rejected', reason: reason };
+    }
+  });
+define("rsvp/config",
+  ["./events","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var EventTarget = __dependency1__["default"];
+
+    var config = {
+      instrument: false
+    };
+
+    EventTarget.mixin(config);
+
+    function configure(name, value) {
+      if (name === 'onerror') {
+        // handle for legacy users that expect the actual
+        // error to be passed to their function added via
+        // `RSVP.configure('onerror', someFunctionHere);`
+        config.on('error', value);
+        return;
+      }
+
+      if (arguments.length === 2) {
+        config[name] = value;
+      } else {
+        return config[name];
+      }
+    }
+
+    __exports__.config = config;
+    __exports__.configure = configure;
+  });
+define("rsvp/defer",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      `RSVP.defer` returns an object similar to jQuery's `$.Deferred`.
+      `RSVP.defer` should be used when porting over code reliant on `$.Deferred`'s
+      interface. New code should use the `RSVP.Promise` constructor instead.
+
+      The object returned from `RSVP.defer` is a plain object with three properties:
+
+      * promise - an `RSVP.Promise`.
+      * reject - a function that causes the `promise` property on this object to
+        become rejected
+      * resolve - a function that causes the `promise` property on this object to
+        become fulfilled.
+
+      Example:
+
+       ```javascript
+       var deferred = RSVP.defer();
+
+       deferred.resolve("Success!");
+
+       deferred.promise.then(function(value){
+         // value here is "Success!"
+       });
+       ```
+
+      @method defer
+      @for RSVP
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Object}
+     */
+
+    __exports__["default"] = function defer(label) {
+      var deferred = { };
+
+      deferred.promise = new Promise(function(resolve, reject) {
+        deferred.resolve = resolve;
+        deferred.reject = reject;
+      }, label);
+
+      return deferred;
+    };
+  });
+define("rsvp/events",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var indexOf = function(callbacks, callback) {
+      for (var i=0, l=callbacks.length; i<l; i++) {
+        if (callbacks[i] === callback) { return i; }
+      }
+
+      return -1;
+    };
+
+    var callbacksFor = function(object) {
+      var callbacks = object._promiseCallbacks;
+
+      if (!callbacks) {
+        callbacks = object._promiseCallbacks = {};
+      }
+
+      return callbacks;
+    };
+
+    /**
+      @class RSVP.EventTarget
+    */
+    __exports__["default"] = {
+
+      /**
+        `RSVP.EventTarget.mixin` extends an object with EventTarget methods. For
+        Example:
+
+        ```javascript
+        var object = {};
+
+        RSVP.EventTarget.mixin(object);
+
+        object.on("finished", function(event) {
+          // handle event
+        });
+
+        object.trigger("finished", { detail: value });
+        ```
+
+        `EventTarget.mixin` also works with prototypes:
+
+        ```javascript
+        var Person = function() {};
+        RSVP.EventTarget.mixin(Person.prototype);
+
+        var yehuda = new Person();
+        var tom = new Person();
+
+        yehuda.on("poke", function(event) {
+          console.log("Yehuda says OW");
+        });
+
+        tom.on("poke", function(event) {
+          console.log("Tom says OW");
+        });
+
+        yehuda.trigger("poke");
+        tom.trigger("poke");
+        ```
+
+        @method mixin
+        @param {Object} object object to extend with EventTarget methods
+        @private
+      */
+      mixin: function(object) {
+        object.on = this.on;
+        object.off = this.off;
+        object.trigger = this.trigger;
+        object._promiseCallbacks = undefined;
+        return object;
+      },
+
+      /**
+        Registers a callback to be executed when `eventName` is triggered
+
+        ```javascript
+        object.on('event', function(eventInfo){
+          // handle the event
+        });
+
+        object.trigger('event');
+        ```
+
+        @method on
+        @param {String} eventName name of the event to listen for
+        @param {Function} callback function to be called when the event is triggered.
+        @private
+      */
+      on: function(eventName, callback) {
+        var allCallbacks = callbacksFor(this), callbacks;
+
+        callbacks = allCallbacks[eventName];
+
+        if (!callbacks) {
+          callbacks = allCallbacks[eventName] = [];
+        }
+
+        if (indexOf(callbacks, callback) === -1) {
+          callbacks.push(callback);
+        }
+      },
+
+      /**
+        You can use `off` to stop firing a particular callback for an event:
+
+        ```javascript
+        function doStuff() { // do stuff! }
+        object.on('stuff', doStuff);
+
+        object.trigger('stuff'); // doStuff will be called
+
+        // Unregister ONLY the doStuff callback
+        object.off('stuff', doStuff);
+        object.trigger('stuff'); // doStuff will NOT be called
+        ```
+
+        If you don't pass a `callback` argument to `off`, ALL callbacks for the
+        event will not be executed when the event fires. For example:
+
+        ```javascript
+        var callback1 = function(){};
+        var callback2 = function(){};
+
+        object.on('stuff', callback1);
+        object.on('stuff', callback2);
+
+        object.trigger('stuff'); // callback1 and callback2 will be executed.
+
+        object.off('stuff');
+        object.trigger('stuff'); // callback1 and callback2 will not be executed!
+        ```
+
+        @method off
+        @param {String} eventName event to stop listening to
+        @param {Function} callback optional argument. If given, only the function
+        given will be removed from the event's callback queue. If no `callback`
+        argument is given, all callbacks will be removed from the event's callback
+        queue.
+        @private
+
+      */
+      off: function(eventName, callback) {
+        var allCallbacks = callbacksFor(this), callbacks, index;
+
+        if (!callback) {
+          allCallbacks[eventName] = [];
+          return;
+        }
+
+        callbacks = allCallbacks[eventName];
+
+        index = indexOf(callbacks, callback);
+
+        if (index !== -1) { callbacks.splice(index, 1); }
+      },
+
+      /**
+        Use `trigger` to fire custom events. For example:
+
+        ```javascript
+        object.on('foo', function(){
+          console.log('foo event happened!');
+        });
+        object.trigger('foo');
+        // 'foo event happened!' logged to the console
+        ```
+
+        You can also pass a value as a second argument to `trigger` that will be
+        passed as an argument to all event listeners for the event:
+
+        ```javascript
+        object.on('foo', function(value){
+          console.log(value.name);
+        });
+
+        object.trigger('foo', { name: 'bar' });
+        // 'bar' logged to the console
+        ```
+
+        @method trigger
+        @param {String} eventName name of the event to be triggered
+        @param {Any} options optional value to be passed to any event handlers for
+        the given `eventName`
+        @private
+      */
+      trigger: function(eventName, options) {
+        var allCallbacks = callbacksFor(this),
+            callbacks, callbackTuple, callback, binding;
+
+        if (callbacks = allCallbacks[eventName]) {
+          // Don't cache the callbacks.length since it may grow
+          for (var i=0; i<callbacks.length; i++) {
+            callback = callbacks[i];
+
+            callback(options);
+          }
+        }
+      }
+    };
+  });
+define("rsvp/filter",
+  ["./all","./map","./utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var all = __dependency1__["default"];
+    var map = __dependency2__["default"];
+    var isFunction = __dependency3__.isFunction;
+    var isArray = __dependency3__.isArray;
+
+    /**
+     `RSVP.filter` is similar to JavaScript's native `filter` method, except that it
+      waits for all promises to become fulfilled before running the `filterFn` on
+      each item in given to `promises`. `RSVP.filter` returns a promise that will
+      become fulfilled with the result of running `filterFn` on the values the
+      promises become fulfilled with.
+
+      For example:
+
+      ```javascript
+
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.resolve(2);
+      var promise3 = RSVP.resolve(3);
+
+      var filterFn = function(item){
+        return item > 1;
+      };
+
+      RSVP.filter(promises, filterFn).then(function(result){
+        // result is [ 2, 3 ]
+      });
+      ```
+
+      If any of the `promises` given to `RSVP.filter` are rejected, the first promise
+      that is rejected will be given as an argument to the returned promise's
+      rejection handler. For example:
+
+      ```javascript
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.reject(new Error("2"));
+      var promise3 = RSVP.reject(new Error("3"));
+      var promises = [ promise1, promise2, promise3 ];
+
+      var filterFn = function(item){
+        return item > 1;
+      };
+
+      RSVP.filter(promises, filterFn).then(function(array){
+        // Code here never runs because there are rejected promises!
+      }, function(reason) {
+        // reason.message === "2"
+      });
+      ```
+
+      `RSVP.filter` will also wait for any promises returned from `filterFn`.
+      For instance, you may want to fetch a list of users then return a subset
+      of those users based on some asynchronous operation:
+
+      ```javascript
+
+      var alice = { name: 'alice' };
+      var bob   = { name: 'bob' };
+      var users = [ alice, bob ];
+
+      var promises = users.map(function(user){
+        return RSVP.resolve(user);
+      });
+
+      var filterFn = function(user){
+        // Here, Alice has permissions to create a blog post, but Bob does not.
+        return getPrivilegesForUser(user).then(function(privs){
+          return privs.can_create_blog_post === true;
+        });
+      };
+      RSVP.filter(promises, filterFn).then(function(users){
+        // true, because the server told us only Alice can create a blog post.
+        users.length === 1;
+        // false, because Alice is the only user present in `users`
+        users[0] === bob;
+      });
+      ```
+
+      @method filter
+      @for RSVP
+      @param {Array} promises
+      @param {Function} filterFn - function to be called on each resolved value to
+      filter the final results.
+      @param {String} label optional string describing the promise. Useful for
+      tooling.
+      @return {Promise}
+    */
+    function filter(promises, filterFn, label) {
+      return all(promises, label).then(function(values){
+        if (!isArray(promises)) {
+          throw new TypeError('You must pass an array to filter.');
+        }
+
+        if (!isFunction(filterFn)){
+          throw new TypeError("You must pass a function to filter's second argument.");
+        }
+
+        return map(promises, filterFn, label).then(function(filterResults){
+           var i,
+               valuesLen = values.length,
+               filtered = [];
+
+           for (i = 0; i < valuesLen; i++){
+             if(filterResults[i]) filtered.push(values[i]);
+           }
+           return filtered;
+        });
+      });
+    }
+
+    __exports__["default"] = filter;
+  });
+define("rsvp/hash",
+  ["./promise","./utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var isNonThenable = __dependency2__.isNonThenable;
+    var keysOf = __dependency2__.keysOf;
+
+    /**
+      `RSVP.hash` is similar to `RSVP.all`, but takes an object instead of an array
+      for its `promises` argument.
+
+      Returns a promise that is fulfilled when all the given promises have been
+      fulfilled, or rejected if any of them become rejected. The returned promise
+      is fulfilled with a hash that has the same key names as the `promises` object
+      argument. If any of the values in the object are not promises, they will
+      simply be copied over to the fulfilled object.
+
+      Example:
+
+      ```javascript
+      var promises = {
+        myPromise: RSVP.resolve(1),
+        yourPromise: RSVP.resolve(2),
+        theirPromise: RSVP.resolve(3),
+        notAPromise: 4
+      };
+
+      RSVP.hash(promises).then(function(hash){
+        // hash here is an object that looks like:
+        // {
+        //   myPromise: 1,
+        //   yourPromise: 2,
+        //   theirPromise: 3,
+        //   notAPromise: 4
+        // }
+      });
+      ````
+
+      If any of the `promises` given to `RSVP.hash` are rejected, the first promise
+      that is rejected will be given as the reason to the rejection handler.
+
+      Example:
+
+      ```javascript
+      var promises = {
+        myPromise: RSVP.resolve(1),
+        rejectedPromise: RSVP.reject(new Error("rejectedPromise")),
+        anotherRejectedPromise: RSVP.reject(new Error("anotherRejectedPromise")),
+      };
+
+      RSVP.hash(promises).then(function(hash){
+        // Code here never runs because there are rejected promises!
+      }, function(reason) {
+        // reason.message === "rejectedPromise"
+      });
+      ```
+
+      An important note: `RSVP.hash` is intended for plain JavaScript objects that
+      are just a set of keys and values. `RSVP.hash` will NOT preserve prototype
+      chains.
+
+      Example:
+
+      ```javascript
+      function MyConstructor(){
+        this.example = RSVP.resolve("Example");
+      }
+
+      MyConstructor.prototype = {
+        protoProperty: RSVP.resolve("Proto Property")
+      };
+
+      var myObject = new MyConstructor();
+
+      RSVP.hash(myObject).then(function(hash){
+        // protoProperty will not be present, instead you will just have an
+        // object that looks like:
+        // {
+        //   example: "Example"
+        // }
+        //
+        // hash.hasOwnProperty('protoProperty'); // false
+        // 'undefined' === typeof hash.protoProperty
+      });
+      ```
+
+      @method hash
+      @for RSVP
+      @param {Object} promises
+      @param {String} label optional string that describes the promise.
+      Useful for tooling.
+      @return {Promise} promise that is fulfilled when all properties of `promises`
+      have been fulfilled, or rejected if any of them become rejected.
+      @static
+    */
+    __exports__["default"] = function hash(object, label) {
+      return new Promise(function(resolve, reject){
+        var results = {};
+        var keys = keysOf(object);
+        var remaining = keys.length;
+        var entry, property;
+
+        if (remaining === 0) {
+          resolve(results);
+          return;
+        }
+
+       function fulfilledTo(property) {
+          return function(value) {
+            results[property] = value;
+            if (--remaining === 0) {
+              resolve(results);
+            }
+          };
+        }
+
+        function onRejection(reason) {
+          remaining = 0;
+          reject(reason);
+        }
+
+        for (var i = 0; i < keys.length; i++) {
+          property = keys[i];
+          entry = object[property];
+
+          if (isNonThenable(entry)) {
+            results[property] = entry;
+            if (--remaining === 0) {
+              resolve(results);
+            }
+          } else {
+            Promise.cast(entry).then(fulfilledTo(property), onRejection);
+          }
+        }
+      });
+    };
+  });
+define("rsvp/instrument",
+  ["./config","./utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var config = __dependency1__.config;
+    var now = __dependency2__.now;
+
+    __exports__["default"] = function instrument(eventName, promise, child) {
+      // instrumentation should not disrupt normal usage.
+      try {
+        config.trigger(eventName, {
+          guid: promise._guidKey + promise._id,
+          eventName: eventName,
+          detail: promise._detail,
+          childGuid: child && promise._guidKey + child._id,
+          label: promise._label,
+          timeStamp: now(),
+          stack: new Error(promise._label).stack
+        });
+      } catch(error) {
+        setTimeout(function(){
+          throw error;
+        }, 0);
+      }
+    };
+  });
+define("rsvp/map",
+  ["./promise","./all","./utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var all = __dependency2__["default"];
+    var isArray = __dependency3__.isArray;
+    var isFunction = __dependency3__.isFunction;
+
+    /**
+     `RSVP.map` is similar to JavaScript's native `map` method, except that it
+      waits for all promises to become fulfilled before running the `mapFn` on
+      each item in given to `promises`. `RSVP.map` returns a promise that will
+      become fulfilled with the result of running `mapFn` on the values the promises
+      become fulfilled with.
+
+      For example:
+
+      ```javascript
+
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.resolve(2);
+      var promise3 = RSVP.resolve(3);
+      var promises = [ promise1, promise2, promise3 ];
+
+      var mapFn = function(item){
+        return item + 1;
+      };
+
+      RSVP.map(promises, mapFn).then(function(result){
+        // result is [ 2, 3, 4 ]
+      });
+      ```
+
+      If any of the `promises` given to `RSVP.map` are rejected, the first promise
+      that is rejected will be given as an argument to the returned promise's
+      rejection handler. For example:
+
+      ```javascript
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.reject(new Error("2"));
+      var promise3 = RSVP.reject(new Error("3"));
+      var promises = [ promise1, promise2, promise3 ];
+
+      var mapFn = function(item){
+        return item + 1;
+      };
+
+      RSVP.map(promises, mapFn).then(function(array){
+        // Code here never runs because there are rejected promises!
+      }, function(reason) {
+        // reason.message === "2"
+      });
+      ```
+
+      `RSVP.map` will also wait if a promise is returned from `mapFn`. For example,
+      say you want to get all comments from a set of blog posts, but you need
+      the blog posts first becuase they contain a url to those comments.
+
+      ```javscript
+
+      var mapFn = function(blogPost){
+        // getComments does some ajax and returns an RSVP.Promise that is fulfilled
+        // with some comments data
+        return getComments(blogPost.comments_url);
+      };
+
+      // getBlogPosts does some ajax and returns an RSVP.Promise that is fulfilled
+      // with some blog post data
+      RSVP.map(getBlogPosts(), mapFn).then(function(comments){
+        // comments is the result of asking the server for the comments
+        // of all blog posts returned from getBlogPosts()
+      });
+      ```
+
+      @method map
+      @for RSVP
+      @param {Array} promises
+      @param {Function} mapFn function to be called on each fulfilled promise.
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise} promise that is fulfilled with the result of calling
+      `mapFn` on each fulfilled promise or value when they become fulfilled.
+       The promise will be rejected if any of the given `promises` become rejected.
+      @static
+    */
+    __exports__["default"] = function map(promises, mapFn, label) {
+      return all(promises, label).then(function(results){
+        if (!isArray(promises)) {
+          throw new TypeError('You must pass an array to map.');
+        }
+
+        if (!isFunction(mapFn)){
+          throw new TypeError("You must pass a function to map's second argument.");
+        }
+
+
+        var resultLen = results.length,
+            mappedResults = [],
+            i;
+
+        for (i = 0; i < resultLen; i++){
+          mappedResults.push(mapFn(results[i]));
+        }
+
+        return all(mappedResults, label);
+      });
+    };
+  });
+define("rsvp/node",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    var slice = Array.prototype.slice;
+
+    function makeNodeCallbackFor(resolve, reject) {
+      return function (error, value) {
+        if (error) {
+          reject(error);
+        } else if (arguments.length > 2) {
+          resolve(slice.call(arguments, 1));
+        } else {
+          resolve(value);
+        }
+      };
+    }
+
+    /**
+      `RSVP.denodeify` takes a "node-style" function and returns a function that
+      will return an `RSVP.Promise`. You can use `denodeify` in Node.js or the
+      browser when you'd prefer to use promises over using callbacks. For example,
+      `denodeify` transforms the following:
+
+      ```javascript
+      var fs = require('fs');
+
+      fs.readFile('myfile.txt', function(err, data){
+        if (err) return handleError(err);
+        handleData(data);
+      });
+      ```
+
+      into:
+
+      ```javascript
+      var fs = require('fs');
+
+      var readFile = RSVP.denodeify(fs.readFile);
+
+      readFile('myfile.txt').then(handleData, handleError);
+      ```
+
+      Using `denodeify` makes it easier to compose asynchronous operations instead
+      of using callbacks. For example, instead of:
+
+      ```javascript
+      var fs = require('fs');
+      var log = require('some-async-logger');
+
+      fs.readFile('myfile.txt', function(err, data){
+        if (err) return handleError(err);
+        fs.writeFile('myfile2.txt', data, function(err){
+          if (err) throw err;
+          log('success', function(err) {
+            if (err) throw err;
+          });
+        });
+      });
+      ```
+
+      You can chain the operations together using `then` from the returned promise:
+
+      ```javascript
+      var fs = require('fs');
+      var denodeify = RSVP.denodeify;
+      var readFile = denodeify(fs.readFile);
+      var writeFile = denodeify(fs.writeFile);
+      var log = denodeify(require('some-async-logger'));
+
+      readFile('myfile.txt').then(function(data){
+        return writeFile('myfile2.txt', data);
+      }).then(function(){
+        return log('SUCCESS');
+      }).then(function(){
+        // success handler
+      }, function(reason){
+        // rejection handler
+      });
+      ```
+
+      @method denodeify
+      @for RSVP
+      @param {Function} nodeFunc a "node-style" function that takes a callback as
+      its last argument. The callback expects an error to be passed as its first
+      argument (if an error occurred, otherwise null), and the value from the
+      operation as its second argument ("function(err, value){ }").
+      @param {Any} binding optional argument for binding the "this" value when
+      calling the `nodeFunc` function.
+      @return {Function} a function that wraps `nodeFunc` to return an
+      `RSVP.Promise`
+      @static
+    */
+    __exports__["default"] = function denodeify(nodeFunc, binding) {
+      return function()  {
+        var nodeArgs = slice.call(arguments), resolve, reject;
+        var thisArg = this || binding;
+
+        return new Promise(function(resolve, reject) {
+          Promise.all(nodeArgs).then(function(nodeArgs) {
+            try {
+              nodeArgs.push(makeNodeCallbackFor(resolve, reject));
+              nodeFunc.apply(thisArg, nodeArgs);
+            } catch(e) {
+              reject(e);
+            }
+          });
+        });
+      };
+    };
+  });
+define("rsvp/promise",
+  ["./config","./events","./instrument","./utils","./promise/cast","./promise/all","./promise/race","./promise/resolve","./promise/reject","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+    "use strict";
+    var config = __dependency1__.config;
+    var EventTarget = __dependency2__["default"];
+    var instrument = __dependency3__["default"];
+    var objectOrFunction = __dependency4__.objectOrFunction;
+    var isFunction = __dependency4__.isFunction;
+    var now = __dependency4__.now;
+    var cast = __dependency5__["default"];
+    var all = __dependency6__["default"];
+    var race = __dependency7__["default"];
+    var Resolve = __dependency8__["default"];
+    var Reject = __dependency9__["default"];
+
+    var guidKey = 'rsvp_' + now() + '-';
+    var counter = 0;
+
+    function noop() {}
+
+    __exports__["default"] = Promise;
+
+
+    /**
+      Promise objects represent the eventual result of an asynchronous operation. The
+      primary way of interacting with a promise is through its `then` method, which
+      registers callbacks to receive either a promise’s eventual value or the reason
+      why the promise cannot be fulfilled.
+
+      Terminology
+      -----------
+
+      - `promise` is an object or function with a `then` method whose behavior conforms to this specification.
+      - `thenable` is an object or function that defines a `then` method.
+      - `value` is any legal JavaScript value (including undefined, a thenable, or a promise).
+      - `exception` is a value that is thrown using the throw statement.
+      - `reason` is a value that indicates why a promise was rejected.
+      - `settled` the final resting state of a promise, fulfilled or rejected.
+
+      A promise can be in one of three states: pending, fulfilled, or rejected.
+
+      Promises that are fulfilled have a fulfillment value and are in the fulfilled
+      state.  Promises that are rejected have a rejection reason and are in the
+      rejected state.  A fulfillment value is never a thenable.  Similarly, a
+      rejection reason is never a thenable.
+
+      Promises can also be said to *resolve* a value.  If this value is also a
+      promise, then the original promise's settled state will match the value's
+      settled state.  So a promise that *resolves* a promise that rejects will
+      itself reject, and a promise that *resolves* a promise that fulfills will
+      itself fulfill.
+
+
+      Basic Usage:
+      ------------
+
+      ```js
+      var promise = new Promise(function(resolve, reject) {
+        // on success
+        resolve(value);
+
+        // on failure
+        reject(reason);
+      });
+
+      promise.then(function(value) {
+        // on fulfillment
+      }, function(reason) {
+        // on rejection
+      });
+      ```
+
+      Advanced Usage:
+      ---------------
+
+      Promises shine when abstracting away asynchronous interactions such as
+      `XMLHttpRequest`s.
+
+      ```js
+      function getJSON(url) {
+        return new Promise(function(resolve, reject){
+          var xhr = new XMLHttpRequest();
+
+          xhr.open('GET', url);
+          xhr.onreadystatechange = handler;
+          xhr.responseType = 'json';
+          xhr.setRequestHeader('Accept', 'application/json');
+          xhr.send();
+
+          function handler() {
+            if (this.readyState === this.DONE) {
+              if (this.status === 200) {
+                resolve(this.response);
+              } else {
+                reject(new Error("getJSON: `" + url + "` failed with status: [" + this.status + "]");
+              }
+            }
+          };
+        });
+      }
+
+      getJSON('/posts.json').then(function(json) {
+        // on fulfillment
+      }, function(reason) {
+        // on rejection
+      });
+      ```
+
+      Unlike callbacks, promises are great composable primitives.
+
+      ```js
+      Promise.all([
+        getJSON('/posts'),
+        getJSON('/comments')
+      ]).then(function(values){
+        values[0] // => postsJSON
+        values[1] // => commentsJSON
+
+        return values;
+      });
+      ```
+
+      @class RSVP.Promise
+      @param {function}
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @constructor
+    */
+    function Promise(resolver, label) {
+      if (!isFunction(resolver)) {
+        throw new TypeError('You must pass a resolver function as the first argument to the promise constructor');
+      }
+
+      if (!(this instanceof Promise)) {
+        throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");
+      }
+
+      this._id = counter++;
+      this._label = label;
+      this._subscribers = [];
+
+      if (config.instrument) {
+        instrument('created', this);
+      }
+
+      if (noop !== resolver) {
+        invokeResolver(resolver, this);
+      }
+    }
+
+    function invokeResolver(resolver, promise) {
+      function resolvePromise(value) {
+        resolve(promise, value);
+      }
+
+      function rejectPromise(reason) {
+        reject(promise, reason);
+      }
+
+      try {
+        resolver(resolvePromise, rejectPromise);
+      } catch(e) {
+        rejectPromise(e);
+      }
+    }
+
+    Promise.cast = cast;
+    Promise.all = all;
+    Promise.race = race;
+    Promise.resolve = Resolve;
+    Promise.reject = Reject;
+
+    var PENDING   = void 0;
+    var SEALED    = 0;
+    var FULFILLED = 1;
+    var REJECTED  = 2;
+
+    function subscribe(parent, child, onFulfillment, onRejection) {
+      var subscribers = parent._subscribers;
+      var length = subscribers.length;
+
+      subscribers[length] = child;
+      subscribers[length + FULFILLED] = onFulfillment;
+      subscribers[length + REJECTED]  = onRejection;
+    }
+
+    function publish(promise, settled) {
+      var child, callback, subscribers = promise._subscribers, detail = promise._detail;
+
+      if (config.instrument) {
+        instrument(settled === FULFILLED ? 'fulfilled' : 'rejected', promise);
+      }
+
+      for (var i = 0; i < subscribers.length; i += 3) {
+        child = subscribers[i];
+        callback = subscribers[i + settled];
+
+        invokeCallback(settled, child, callback, detail);
+      }
+
+      promise._subscribers = null;
+    }
+
+    Promise.prototype = {
+      constructor: Promise,
+
+      _id: undefined,
+      _guidKey: guidKey,
+      _label: undefined,
+
+      _state: undefined,
+      _detail: undefined,
+      _subscribers: undefined,
+
+      _onerror: function (reason) {
+        config.trigger('error', reason);
+      },
+
+    /**
+      The primary way of interacting with a promise is through its `then` method,
+      which registers callbacks to receive either a promise's eventual value or the
+      reason why the promise cannot be fulfilled.
+
+      ```js
+      findUser().then(function(user){
+        // user is available
+      }, function(reason){
+        // user is unavailable, and you are given the reason why
+      });
+      ```
+
+      Chaining
+      --------
+
+      The return value of `then` is itself a promise.  This second, "downstream"
+      promise is resolved with the return value of the first promise's fulfillment
+      or rejection handler, or rejected if the handler throws an exception.
+
+      ```js
+      findUser().then(function (user) {
+        return user.name;
+      }, function (reason) {
+        return "default name";
+      }).then(function (userName) {
+        // If `findUser` fulfilled, `userName` will be the user's name, otherwise it
+        // will be `"default name"`
+      });
+
+      findUser().then(function (user) {
+        throw new Error("Found user, but still unhappy");
+      }, function (reason) {
+        throw new Error("`findUser` rejected and we're unhappy");
+      }).then(function (value) {
+        // never reached
+      }, function (reason) {
+        // if `findUser` fulfilled, `reason` will be "Found user, but still unhappy".
+        // If `findUser` rejected, `reason` will be "`findUser` rejected and we're unhappy".
+      });
+      ```
+      If the downstream promise does not specify a rejection handler, rejection reasons will be propagated further downstream.
+
+      ```js
+      findUser().then(function (user) {
+        throw new PedagogicalException("Upstream error");
+      }).then(function (value) {
+        // never reached
+      }).then(function (value) {
+        // never reached
+      }, function (reason) {
+        // The `PedgagocialException` is propagated all the way down to here
+      });
+      ```
+
+      Assimilation
+      ------------
+
+      Sometimes the value you want to propagate to a downstream promise can only be
+      retrieved asynchronously. This can be achieved by returning a promise in the
+      fulfillment or rejection handler. The downstream promise will then be pending
+      until the returned promise is settled. This is called *assimilation*.
+
+      ```js
+      findUser().then(function (user) {
+        return findCommentsByAuthor(user);
+      }).then(function (comments) {
+        // The user's comments are now available
+      });
+      ```
+
+      If the assimliated promise rejects, then the downstream promise will also reject.
+
+      ```js
+      findUser().then(function (user) {
+        return findCommentsByAuthor(user);
+      }).then(function (comments) {
+        // If `findCommentsByAuthor` fulfills, we'll have the value here
+      }, function (reason) {
+        // If `findCommentsByAuthor` rejects, we'll have the reason here
+      });
+      ```
+
+      Simple Example
+      --------------
+
+      Synchronous Example
+
+      ```javascript
+      var result;
+
+      try {
+        result = findResult();
+        // success
+      } catch(reason) {
+        // failure
+      }
+      ```
+
+      Errback Example
+
+      ```js
+      findResult(function(result, err){
+        if (err) {
+          // failure
+        } else {
+          // success
+        }
+      });
+      ```
+
+      Promise Example;
+
+      ```javascript
+      findResult().then(function(result){
+        // success
+      }, function(reason){
+        // failure
+      });
+      ```
+
+      Advanced Example
+      --------------
+
+      Synchronous Example
+
+      ```javascript
+      var author, books;
+
+      try {
+        author = findAuthor();
+        books  = findBooksByAuthor(author);
+        // success
+      } catch(reason) {
+        // failure
+      }
+      ```
+
+      Errback Example
+
+      ```js
+
+      function foundBooks(books) {
+
+      }
+
+      function failure(reason) {
+
+      }
+
+      findAuthor(function(author, err){
+        if (err) {
+          failure(err);
+          // failure
+        } else {
+          try {
+            findBoooksByAuthor(author, function(books, err) {
+              if (err) {
+                failure(err);
+              } else {
+                try {
+                  foundBooks(books);
+                } catch(reason) {
+                  failure(reason);
+                }
+              }
+            });
+          } catch(error) {
+            failure(err);
+          }
+          // success
+        }
+      });
+      ```
+
+      Promise Example;
+
+      ```javascript
+      findAuthor().
+        then(findBooksByAuthor).
+        then(function(books){
+          // found books
+      }).catch(function(reason){
+        // something went wrong
+      });
+      ```
+
+      @method then
+      @param {Function} onFulfilled
+      @param {Function} onRejected
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      then: function(onFulfillment, onRejection, label) {
+        var promise = this;
+        this._onerror = null;
+
+        var thenPromise = new this.constructor(noop, label);
+
+        if (this._state) {
+          var callbacks = arguments;
+          config.async(function invokePromiseCallback() {
+            invokeCallback(promise._state, thenPromise, callbacks[promise._state - 1], promise._detail);
+          });
+        } else {
+          subscribe(this, thenPromise, onFulfillment, onRejection);
+        }
+
+        if (config.instrument) {
+          instrument('chained', promise, thenPromise);
+        }
+
+        return thenPromise;
+      },
+
+    /**
+      `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same
+      as the catch block of a try/catch statement.
+
+      ```js
+      function findAuthor(){
+        throw new Error("couldn't find that author");
+      }
+
+      // synchronous
+      try {
+        findAuthor();
+      } catch(reason) {
+        // something went wrong
+      }
+
+      // async with promises
+      findAuthor().catch(function(reason){
+        // something went wrong
+      });
+      ```
+
+      @method catch
+      @param {Function} onRejection
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      'catch': function(onRejection, label) {
+        return this.then(null, onRejection, label);
+      },
+
+    /**
+      `finally` will be invoked regardless of the promise's fate just as native
+      try/catch/finally behaves
+
+      Synchronous example:
+
+      ```js
+      findAuthor() {
+        if (Math.random() > 0.5) {
+          throw new Error();
+        }
+        return new Author();
+      }
+
+      try {
+        return findAuthor(); // succeed or fail
+      } catch(error) {
+        return findOtherAuther();
+      } finally {
+        // always runs
+        // doesn't affect the return value
+      }
+      ```
+
+      Asynchronous example:
+
+      ```js
+      findAuthor().catch(function(reason){
+        return findOtherAuther();
+      }).finally(function(){
+        // author was either found, or not
+      });
+      ```
+
+      @method finally
+      @param {Function} callback
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      'finally': function(callback, label) {
+        var constructor = this.constructor;
+
+        return this.then(function(value) {
+          return constructor.cast(callback()).then(function(){
+            return value;
+          });
+        }, function(reason) {
+          return constructor.cast(callback()).then(function(){
+            throw reason;
+          });
+        }, label);
+      }
+    };
+
+    function invokeCallback(settled, promise, callback, detail) {
+      var hasCallback = isFunction(callback),
+          value, error, succeeded, failed;
+
+      if (hasCallback) {
+        try {
+          value = callback(detail);
+          succeeded = true;
+        } catch(e) {
+          failed = true;
+          error = e;
+        }
+      } else {
+        value = detail;
+        succeeded = true;
+      }
+
+      if (handleThenable(promise, value)) {
+        return;
+      } else if (hasCallback && succeeded) {
+        resolve(promise, value);
+      } else if (failed) {
+        reject(promise, error);
+      } else if (settled === FULFILLED) {
+        resolve(promise, value);
+      } else if (settled === REJECTED) {
+        reject(promise, value);
+      }
+    }
+
+    function handleThenable(promise, value) {
+      var then = null,
+      resolved;
+
+      try {
+        if (promise === value) {
+          throw new TypeError("A promises callback cannot return that same promise.");
+        }
+
+        if (objectOrFunction(value)) {
+          then = value.then;
+
+          if (isFunction(then)) {
+            then.call(value, function(val) {
+              if (resolved) { return true; }
+              resolved = true;
+
+              if (value !== val) {
+                resolve(promise, val);
+              } else {
+                fulfill(promise, val);
+              }
+            }, function(val) {
+              if (resolved) { return true; }
+              resolved = true;
+
+              reject(promise, val);
+            }, 'derived from: ' + (promise._label || ' unknown promise'));
+
+            return true;
+          }
+        }
+      } catch (error) {
+        if (resolved) { return true; }
+        reject(promise, error);
+        return true;
+      }
+
+      return false;
+    }
+
+    function resolve(promise, value) {
+      if (promise === value) {
+        fulfill(promise, value);
+      } else if (!handleThenable(promise, value)) {
+        fulfill(promise, value);
+      }
+    }
+
+    function fulfill(promise, value) {
+      if (promise._state !== PENDING) { return; }
+      promise._state = SEALED;
+      promise._detail = value;
+
+      config.async(publishFulfillment, promise);
+    }
+
+    function reject(promise, reason) {
+      if (promise._state !== PENDING) { return; }
+      promise._state = SEALED;
+      promise._detail = reason;
+
+      config.async(publishRejection, promise);
+    }
+
+    function publishFulfillment(promise) {
+      publish(promise, promise._state = FULFILLED);
+    }
+
+    function publishRejection(promise) {
+      if (promise._onerror) {
+        promise._onerror(promise._detail);
+      }
+
+      publish(promise, promise._state = REJECTED);
+    }
+  });
+define("rsvp/promise/all",
+  ["../utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var isArray = __dependency1__.isArray;
+    var isNonThenable = __dependency1__.isNonThenable;
+
+    /**
+      `RSVP.Promise.all` accepts an array of promises, and returns a new promise which
+      is fulfilled with an array of fulfillment values for the passed promises, or
+      rejected with the reason of the first passed promise to be rejected. It casts all
+      elements of the passed iterable to promises as it runs this algorithm.
+
+      Example:
+
+      ```javascript
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.resolve(2);
+      var promise3 = RSVP.resolve(3);
+      var promises = [ promise1, promise2, promise3 ];
+
+      RSVP.Promise.all(promises).then(function(array){
+        // The array here would be [ 1, 2, 3 ];
+      });
+      ```
+
+      If any of the `promises` given to `RSVP.all` are rejected, the first promise
+      that is rejected will be given as an argument to the returned promises's
+      rejection handler. For example:
+
+      Example:
+
+      ```javascript
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.reject(new Error("2"));
+      var promise3 = RSVP.reject(new Error("3"));
+      var promises = [ promise1, promise2, promise3 ];
+
+      RSVP.Promise.all(promises).then(function(array){
+        // Code here never runs because there are rejected promises!
+      }, function(error) {
+        // error.message === "2"
+      });
+      ```
+
+      @method all
+      @for Ember.RSVP.Promise
+      @param {Array} entries array of promises
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise} promise that is fulfilled when all `promises` have been
+      fulfilled, or rejected if any of them become rejected.
+      @static
+    */
+    __exports__["default"] = function all(entries, label) {
+
+      /*jshint validthis:true */
+      var Constructor = this;
+
+      return new Constructor(function(resolve, reject) {
+        if (!isArray(entries)) {
+          throw new TypeError('You must pass an array to all.');
+        }
+
+        var remaining = entries.length;
+        var results = new Array(remaining);
+        var entry, pending = true;
+
+        if (remaining === 0) {
+          resolve(results);
+          return;
+        }
+
+        function fulfillmentAt(index) {
+          return function(value) {
+            results[index] = value;
+            if (--remaining === 0) {
+              resolve(results);
+            }
+          };
+        }
+
+        function onRejection(reason) {
+          remaining = 0;
+          reject(reason);
+        }
+
+        for (var index = 0; index < entries.length; index++) {
+          entry = entries[index];
+          if (isNonThenable(entry)) {
+            results[index] = entry;
+            if (--remaining === 0) {
+              resolve(results);
+            }
+          } else {
+            Constructor.cast(entry).then(fulfillmentAt(index), onRejection);
+          }
+        }
+      }, label);
+    };
+  });
+define("rsvp/promise/cast",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      `RSVP.Promise.cast` coerces its argument to a promise, or returns the
+      argument if it is already a promise which shares a constructor with the caster.
+
+      Example:
+
+      ```javascript
+      var promise = RSVP.Promise.resolve(1);
+      var casted = RSVP.Promise.cast(promise);
+
+      console.log(promise === casted); // true
+      ```
+
+      In the case of a promise whose constructor does not match, it is assimilated.
+      The resulting promise will fulfill or reject based on the outcome of the
+      promise being casted.
+
+      Example:
+
+      ```javascript
+      var thennable = $.getJSON('/api/foo');
+      var casted = RSVP.Promise.cast(thennable);
+
+      console.log(thennable === casted); // false
+      console.log(casted instanceof RSVP.Promise) // true
+
+      casted.then(function(data) {
+        // data is the value getJSON fulfills with
+      });
+      ```
+
+      In the case of a non-promise, a promise which will fulfill with that value is
+      returned.
+
+      Example:
+
+      ```javascript
+      var value = 1; // could be a number, boolean, string, undefined...
+      var casted = RSVP.Promise.cast(value);
+
+      console.log(value === casted); // false
+      console.log(casted instanceof RSVP.Promise) // true
+
+      casted.then(function(val) {
+        val === value // => true
+      });
+      ```
+
+      `RSVP.Promise.cast` is similar to `RSVP.Promise.resolve`, but `RSVP.Promise.cast` differs in the
+      following ways:
+
+      * `RSVP.Promise.cast` serves as a memory-efficient way of getting a promise, when you
+      have something that could either be a promise or a value. RSVP.resolve
+      will have the same effect but will create a new promise wrapper if the
+      argument is a promise.
+      * `RSVP.Promise.cast` is a way of casting incoming thenables or promise subclasses to
+      promises of the exact class specified, so that the resulting object's `then` is
+      ensured to have the behavior of the constructor you are calling cast on (i.e., RSVP.Promise).
+
+      @method cast
+      @param {Object} object to be casted
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise} promise
+      @static
+    */
+
+    __exports__["default"] = function cast(object, label) {
+      /*jshint validthis:true */
+      var Constructor = this;
+
+      if (object && typeof object === 'object' && object.constructor === Constructor) {
+        return object;
+      }
+
+      return new Constructor(function(resolve) {
+        resolve(object);
+      }, label);
+    };
+  });
+define("rsvp/promise/race",
+  ["../utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    /* global toString */
+
+    var isArray = __dependency1__.isArray;
+    var isFunction = __dependency1__.isFunction;
+    var isNonThenable = __dependency1__.isNonThenable;
+
+    /**
+      `RSVP.Promise.race` returns a new promise which is settled in the same way as the
+      first passed promise to settle.
+
+      Example:
+
+      ```javascript
+      var promise1 = new RSVP.Promise(function(resolve, reject){
+        setTimeout(function(){
+          resolve("promise 1");
+        }, 200);
+      });
+
+      var promise2 = new RSVP.Promise(function(resolve, reject){
+        setTimeout(function(){
+          resolve("promise 2");
+        }, 100);
+      });
+
+      RSVP.Promise.race([promise1, promise2]).then(function(result){
+        // result === "promise 2" because it was resolved before promise1
+        // was resolved.
+      });
+      ```
+
+      `RSVP.Promise.race` is deterministic in that only the state of the first
+      settled promise matters. For example, even if other promises given to the
+      `promises` array argument are resolved, but the first settled promise has
+      become rejected before the other promises became fulfilled, the returned
+      promise will become rejected:
+
+      ```javascript
+      var promise1 = new RSVP.Promise(function(resolve, reject){
+        setTimeout(function(){
+          resolve("promise 1");
+        }, 200);
+      });
+
+      var promise2 = new RSVP.Promise(function(resolve, reject){
+        setTimeout(function(){
+          reject(new Error("promise 2"));
+        }, 100);
+      });
+
+      RSVP.Promise.race([promise1, promise2]).then(function(result){
+        // Code here never runs
+      }, function(reason){
+        // reason.message === "promise2" because promise 2 became rejected before
+        // promise 1 became fulfilled
+      });
+      ```
+
+      An example real-world use case is implementing timeouts:
+
+      ```javascript
+      RSVP.Promise.race([ajax('foo.json'), timeout(5000)])
+      ```
+
+      @method race
+      @param {Array} promises array of promises to observe
+      @param {String} label optional string for describing the promise returned.
+      Useful for tooling.
+      @return {Promise} a promise which settles in the same way as the first passed
+      promise to settle.
+      @static
+    */
+    __exports__["default"] = function race(entries, label) {
+      /*jshint validthis:true */
+      var Constructor = this, entry;
+
+      return new Constructor(function(resolve, reject) {
+        if (!isArray(entries)) {
+          throw new TypeError('You must pass an array to race.');
+        }
+
+        var pending = true;
+
+        function onFulfillment(value) { if (pending) { pending = false; resolve(value); } }
+        function onRejection(reason)  { if (pending) { pending = false; reject(reason); } }
+
+        for (var i = 0; i < entries.length; i++) {
+          entry = entries[i];
+          if (isNonThenable(entry)) {
+            pending = false;
+            resolve(entry);
+            return;
+          } else {
+            Constructor.cast(entry).then(onFulfillment, onRejection);
+          }
+        }
+      }, label);
+    };
+  });
+define("rsvp/promise/reject",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      `RSVP.Promise.reject` returns a promise rejected with the passed `reason`.
+      It is shorthand for the following:
+
+      ```javascript
+      var promise = new RSVP.Promise(function(resolve, reject){
+        reject(new Error('WHOOPS'));
+      });
+
+      promise.then(function(value){
+        // Code here doesn't run because the promise is rejected!
+      }, function(reason){
+        // reason.message === 'WHOOPS'
+      });
+      ```
+
+      Instead of writing the above, your code now simply becomes the following:
+
+      ```javascript
+      var promise = RSVP.Promise.reject(new Error('WHOOPS'));
+
+      promise.then(function(value){
+        // Code here doesn't run because the promise is rejected!
+      }, function(reason){
+        // reason.message === 'WHOOPS'
+      });
+      ```
+
+      @method reject
+      @param {Any} reason value that the returned promise will be rejected with.
+      @param {String} label optional string for identifying the returned promise.
+      Useful for tooling.
+      @return {Promise} a promise rejected with the given `reason`.
+      @static
+    */
+    __exports__["default"] = function reject(reason, label) {
+      /*jshint validthis:true */
+      var Constructor = this;
+
+      return new Constructor(function (resolve, reject) {
+        reject(reason);
+      }, label);
+    };
+  });
+define("rsvp/promise/resolve",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      `RSVP.Promise.resolve` returns a promise that will become resolved with the
+      passed `value`. It is shorthand for the following:
+
+      ```javascript
+      var promise = new RSVP.Promise(function(resolve, reject){
+        resolve(1);
+      });
+
+      promise.then(function(value){
+        // value === 1
+      });
+      ```
+
+      Instead of writing the above, your code now simply becomes the following:
+
+      ```javascript
+      var promise = RSVP.Promise.resolve(1);
+
+      promise.then(function(value){
+        // value === 1
+      });
+      ```
+
+      @method resolve
+      @param {Any} value value that the returned promise will be resolved with
+      @param {String} label optional string for identifying the returned promise.
+      Useful for tooling.
+      @return {Promise} a promise that will become fulfilled with the given
+      `value`
+      @static
+    */
+    __exports__["default"] = function resolve(value, label) {
+      /*jshint validthis:true */
+      var Constructor = this;
+
+      return new Constructor(function(resolve, reject) {
+        resolve(value);
+      }, label);
+    };
+  });
+define("rsvp/race",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      This is a convenient alias for `RSVP.Promise.race`.
+
+      @method race
+      @param {Array} array Array of promises.
+      @param {String} label An optional label. This is useful
+      for tooling.
+      @static
+    */
+    __exports__["default"] = function race(array, label) {
+      return Promise.race(array, label);
+    };
+  });
+define("rsvp/reject",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      This is a convenient alias for `RSVP.Promise.reject`.
+
+      @method reject
+      @for RSVP
+      @param {Any} reason value that the returned promise will be rejected with.
+      @param {String} label optional string for identifying the returned promise.
+      Useful for tooling.
+      @return {Promise} a promise rejected with the given `reason`.
+      @static
+    */
+    __exports__["default"] = function reject(reason, label) {
+      return Promise.reject(reason, label);
+    };
+  });
+define("rsvp/resolve",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      This is a convenient alias for `RSVP.Promise.resolve`.
+
+      @method resolve
+      @for RSVP
+      @param {Any} value value that the returned promise will be resolved with
+      @param {String} label optional string for identifying the returned promise.
+      Useful for tooling.
+      @return {Promise} a promise that will become fulfilled with the given
+      `value`
+      @static
+    */
+    __exports__["default"] = function resolve(value, label) {
+      return Promise.resolve(value, label);
+    };
+  });
+define("rsvp/rethrow",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      `RSVP.rethrow` will rethrow an error on the next turn of the JavaScript event
+      loop in order to aid debugging.
+
+      Promises A+ specifies that any exceptions that occur with a promise must be
+      caught by the promises implementation and bubbled to the last handler. For
+      this reason, it is recommended that you always specify a second rejection
+      handler function to `then`. However, `RSVP.rethrow` will throw the exception
+      outside of the promise, so it bubbles up to your console if in the browser,
+      or domain/cause uncaught exception in Node. `rethrow` will also throw the
+      error again so the error can be handled by the promise per the spec.
+
+      ```javascript
+      function throws(){
+        throw new Error('Whoops!');
+      }
+
+      var promise = new RSVP.Promise(function(resolve, reject){
+        throws();
+      });
+
+      promise.catch(RSVP.rethrow).then(function(){
+        // Code here doesn't run because the promise became rejected due to an
+        // error!
+      }, function (err){
+        // handle the error here
+      });
+      ```
+
+      The 'Whoops' error will be thrown on the next turn of the event loop
+      and you can watch for it in your console. You can also handle it using a
+      rejection handler given to `.then` or `.catch` on the returned promise.
+
+      @method rethrow
+      @for RSVP
+      @param {Error} reason reason the promise became rejected.
+      @throws Error
+      @static
+    */
+    __exports__["default"] = function rethrow(reason) {
+      setTimeout(function() {
+        throw reason;
+      });
+      throw reason;
+    };
+  });
+define("rsvp/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function objectOrFunction(x) {
+      return typeof x === "function" || (typeof x === "object" && x !== null);
+    }
+
+    __exports__.objectOrFunction = objectOrFunction;function isFunction(x) {
+      return typeof x === "function";
+    }
+
+    __exports__.isFunction = isFunction;function isNonThenable(x) {
+      return !objectOrFunction(x);
+    }
+
+    __exports__.isNonThenable = isNonThenable;function isArray(x) {
+      return Object.prototype.toString.call(x) === "[object Array]";
+    }
+
+    __exports__.isArray = isArray;// Date.now is not available in browsers < IE9
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now#Compatibility
+    var now = Date.now || function() { return new Date().getTime(); };
+    __exports__.now = now;
+    var keysOf = Object.keys || function(object) {
+      var result = [];
+
+      for (var prop in object) {
+        result.push(prop);
+      }
+
+      return result;
+    };
+    __exports__.keysOf = keysOf;
+  });
+define("rsvp",
+  ["./rsvp/promise","./rsvp/events","./rsvp/node","./rsvp/all","./rsvp/all_settled","./rsvp/race","./rsvp/hash","./rsvp/rethrow","./rsvp/defer","./rsvp/config","./rsvp/map","./rsvp/resolve","./rsvp/reject","./rsvp/filter","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var EventTarget = __dependency2__["default"];
+    var denodeify = __dependency3__["default"];
+    var all = __dependency4__["default"];
+    var allSettled = __dependency5__["default"];
+    var race = __dependency6__["default"];
+    var hash = __dependency7__["default"];
+    var rethrow = __dependency8__["default"];
+    var defer = __dependency9__["default"];
+    var config = __dependency10__.config;
+    var configure = __dependency10__.configure;
+    var map = __dependency11__["default"];
+    var resolve = __dependency12__["default"];
+    var reject = __dependency13__["default"];
+    var filter = __dependency14__["default"];
+
+    function async(callback, arg) {
+      config.async(callback, arg);
+    }
+
+    function on() {
+      config.on.apply(config, arguments);
+    }
+
+    function off() {
+      config.off.apply(config, arguments);
+    }
+
+    // Set up instrumentation through `window.__PROMISE_INTRUMENTATION__`
+    if (typeof window !== 'undefined' && typeof window.__PROMISE_INSTRUMENTATION__ === 'object') {
+      var callbacks = window.__PROMISE_INSTRUMENTATION__;
+      configure('instrument', true);
+      for (var eventName in callbacks) {
+        if (callbacks.hasOwnProperty(eventName)) {
+          on(eventName, callbacks[eventName]);
+        }
+      }
+    }
+
+    __exports__.Promise = Promise;
+    __exports__.EventTarget = EventTarget;
+    __exports__.all = all;
+    __exports__.allSettled = allSettled;
+    __exports__.race = race;
+    __exports__.hash = hash;
+    __exports__.rethrow = rethrow;
+    __exports__.defer = defer;
+    __exports__.denodeify = denodeify;
+    __exports__.configure = configure;
+    __exports__.on = on;
+    __exports__.off = off;
+    __exports__.resolve = resolve;
+    __exports__.reject = reject;
+    __exports__.async = async;
+    __exports__.map = map;
+    __exports__.filter = filter;
+  });
+
+})();
+
+(function() {
+define("container/container",
+  ["container/inheriting_dict","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var InheritingDict = __dependency1__["default"];
+
+    // A lightweight container that helps to assemble and decouple components.
+    // Public api for the container is still in flux.
+    // The public api, specified on the application namespace should be considered the stable api.
+    function Container(parent) {
+      this.parent = parent;
+      this.children = [];
+
+      this.resolver = parent && parent.resolver || function() {};
+
+      this.registry = new InheritingDict(parent && parent.registry);
+      this.cache = new InheritingDict(parent && parent.cache);
+      this.factoryCache = new InheritingDict(parent && parent.factoryCache);
+      this.resolveCache = new InheritingDict(parent && parent.resolveCache);
+      this.typeInjections = new InheritingDict(parent && parent.typeInjections);
+      this.injections = {};
+
+      this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
+      this.factoryInjections = {};
+
+      this._options = new InheritingDict(parent && parent._options);
+      this._typeOptions = new InheritingDict(parent && parent._typeOptions);
+    }
+
+    Container.prototype = {
+
+      /**
+        @property parent
+        @type Container
+        @default null
+      */
+      parent: null,
+
+      /**
+        @property children
+        @type Array
+        @default []
+      */
+      children: null,
+
+      /**
+        @property resolver
+        @type function
+      */
+      resolver: null,
+
+      /**
+        @property registry
+        @type InheritingDict
+      */
+      registry: null,
+
+      /**
+        @property cache
+        @type InheritingDict
+      */
+      cache: null,
+
+      /**
+        @property typeInjections
+        @type InheritingDict
+      */
+      typeInjections: null,
+
+      /**
+        @property injections
+        @type Object
+        @default {}
+      */
+      injections: null,
+
+      /**
+        @private
+
+        @property _options
+        @type InheritingDict
+        @default null
+      */
+      _options: null,
+
+      /**
+        @private
+
+        @property _typeOptions
+        @type InheritingDict
+      */
+      _typeOptions: null,
+
+      /**
+        Returns a new child of the current container. These children are configured
+        to correctly inherit from the current container.
+
+        @method child
+        @return {Container}
+      */
+      child: function() {
+        var container = new Container(this);
+        this.children.push(container);
+        return container;
+      },
+
+      /**
+        Sets a key-value pair on the current container. If a parent container,
+        has the same key, once set on a child, the parent and child will diverge
+        as expected.
+
+        @method set
+        @param {Object} object
+        @param {String} key
+        @param {any} value
+      */
+      set: function(object, key, value) {
+        object[key] = value;
+      },
+
+      /**
+        Registers a factory for later injection.
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('model:user', Person, {singleton: false });
+        container.register('fruit:favorite', Orange);
+        container.register('communication:main', Email, {singleton: false});
+        ```
+
+        @method register
+        @param {String} fullName
+        @param {Function} factory
+        @param {Object} options
+      */
+      register: function(fullName, factory, options) {
+        validateFullName(fullName);
+
+        if (factory === undefined) {
+          throw new TypeError('Attempting to register an unknown factory: `' + fullName + '`');
+        }
+
+        var normalizedName = this.normalize(fullName);
+
+        if (this.cache.has(normalizedName)) {
+          throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
+        }
+
+        this.registry.set(normalizedName, factory);
+        this._options.set(normalizedName, options || {});
+      },
+
+      /**
+        Unregister a fullName
+
+        ```javascript
+        var container = new Container();
+        container.register('model:user', User);
+
+        container.lookup('model:user') instanceof User //=> true
+
+        container.unregister('model:user')
+        container.lookup('model:user') === undefined //=> true
+        ```
+
+        @method unregister
+        @param {String} fullName
+       */
+      unregister: function(fullName) {
+        validateFullName(fullName);
+
+        var normalizedName = this.normalize(fullName);
+
+        this.registry.remove(normalizedName);
+        this.cache.remove(normalizedName);
+        this.factoryCache.remove(normalizedName);
+        this.resolveCache.remove(normalizedName);
+        this._options.remove(normalizedName);
+      },
+
+      /**
+        Given a fullName return the corresponding factory.
+
+        By default `resolve` will retrieve the factory from
+        its container's registry.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        container.resolve('api:twitter') // => Twitter
+        ```
+
+        Optionally the container can be provided with a custom resolver.
+        If provided, `resolve` will first provide the custom resolver
+        the opportunity to resolve the fullName, otherwise it will fallback
+        to the registry.
+
+        ```javascript
+        var container = new Container();
+        container.resolver = function(fullName) {
+          // lookup via the module system of choice
+        };
+
+        // the twitter factory is added to the module system
+        container.resolve('api:twitter') // => Twitter
+        ```
+
+        @method resolve
+        @param {String} fullName
+        @return {Function} fullName's factory
+      */
+      resolve: function(fullName) {
+        validateFullName(fullName);
+
+        var normalizedName = this.normalize(fullName);
+        var cached = this.resolveCache.get(normalizedName);
+
+        if (cached) { return cached; }
+
+        var resolved = this.resolver(normalizedName) || this.registry.get(normalizedName);
+
+        this.resolveCache.set(normalizedName, resolved);
+
+        return resolved;
+      },
+
+      /**
+        A hook that can be used to describe how the resolver will
+        attempt to find the factory.
+
+        For example, the default Ember `.describe` returns the full
+        class name (including namespace) where Ember's resolver expects
+        to find the `fullName`.
+
+        @method describe
+        @param {String} fullName
+        @return {string} described fullName
+      */
+      describe: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        A hook to enable custom fullName normalization behaviour
+
+        @method normalize
+        @param {String} fullName
+        @return {string} normalized fullName
+      */
+      normalize: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        @method makeToString
+
+        @param {any} factory
+        @param {string} fullName
+        @return {function} toString function
+      */
+      makeToString: function(factory, fullName) {
+        return factory.toString();
+      },
+
+      /**
+        Given a fullName return a corresponding instance.
+
+        The default behaviour is for lookup to return a singleton instance.
+        The singleton is scoped to the container, allowing multiple containers
+        to all have their own locally scoped singletons.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        var twitter = container.lookup('api:twitter');
+
+        twitter instanceof Twitter; // => true
+
+        // by default the container will return singletons
+        var twitter2 = container.lookup('api:twitter');
+        twitter2 instanceof Twitter; // => true
+
+        twitter === twitter2; //=> true
+        ```
+
+        If singletons are not wanted an optional flag can be provided at lookup.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        var twitter = container.lookup('api:twitter', { singleton: false });
+        var twitter2 = container.lookup('api:twitter', { singleton: false });
+
+        twitter === twitter2; //=> false
+        ```
+
+        @method lookup
+        @param {String} fullName
+        @param {Object} options
+        @return {any}
+      */
+      lookup: function(fullName, options) {
+        validateFullName(fullName);
+        return lookup(this, this.normalize(fullName), options);
+      },
+
+      /**
+        Given a fullName return the corresponding factory.
+
+        @method lookupFactory
+        @param {String} fullName
+        @return {any}
+      */
+      lookupFactory: function(fullName) {
+        validateFullName(fullName);
+        return factoryFor(this, this.normalize(fullName));
+      },
+
+      /**
+        Given a fullName check if the container is aware of its factory
+        or singleton instance.
+
+        @method has
+        @param {String} fullName
+        @return {Boolean}
+      */
+      has: function(fullName) {
+        validateFullName(fullName);
+        return has(this, this.normalize(fullName));
+      },
+
+      /**
+        Allow registering options for all factories of a type.
+
+        ```javascript
+        var container = new Container();
+
+        // if all of type `connection` must not be singletons
+        container.optionsForType('connection', { singleton: false });
+
+        container.register('connection:twitter', TwitterConnection);
+        container.register('connection:facebook', FacebookConnection);
+
+        var twitter = container.lookup('connection:twitter');
+        var twitter2 = container.lookup('connection:twitter');
+
+        twitter === twitter2; // => false
+
+        var facebook = container.lookup('connection:facebook');
+        var facebook2 = container.lookup('connection:facebook');
+
+        facebook === facebook2; // => false
+        ```
+
+        @method optionsForType
+        @param {String} type
+        @param {Object} options
+      */
+      optionsForType: function(type, options) {
+        if (this.parent) { illegalChildOperation('optionsForType'); }
+
+        this._typeOptions.set(type, options);
+      },
+
+      /**
+        @method options
+        @param {String} type
+        @param {Object} options
+      */
+      options: function(type, options) {
+        this.optionsForType(type, options);
+      },
+
+      /**
+        Used only via `injection`.
+
+        Provides a specialized form of injection, specifically enabling
+        all objects of one type to be injected with a reference to another
+        object.
+
+        For example, provided each object of type `controller` needed a `router`.
+        one would do the following:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('router:main', Router);
+        container.register('controller:user', UserController);
+        container.register('controller:post', PostController);
+
+        container.typeInjection('controller', 'router', 'router:main');
+
+        var user = container.lookup('controller:user');
+        var post = container.lookup('controller:post');
+
+        user.router instanceof Router; //=> true
+        post.router instanceof Router; //=> true
+
+        // both controllers share the same router
+        user.router === post.router; //=> true
+        ```
+
+        @private
+        @method typeInjection
+        @param {String} type
+        @param {String} property
+        @param {String} fullName
+      */
+      typeInjection: function(type, property, fullName) {
+        validateFullName(fullName);
+        if (this.parent) { illegalChildOperation('typeInjection'); }
+
+        var fullNameType = fullName.split(':')[0];
+        if(fullNameType === type) {
+          throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
+        }
+        addTypeInjection(this.typeInjections, type, property, fullName);
+      },
+
+      /**
+        Defines injection rules.
+
+        These rules are used to inject dependencies onto objects when they
+        are instantiated.
+
+        Two forms of injections are possible:
+
+        * Injecting one fullName on another fullName
+        * Injecting one fullName on a type
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('source:main', Source);
+        container.register('model:user', User);
+        container.register('model:post', Post);
+
+        // injecting one fullName on another fullName
+        // eg. each user model gets a post model
+        container.injection('model:user', 'post', 'model:post');
+
+        // injecting one fullName on another type
+        container.injection('model', 'source', 'source:main');
+
+        var user = container.lookup('model:user');
+        var post = container.lookup('model:post');
+
+        user.source instanceof Source; //=> true
+        post.source instanceof Source; //=> true
+
+        user.post instanceof Post; //=> true
+
+        // and both models share the same source
+        user.source === post.source; //=> true
+        ```
+
+        @method injection
+        @param {String} factoryName
+        @param {String} property
+        @param {String} injectionName
+      */
+      injection: function(fullName, property, injectionName) {
+        if (this.parent) { illegalChildOperation('injection'); }
+
+        validateFullName(injectionName);
+        var normalizedInjectionName = this.normalize(injectionName);
+
+        if (fullName.indexOf(':') === -1) {
+          return this.typeInjection(fullName, property, normalizedInjectionName);
+        }
+
+        validateFullName(fullName);
+        var normalizedName = this.normalize(fullName);
+
+        addInjection(this.injections, normalizedName, property, normalizedInjectionName);
+      },
+
+
+      /**
+        Used only via `factoryInjection`.
+
+        Provides a specialized form of injection, specifically enabling
+        all factory of one type to be injected with a reference to another
+        object.
+
+        For example, provided each factory of type `model` needed a `store`.
+        one would do the following:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('store:main', SomeStore);
+
+        container.factoryTypeInjection('model', 'store', 'store:main');
+
+        var store = container.lookup('store:main');
+        var UserFactory = container.lookupFactory('model:user');
+
+        UserFactory.store instanceof SomeStore; //=> true
+        ```
+
+        @private
+        @method factoryTypeInjection
+        @param {String} type
+        @param {String} property
+        @param {String} fullName
+      */
+      factoryTypeInjection: function(type, property, fullName) {
+        if (this.parent) { illegalChildOperation('factoryTypeInjection'); }
+
+        addTypeInjection(this.factoryTypeInjections, type, property, this.normalize(fullName));
+      },
+
+      /**
+        Defines factory injection rules.
+
+        Similar to regular injection rules, but are run against factories, via
+        `Container#lookupFactory`.
+
+        These rules are used to inject objects onto factories when they
+        are looked up.
+
+        Two forms of injections are possible:
+
+      * Injecting one fullName on another fullName
+      * Injecting one fullName on a type
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('store:main', Store);
+        container.register('store:secondary', OtherStore);
+        container.register('model:user', User);
+        container.register('model:post', Post);
+
+        // injecting one fullName on another type
+        container.factoryInjection('model', 'store', 'store:main');
+
+        // injecting one fullName on another fullName
+        container.factoryInjection('model:post', 'secondaryStore', 'store:secondary');
+
+        var UserFactory = container.lookupFactory('model:user');
+        var PostFactory = container.lookupFactory('model:post');
+        var store = container.lookup('store:main');
+
+        UserFactory.store instanceof Store; //=> true
+        UserFactory.secondaryStore instanceof OtherStore; //=> false
+
+        PostFactory.store instanceof Store; //=> true
+        PostFactory.secondaryStore instanceof OtherStore; //=> true
+
+        // and both models share the same source instance
+        UserFactory.store === PostFactory.store; //=> true
+        ```
+
+        @method factoryInjection
+        @param {String} factoryName
+        @param {String} property
+        @param {String} injectionName
+      */
+      factoryInjection: function(fullName, property, injectionName) {
+        if (this.parent) { illegalChildOperation('injection'); }
+
+        var normalizedName = this.normalize(fullName);
+        var normalizedInjectionName = this.normalize(injectionName);
+
+        validateFullName(injectionName);
+
+        if (fullName.indexOf(':') === -1) {
+          return this.factoryTypeInjection(normalizedName, property, normalizedInjectionName);
+        }
+
+        validateFullName(fullName);
+
+        addInjection(this.factoryInjections, normalizedName, property, normalizedInjectionName);
+      },
+
+      /**
+        A depth first traversal, destroying the container, its descendant containers and all
+        their managed objects.
+
+        @method destroy
+      */
+      destroy: function() {
+        for (var i=0, l=this.children.length; i<l; i++) {
+          this.children[i].destroy();
+        }
+
+        this.children = [];
+
+        eachDestroyable(this, function(item) {
+          item.destroy();
+        });
+
+        this.parent = undefined;
+        this.isDestroyed = true;
+      },
+
+      /**
+        @method reset
+      */
+      reset: function() {
+        for (var i=0, l=this.children.length; i<l; i++) {
+          resetCache(this.children[i]);
+        }
+        resetCache(this);
+      }
+    };
+
+    function has(container, fullName){
+      if (container.cache.has(fullName)) {
+        return true;
+      }
+
+      return !!container.resolve(fullName);
+    }
+
+    function lookup(container, fullName, options) {
+      options = options || {};
+
+      if (container.cache.has(fullName) && options.singleton !== false) {
+        return container.cache.get(fullName);
+      }
+
+      var value = instantiate(container, fullName);
+
+      if (value === undefined) { return; }
+
+      if (isSingleton(container, fullName) && options.singleton !== false) {
+        container.cache.set(fullName, value);
+      }
+
+      return value;
+    }
+
+    function illegalChildOperation(operation) {
+      throw new Error(operation + " is not currently supported on child containers");
+    }
+
+    function isSingleton(container, fullName) {
+      var singleton = option(container, fullName, 'singleton');
+
+      return singleton !== false;
+    }
+
+    function buildInjections(container, injections) {
+      var hash = {};
+
+      if (!injections) { return hash; }
+
+      var injection, injectable;
+
+      for (var i=0, l=injections.length; i<l; i++) {
+        injection = injections[i];
+        injectable = lookup(container, injection.fullName);
+
+        if (injectable !== undefined) {
+          hash[injection.property] = injectable;
+        } else {
+          throw new Error('Attempting to inject an unknown injection: `' + injection.fullName + '`');
+        }
+      }
+
+      return hash;
+    }
+
+    function option(container, fullName, optionName) {
+      var options = container._options.get(fullName);
+
+      if (options && options[optionName] !== undefined) {
+        return options[optionName];
+      }
+
+      var type = fullName.split(":")[0];
+      options = container._typeOptions.get(type);
+
+      if (options) {
+        return options[optionName];
+      }
+    }
+
+    function factoryFor(container, fullName) {
+      var name = fullName;
+      var factory = container.resolve(name);
+      var injectedFactory;
+      var cache = container.factoryCache;
+      var type = fullName.split(":")[0];
+
+      if (factory === undefined) { return; }
+
+      if (cache.has(fullName)) {
+        return cache.get(fullName);
+      }
+
+      if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
+        // TODO: think about a 'safe' merge style extension
+        // for now just fallback to create time injection
+        return factory;
+      } else {
+
+        var injections        = injectionsFor(container, fullName);
+        var factoryInjections = factoryInjectionsFor(container, fullName);
+
+        factoryInjections._toString = container.makeToString(factory, fullName);
+
+        injectedFactory = factory.extend(injections);
+        injectedFactory.reopenClass(factoryInjections);
+
+        cache.set(fullName, injectedFactory);
+
+        return injectedFactory;
+      }
+    }
+
+    function injectionsFor(container, fullName) {
+      var splitName = fullName.split(":"),
+        type = splitName[0],
+        injections = [];
+
+      injections = injections.concat(container.typeInjections.get(type) || []);
+      injections = injections.concat(container.injections[fullName] || []);
+
+      injections = buildInjections(container, injections);
+      injections._debugContainerKey = fullName;
+      injections.container = container;
+
+      return injections;
+    }
+
+    function factoryInjectionsFor(container, fullName) {
+      var splitName = fullName.split(":"),
+        type = splitName[0],
+        factoryInjections = [];
+
+      factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
+      factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
+
+      factoryInjections = buildInjections(container, factoryInjections);
+      factoryInjections._debugContainerKey = fullName;
+
+      return factoryInjections;
+    }
+
+    function instantiate(container, fullName) {
+      var factory = factoryFor(container, fullName);
+
+      if (option(container, fullName, 'instantiate') === false) {
+        return factory;
+      }
+
+      if (factory) {
+        if (typeof factory.extend === 'function') {
+          // assume the factory was extendable and is already injected
+          return factory.create();
+        } else {
+          // assume the factory was extendable
+          // to create time injections
+          // TODO: support new'ing for instantiation and merge injections for pure JS Functions
+          return factory.create(injectionsFor(container, fullName));
+        }
+      }
+    }
+
+    function eachDestroyable(container, callback) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        callback(value);
+      });
+    }
+
+    function resetCache(container) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        value.destroy();
+      });
+      container.cache.dict = {};
+    }
+
+    function addTypeInjection(rules, type, property, fullName) {
+      var injections = rules.get(type);
+
+      if (!injections) {
+        injections = [];
+        rules.set(type, injections);
+      }
+
+      injections.push({
+        property: property,
+        fullName: fullName
+      });
+    }
+
+    var VALID_FULL_NAME_REGEXP = /^[^:]+.+:[^:]+$/;
+    function validateFullName(fullName) {
+      if (!VALID_FULL_NAME_REGEXP.test(fullName)) {
+        throw new TypeError('Invalid Fullname, expected: `type:name` got: ' + fullName);
+      }
+    }
+
+    function addInjection(rules, factoryName, property, injectionName) {
+      var injections = rules[factoryName] = rules[factoryName] || [];
+      injections.push({ property: property, fullName: injectionName });
+    }
+
+    __exports__["default"] = Container;
+  });
+define("container/inheriting_dict",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    // A safe and simple inheriting object.
+    function InheritingDict(parent) {
+      this.parent = parent;
+      this.dict = {};
+    }
+
+    InheritingDict.prototype = {
+
+      /**
+        @property parent
+        @type InheritingDict
+        @default null
+      */
+
+      parent: null,
+
+      /**
+        Object used to store the current nodes data.
+
+        @property dict
+        @type Object
+        @default Object
+      */
+      dict: null,
+
+      /**
+        Retrieve the value given a key, if the value is present at the current
+        level use it, otherwise walk up the parent hierarchy and try again. If
+        no matching key is found, return undefined.
+
+        @method get
+        @param {String} key
+        @return {any}
+      */
+      get: function(key) {
+        var dict = this.dict;
+
+        if (dict.hasOwnProperty(key)) {
+          return dict[key];
+        }
+
+        if (this.parent) {
+          return this.parent.get(key);
+        }
+      },
+
+      /**
+        Set the given value for the given key, at the current level.
+
+        @method set
+        @param {String} key
+        @param {Any} value
+      */
+      set: function(key, value) {
+        this.dict[key] = value;
+      },
+
+      /**
+        Delete the given key
+
+        @method remove
+        @param {String} key
+      */
+      remove: function(key) {
+        delete this.dict[key];
+      },
+
+      /**
+        Check for the existence of given a key, if the key is present at the current
+        level return true, otherwise walk up the parent hierarchy and try again. If
+        no matching key is found, return false.
+
+        @method has
+        @param {String} key
+        @return {Boolean}
+      */
+      has: function(key) {
+        var dict = this.dict;
+
+        if (dict.hasOwnProperty(key)) {
+          return true;
+        }
+
+        if (this.parent) {
+          return this.parent.has(key);
+        }
+
+        return false;
+      },
+
+      /**
+        Iterate and invoke a callback for each local key-value pair.
+
+        @method eachLocal
+        @param {Function} callback
+        @param {Object} binding
+      */
+      eachLocal: function(callback, binding) {
+        var dict = this.dict;
+
+        for (var prop in dict) {
+          if (dict.hasOwnProperty(prop)) {
+            callback.call(binding, prop, dict[prop]);
+          }
+        }
+      }
+    };
+
+    __exports__["default"] = InheritingDict;
+  });
+define("container",
+  ["container/container","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    /*
+    Public api for the container is still in flux.
+    The public api, specified on the application namespace should be considered the stable api.
+    // @module container
+      @private
+    */
+
+    /*
+     Flag to enable/disable model factory injections (disabled by default)
+     If model factory injections are enabled, models should not be
+     accessed globally (only through `container.lookupFactory('model:modelName'))`);
+    */
+    Ember.MODEL_FACTORY_INJECTIONS = false;
+
+    if (Ember.ENV && typeof Ember.ENV.MODEL_FACTORY_INJECTIONS !== 'undefined') {
+      Ember.MODEL_FACTORY_INJECTIONS = !!Ember.ENV.MODEL_FACTORY_INJECTIONS;
+    }
+
+
+    var Container = __dependency1__["default"];
+
+    __exports__["default"] = Container;
+  });
+})();
+
+(function() {
+define("ember-runtime/compare",
+  ["ember-metal/core","ember-metal/utils","ember-runtime/mixins/comparable","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+     // for Ember.ORDER_DEFINITION
+    var typeOf = __dependency2__.typeOf;
+    var Comparable = __dependency3__["default"];
+
+    // Used by Ember.compare
+    Ember.ORDER_DEFINITION = Ember.ENV.ORDER_DEFINITION || [
+      'undefined',
+      'null',
+      'boolean',
+      'number',
+      'string',
+      'array',
+      'object',
+      'instance',
+      'function',
+      'class',
+      'date'
+    ];
+
+    /**
+     This will compare two javascript values of possibly different types.
+     It will tell you which one is greater than the other by returning:
+
+      - -1 if the first is smaller than the second,
+      - 0 if both are equal,
+      - 1 if the first is greater than the second.
+
+     The order is calculated based on `Ember.ORDER_DEFINITION`, if types are different.
+     In case they have the same type an appropriate comparison for this type is made.
+
+      ```javascript
+      Ember.compare('hello', 'hello');  // 0
+      Ember.compare('abc', 'dfg');      // -1
+      Ember.compare(2, 1);              // 1
+      ```
+
+     @method compare
+     @for Ember
+     @param {Object} v First value to compare
+     @param {Object} w Second value to compare
+     @return {Number} -1 if v < w, 0 if v = w and 1 if v > w.
+    */
+    function compare(v, w) {
+      if (v === w) { return 0; }
+
+      var type1 = typeOf(v);
+      var type2 = typeOf(w);
+
+      if (Comparable) {
+        if (type1==='instance' && Comparable.detect(v.constructor)) {
+          return v.constructor.compare(v, w);
+        }
+
+        if (type2 === 'instance' && Comparable.detect(w.constructor)) {
+          return 1-w.constructor.compare(w, v);
+        }
+      }
+
+      // If we haven't yet generated a reverse-mapping of Ember.ORDER_DEFINITION,
+      // do so now.
+      var mapping = Ember.ORDER_DEFINITION_MAPPING;
+      if (!mapping) {
+        var order = Ember.ORDER_DEFINITION;
+        mapping = Ember.ORDER_DEFINITION_MAPPING = {};
+        var idx, len;
+        for (idx = 0, len = order.length; idx < len;  ++idx) {
+          mapping[order[idx]] = idx;
+        }
+
+        // We no longer need Ember.ORDER_DEFINITION.
+        delete Ember.ORDER_DEFINITION;
+      }
+
+      var type1Index = mapping[type1];
+      var type2Index = mapping[type2];
+
+      if (type1Index < type2Index) { return -1; }
+      if (type1Index > type2Index) { return 1; }
+
+      // types are equal - so we have to check values now
+      switch (type1) {
+        case 'boolean':
+        case 'number':
+          if (v < w) { return -1; }
+          if (v > w) { return 1; }
+          return 0;
+
+        case 'string':
+          var comp = v.localeCompare(w);
+          if (comp < 0) { return -1; }
+          if (comp > 0) { return 1; }
+          return 0;
+
+        case 'array':
+          var vLen = v.length;
+          var wLen = w.length;
+          var l = Math.min(vLen, wLen);
+          var r = 0;
+          var i = 0;
+          while (r === 0 && i < l) {
+            r = compare(v[i],w[i]);
+            i++;
+          }
+          if (r !== 0) { return r; }
+
+          // all elements are equal now
+          // shorter array should be ordered first
+          if (vLen < wLen) { return -1; }
+          if (vLen > wLen) { return 1; }
+          // arrays are equal now
+          return 0;
+
+        case 'instance':
+          if (Comparable && Comparable.detect(v)) {
+            return v.compare(v, w);
+          }
+          return 0;
+
+        case 'date':
+          var vNum = v.getTime();
+          var wNum = w.getTime();
+          if (vNum < wNum) { return -1; }
+          if (vNum > wNum) { return 1; }
+          return 0;
+
+        default:
+          return 0;
+      }
+    };
+
+    __exports__["default"] = compare;
+  });
+define("ember-runtime/computed/array_computed",
+  ["ember-metal/core","ember-runtime/computed/reduce_computed","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/observer","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var reduceComputed = __dependency2__.reduceComputed;
+    var ReduceComputedProperty = __dependency2__.ReduceComputedProperty;
+    var EnumerableUtils = __dependency3__["default"];
+    var create = __dependency4__.create;
+    var addObserver = __dependency5__.addObserver;
+    var EmberError = __dependency6__["default"];
+
+    var a_slice = [].slice,
+        o_create = create,
+        forEach = EnumerableUtils.forEach;
+
+    function ArrayComputedProperty() {
+      var cp = this;
+
+      ReduceComputedProperty.apply(this, arguments);
+
+      this.func = (function(reduceFunc) {
+        return function (propertyName) {
+          if (!cp._hasInstanceMeta(this, propertyName)) {
+            // When we recompute an array computed property, we need already
+            // retrieved arrays to be updated; we can't simply empty the cache and
+            // hope the array is re-retrieved.
+            forEach(cp._dependentKeys, function(dependentKey) {
+              addObserver(this, dependentKey, function() {
+                cp.recomputeOnce.call(this, propertyName);
+              });
+            }, this);
+          }
+
+          return reduceFunc.apply(this, arguments);
+        };
+      })(this.func);
+
+      return this;
+    }
+
+    ArrayComputedProperty.prototype = o_create(ReduceComputedProperty.prototype);
+    ArrayComputedProperty.prototype.initialValue = function () {
+      return Ember.A();
+    };
+    ArrayComputedProperty.prototype.resetValue = function (array) {
+      array.clear();
+      return array;
+    };
+
+    // This is a stopgap to keep the reference counts correct with lazy CPs.
+    ArrayComputedProperty.prototype.didChange = function (obj, keyName) {
+      return;
+    };
+
+    /**
+      Creates a computed property which operates on dependent arrays and
+      is updated with "one at a time" semantics. When items are added or
+      removed from the dependent array(s) an array computed only operates
+      on the change instead of re-evaluating the entire array. This should
+      return an array, if you'd like to use "one at a time" semantics and
+      compute some value other then an array look at
+      `Ember.reduceComputed`.
+
+      If there are more than one arguments the first arguments are
+      considered to be dependent property keys. The last argument is
+      required to be an options object. The options object can have the
+      following three properties.
+
+      `initialize` - An optional initialize function. Typically this will be used
+      to set up state on the instanceMeta object.
+
+      `removedItem` - A function that is called each time an element is
+      removed from the array.
+
+      `addedItem` - A function that is called each time an element is
+      added to the array.
+
+
+      The `initialize` function has the following signature:
+
+      ```javascript
+      function(array, changeMeta, instanceMeta)
+      ```
+
+      `array` - The initial value of the arrayComputed, an empty array.
+
+      `changeMeta` - An object which contains meta information about the
+      computed. It contains the following properties:
+
+         - `property` the computed property
+         - `propertyName` the name of the property on the object
+
+      `instanceMeta` - An object that can be used to store meta
+      information needed for calculating your computed. For example a
+      unique computed might use this to store the number of times a given
+      element is found in the dependent array.
+
+
+      The `removedItem` and `addedItem` functions both have the following signature:
+
+      ```javascript
+      function(accumulatedValue, item, changeMeta, instanceMeta)
+      ```
+
+      `accumulatedValue` - The value returned from the last time
+      `removedItem` or `addedItem` was called or an empty array.
+
+      `item` - the element added or removed from the array
+
+      `changeMeta` - An object which contains meta information about the
+      change. It contains the following properties:
+
+        - `property` the computed property
+        - `propertyName` the name of the property on the object
+        - `index` the index of the added or removed item
+        - `item` the added or removed item: this is exactly the same as
+          the second arg
+        - `arrayChanged` the array that triggered the change. Can be
+          useful when depending on multiple arrays.
+
+      For property changes triggered on an item property change (when
+      depKey is something like `someArray.@each.someProperty`),
+      `changeMeta` will also contain the following property:
+
+        - `previousValues` an object whose keys are the properties that changed on
+        the item, and whose values are the item's previous values.
+
+      `previousValues` is important Ember coalesces item property changes via
+      Ember.run.once. This means that by the time removedItem gets called, item has
+      the new values, but you may need the previous value (eg for sorting &
+      filtering).
+
+      `instanceMeta` - An object that can be used to store meta
+      information needed for calculating your computed. For example a
+      unique computed might use this to store the number of times a given
+      element is found in the dependent array.
+
+      The `removedItem` and `addedItem` functions should return the accumulated
+      value. It is acceptable to not return anything (ie return undefined)
+      to invalidate the computation. This is generally not a good idea for
+      arrayComputed but it's used in eg max and min.
+
+      Example
+
+      ```javascript
+      Ember.computed.map = function(dependentKey, callback) {
+        var options = {
+          addedItem: function(array, item, changeMeta, instanceMeta) {
+            var mapped = callback(item);
+            array.insertAt(changeMeta.index, mapped);
+            return array;
+          },
+          removedItem: function(array, item, changeMeta, instanceMeta) {
+            array.removeAt(changeMeta.index, 1);
+            return array;
+          }
+        };
+
+        return Ember.arrayComputed(dependentKey, options);
+      };
+      ```
+
+      @method arrayComputed
+      @for Ember
+      @param {String} [dependentKeys*]
+      @param {Object} options
+      @return {Ember.ComputedProperty}
+    */
+    function arrayComputed (options) {
+      var args;
+
+      if (arguments.length > 1) {
+        args = a_slice.call(arguments, 0, -1);
+        options = a_slice.call(arguments, -1)[0];
+      }
+
+      if (typeof options !== "object") {
+        throw new EmberError("Array Computed Property declared without an options hash");
+      }
+
+      var cp = new ArrayComputedProperty(options);
+
+      if (args) {
+        cp.property.apply(cp, args);
+      }
+
+      return cp;
+    };
+
+    __exports__.arrayComputed = arrayComputed;
+    __exports__.ArrayComputedProperty = ArrayComputedProperty;
+  });
+define("ember-runtime/computed/reduce_computed",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","ember-runtime/system/set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var e_get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+    var metaFor = __dependency4__.meta;
+    var EmberError = __dependency5__["default"];
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var expandProperties = __dependency7__["default"];
+    var addObserver = __dependency8__.addObserver;
+    var observersFor = __dependency8__.observersFor;
+    var removeObserver = __dependency8__.removeObserver;
+    var addBeforeObserver = __dependency8__.addBeforeObserver;
+    var removeBeforeObserver = __dependency8__.removeBeforeObserver;
+    var ComputedProperty = __dependency9__.ComputedProperty;
+    var cacheFor = __dependency9__.cacheFor;
+    var create = __dependency10__.create;
+    var EnumerableUtils = __dependency11__["default"];
+    var TrackedArray = __dependency12__["default"];
+    var EmberArray = __dependency13__["default"];
+    var run = __dependency14__["default"];
+    var Set = __dependency15__["default"];
+    var isArray = __dependency4__.isArray;
+
+    var cacheSet = cacheFor.set,
+        cacheGet = cacheFor.get,
+        cacheRemove = cacheFor.remove,
+        a_slice = [].slice,
+        o_create = create,
+        forEach = EnumerableUtils.forEach,
+        // Here we explicitly don't allow `@each.foo`; it would require some special
+        // testing, but there's no particular reason why it should be disallowed.
+        eachPropertyPattern = /^(.*)\.@each\.(.*)/,
+        doubleEachPropertyPattern = /(.*\.@each){2,}/,
+        arrayBracketPattern = /\.\[\]$/;
+
+    function get(obj, key) {
+      if (key === '@this') {
+        return obj;
+      }
+
+      return e_get(obj, key);
+    }
+
+    /*
+      Tracks changes to dependent arrays, as well as to properties of items in
+      dependent arrays.
+
+      @class DependentArraysObserver
+    */
+    function DependentArraysObserver(callbacks, cp, instanceMeta, context, propertyName, sugarMeta) {
+      // user specified callbacks for `addedItem` and `removedItem`
+      this.callbacks = callbacks;
+
+      // the computed property: remember these are shared across instances
+      this.cp = cp;
+
+      // the ReduceComputedPropertyInstanceMeta this DependentArraysObserver is
+      // associated with
+      this.instanceMeta = instanceMeta;
+
+      // A map of array guids to dependentKeys, for the given context.  We track
+      // this because we want to set up the computed property potentially before the
+      // dependent array even exists, but when the array observer fires, we lack
+      // enough context to know what to update: we can recover that context by
+      // getting the dependentKey.
+      this.dependentKeysByGuid = {};
+
+      // a map of dependent array guids -> TrackedArray instances.  We use
+      // this to lazily recompute indexes for item property observers.
+      this.trackedArraysByGuid = {};
+
+      // We suspend observers to ignore replacements from `reset` when totally
+      // recomputing.  Unfortunately we cannot properly suspend the observers
+      // because we only have the key; instead we make the observers no-ops
+      this.suspended = false;
+
+      // This is used to coalesce item changes from property observers within a
+      // single item.
+      this.changedItems = {};
+      // This is used to coalesce item changes for multiple items that depend on
+      // some shared state.
+      this.changedItemCount = 0;
+    }
+
+    function ItemPropertyObserverContext (dependentArray, index, trackedArray) {
+      Ember.assert("Internal error: trackedArray is null or undefined", trackedArray);
+
+      this.dependentArray = dependentArray;
+      this.index = index;
+      this.item = dependentArray.objectAt(index);
+      this.trackedArray = trackedArray;
+      this.beforeObserver = null;
+      this.observer = null;
+
+      this.destroyed = false;
+    }
+
+    DependentArraysObserver.prototype = {
+      setValue: function (newValue) {
+        this.instanceMeta.setValue(newValue, true);
+      },
+      getValue: function () {
+        return this.instanceMeta.getValue();
+      },
+
+      setupObservers: function (dependentArray, dependentKey) {
+        this.dependentKeysByGuid[guidFor(dependentArray)] = dependentKey;
+
+        dependentArray.addArrayObserver(this, {
+          willChange: 'dependentArrayWillChange',
+          didChange: 'dependentArrayDidChange'
+        });
+
+        if (this.cp._itemPropertyKeys[dependentKey]) {
+          this.setupPropertyObservers(dependentKey, this.cp._itemPropertyKeys[dependentKey]);
+        }
+      },
+
+      teardownObservers: function (dependentArray, dependentKey) {
+        var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey] || [];
+
+        delete this.dependentKeysByGuid[guidFor(dependentArray)];
+
+        this.teardownPropertyObservers(dependentKey, itemPropertyKeys);
+
+        dependentArray.removeArrayObserver(this, {
+          willChange: 'dependentArrayWillChange',
+          didChange: 'dependentArrayDidChange'
+        });
+      },
+
+      suspendArrayObservers: function (callback, binding) {
+        var oldSuspended = this.suspended;
+        this.suspended = true;
+        callback.call(binding);
+        this.suspended = oldSuspended;
+      },
+
+      setupPropertyObservers: function (dependentKey, itemPropertyKeys) {
+        var dependentArray = get(this.instanceMeta.context, dependentKey),
+            length = get(dependentArray, 'length'),
+            observerContexts = new Array(length);
+
+        this.resetTransformations(dependentKey, observerContexts);
+
+        forEach(dependentArray, function (item, index) {
+          var observerContext = this.createPropertyObserverContext(dependentArray, index, this.trackedArraysByGuid[dependentKey]);
+          observerContexts[index] = observerContext;
+
+          forEach(itemPropertyKeys, function (propertyKey) {
+            addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
+            addObserver(item, propertyKey, this, observerContext.observer);
+          }, this);
+        }, this);
+      },
+
+      teardownPropertyObservers: function (dependentKey, itemPropertyKeys) {
+        var dependentArrayObserver = this,
+            trackedArray = this.trackedArraysByGuid[dependentKey],
+            beforeObserver,
+            observer,
+            item;
+
+        if (!trackedArray) { return; }
+
+        trackedArray.apply(function (observerContexts, offset, operation) {
+          if (operation === TrackedArray.DELETE) { return; }
+
+          forEach(observerContexts, function (observerContext) {
+            observerContext.destroyed = true;
+            beforeObserver = observerContext.beforeObserver;
+            observer = observerContext.observer;
+            item = observerContext.item;
+
+            forEach(itemPropertyKeys, function (propertyKey) {
+              removeBeforeObserver(item, propertyKey, dependentArrayObserver, beforeObserver);
+              removeObserver(item, propertyKey, dependentArrayObserver, observer);
+            });
+          });
+        });
+      },
+
+      createPropertyObserverContext: function (dependentArray, index, trackedArray) {
+        var observerContext = new ItemPropertyObserverContext(dependentArray, index, trackedArray);
+
+        this.createPropertyObserver(observerContext);
+
+        return observerContext;
+      },
+
+      createPropertyObserver: function (observerContext) {
+        var dependentArrayObserver = this;
+
+        observerContext.beforeObserver = function (obj, keyName) {
+          return dependentArrayObserver.itemPropertyWillChange(obj, keyName, observerContext.dependentArray, observerContext);
+        };
+        observerContext.observer = function (obj, keyName) {
+          return dependentArrayObserver.itemPropertyDidChange(obj, keyName, observerContext.dependentArray, observerContext);
+        };
+      },
+
+      resetTransformations: function (dependentKey, observerContexts) {
+        this.trackedArraysByGuid[dependentKey] = new TrackedArray(observerContexts);
+      },
+
+      trackAdd: function (dependentKey, index, newItems) {
+        var trackedArray = this.trackedArraysByGuid[dependentKey];
+        if (trackedArray) {
+          trackedArray.addItems(index, newItems);
+        }
+      },
+
+      trackRemove: function (dependentKey, index, removedCount) {
+        var trackedArray = this.trackedArraysByGuid[dependentKey];
+
+        if (trackedArray) {
+          return trackedArray.removeItems(index, removedCount);
+        }
+
+        return [];
+      },
+
+      updateIndexes: function (trackedArray, array) {
+        var length = get(array, 'length');
+        // OPTIMIZE: we could stop updating once we hit the object whose observer
+        // fired; ie partially apply the transformations
+        trackedArray.apply(function (observerContexts, offset, operation, operationIndex) {
+          // we don't even have observer contexts for removed items, even if we did,
+          // they no longer have any index in the array
+          if (operation === TrackedArray.DELETE) { return; }
+          if (operationIndex === 0 && operation === TrackedArray.RETAIN && observerContexts.length === length && offset === 0) {
+            // If we update many items we don't want to walk the array each time: we
+            // only need to update the indexes at most once per run loop.
+            return;
+          }
+
+          forEach(observerContexts, function (context, index) {
+            context.index = index + offset;
+          });
+        });
+      },
+
+      dependentArrayWillChange: function (dependentArray, index, removedCount, addedCount) {
+        if (this.suspended) { return; }
+
+        var removedItem = this.callbacks.removedItem,
+            changeMeta,
+            guid = guidFor(dependentArray),
+            dependentKey = this.dependentKeysByGuid[guid],
+            itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey] || [],
+            length = get(dependentArray, 'length'),
+            normalizedIndex = normalizeIndex(index, length, 0),
+            normalizedRemoveCount = normalizeRemoveCount(normalizedIndex, length, removedCount),
+            item,
+            itemIndex,
+            sliceIndex,
+            observerContexts;
+
+        observerContexts = this.trackRemove(dependentKey, normalizedIndex, normalizedRemoveCount);
+
+        function removeObservers(propertyKey) {
+          observerContexts[sliceIndex].destroyed = true;
+          removeBeforeObserver(item, propertyKey, this, observerContexts[sliceIndex].beforeObserver);
+          removeObserver(item, propertyKey, this, observerContexts[sliceIndex].observer);
+        }
+
+        for (sliceIndex = normalizedRemoveCount - 1; sliceIndex >= 0; --sliceIndex) {
+          itemIndex = normalizedIndex + sliceIndex;
+          if (itemIndex >= length) { break; }
+
+          item = dependentArray.objectAt(itemIndex);
+
+          forEach(itemPropertyKeys, removeObservers, this);
+
+          changeMeta = createChangeMeta(dependentArray, item, itemIndex, this.instanceMeta.propertyName, this.cp);
+          this.setValue( removedItem.call(
+            this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
+        }
+      },
+
+      dependentArrayDidChange: function (dependentArray, index, removedCount, addedCount) {
+        if (this.suspended) { return; }
+
+        var addedItem = this.callbacks.addedItem,
+            guid = guidFor(dependentArray),
+            dependentKey = this.dependentKeysByGuid[guid],
+            observerContexts = new Array(addedCount),
+            itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey],
+            length = get(dependentArray, 'length'),
+            normalizedIndex = normalizeIndex(index, length, addedCount),
+            changeMeta,
+            observerContext;
+
+        forEach(dependentArray.slice(normalizedIndex, normalizedIndex + addedCount), function (item, sliceIndex) {
+          if (itemPropertyKeys) {
+            observerContext =
+              observerContexts[sliceIndex] =
+              this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex, this.trackedArraysByGuid[dependentKey]);
+            forEach(itemPropertyKeys, function (propertyKey) {
+              addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
+              addObserver(item, propertyKey, this, observerContext.observer);
+            }, this);
+          }
+
+          changeMeta = createChangeMeta(dependentArray, item, normalizedIndex + sliceIndex, this.instanceMeta.propertyName, this.cp);
+          this.setValue( addedItem.call(
+            this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
+        }, this);
+
+        this.trackAdd(dependentKey, normalizedIndex, observerContexts);
+      },
+
+      itemPropertyWillChange: function (obj, keyName, array, observerContext) {
+        var guid = guidFor(obj);
+
+        if (!this.changedItems[guid]) {
+          this.changedItems[guid] = {
+            array:            array,
+            observerContext:  observerContext,
+            obj:              obj,
+            previousValues:   {}
+          };
+        }
+        ++this.changedItemCount;
+
+        this.changedItems[guid].previousValues[keyName] = get(obj, keyName);
+      },
+
+      itemPropertyDidChange: function(obj, keyName, array, observerContext) {
+        if (--this.changedItemCount === 0) {
+          this.flushChanges();
+        }
+      },
+
+      flushChanges: function() {
+        var changedItems = this.changedItems, key, c, changeMeta;
+
+        for (key in changedItems) {
+          c = changedItems[key];
+          if (c.observerContext.destroyed) { continue; }
+
+          this.updateIndexes(c.observerContext.trackedArray, c.observerContext.dependentArray);
+
+          changeMeta = createChangeMeta(c.array, c.obj, c.observerContext.index, this.instanceMeta.propertyName, this.cp, c.previousValues);
+          this.setValue(
+            this.callbacks.removedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
+          this.setValue(
+            this.callbacks.addedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
+        }
+        this.changedItems = {};
+      }
+    };
+
+    function normalizeIndex(index, length, newItemsOffset) {
+      if (index < 0) {
+        return Math.max(0, length + index);
+      } else if (index < length) {
+        return index;
+      } else /* index > length */ {
+        return Math.min(length - newItemsOffset, index);
+      }
+    }
+
+    function normalizeRemoveCount(index, length, removedCount) {
+      return Math.min(removedCount, length - index);
+    }
+
+    function createChangeMeta(dependentArray, item, index, propertyName, property, previousValues) {
+      var meta = {
+        arrayChanged: dependentArray,
+        index: index,
+        item: item,
+        propertyName: propertyName,
+        property: property
+      };
+
+      if (previousValues) {
+        // previous values only available for item property changes
+        meta.previousValues = previousValues;
+      }
+
+      return meta;
+    }
+
+    function addItems (dependentArray, callbacks, cp, propertyName, meta) {
+      forEach(dependentArray, function (item, index) {
+        meta.setValue( callbacks.addedItem.call(
+          this, meta.getValue(), item, createChangeMeta(dependentArray, item, index, propertyName, cp), meta.sugarMeta));
+      }, this);
+    }
+
+    function reset(cp, propertyName) {
+      var callbacks = cp._callbacks(),
+          meta;
+
+      if (cp._hasInstanceMeta(this, propertyName)) {
+        meta = cp._instanceMeta(this, propertyName);
+        meta.setValue(cp.resetValue(meta.getValue()));
+      } else {
+        meta = cp._instanceMeta(this, propertyName);
+      }
+
+      if (cp.options.initialize) {
+        cp.options.initialize.call(this, meta.getValue(), { property: cp, propertyName: propertyName }, meta.sugarMeta);
+      }
+    }
+
+    function partiallyRecomputeFor(obj, dependentKey) {
+      if (arrayBracketPattern.test(dependentKey)) {
+        return false;
+      }
+
+      var value = get(obj, dependentKey);
+      return EmberArray.detect(value);
+    }
+
+    function ReduceComputedPropertyInstanceMeta(context, propertyName, initialValue) {
+      this.context = context;
+      this.propertyName = propertyName;
+      this.cache = metaFor(context).cache;
+
+      this.dependentArrays = {};
+      this.sugarMeta = {};
+
+      this.initialValue = initialValue;
+    }
+
+    ReduceComputedPropertyInstanceMeta.prototype = {
+      getValue: function () {
+        var value = cacheGet(this.cache, this.propertyName);
+        if (value !== undefined) {
+          return value;
+        } else {
+          return this.initialValue;
+        }
+      },
+
+      setValue: function(newValue, triggerObservers) {
+        // This lets sugars force a recomputation, handy for very simple
+        // implementations of eg max.
+        if (newValue === cacheGet(this.cache, this.propertyName)) {
+          return;
+        }
+
+        if (triggerObservers) {
+          propertyWillChange(this.context, this.propertyName);
+        }
+
+        if (newValue === undefined) {
+          cacheRemove(this.cache, this.propertyName);
+        } else {
+          cacheSet(this.cache, this.propertyName, newValue);
+        }
+
+        if (triggerObservers) {
+          propertyDidChange(this.context, this.propertyName);
+        }
+      }
+    };
+
+    /**
+      A computed property whose dependent keys are arrays and which is updated with
+      "one at a time" semantics.
+
+      @class ReduceComputedProperty
+      @namespace Ember
+      @extends Ember.ComputedProperty
+      @constructor
+    */
+    function ReduceComputedProperty(options) {
+      var cp = this;
+
+      this.options = options;
+
+      this._dependentKeys = null;
+      // A map of dependentKey -> [itemProperty, ...] that tracks what properties of
+      // items in the array we must track to update this property.
+      this._itemPropertyKeys = {};
+      this._previousItemPropertyKeys = {};
+
+      this.readOnly();
+      this.cacheable();
+
+      this.recomputeOnce = function(propertyName) {
+        // What we really want to do is coalesce by <cp, propertyName>.
+        // We need a form of `scheduleOnce` that accepts an arbitrary token to
+        // coalesce by, in addition to the target and method.
+        run.once(this, recompute, propertyName);
+      };
+      var recompute = function(propertyName) {
+        var dependentKeys = cp._dependentKeys,
+            meta = cp._instanceMeta(this, propertyName),
+            callbacks = cp._callbacks();
+
+        reset.call(this, cp, propertyName);
+
+        meta.dependentArraysObserver.suspendArrayObservers(function () {
+          forEach(cp._dependentKeys, function (dependentKey) {
+            Ember.assert(
+              "dependent array " + dependentKey + " must be an `Ember.Array`.  " +
+              "If you are not extending arrays, you will need to wrap native arrays with `Ember.A`",
+              !(isArray(get(this, dependentKey)) && !EmberArray.detect(get(this, dependentKey))));
+
+            if (!partiallyRecomputeFor(this, dependentKey)) { return; }
+
+            var dependentArray = get(this, dependentKey),
+                previousDependentArray = meta.dependentArrays[dependentKey];
+
+            if (dependentArray === previousDependentArray) {
+              // The array may be the same, but our item property keys may have
+              // changed, so we set them up again.  We can't easily tell if they've
+              // changed: the array may be the same object, but with different
+              // contents.
+              if (cp._previousItemPropertyKeys[dependentKey]) {
+                delete cp._previousItemPropertyKeys[dependentKey];
+                meta.dependentArraysObserver.setupPropertyObservers(dependentKey, cp._itemPropertyKeys[dependentKey]);
+              }
+            } else {
+              meta.dependentArrays[dependentKey] = dependentArray;
+
+              if (previousDependentArray) {
+                meta.dependentArraysObserver.teardownObservers(previousDependentArray, dependentKey);
+              }
+
+              if (dependentArray) {
+                meta.dependentArraysObserver.setupObservers(dependentArray, dependentKey);
+              }
+            }
+          }, this);
+        }, this);
+
+        forEach(cp._dependentKeys, function(dependentKey) {
+          if (!partiallyRecomputeFor(this, dependentKey)) { return; }
+
+          var dependentArray = get(this, dependentKey);
+          if (dependentArray) {
+            addItems.call(this, dependentArray, callbacks, cp, propertyName, meta);
+          }
+        }, this);
+      };
+
+
+      this.func = function (propertyName) {
+        Ember.assert("Computed reduce values require at least one dependent key", cp._dependentKeys);
+
+        recompute.call(this, propertyName);
+
+        return cp._instanceMeta(this, propertyName).getValue();
+      };
+    }
+
+    ReduceComputedProperty.prototype = o_create(ComputedProperty.prototype);
+
+    function defaultCallback(computedValue) {
+      return computedValue;
+    }
+
+    ReduceComputedProperty.prototype._callbacks = function () {
+      if (!this.callbacks) {
+        var options = this.options;
+        this.callbacks = {
+          removedItem: options.removedItem || defaultCallback,
+          addedItem: options.addedItem || defaultCallback
+        };
+      }
+      return this.callbacks;
+    };
+
+    ReduceComputedProperty.prototype._hasInstanceMeta = function (context, propertyName) {
+      return !!metaFor(context).cacheMeta[propertyName];
+    };
+
+    ReduceComputedProperty.prototype._instanceMeta = function (context, propertyName) {
+      var cacheMeta = metaFor(context).cacheMeta,
+          meta = cacheMeta[propertyName];
+
+      if (!meta) {
+        meta = cacheMeta[propertyName] = new ReduceComputedPropertyInstanceMeta(context, propertyName, this.initialValue());
+        meta.dependentArraysObserver = new DependentArraysObserver(this._callbacks(), this, meta, context, propertyName, meta.sugarMeta);
+      }
+
+      return meta;
+    };
+
+    ReduceComputedProperty.prototype.initialValue = function () {
+      if (typeof this.options.initialValue === 'function') {
+        return this.options.initialValue();
+      }
+      else {
+        return this.options.initialValue;
+      }
+    };
+
+    ReduceComputedProperty.prototype.resetValue = function (value) {
+      return this.initialValue();
+    };
+
+    ReduceComputedProperty.prototype.itemPropertyKey = function (dependentArrayKey, itemPropertyKey) {
+      this._itemPropertyKeys[dependentArrayKey] = this._itemPropertyKeys[dependentArrayKey] || [];
+      this._itemPropertyKeys[dependentArrayKey].push(itemPropertyKey);
+    };
+
+    ReduceComputedProperty.prototype.clearItemPropertyKeys = function (dependentArrayKey) {
+      if (this._itemPropertyKeys[dependentArrayKey]) {
+        this._previousItemPropertyKeys[dependentArrayKey] = this._itemPropertyKeys[dependentArrayKey];
+        this._itemPropertyKeys[dependentArrayKey] = [];
+      }
+    };
+
+    ReduceComputedProperty.prototype.property = function () {
+      var cp = this,
+          args = a_slice.call(arguments),
+          propertyArgs = new Set(),
+          match,
+          dependentArrayKey,
+          itemPropertyKey;
+
+      forEach(args, function (dependentKey) {
+        if (doubleEachPropertyPattern.test(dependentKey)) {
+          throw new EmberError("Nested @each properties not supported: " + dependentKey);
+        } else if (match = eachPropertyPattern.exec(dependentKey)) {
+          dependentArrayKey = match[1];
+
+          var itemPropertyKeyPattern = match[2],
+              addItemPropertyKey = function (itemPropertyKey) {
+                cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
+              };
+
+          expandProperties(itemPropertyKeyPattern, addItemPropertyKey);
+          propertyArgs.add(dependentArrayKey);
+        } else {
+          propertyArgs.add(dependentKey);
+        }
+      });
+
+      return ComputedProperty.prototype.property.apply(this, propertyArgs.toArray());
+
+    };
+
+    /**
+      Creates a computed property which operates on dependent arrays and
+      is updated with "one at a time" semantics. When items are added or
+      removed from the dependent array(s) a reduce computed only operates
+      on the change instead of re-evaluating the entire array.
+
+      If there are more than one arguments the first arguments are
+      considered to be dependent property keys. The last argument is
+      required to be an options object. The options object can have the
+      following four properties:
+
+      `initialValue` - A value or function that will be used as the initial
+      value for the computed. If this property is a function the result of calling
+      the function will be used as the initial value. This property is required.
+
+      `initialize` - An optional initialize function. Typically this will be used
+      to set up state on the instanceMeta object.
+
+      `removedItem` - A function that is called each time an element is removed
+      from the array.
+
+      `addedItem` - A function that is called each time an element is added to
+      the array.
+
+
+      The `initialize` function has the following signature:
+
+      ```javascript
+      function(initialValue, changeMeta, instanceMeta)
+      ```
+
+      `initialValue` - The value of the `initialValue` property from the
+      options object.
+
+      `changeMeta` - An object which contains meta information about the
+      computed. It contains the following properties:
+
+         - `property` the computed property
+         - `propertyName` the name of the property on the object
+
+      `instanceMeta` - An object that can be used to store meta
+      information needed for calculating your computed. For example a
+      unique computed might use this to store the number of times a given
+      element is found in the dependent array.
+
+
+      The `removedItem` and `addedItem` functions both have the following signature:
+
+      ```javascript
+      function(accumulatedValue, item, changeMeta, instanceMeta)
+      ```
+
+      `accumulatedValue` - The value returned from the last time
+      `removedItem` or `addedItem` was called or `initialValue`.
+
+      `item` - the element added or removed from the array
+
+      `changeMeta` - An object which contains meta information about the
+      change. It contains the following properties:
+
+        - `property` the computed property
+        - `propertyName` the name of the property on the object
+        - `index` the index of the added or removed item
+        - `item` the added or removed item: this is exactly the same as
+          the second arg
+        - `arrayChanged` the array that triggered the change. Can be
+          useful when depending on multiple arrays.
+
+      For property changes triggered on an item property change (when
+      depKey is something like `someArray.@each.someProperty`),
+      `changeMeta` will also contain the following property:
+
+        - `previousValues` an object whose keys are the properties that changed on
+        the item, and whose values are the item's previous values.
+
+      `previousValues` is important Ember coalesces item property changes via
+      Ember.run.once. This means that by the time removedItem gets called, item has
+      the new values, but you may need the previous value (eg for sorting &
+      filtering).
+
+      `instanceMeta` - An object that can be used to store meta
+      information needed for calculating your computed. For example a
+      unique computed might use this to store the number of times a given
+      element is found in the dependent array.
+
+      The `removedItem` and `addedItem` functions should return the accumulated
+      value. It is acceptable to not return anything (ie return undefined)
+      to invalidate the computation. This is generally not a good idea for
+      arrayComputed but it's used in eg max and min.
+
+      Note that observers will be fired if either of these functions return a value
+      that differs from the accumulated value.  When returning an object that
+      mutates in response to array changes, for example an array that maps
+      everything from some other array (see `Ember.computed.map`), it is usually
+      important that the *same* array be returned to avoid accidentally triggering observers.
+
+      Example
+
+      ```javascript
+      Ember.computed.max = function(dependentKey) {
+        return Ember.reduceComputed(dependentKey, {
+          initialValue: -Infinity,
+
+          addedItem: function(accumulatedValue, item, changeMeta, instanceMeta) {
+            return Math.max(accumulatedValue, item);
+          },
+
+          removedItem: function(accumulatedValue, item, changeMeta, instanceMeta) {
+            if (item < accumulatedValue) {
+              return accumulatedValue;
+            }
+          }
+        });
+      };
+      ```
+
+      Dependent keys may refer to `@this` to observe changes to the object itself,
+      which must be array-like, rather than a property of the object.  This is
+      mostly useful for array proxies, to ensure objects are retrieved via
+      `objectAtContent`.  This is how you could sort items by properties defined on an item controller.
+
+      Example
+
+      ```javascript
+      App.PeopleController = Ember.ArrayController.extend({
+        itemController: 'person',
+
+        sortedPeople: Ember.computed.sort('@this.@each.reversedName', function(personA, personB) {
+          // `reversedName` isn't defined on Person, but we have access to it via
+          // the item controller App.PersonController.  If we'd used
+          // `content.@each.reversedName` above, we would be getting the objects
+          // directly and not have access to `reversedName`.
+          //
+          var reversedNameA = get(personA, 'reversedName'),
+              reversedNameB = get(personB, 'reversedName');
+
+          return Ember.compare(reversedNameA, reversedNameB);
+        })
+      });
+
+      App.PersonController = Ember.ObjectController.extend({
+        reversedName: function() {
+          return reverse(get(this, 'name'));
+        }.property('name')
+      });
+      ```
+
+      Dependent keys whose values are not arrays are treated as regular
+      dependencies: when they change, the computed property is completely
+      recalculated.  It is sometimes useful to have dependent arrays with similar
+      semantics.  Dependent keys which end in `.[]` do not use "one at a time"
+      semantics.  When an item is added or removed from such a dependency, the
+      computed property is completely recomputed.
+
+      When the computed property is completely recomputed, the `accumulatedValue`
+      is discarded, it starts with `initialValue` again, and each item is passed
+      to `addedItem` in turn.
+
+      Example
+
+      ```javascript
+      Ember.Object.extend({
+        // When `string` is changed, `computed` is completely recomputed.
+        string: 'a string',
+
+        // When an item is added to `array`, `addedItem` is called.
+        array: [],
+
+        // When an item is added to `anotherArray`, `computed` is completely
+        // recomputed.
+        anotherArray: [],
+
+        computed: Ember.reduceComputed('string', 'array', 'anotherArray.[]', {
+          addedItem: addedItemCallback,
+          removedItem: removedItemCallback
+        })
+      });
+      ```
+
+      @method reduceComputed
+      @for Ember
+      @param {String} [dependentKeys*]
+      @param {Object} options
+      @return {Ember.ComputedProperty}
+    */
+    function reduceComputed(options) {
+      var args;
+
+      if (arguments.length > 1) {
+        args = a_slice.call(arguments, 0, -1);
+        options = a_slice.call(arguments, -1)[0];
+      }
+
+      if (typeof options !== "object") {
+        throw new EmberError("Reduce Computed Property declared without an options hash");
+      }
+
+      if (!('initialValue' in options)) {
+        throw new EmberError("Reduce Computed Property declared without an initial value");
+      }
+
+      var cp = new ReduceComputedProperty(options);
+
+      if (args) {
+        cp.property.apply(cp, args);
+      }
+
+      return cp;
+    }
+
+    __exports__.reduceComputed = reduceComputed;
+    __exports__.ReduceComputedProperty = ReduceComputedProperty;
+  });
+define("ember-runtime/computed/reduce_computed_macros",
+  ["ember-metal/core","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/object_proxy","ember-runtime/system/subarray","ember-runtime/keys","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var merge = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var isArray = __dependency5__.isArray;
+    var guidFor = __dependency5__.guidFor;
+    var EmberError = __dependency6__["default"];
+    var EnumerableUtils = __dependency7__["default"];
+    var run = __dependency8__["default"];
+    var addObserver = __dependency9__.addObserver;
+    var arrayComputed = __dependency10__.arrayComputed;
+    var reduceComputed = __dependency11__.reduceComputed;
+    var ObjectProxy = __dependency12__["default"];
+    var SubArray = __dependency13__["default"];
+    var keys = __dependency14__["default"];
+    var compare = __dependency15__["default"];
+
+    var a_slice = [].slice,
+        forEach = EnumerableUtils.forEach,
+        SearchProxy;
+
+    /**
+     A computed property that returns the sum of the value
+     in the dependent array.
+
+     @method computed.sum
+     @for Ember
+     @param {String} dependentKey
+     @return {Ember.ComputedProperty} computes the sum of all values in the dependentKey's array
+     @since 1.4.0
+    */
+
+    function sum(dependentKey){
+      return reduceComputed(dependentKey, {
+        initialValue: 0,
+
+        addedItem: function(accumulatedValue, item, changeMeta, instanceMeta){
+          return accumulatedValue + item;
+        },
+
+        removedItem: function(accumulatedValue, item, changeMeta, instanceMeta){
+          return accumulatedValue - item;
+        }
+      });
+    };
+
+    /**
+      A computed property that calculates the maximum value in the
+      dependent array. This will return `-Infinity` when the dependent
+      array is empty.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        childAges: Ember.computed.mapBy('children', 'age'),
+        maxChildAge: Ember.computed.max('childAges')
+      });
+
+      var lordByron = Person.create({ children: [] });
+
+      lordByron.get('maxChildAge'); // -Infinity
+      lordByron.get('children').pushObject({
+        name: 'Augusta Ada Byron', age: 7
+      });
+      lordByron.get('maxChildAge'); // 7
+      lordByron.get('children').pushObjects([{
+        name: 'Allegra Byron',
+        age: 5
+      }, {
+        name: 'Elizabeth Medora Leigh',
+        age: 8
+      }]);
+      lordByron.get('maxChildAge'); // 8
+      ```
+
+      @method computed.max
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computes the largest value in the dependentKey's array
+    */
+    function max (dependentKey) {
+      return reduceComputed(dependentKey, {
+        initialValue: -Infinity,
+
+        addedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          return Math.max(accumulatedValue, item);
+        },
+
+        removedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          if (item < accumulatedValue) {
+            return accumulatedValue;
+          }
+        }
+      });
+    };
+
+    /**
+      A computed property that calculates the minimum value in the
+      dependent array. This will return `Infinity` when the dependent
+      array is empty.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        childAges: Ember.computed.mapBy('children', 'age'),
+        minChildAge: Ember.computed.min('childAges')
+      });
+
+      var lordByron = Person.create({ children: [] });
+
+      lordByron.get('minChildAge'); // Infinity
+      lordByron.get('children').pushObject({
+        name: 'Augusta Ada Byron', age: 7
+      });
+      lordByron.get('minChildAge'); // 7
+      lordByron.get('children').pushObjects([{
+        name: 'Allegra Byron',
+        age: 5
+      }, {
+        name: 'Elizabeth Medora Leigh',
+        age: 8
+      }]);
+      lordByron.get('minChildAge'); // 5
+      ```
+
+      @method computed.min
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computes the smallest value in the dependentKey's array
+    */
+    function min(dependentKey) {
+      return reduceComputed(dependentKey, {
+        initialValue: Infinity,
+
+        addedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          return Math.min(accumulatedValue, item);
+        },
+
+        removedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          if (item > accumulatedValue) {
+            return accumulatedValue;
+          }
+        }
+      });
+    };
+
+    /**
+      Returns an array mapped via the callback
+
+      The callback method you provide should have the following signature.
+      `item` is the current item in the iteration.
+
+      ```javascript
+      function(item);
+      ```
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        excitingChores: Ember.computed.map('chores', function(chore) {
+          return chore.toUpperCase() + '!';
+        })
+      });
+
+      var hamster = Hamster.create({
+        chores: ['clean', 'write more unit tests']
+      });
+
+      hamster.get('excitingChores'); // ['CLEAN!', 'WRITE MORE UNIT TESTS!']
+      ```
+
+      @method computed.map
+      @for Ember
+      @param {String} dependentKey
+      @param {Function} callback
+      @return {Ember.ComputedProperty} an array mapped via the callback
+    */
+    function map(dependentKey, callback) {
+      var options = {
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var mapped = callback.call(this, item);
+          array.insertAt(changeMeta.index, mapped);
+          return array;
+        },
+        removedItem: function(array, item, changeMeta, instanceMeta) {
+          array.removeAt(changeMeta.index, 1);
+          return array;
+        }
+      };
+
+      return arrayComputed(dependentKey, options);
+    };
+
+    /**
+      Returns an array mapped to the specified key.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        childAges: Ember.computed.mapBy('children', 'age')
+      });
+
+      var lordByron = Person.create({ children: [] });
+
+      lordByron.get('childAges'); // []
+      lordByron.get('children').pushObject({ name: 'Augusta Ada Byron', age: 7 });
+      lordByron.get('childAges'); // [7]
+      lordByron.get('children').pushObjects([{
+        name: 'Allegra Byron',
+        age: 5
+      }, {
+        name: 'Elizabeth Medora Leigh',
+        age: 8
+      }]);
+      lordByron.get('childAges'); // [7, 5, 8]
+      ```
+
+      @method computed.mapBy
+      @for Ember
+      @param {String} dependentKey
+      @param {String} propertyKey
+      @return {Ember.ComputedProperty} an array mapped to the specified key
+    */
+    function mapBy (dependentKey, propertyKey) {
+      var callback = function(item) { return get(item, propertyKey); };
+      return map(dependentKey + '.@each.' + propertyKey, callback);
+    };
+
+    /**
+      @method computed.mapProperty
+      @for Ember
+      @deprecated Use `Ember.computed.mapBy` instead
+      @param dependentKey
+      @param propertyKey
+    */
+    var mapProperty = mapBy;
+
+    /**
+      Filters the array by the callback.
+
+      The callback method you provide should have the following signature.
+      `item` is the current item in the iteration.
+
+      ```javascript
+      function(item);
+      ```
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        remainingChores: Ember.computed.filter('chores', function(chore) {
+          return !chore.done;
+        })
+      });
+
+      var hamster = Hamster.create({ 
+        chores: [
+          { name: 'cook', done: true },
+          { name: 'clean', done: true },
+          { name: 'write more unit tests', done: false }
+        ] 
+      });
+
+      hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
+      ```
+
+      @method computed.filter
+      @for Ember
+      @param {String} dependentKey
+      @param {Function} callback
+      @return {Ember.ComputedProperty} the filtered array
+    */
+    function filter(dependentKey, callback) {
+      var options = {
+        initialize: function (array, changeMeta, instanceMeta) {
+          instanceMeta.filteredArrayIndexes = new SubArray();
+        },
+
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var match = !!callback.call(this, item),
+              filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
+
+          if (match) {
+            array.insertAt(filterIndex, item);
+          }
+
+          return array;
+        },
+
+        removedItem: function(array, item, changeMeta, instanceMeta) {
+          var filterIndex = instanceMeta.filteredArrayIndexes.removeItem(changeMeta.index);
+
+          if (filterIndex > -1) {
+            array.removeAt(filterIndex);
+          }
+
+          return array;
+        }
+      };
+
+      return arrayComputed(dependentKey, options);
+    };
+
+    /**
+      Filters the array by the property and value
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        remainingChores: Ember.computed.filterBy('chores', 'done', false)
+      });
+
+      var hamster = Hamster.create({
+        chores: [
+          { name: 'cook', done: true },
+          { name: 'clean', done: true },
+          { name: 'write more unit tests', done: false }
+        ]
+      });
+
+      hamster.get('remainingChores'); // [{ name: 'write more unit tests', done: false }]
+      ```
+
+      @method computed.filterBy
+      @for Ember
+      @param {String} dependentKey
+      @param {String} propertyKey
+      @param {*} value
+      @return {Ember.ComputedProperty} the filtered array
+    */
+    function filterBy (dependentKey, propertyKey, value) {
+      var callback;
+
+      if (arguments.length === 2) {
+        callback = function(item) {
+          return get(item, propertyKey);
+        };
+      } else {
+        callback = function(item) {
+          return get(item, propertyKey) === value;
+        };
+      }
+
+      return filter(dependentKey + '.@each.' + propertyKey, callback);
+    };
+
+    /**
+      @method computed.filterProperty
+      @for Ember
+      @param dependentKey
+      @param propertyKey
+      @param value
+      @deprecated Use `Ember.computed.filterBy` instead
+    */
+    var filterProperty = filterBy;
+
+    /**
+      A computed property which returns a new array with all the unique
+      elements from one or more dependent arrays.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        uniqueFruits: Ember.computed.uniq('fruits')
+      });
+
+      var hamster = Hamster.create({
+        fruits: [
+          'banana',
+          'grape',
+          'kale',
+          'banana'
+        ]
+      });
+
+      hamster.get('uniqueFruits'); // ['banana', 'grape', 'kale']
+      ```
+
+      @method computed.uniq
+      @for Ember
+      @param {String} propertyKey*
+      @return {Ember.ComputedProperty} computes a new array with all the
+      unique elements from the dependent array
+    */
+    function uniq() {
+      var args = a_slice.call(arguments);
+      args.push({
+        initialize: function(array, changeMeta, instanceMeta) {
+          instanceMeta.itemCounts = {};
+        },
+
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var guid = guidFor(item);
+
+          if (!instanceMeta.itemCounts[guid]) {
+            instanceMeta.itemCounts[guid] = 1;
+          } else {
+            ++instanceMeta.itemCounts[guid];
+          }
+          array.addObject(item);
+          return array;
+        },
+        removedItem: function(array, item, _, instanceMeta) {
+          var guid = guidFor(item),
+              itemCounts = instanceMeta.itemCounts;
+
+          if (--itemCounts[guid] === 0) {
+            array.removeObject(item);
+          }
+          return array;
+        }
+      });
+      return arrayComputed.apply(null, args);
+    };
+
+    /**
+      Alias for [Ember.computed.uniq](/api/#method_computed_uniq).
+
+      @method computed.union
+      @for Ember
+      @param {String} propertyKey*
+      @return {Ember.ComputedProperty} computes a new array with all the
+      unique elements from the dependent array
+    */
+    var union = uniq;
+
+    /**
+      A computed property which returns a new array with all the duplicated
+      elements from two or more dependent arrays.
+
+      Example
+
+      ```javascript
+      var obj = Ember.Object.createWithMixins({
+        adaFriends: ['Charles Babbage', 'John Hobhouse', 'William King', 'Mary Somerville'],
+        charlesFriends: ['William King', 'Mary Somerville', 'Ada Lovelace', 'George Peacock'],
+        friendsInCommon: Ember.computed.intersect('adaFriends', 'charlesFriends')
+      });
+
+      obj.get('friendsInCommon'); // ['William King', 'Mary Somerville']
+      ```
+
+      @method computed.intersect
+      @for Ember
+      @param {String} propertyKey*
+      @return {Ember.ComputedProperty} computes a new array with all the
+      duplicated elements from the dependent arrays
+    */
+    function intersect() {
+      var getDependentKeyGuids = function (changeMeta) {
+        return EnumerableUtils.map(changeMeta.property._dependentKeys, function (dependentKey) {
+          return guidFor(dependentKey);
+        });
+      };
+
+      var args = a_slice.call(arguments);
+      args.push({
+        initialize: function (array, changeMeta, instanceMeta) {
+          instanceMeta.itemCounts = {};
+        },
+
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var itemGuid = guidFor(item),
+              dependentGuids = getDependentKeyGuids(changeMeta),
+              dependentGuid = guidFor(changeMeta.arrayChanged),
+              numberOfDependentArrays = changeMeta.property._dependentKeys.length,
+              itemCounts = instanceMeta.itemCounts;
+
+          if (!itemCounts[itemGuid]) { itemCounts[itemGuid] = {}; }
+          if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
+
+          if (++itemCounts[itemGuid][dependentGuid] === 1 &&
+              numberOfDependentArrays === keys(itemCounts[itemGuid]).length) {
+
+            array.addObject(item);
+          }
+          return array;
+        },
+        removedItem: function(array, item, changeMeta, instanceMeta) {
+          var itemGuid = guidFor(item),
+              dependentGuids = getDependentKeyGuids(changeMeta),
+              dependentGuid = guidFor(changeMeta.arrayChanged),
+              numberOfDependentArrays = changeMeta.property._dependentKeys.length,
+              numberOfArraysItemAppearsIn,
+              itemCounts = instanceMeta.itemCounts;
+
+          if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
+          if (--itemCounts[itemGuid][dependentGuid] === 0) {
+            delete itemCounts[itemGuid][dependentGuid];
+            numberOfArraysItemAppearsIn = keys(itemCounts[itemGuid]).length;
+
+            if (numberOfArraysItemAppearsIn === 0) {
+              delete itemCounts[itemGuid];
+            }
+            array.removeObject(item);
+          }
+          return array;
+        }
+      });
+      return arrayComputed.apply(null, args);
+    };
+
+    /**
+      A computed property which returns a new array with all the
+      properties from the first dependent array that are not in the second
+      dependent array.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        likes: ['banana', 'grape', 'kale'],
+        wants: Ember.computed.setDiff('likes', 'fruits')
+      });
+
+      var hamster = Hamster.create({
+        fruits: [
+          'grape',
+          'kale',
+        ]
+      });
+
+      hamster.get('wants'); // ['banana']
+      ```
+
+      @method computed.setDiff
+      @for Ember
+      @param {String} setAProperty
+      @param {String} setBProperty
+      @return {Ember.ComputedProperty} computes a new array with all the
+      items from the first dependent array that are not in the second
+      dependent array
+    */
+    function setDiff(setAProperty, setBProperty) {
+      if (arguments.length !== 2) {
+        throw new EmberError("setDiff requires exactly two dependent arrays.");
+      }
+      return arrayComputed(setAProperty, setBProperty, {
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          var setA = get(this, setAProperty),
+              setB = get(this, setBProperty);
+
+          if (changeMeta.arrayChanged === setA) {
+            if (!setB.contains(item)) {
+              array.addObject(item);
+            }
+          } else {
+            array.removeObject(item);
+          }
+          return array;
+        },
+
+        removedItem: function (array, item, changeMeta, instanceMeta) {
+          var setA = get(this, setAProperty),
+              setB = get(this, setBProperty);
+
+          if (changeMeta.arrayChanged === setB) {
+            if (setA.contains(item)) {
+              array.addObject(item);
+            }
+          } else {
+            array.removeObject(item);
+          }
+          return array;
+        }
+      });
+    };
+
+    function binarySearch(array, item, low, high) {
+      var mid, midItem, res, guidMid, guidItem;
+
+      if (arguments.length < 4) { high = get(array, 'length'); }
+      if (arguments.length < 3) { low = 0; }
+
+      if (low === high) {
+        return low;
+      }
+
+      mid = low + Math.floor((high - low) / 2);
+      midItem = array.objectAt(mid);
+
+      guidMid = _guidFor(midItem);
+      guidItem = _guidFor(item);
+
+      if (guidMid === guidItem) {
+        return mid;
+      }
+
+      res = this.order(midItem, item);
+      if (res === 0) {
+        res = guidMid < guidItem ? -1 : 1;
+      }
+
+
+      if (res < 0) {
+        return this.binarySearch(array, item, mid+1, high);
+      } else if (res > 0) {
+        return this.binarySearch(array, item, low, mid);
+      }
+
+      return mid;
+
+      function _guidFor(item) {
+        if (SearchProxy.detectInstance(item)) {
+          return guidFor(get(item, 'content'));
+        }
+        return guidFor(item);
+      }
+    }
+
+
+    var SearchProxy = ObjectProxy.extend();
+
+    /**
+      A computed property which returns a new array with all the
+      properties from the first dependent array sorted based on a property
+      or sort function.
+
+      The callback method you provide should have the following signature:
+
+      ```javascript
+      function(itemA, itemB);
+      ```
+
+      - `itemA` the first item to compare.
+      - `itemB` the second item to compare.
+
+      This function should return negative number (e.g. `-1`) when `itemA` should come before
+      `itemB`. It should return positive number (e.g. `1`) when `itemA` should come after
+      `itemB`. If the `itemA` and `itemB` are equal this function should return `0`.
+
+      Therefore, if this function is comparing some numeric values, simple `itemA - itemB` or
+      `itemA.get( 'foo' ) - itemB.get( 'foo' )` can be used instead of series of `if`.
+
+      Example
+
+      ```javascript
+      var ToDoList = Ember.Object.extend({
+        // using standard ascending sort
+        todosSorting: ['name'],
+        sortedTodos: Ember.computed.sort('todos', 'todosSorting'),
+
+        // using descending sort
+        todosSortingDesc: ['name:desc'],
+        sortedTodosDesc: Ember.computed.sort('todos', 'todosSortingDesc'),
+
+        // using a custom sort function
+        priorityTodos: Ember.computed.sort('todos', function(a, b){
+          if (a.priority > b.priority) {
+            return 1;
+          } else if (a.priority < b.priority) {
+            return -1;
+          }
+
+          return 0;
+        }),
+      });
+
+      var todoList = ToDoList.create({todos: [
+        { name: 'Unit Test', priority: 2 },
+        { name: 'Documentation', priority: 3 },
+        { name: 'Release', priority: 1 }
+      ]});
+
+      todoList.get('sortedTodos');      // [{ name:'Documentation', priority:3 }, { name:'Release', priority:1 }, { name:'Unit Test', priority:2 }]
+      todoList.get('sortedTodosDesc');  // [{ name:'Unit Test', priority:2 }, { name:'Release', priority:1 }, { name:'Documentation', priority:3 }]
+      todoList.get('priorityTodos');    // [{ name:'Release', priority:1 }, { name:'Unit Test', priority:2 }, { name:'Documentation', priority:3 }]
+      ```
+
+      @method computed.sort
+      @for Ember
+      @param {String} dependentKey
+      @param {String or Function} sortDefinition a dependent key to an
+      array of sort properties (add `:desc` to the arrays sort properties to sort descending) or a function to use when sorting
+      @return {Ember.ComputedProperty} computes a new sorted array based
+      on the sort property array or callback function
+    */
+    function sort(itemsKey, sortDefinition) {
+      Ember.assert("Ember.computed.sort requires two arguments: an array key to sort and either a sort properties key or sort function", arguments.length === 2);
+
+      var initFn, sortPropertiesKey;
+
+      if (typeof sortDefinition === 'function') {
+        initFn = function (array, changeMeta, instanceMeta) {
+          instanceMeta.order = sortDefinition;
+          instanceMeta.binarySearch = binarySearch;
+        };
+      } else {
+        sortPropertiesKey = sortDefinition;
+        initFn = function (array, changeMeta, instanceMeta) {
+          function setupSortProperties() {
+            var sortPropertyDefinitions = get(this, sortPropertiesKey),
+                sortProperty,
+                sortProperties = instanceMeta.sortProperties = [],
+                sortPropertyAscending = instanceMeta.sortPropertyAscending = {},
+                idx,
+                asc;
+
+            Ember.assert("Cannot sort: '" + sortPropertiesKey + "' is not an array.", isArray(sortPropertyDefinitions));
+
+            changeMeta.property.clearItemPropertyKeys(itemsKey);
+
+            forEach(sortPropertyDefinitions, function (sortPropertyDefinition) {
+              if ((idx = sortPropertyDefinition.indexOf(':')) !== -1) {
+                sortProperty = sortPropertyDefinition.substring(0, idx);
+                asc = sortPropertyDefinition.substring(idx+1).toLowerCase() !== 'desc';
+              } else {
+                sortProperty = sortPropertyDefinition;
+                asc = true;
+              }
+
+              sortProperties.push(sortProperty);
+              sortPropertyAscending[sortProperty] = asc;
+              changeMeta.property.itemPropertyKey(itemsKey, sortProperty);
+            });
+
+            sortPropertyDefinitions.addObserver('@each', this, updateSortPropertiesOnce);
+          }
+
+          function updateSortPropertiesOnce() {
+            run.once(this, updateSortProperties, changeMeta.propertyName);
+          }
+
+          function updateSortProperties(propertyName) {
+            setupSortProperties.call(this);
+            changeMeta.property.recomputeOnce.call(this, propertyName);
+          }
+
+          addObserver(this, sortPropertiesKey, updateSortPropertiesOnce);
+
+          setupSortProperties.call(this);
+
+
+          instanceMeta.order = function (itemA, itemB) {
+            var isProxy = itemB instanceof SearchProxy,
+                sortProperty, result, asc;
+
+            for (var i = 0; i < this.sortProperties.length; ++i) {
+              sortProperty = this.sortProperties[i];
+              result = compare(get(itemA, sortProperty), isProxy ? itemB[sortProperty] : get(itemB, sortProperty));
+
+              if (result !== 0) {
+                asc = this.sortPropertyAscending[sortProperty];
+                return asc ? result : (-1 * result);
+              }
+            }
+
+            return 0;
+          };
+
+          instanceMeta.binarySearch = binarySearch;
+        };
+      }
+
+      return arrayComputed(itemsKey, {
+        initialize: initFn,
+
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          var index = instanceMeta.binarySearch(array, item);
+          array.insertAt(index, item);
+          return array;
+        },
+
+        removedItem: function (array, item, changeMeta, instanceMeta) {
+          var proxyProperties, index, searchItem;
+
+          if (changeMeta.previousValues) {
+            proxyProperties = merge({ content: item }, changeMeta.previousValues);
+
+            searchItem = SearchProxy.create(proxyProperties);
+          } else {
+            searchItem = item;
+          }
+
+          index = instanceMeta.binarySearch(array, searchItem);
+          array.removeAt(index);
+          return array;
+        }
+      });
+    };
+
+
+    __exports__.sum = sum;
+    __exports__.min = min;
+    __exports__.max = max;
+    __exports__.map = map;
+    __exports__.sort = sort;
+    __exports__.setDiff = setDiff;
+    __exports__.mapBy = mapBy;
+    __exports__.mapProperty = mapProperty;
+    __exports__.filter = filter;
+    __exports__.filterBy = filterBy;
+    __exports__.filterProperty = filterProperty;
+    __exports__.uniq = uniq;
+    __exports__.union = union;
+    __exports__.intersect = intersect;
+  });
+define("ember-runtime/controllers/array_controller",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-runtime/system/array_proxy","ember-runtime/mixins/sortable","ember-runtime/controllers/controller","ember-metal/computed","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EnumerableUtils = __dependency4__["default"];
+    var ArrayProxy = __dependency5__["default"];
+    var SortableMixin = __dependency6__["default"];
+    var ControllerMixin = __dependency7__.ControllerMixin;
+    var computed = __dependency8__.computed;
+    var EmberError = __dependency9__["default"];
+
+    var forEach = EnumerableUtils.forEach,
+        replace = EnumerableUtils.replace;
+
+    /**
+      `Ember.ArrayController` provides a way for you to publish a collection of
+      objects so that you can easily bind to the collection from a Handlebars
+      `#each` helper, an `Ember.CollectionView`, or other controllers.
+
+      The advantage of using an `ArrayController` is that you only have to set up
+      your view bindings once; to change what's displayed, simply swap out the
+      `content` property on the controller.
+
+      For example, imagine you wanted to display a list of items fetched via an XHR
+      request. Create an `Ember.ArrayController` and set its `content` property:
+
+      ```javascript
+      MyApp.listController = Ember.ArrayController.create();
+
+      $.get('people.json', function(data) {
+        MyApp.listController.set('content', data);
+      });
+      ```
+
+      Then, create a view that binds to your new controller:
+
+      ```handlebars
+      {{#each MyApp.listController}}
+        {{firstName}} {{lastName}}
+      {{/each}}
+      ```
+
+      Although you are binding to the controller, the behavior of this controller
+      is to pass through any methods or properties to the underlying array. This
+      capability comes from `Ember.ArrayProxy`, which this class inherits from.
+
+      Sometimes you want to display computed properties within the body of an
+      `#each` helper that depend on the underlying items in `content`, but are not
+      present on those items.   To do this, set `itemController` to the name of a
+      controller (probably an `ObjectController`) that will wrap each individual item.
+
+      For example:
+
+      ```handlebars
+        {{#each post in controller}}
+          <li>{{post.title}} ({{post.titleLength}} characters)</li>
+        {{/each}}
+      ```
+
+      ```javascript
+      App.PostsController = Ember.ArrayController.extend({
+        itemController: 'post'
+      });
+
+      App.PostController = Ember.ObjectController.extend({
+        // the `title` property will be proxied to the underlying post.
+
+        titleLength: function() {
+          return this.get('title').length;
+        }.property('title')
+      });
+      ```
+
+      In some cases it is helpful to return a different `itemController` depending
+      on the particular item.  Subclasses can do this by overriding
+      `lookupItemController`.
+
+      For example:
+
+      ```javascript
+      App.MyArrayController = Ember.ArrayController.extend({
+        lookupItemController: function( object ) {
+          if (object.get('isSpecial')) {
+            return "special"; // use App.SpecialController
+          } else {
+            return "regular"; // use App.RegularController
+          }
+        }
+      });
+      ```
+
+      The itemController instances will have a `parentController` property set to
+      the `ArrayController` instance.
+
+      @class ArrayController
+      @namespace Ember
+      @extends Ember.ArrayProxy
+      @uses Ember.SortableMixin
+      @uses Ember.ControllerMixin
+    */
+
+    var ArrayController = ArrayProxy.extend(ControllerMixin, SortableMixin, {
+
+      /**
+        The controller used to wrap items, if any.
+
+        @property itemController
+        @type String
+        @default null
+      */
+      itemController: null,
+
+      /**
+        Return the name of the controller to wrap items, or `null` if items should
+        be returned directly.  The default implementation simply returns the
+        `itemController` property, but subclasses can override this method to return
+        different controllers for different objects.
+
+        For example:
+
+        ```javascript
+        App.MyArrayController = Ember.ArrayController.extend({
+          lookupItemController: function( object ) {
+            if (object.get('isSpecial')) {
+              return "special"; // use App.SpecialController
+            } else {
+              return "regular"; // use App.RegularController
+            }
+          }
+        });
+        ```
+
+        @method lookupItemController
+        @param {Object} object
+        @return {String}
+      */
+      lookupItemController: function(object) {
+        return get(this, 'itemController');
+      },
+
+      objectAtContent: function(idx) {
+        var length = get(this, 'length'),
+            arrangedContent = get(this,'arrangedContent'),
+            object = arrangedContent && arrangedContent.objectAt(idx);
+
+        if (idx >= 0 && idx < length) {
+          var controllerClass = this.lookupItemController(object);
+          if (controllerClass) {
+            return this.controllerAt(idx, object, controllerClass);
+          }
+        }
+
+        // When `controllerClass` is falsy, we have not opted in to using item
+        // controllers, so return the object directly.
+
+        // When the index is out of range, we want to return the "out of range"
+        // value, whatever that might be.  Rather than make assumptions
+        // (e.g. guessing `null` or `undefined`) we defer this to `arrangedContent`.
+        return object;
+      },
+
+      arrangedContentDidChange: function() {
+        this._super();
+        this._resetSubControllers();
+      },
+
+      arrayContentDidChange: function(idx, removedCnt, addedCnt) {
+        var subControllers = get(this, '_subControllers'),
+            subControllersToRemove = subControllers.slice(idx, idx+removedCnt);
+
+        forEach(subControllersToRemove, function(subController) {
+          if (subController) { subController.destroy(); }
+        });
+
+        replace(subControllers, idx, removedCnt, new Array(addedCnt));
+
+        // The shadow array of subcontrollers must be updated before we trigger
+        // observers, otherwise observers will get the wrong subcontainer when
+        // calling `objectAt`
+        this._super(idx, removedCnt, addedCnt);
+      },
+
+      init: function() {
+        this._super();
+
+        this.set('_subControllers', [ ]);
+      },
+
+      content: computed(function () {
+        return Ember.A();
+      }),
+
+      /**
+       * Flag to mark as being "virtual". Used to keep this instance
+       * from participating in the parentController hierarchy.
+       *
+       * @private
+       * @property _isVirtual
+       * @type Boolean
+       */
+      _isVirtual: false,
+
+      controllerAt: function(idx, object, controllerClass) {
+        var container = get(this, 'container'),
+            subControllers = get(this, '_subControllers'),
+            subController = subControllers[idx],
+            fullName;
+
+        if (subController) { return subController; }
+
+        fullName = "controller:" + controllerClass;
+
+        if (!container.has(fullName)) {
+          throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
+        }
+        var parentController;
+        if (this._isVirtual) {
+          parentController = get(this, 'parentController');
+        }
+        parentController = parentController || this;
+        subController = container.lookupFactory(fullName).create({
+          target: this,
+          parentController: parentController,
+          content: object
+        });
+
+        subControllers[idx] = subController;
+
+        return subController;
+      },
+
+      _subControllers: null,
+
+      _resetSubControllers: function() {
+        var subControllers = get(this, '_subControllers');
+        var controller;
+
+        if (subControllers.length) {
+          for (var i = 0, length = subControllers.length; length > i; i++) {
+            controller = subControllers[i];
+            if (controller) {
+              controller.destroy();
+            }
+          }
+
+          subControllers.length = 0;
+        }
+      },
+
+      willDestroy: function() {
+        this._resetSubControllers();
+        this._super();
+      }
+    });
+
+    __exports__["default"] = ArrayController;
+  });
+define("ember-runtime/controllers/controller",
+  ["ember-metal/core","ember-metal/property_get","ember-runtime/system/object","ember-metal/mixin","ember-metal/computed","ember-runtime/mixins/action_handler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.deprecate
+    var get = __dependency2__.get;
+    var EmberObject = __dependency3__["default"];
+    var Mixin = __dependency4__.Mixin;
+    var computed = __dependency5__.computed;
+    var ActionHandler = __dependency6__["default"];
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    /**
+      `Ember.ControllerMixin` provides a standard interface for all classes that
+      compose Ember's controller layer: `Ember.Controller`,
+      `Ember.ArrayController`, and `Ember.ObjectController`.
+
+      @class ControllerMixin
+      @namespace Ember
+      @uses Ember.ActionHandler
+    */
+    var ControllerMixin = Mixin.create(ActionHandler, {
+      /* ducktype as a controller */
+      isController: true,
+
+      /**
+        The object to which actions from the view should be sent.
+
+        For example, when a Handlebars template uses the `{{action}}` helper,
+        it will attempt to send the action to the view's controller's `target`.
+
+        By default, the value of the target property is set to the router, and
+        is injected when a controller is instantiated. This injection is defined
+        in Ember.Application#buildContainer, and is applied as part of the
+        applications initialization process. It can also be set after a controller
+        has been instantiated, for instance when using the render helper in a
+        template, or when a controller is used as an `itemController`. In most
+        cases the `target` property will automatically be set to the logical
+        consumer of actions for the controller.
+
+        @property target
+        @default null
+      */
+      target: null,
+
+      container: null,
+
+      parentController: null,
+
+      store: null,
+
+      model: computed.alias('content'),
+
+      deprecatedSendHandles: function(actionName) {
+        return !!this[actionName];
+      },
+
+      deprecatedSend: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+        Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
+        Ember.deprecate('Action handlers implemented directly on controllers are deprecated in favor of action handlers on an `actions` object ( action: `' + actionName + '` on ' + this + ')', false);
+        this[actionName].apply(this, args);
+        return;
+      }
+    });
+
+    /**
+      @class Controller
+      @namespace Ember
+      @extends Ember.Object
+      @uses Ember.ControllerMixin
+    */
+    var Controller = EmberObject.extend(ControllerMixin);
+
+    __exports__.Controller = Controller;
+    __exports__.ControllerMixin = ControllerMixin;
+  });
+define("ember-runtime/controllers/object_controller",
+  ["ember-runtime/controllers/controller","ember-runtime/system/object_proxy","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var ControllerMixin = __dependency1__.ControllerMixin;
+    var ObjectProxy = __dependency2__["default"];
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    /**
+      `Ember.ObjectController` is part of Ember's Controller layer. It is intended
+      to wrap a single object, proxying unhandled attempts to `get` and `set` to the underlying
+      content object, and to forward unhandled action attempts to its `target`.
+
+      `Ember.ObjectController` derives this functionality from its superclass
+      `Ember.ObjectProxy` and the `Ember.ControllerMixin` mixin.
+
+      @class ObjectController
+      @namespace Ember
+      @extends Ember.ObjectProxy
+      @uses Ember.ControllerMixin
+    **/
+    var ObjectController = ObjectProxy.extend(ControllerMixin);
+    __exports__["default"] = ObjectController;
+  });
+define("ember-runtime/copy",
+  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var EnumerableUtils = __dependency1__["default"];
+    var typeOf = __dependency2__.typeOf;
+    var EmberObject = __dependency3__["default"];
+    var Copyable = __dependency4__["default"];
+    var create = __dependency5__.create;
+
+    var indexOf = EnumerableUtils.indexOf;
+
+    function _copy(obj, deep, seen, copies) {
+      var ret, loc, key;
+
+      // primitive data types are immutable, just return them.
+      if ('object' !== typeof obj || obj===null) return obj;
+
+      // avoid cyclical loops
+      if (deep && (loc=indexOf(seen, obj))>=0) return copies[loc];
+
+      Ember.assert('Cannot clone an Ember.Object that does not implement Ember.Copyable', !(obj instanceof EmberObject) || (Copyable && Copyable.detect(obj)));
+
+      // IMPORTANT: this specific test will detect a native array only. Any other
+      // object will need to implement Copyable.
+      if (typeOf(obj) === 'array') {
+        ret = obj.slice();
+        if (deep) {
+          loc = ret.length;
+          while(--loc>=0) ret[loc] = _copy(ret[loc], deep, seen, copies);
+        }
+      } else if (Copyable && Copyable.detect(obj)) {
+        ret = obj.copy(deep, seen, copies);
+      } else if (obj instanceof Date) {
+        ret = new Date(obj.getTime());
+      } else {
+        ret = {};
+        for(key in obj) {
+          if (!obj.hasOwnProperty(key)) continue;
+
+          // Prevents browsers that don't respect non-enumerability from
+          // copying internal Ember properties
+          if (key.substring(0,2) === '__') continue;
+
+          ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
+        }
+      }
+
+      if (deep) {
+        seen.push(obj);
+        copies.push(ret);
+      }
+
+      return ret;
+    }
+
+    /**
+      Creates a clone of the passed object. This function can take just about
+      any type of object and create a clone of it, including primitive values
+      (which are not actually cloned because they are immutable).
+
+      If the passed object implements the `clone()` method, then this function
+      will simply call that method and return the result.
+
+      @method copy
+      @for Ember
+      @param {Object} obj The object to clone
+      @param {Boolean} deep If true, a deep copy of the object is made
+      @return {Object} The cloned object
+    */
+    function copy(obj, deep) {
+      // fast paths
+      if ('object' !== typeof obj || obj===null) return obj; // can't copy primitives
+      if (Copyable && Copyable.detect(obj)) return obj.copy(deep);
+      return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
+    };
+
+    __exports__["default"] = copy;
+  });
+define("ember-runtime/core",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    /**
+      Compares two objects, returning true if they are logically equal. This is
+      a deeper comparison than a simple triple equal. For sets it will compare the
+      internal objects. For any other object that implements `isEqual()` it will
+      respect that method.
+
+      ```javascript
+      Ember.isEqual('hello', 'hello');  // true
+      Ember.isEqual(1, 2);              // false
+      Ember.isEqual([4, 2], [4, 2]);    // false
+      ```
+
+      @method isEqual
+      @for Ember
+      @param {Object} a first object to compare
+      @param {Object} b second object to compare
+      @return {Boolean}
+    */
+    function isEqual(a, b) {
+      if (a && 'function'===typeof a.isEqual) return a.isEqual(b);
+      if (a instanceof Date && b instanceof Date) {
+        return a.getTime() === b.getTime();
+      } 
+      return a === b;
+    };
+
+    __exports__.isEqual = isEqual;
+  });
+define("ember-runtime/ext/function",
+  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.EXTEND_PROTOTYPES, Ember.assert
+    var expandProperties = __dependency2__["default"];
+    var computed = __dependency3__.computed;
+
+    var a_slice = Array.prototype.slice;
+    var FunctionPrototype = Function.prototype;
+
+    if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Function) {
+
+      /**
+        The `property` extension of Javascript's Function prototype is available
+        when `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Function` is
+        `true`, which is the default.
+
+        Computed properties allow you to treat a function like a property:
+
+        ```javascript
+        MyApp.President = Ember.Object.extend({
+          firstName: '',
+          lastName:  '',
+
+          fullName: function() {
+            return this.get('firstName') + ' ' + this.get('lastName');
+
+            // Call this flag to mark the function as a property
+          }.property()
+        });
+
+        var president = MyApp.President.create({
+          firstName: "Barack",
+          lastName: "Obama"
+        });
+
+        president.get('fullName');    // "Barack Obama"
+        ```
+
+        Treating a function like a property is useful because they can work with
+        bindings, just like any other property.
+
+        Many computed properties have dependencies on other properties. For
+        example, in the above example, the `fullName` property depends on
+        `firstName` and `lastName` to determine its value. You can tell Ember
+        about these dependencies like this:
+
+        ```javascript
+        MyApp.President = Ember.Object.extend({
+          firstName: '',
+          lastName:  '',
+
+          fullName: function() {
+            return this.get('firstName') + ' ' + this.get('lastName');
+
+            // Tell Ember.js that this computed property depends on firstName
+            // and lastName
+          }.property('firstName', 'lastName')
+        });
+        ```
+
+        Make sure you list these dependencies so Ember knows when to update
+        bindings that connect to a computed property. Changing a dependency
+        will not immediately trigger an update of the computed property, but
+        will instead clear the cache so that it is updated when the next `get`
+        is called on the property.
+
+        See [Ember.ComputedProperty](/api/classes/Ember.ComputedProperty.html), [Ember.computed](/api/#method_computed).
+
+        @method property
+        @for Function
+      */
+      FunctionPrototype.property = function() {
+        var ret = computed(this);
+        // ComputedProperty.prototype.property expands properties; no need for us to
+        // do so here.
+        return ret.property.apply(ret, arguments);
+      };
+
+      /**
+        The `observes` extension of Javascript's Function prototype is available
+        when `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Function` is
+        true, which is the default.
+
+        You can observe property changes simply by adding the `observes`
+        call to the end of your method declarations in classes that you write.
+        For example:
+
+        ```javascript
+        Ember.Object.extend({
+          valueObserver: function() {
+            // Executes whenever the "value" property changes
+          }.observes('value')
+        });
+        ```
+
+        In the future this method may become asynchronous. If you want to ensure
+        synchronous behavior, use `observesImmediately`.
+
+        See `Ember.observer`.
+
+        @method observes
+        @for Function
+      */
+      FunctionPrototype.observes = function() {
+        var addWatchedProperty = function (obs) { watched.push(obs); };
+        var watched = [];
+
+        for (var i=0; i<arguments.length; ++i) {
+          expandProperties(arguments[i], addWatchedProperty);
+        }
+
+        this.__ember_observes__ = watched;
+
+        return this;
+      };
+
+      /**
+        The `observesImmediately` extension of Javascript's Function prototype is
+        available when `Ember.EXTEND_PROTOTYPES` or
+        `Ember.EXTEND_PROTOTYPES.Function` is true, which is the default.
+
+        You can observe property changes simply by adding the `observesImmediately`
+        call to the end of your method declarations in classes that you write.
+        For example:
+
+        ```javascript
+        Ember.Object.extend({
+          valueObserver: function() {
+            // Executes immediately after the "value" property changes
+          }.observesImmediately('value')
+        });
+        ```
+
+        In the future, `observes` may become asynchronous. In this event,
+        `observesImmediately` will maintain the synchronous behavior.
+
+        See `Ember.immediateObserver`.
+
+        @method observesImmediately
+        @for Function
+      */
+      FunctionPrototype.observesImmediately = function() {
+        for (var i=0, l=arguments.length; i<l; i++) {
+          var arg = arguments[i];
+          Ember.assert("Immediate observers must observe internal properties only, not properties on other objects.", arg.indexOf('.') === -1);
+        }
+
+        // observes handles property expansion
+        return this.observes.apply(this, arguments);
+      };
+
+      /**
+        The `observesBefore` extension of Javascript's Function prototype is
+        available when `Ember.EXTEND_PROTOTYPES` or
+        `Ember.EXTEND_PROTOTYPES.Function` is true, which is the default.
+
+        You can get notified when a property change is about to happen by
+        by adding the `observesBefore` call to the end of your method
+        declarations in classes that you write. For example:
+
+        ```javascript
+        Ember.Object.extend({
+          valueObserver: function() {
+            // Executes whenever the "value" property is about to change
+          }.observesBefore('value')
+        });
+        ```
+
+        See `Ember.beforeObserver`.
+
+        @method observesBefore
+        @for Function
+      */
+      FunctionPrototype.observesBefore = function() {
+        var addWatchedProperty = function (obs) { watched.push(obs); };
+        var watched = [];
+
+        for (var i=0; i<arguments.length; ++i) {
+          expandProperties(arguments[i], addWatchedProperty);
+        }
+
+        this.__ember_observesBefore__ = watched;
+
+        return this;
+      };
+
+      /**
+        The `on` extension of Javascript's Function prototype is available
+        when `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Function` is
+        true, which is the default.
+
+        You can listen for events simply by adding the `on` call to the end of
+        your method declarations in classes or mixins that you write. For example:
+
+        ```javascript
+        Ember.Mixin.create({
+          doSomethingWithElement: function() {
+            // Executes whenever the "didInsertElement" event fires
+          }.on('didInsertElement')
+        });
+        ```
+
+        See `Ember.on`.
+
+        @method on
+        @for Function
+      */
+      FunctionPrototype.on = function() {
+        var events = a_slice.call(arguments);
+        this.__ember_listens__ = events;
+        return this;
+      };
+    }
+  });
+define("ember-runtime/ext/rsvp",
+  ["ember-metal/core","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var Logger = __dependency2__["default"];
+
+    var RSVP = requireModule("rsvp");
+    var Test, testModuleName = 'ember-testing/test';
+
+    RSVP.onerrorDefault = function(error) {
+      if (error instanceof Error) {
+        if (Ember.testing) {
+          // ES6TODO: remove when possible
+          if (!Test && Ember.__loader.registry[testModuleName]) {
+            Test = requireModule(testModuleName)['default'];
+          }
+
+          if (Test && Test.adapter) {
+            Test.adapter.exception(error);
+          } else {
+            throw error;
+          }
+        } else if (Ember.onerror) {
+          Ember.onerror(error);
+        } else {
+          Logger.error(error.stack);
+          Ember.assert(error, false);
+        }
+      }
+    };
+
+    RSVP.on('error', RSVP.onerrorDefault);
+
+    __exports__["default"] = RSVP;
+  });
+define("ember-runtime/ext/string",
+  ["ember-metal/core","ember-runtime/system/string"],
+  function(__dependency1__, __dependency2__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.EXTEND_PROTOTYPES, Ember.assert, Ember.FEATURES
+    var fmt = __dependency2__.fmt;
+    var w = __dependency2__.w;
+    var loc = __dependency2__.loc;
+    var camelize = __dependency2__.camelize;
+    var decamelize = __dependency2__.decamelize;
+    var dasherize = __dependency2__.dasherize;
+    var underscore = __dependency2__.underscore;
+    var capitalize = __dependency2__.capitalize;
+    var classify = __dependency2__.classify;
+    var StringPrototype = String.prototype;
+
+    if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
+
+      /**
+        See [Ember.String.fmt](/api/classes/Ember.String.html#method_fmt).
+
+        @method fmt
+        @for String
+      */
+      StringPrototype.fmt = function() {
+        return fmt(this, arguments);
+      };
+
+      /**
+        See [Ember.String.w](/api/classes/Ember.String.html#method_w).
+
+        @method w
+        @for String
+      */
+      StringPrototype.w = function() {
+        return w(this);
+      };
+
+      /**
+        See [Ember.String.loc](/api/classes/Ember.String.html#method_loc).
+
+        @method loc
+        @for String
+      */
+      StringPrototype.loc = function() {
+        return loc(this, arguments);
+      };
+
+      /**
+        See [Ember.String.camelize](/api/classes/Ember.String.html#method_camelize).
+
+        @method camelize
+        @for String
+      */
+      StringPrototype.camelize = function() {
+        return camelize(this);
+      };
+
+      /**
+        See [Ember.String.decamelize](/api/classes/Ember.String.html#method_decamelize).
+
+        @method decamelize
+        @for String
+      */
+      StringPrototype.decamelize = function() {
+        return decamelize(this);
+      };
+
+      /**
+        See [Ember.String.dasherize](/api/classes/Ember.String.html#method_dasherize).
+
+        @method dasherize
+        @for String
+      */
+      StringPrototype.dasherize = function() {
+        return dasherize(this);
+      };
+
+      /**
+        See [Ember.String.underscore](/api/classes/Ember.String.html#method_underscore).
+
+        @method underscore
+        @for String
+      */
+      StringPrototype.underscore = function() {
+        return underscore(this);
+      };
+
+      /**
+        See [Ember.String.classify](/api/classes/Ember.String.html#method_classify).
+
+        @method classify
+        @for String
+      */
+      StringPrototype.classify = function() {
+        return classify(this);
+      };
+
+      /**
+        See [Ember.String.capitalize](/api/classes/Ember.String.html#method_capitalize).
+
+        @method capitalize
+        @for String
+      */
+      StringPrototype.capitalize = function() {
+        return capitalize(this);
+      };
+    }
+  });
+define("ember-runtime/keys",
+  ["ember-metal/enumerable_utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var EnumerableUtils = __dependency1__["default"];
+    var create = __dependency2__.create;
+
+    /**
+      Returns all of the keys defined on an object or hash. This is useful
+      when inspecting objects for debugging. On browsers that support it, this
+      uses the native `Object.keys` implementation.
+
+      @method keys
+      @for Ember
+      @param {Object} obj
+      @return {Array} Array containing keys of obj
+    */
+    var keys = Object.keys;
+    if (!keys || create.isSimulated) {
+      var prototypeProperties = [
+        'constructor',
+        'hasOwnProperty',
+        'isPrototypeOf',
+        'propertyIsEnumerable',
+        'valueOf',
+        'toLocaleString',
+        'toString'
+      ],
+      pushPropertyName = function(obj, array, key) {
+        // Prevents browsers that don't respect non-enumerability from
+        // copying internal Ember properties
+        if (key.substring(0,2) === '__') return;
+        if (key === '_super') return;
+        if (EnumerableUtils.indexOf(array, key) >= 0) return;
+        if (typeof obj.hasOwnProperty === 'function' && !obj.hasOwnProperty(key)) return;
+
+        array.push(key);
+      };
+
+      keys = function keys(obj) {
+        var ret = [], key;
+        for (key in obj) {
+          pushPropertyName(obj, ret, key);
+        }
+
+        // IE8 doesn't enumerate property that named the same as prototype properties.
+        for (var i = 0, l = prototypeProperties.length; i < l; i++) {
+          key = prototypeProperties[i];
+
+          pushPropertyName(obj, ret, key);
+        }
+
+        return ret;
+      };
+    }
+
+    __exports__["default"] = keys;
+  });
+define("ember-runtime",
+  ["ember-metal","ember-runtime/core","ember-runtime/keys","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __dependency37__, __dependency38__, __dependency39__, __dependency40__, __dependency41__, __dependency42__, __dependency43__, __exports__) {
+    "use strict";
+    /**
+    Ember Runtime
+
+    @module ember
+    @submodule ember-runtime
+    @requires ember-metal
+    */
+
+
+    // BEGIN EXPORTS
+    Ember.compare = __dependency4__["default"];
+    Ember.copy = __dependency5__["default"];
+    Ember.isEqual = __dependency2__.isEqual;
+    Ember.keys = __dependency3__["default"];
+
+    Ember.Array = __dependency21__["default"];
+
+    Ember.Comparable = __dependency22__["default"];
+    Ember.Copyable = __dependency23__["default"];
+
+    Ember.SortableMixin = __dependency34__["default"];
+
+    Ember.Freezable = __dependency25__.Freezable;
+    Ember.FROZEN_ERROR = __dependency25__.FROZEN_ERROR;
+
+    Ember.DeferredMixin = __dependency28__["default"];
+
+    Ember.MutableEnumerable = __dependency29__["default"];
+    Ember.MutableArray = __dependency30__["default"];
+
+    Ember.TargetActionSupport = __dependency31__["default"];
+    Ember.Evented = __dependency32__["default"];
+
+    Ember.PromiseProxyMixin = __dependency33__["default"];
+
+    Ember.Observable = __dependency26__["default"];
+
+    Ember.arrayComputed = __dependency35__.arrayComputed;
+    Ember.ArrayComputedProperty = __dependency35__.ArrayComputedProperty;
+    Ember.reduceComputed = __dependency36__.reduceComputed;
+    Ember.ReduceComputedProperty = __dependency36__.ReduceComputedProperty;
+
+    // ES6TODO: this seems a less than ideal way/place to add properties to Ember.computed
+    var EmComputed = Ember.computed;
+
+    EmComputed.sum = __dependency37__.sum;
+    EmComputed.min = __dependency37__.min;
+    EmComputed.max = __dependency37__.max;
+    EmComputed.map = __dependency37__.map;
+    EmComputed.sort = __dependency37__.sort;
+    EmComputed.setDiff = __dependency37__.setDiff;
+    EmComputed.mapBy = __dependency37__.mapBy;
+    EmComputed.mapProperty = __dependency37__.mapProperty;
+    EmComputed.filter = __dependency37__.filter;
+    EmComputed.filterBy = __dependency37__.filterBy;
+    EmComputed.filterProperty = __dependency37__.filterProperty;
+    EmComputed.uniq = __dependency37__.uniq;
+    EmComputed.union = __dependency37__.union;
+    EmComputed.intersect = __dependency37__.intersect;
+
+    Ember.String = __dependency18__["default"];
+    Ember.Object = __dependency7__["default"];
+    Ember.TrackedArray = __dependency8__["default"];
+    Ember.SubArray = __dependency9__["default"];
+    Ember.Container = __dependency10__["default"];
+    Ember.Namespace = __dependency6__["default"];
+    Ember.Application = __dependency11__["default"];
+    Ember.Enumerable = __dependency24__["default"];
+    Ember.ArrayProxy = __dependency12__["default"];
+    Ember.ObjectProxy = __dependency13__["default"];
+    Ember.ActionHandler = __dependency27__["default"];
+    Ember.CoreObject = __dependency14__["default"];
+    Ember.EachArray = __dependency15__.EachArray;
+    Ember.EachProxy = __dependency15__.EachProxy;
+    Ember.NativeArray = __dependency16__["default"];
+    // ES6TODO: Currently we must rely on the global from ember-metal/core to avoid circular deps
+    // Ember.A = A;
+    Ember.Set = __dependency17__["default"];
+    Ember.Deferred = __dependency19__["default"];
+    Ember.onLoad = __dependency20__.onLoad;
+    Ember.runLoadHooks = __dependency20__.runLoadHooks;
+
+    Ember.ArrayController = __dependency38__["default"];
+    Ember.ObjectController = __dependency39__["default"];
+    Ember.Controller = __dependency40__.Controller;
+    Ember.ControllerMixin = __dependency40__.ControllerMixin;
+
+    Ember.RSVP = __dependency41__["default"];
+    // END EXPORTS
+
+    __exports__["default"] = Ember;
+  });
+define("ember-runtime/mixins/action_handler",
+  ["ember-metal/merge","ember-metal/mixin","ember-metal/property_get","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var merge = __dependency1__["default"];
+    var Mixin = __dependency2__.Mixin;
+    var get = __dependency3__.get;
+    var typeOf = __dependency4__.typeOf;
+
+    /**
+      The `Ember.ActionHandler` mixin implements support for moving an `actions`
+      property to an `_actions` property at extend time, and adding `_actions`
+      to the object's mergedProperties list.
+
+      `Ember.ActionHandler` is available on some familiar classes including
+      `Ember.Route`, `Ember.View`, `Ember.Component`, and controllers such as
+      `Ember.Controller` and `Ember.ObjectController`.
+      (Internally the mixin is used by `Ember.CoreView`, `Ember.ControllerMixin`,
+      and `Ember.Route` and available to the above classes through
+      inheritance.)
+
+      @class ActionHandler
+      @namespace Ember
+    */
+    var ActionHandler = Mixin.create({
+      mergedProperties: ['_actions'],
+
+      /**
+        The collection of functions, keyed by name, available on this
+        `ActionHandler` as action targets.
+
+        These functions will be invoked when a matching `{{action}}` is triggered
+        from within a template and the application's current route is this route.
+
+        Actions can also be invoked from other parts of your application
+        via `ActionHandler#send`.
+
+        The `actions` hash will inherit action handlers from
+        the `actions` hash defined on extended parent classes
+        or mixins rather than just replace the entire hash, e.g.:
+
+        ```js
+        App.CanDisplayBanner = Ember.Mixin.create({
+          actions: {
+            displayBanner: function(msg) {
+              // ...
+            }
+          }
+        });
+
+        App.WelcomeRoute = Ember.Route.extend(App.CanDisplayBanner, {
+          actions: {
+            playMusic: function() {
+              // ...
+            }
+          }
+        });
+
+        // `WelcomeRoute`, when active, will be able to respond
+        // to both actions, since the actions hash is merged rather
+        // then replaced when extending mixins / parent classes.
+        this.send('displayBanner');
+        this.send('playMusic');
+        ```
+
+        Within a Controller, Route, View or Component's action handler,
+        the value of the `this` context is the Controller, Route, View or
+        Component object:
+
+        ```js
+        App.SongRoute = Ember.Route.extend({
+          actions: {
+            myAction: function() {
+              this.controllerFor("song");
+              this.transitionTo("other.route");
+              ...
+            }
+          }
+        });
+        ```
+
+        It is also possible to call `this._super()` from within an
+        action handler if it overrides a handler defined on a parent
+        class or mixin:
+
+        Take for example the following routes:
+
+        ```js
+        App.DebugRoute = Ember.Mixin.create({
+          actions: {
+            debugRouteInformation: function() {
+              console.debug("trololo");
+            }
+          }
+        });
+
+        App.AnnoyingDebugRoute = Ember.Route.extend(App.DebugRoute, {
+          actions: {
+            debugRouteInformation: function() {
+              // also call the debugRouteInformation of mixed in App.DebugRoute
+              this._super();
+
+              // show additional annoyance
+              window.alert(...);
+            }
+          }
+        });
+        ```
+
+        ## Bubbling
+
+        By default, an action will stop bubbling once a handler defined
+        on the `actions` hash handles it. To continue bubbling the action,
+        you must return `true` from the handler:
+
+        ```js
+        App.Router.map(function() {
+          this.resource("album", function() {
+            this.route("song");
+          });
+        });
+
+        App.AlbumRoute = Ember.Route.extend({
+          actions: {
+            startPlaying: function() {
+            }
+          }
+        });
+
+        App.AlbumSongRoute = Ember.Route.extend({
+          actions: {
+            startPlaying: function() {
+              // ...
+
+              if (actionShouldAlsoBeTriggeredOnParentRoute) {
+                return true;
+              }
+            }
+          }
+        });
+        ```
+
+        @property actions
+        @type Hash
+        @default null
+      */
+
+      /**
+        Moves `actions` to `_actions` at extend time. Note that this currently
+        modifies the mixin themselves, which is technically dubious but
+        is practically of little consequence. This may change in the future.
+
+        @private
+        @method willMergeMixin
+      */
+      willMergeMixin: function(props) {
+        var hashName;
+
+        if (!props._actions) {
+          Ember.assert("'actions' should not be a function", typeof(props.actions) !== 'function');
+
+          if (typeOf(props.actions) === 'object') {
+            hashName = 'actions';
+          } else if (typeOf(props.events) === 'object') {
+            Ember.deprecate('Action handlers contained in an `events` object are deprecated in favor of putting them in an `actions` object', false);
+            hashName = 'events';
+          }
+
+          if (hashName) {
+            props._actions = merge(props._actions || {}, props[hashName]);
+          }
+
+          delete props[hashName];
+        }
+      },
+
+      /**
+        Triggers a named action on the `ActionHandler`. Any parameters
+        supplied after the `actionName` string will be passed as arguments
+        to the action target function.
+
+        If the `ActionHandler` has its `target` property set, actions may
+        bubble to the `target`. Bubbling happens when an `actionName` can
+        not be found in the `ActionHandler`'s `actions` hash or if the
+        action target function returns `true`.
+
+        Example
+
+        ```js
+        App.WelcomeRoute = Ember.Route.extend({
+          actions: {
+            playTheme: function() {
+               this.send('playMusic', 'theme.mp3');
+            },
+            playMusic: function(track) {
+              // ...
+            }
+          }
+        });
+        ```
+
+        @method send
+        @param {String} actionName The action to trigger
+        @param {*} context a context to send with the action
+      */
+      send: function(actionName) {
+        var args = [].slice.call(arguments, 1), target;
+
+        if (this._actions && this._actions[actionName]) {
+          if (this._actions[actionName].apply(this, args) === true) {
+            // handler returned true, so this action will bubble
+          } else {
+            return;
+          }
+        } else if (!Ember.FEATURES.isEnabled('ember-routing-drop-deprecated-action-style') && this.deprecatedSend && this.deprecatedSendHandles && this.deprecatedSendHandles(actionName)) {
+          Ember.warn("The current default is deprecated but will prefer to handle actions directly on the controller instead of a similarly named action in the actions hash. To turn off this deprecated feature set: Ember.FEATURES['ember-routing-drop-deprecated-action-style'] = true");
+          if (this.deprecatedSend.apply(this, [].slice.call(arguments)) === true) {
+            // handler return true, so this action will bubble
+          } else {
+            return;
+          }
+        }
+
+        if (target = get(this, 'target')) {
+          Ember.assert("The `target` for " + this + " (" + target + ") does not have a `send` method", typeof target.send === 'function');
+          target.send.apply(target, arguments);
+        }
+      }
+    });
+
+    __exports__["default"] = ActionHandler;
+  });
+define("ember-runtime/mixins/array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    // ..........................................................
+    // HELPERS
+    //
+    var Ember = __dependency1__["default"];
+    // ES6TODO: Ember.A
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var computed = __dependency4__.computed;
+    var cacheFor = __dependency4__.cacheFor;
+    var isNone = __dependency5__.isNone;
+    var none = __dependency5__.none;
+    var Enumerable = __dependency6__["default"];
+    var EnumerableUtils = __dependency7__["default"];
+    var Mixin = __dependency8__.Mixin;
+    var required = __dependency8__.required;
+    var propertyWillChange = __dependency9__.propertyWillChange;
+    var propertyDidChange = __dependency9__.propertyDidChange;
+    var addListener = __dependency10__.addListener;
+    var removeListener = __dependency10__.removeListener;
+    var sendEvent = __dependency10__.sendEvent;
+    var hasListeners = __dependency10__.hasListeners;
+    var isWatching = __dependency11__.isWatching;
+
+    var map = EnumerableUtils.map;
+
+    // ..........................................................
+    // ARRAY
+    //
+    /**
+      This mixin implements Observer-friendly Array-like behavior. It is not a
+      concrete implementation, but it can be used up by other classes that want
+      to appear like arrays.
+
+      For example, ArrayProxy and ArrayController are both concrete classes that can
+      be instantiated to implement array-like behavior. Both of these classes use
+      the Array Mixin by way of the MutableArray mixin, which allows observable
+      changes to be made to the underlying array.
+
+      Unlike `Ember.Enumerable,` this mixin defines methods specifically for
+      collections that provide index-ordered access to their contents. When you
+      are designing code that needs to accept any kind of Array-like object, you
+      should use these methods instead of Array primitives because these will
+      properly notify observers of changes to the array.
+
+      Although these methods are efficient, they do add a layer of indirection to
+      your application so it is a good idea to use them only when you need the
+      flexibility of using both true JavaScript arrays and "virtual" arrays such
+      as controllers and collections.
+
+      You can use the methods defined in this module to access and modify array
+      contents in a KVO-friendly way. You can also be notified whenever the
+      membership of an array changes by using `.observes('myArray.[]')`.
+
+      To support `Ember.Array` in your own class, you must override two
+      primitives to use it: `replace()` and `objectAt()`.
+
+      Note that the Ember.Array mixin also incorporates the `Ember.Enumerable`
+      mixin. All `Ember.Array`-like objects are also enumerable.
+
+      @class Array
+      @namespace Ember
+      @uses Ember.Enumerable
+      @since Ember 0.9.0
+    */
+    var EmberArray = Mixin.create(Enumerable, {
+
+      /**
+        Your array must support the `length` property. Your replace methods should
+        set this property whenever it changes.
+
+        @property {Number} length
+      */
+      length: required(),
+
+      /**
+        Returns the object at the given `index`. If the given `index` is negative
+        or is greater or equal than the array length, returns `undefined`.
+
+        This is one of the primitives you must implement to support `Ember.Array`.
+        If your object supports retrieving the value of an array item using `get()`
+        (i.e. `myArray.get(0)`), then you do not need to implement this method
+        yourself.
+
+        ```javascript
+        var arr = ['a', 'b', 'c', 'd'];
+        arr.objectAt(0);   // "a"
+        arr.objectAt(3);   // "d"
+        arr.objectAt(-1);  // undefined
+        arr.objectAt(4);   // undefined
+        arr.objectAt(5);   // undefined
+        ```
+
+        @method objectAt
+        @param {Number} idx The index of the item to return.
+        @return {*} item at index or undefined
+      */
+      objectAt: function(idx) {
+        if ((idx < 0) || (idx >= get(this, 'length'))) return undefined;
+        return get(this, idx);
+      },
+
+      /**
+        This returns the objects at the specified indexes, using `objectAt`.
+
+        ```javascript
+        var arr = ['a', 'b', 'c', 'd'];
+        arr.objectsAt([0, 1, 2]);  // ["a", "b", "c"]
+        arr.objectsAt([2, 3, 4]);  // ["c", "d", undefined]
+        ```
+
+        @method objectsAt
+        @param {Array} indexes An array of indexes of items to return.
+        @return {Array}
+       */
+      objectsAt: function(indexes) {
+        var self = this;
+        return map(indexes, function(idx) { return self.objectAt(idx); });
+      },
+
+      // overrides Ember.Enumerable version
+      nextObject: function(idx) {
+        return this.objectAt(idx);
+      },
+
+      /**
+        This is the handler for the special array content property. If you get
+        this property, it will return this. If you set this property it a new
+        array, it will replace the current content.
+
+        This property overrides the default property defined in `Ember.Enumerable`.
+
+        @property []
+        @return this
+      */
+      '[]': computed(function(key, value) {
+        if (value !== undefined) this.replace(0, get(this, 'length'), value) ;
+        return this ;
+      }),
+
+      firstObject: computed(function() {
+        return this.objectAt(0);
+      }),
+
+      lastObject: computed(function() {
+        return this.objectAt(get(this, 'length')-1);
+      }),
+
+      // optimized version from Enumerable
+      contains: function(obj) {
+        return this.indexOf(obj) >= 0;
+      },
+
+      // Add any extra methods to Ember.Array that are native to the built-in Array.
+      /**
+        Returns a new array that is a slice of the receiver. This implementation
+        uses the observable array methods to retrieve the objects for the new
+        slice.
+
+        ```javascript
+        var arr = ['red', 'green', 'blue'];
+        arr.slice(0);       // ['red', 'green', 'blue']
+        arr.slice(0, 2);    // ['red', 'green']
+        arr.slice(1, 100);  // ['green', 'blue']
+        ```
+
+        @method slice
+        @param {Integer} beginIndex (Optional) index to begin slicing from.
+        @param {Integer} endIndex (Optional) index to end the slice at (but not included).
+        @return {Array} New array with specified slice
+      */
+      slice: function(beginIndex, endIndex) {
+        var ret = Ember.A();
+        var length = get(this, 'length') ;
+        if (isNone(beginIndex)) beginIndex = 0 ;
+        if (isNone(endIndex) || (endIndex > length)) endIndex = length ;
+
+        if (beginIndex < 0) beginIndex = length + beginIndex;
+        if (endIndex < 0) endIndex = length + endIndex;
+
+        while(beginIndex < endIndex) {
+          ret[ret.length] = this.objectAt(beginIndex++) ;
+        }
+        return ret ;
+      },
+
+      /**
+        Returns the index of the given object's first occurrence.
+        If no `startAt` argument is given, the starting location to
+        search is 0. If it's negative, will count backward from
+        the end of the array. Returns -1 if no match is found.
+
+        ```javascript
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.indexOf("a");       //  0
+        arr.indexOf("z");       // -1
+        arr.indexOf("a", 2);    //  4
+        arr.indexOf("a", -1);   //  4
+        arr.indexOf("b", 3);    // -1
+        arr.indexOf("a", 100);  // -1
+        ```
+
+        @method indexOf
+        @param {Object} object the item to search for
+        @param {Number} startAt optional starting location to search, default 0
+        @return {Number} index or -1 if not found
+      */
+      indexOf: function(object, startAt) {
+        var idx, len = get(this, 'length');
+
+        if (startAt === undefined) startAt = 0;
+        if (startAt < 0) startAt += len;
+
+        for(idx = startAt; idx < len; idx++) {
+          if (this.objectAt(idx) === object) return idx;
+        }
+        return -1;
+      },
+
+      /**
+        Returns the index of the given object's last occurrence.
+        If no `startAt` argument is given, the search starts from
+        the last position. If it's negative, will count backward
+        from the end of the array. Returns -1 if no match is found.
+
+        ```javascript
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.lastIndexOf("a");       //  4
+        arr.lastIndexOf("z");       // -1
+        arr.lastIndexOf("a", 2);    //  0
+        arr.lastIndexOf("a", -1);   //  4
+        arr.lastIndexOf("b", 3);    //  1
+        arr.lastIndexOf("a", 100);  //  4
+        ```
+
+        @method lastIndexOf
+        @param {Object} object the item to search for
+        @param {Number} startAt optional starting location to search, default 0
+        @return {Number} index or -1 if not found
+      */
+      lastIndexOf: function(object, startAt) {
+        var idx, len = get(this, 'length');
+
+        if (startAt === undefined || startAt >= len) startAt = len-1;
+        if (startAt < 0) startAt += len;
+
+        for(idx = startAt; idx >= 0; idx--) {
+          if (this.objectAt(idx) === object) return idx;
+        }
+        return -1;
+      },
+
+      // ..........................................................
+      // ARRAY OBSERVERS
+      //
+
+      /**
+        Adds an array observer to the receiving array. The array observer object
+        normally must implement two methods:
+
+        * `arrayWillChange(observedObj, start, removeCount, addCount)` - This method will be
+          called just before the array is modified.
+        * `arrayDidChange(observedObj, start, removeCount, addCount)` - This method will be
+          called just after the array is modified.
+
+        Both callbacks will be passed the observed object, starting index of the
+        change as well a a count of the items to be removed and added. You can use
+        these callbacks to optionally inspect the array during the change, clear
+        caches, or do any other bookkeeping necessary.
+
+        In addition to passing a target, you can also include an options hash
+        which you can use to override the method names that will be invoked on the
+        target.
+
+        @method addArrayObserver
+        @param {Object} target The observer object.
+        @param {Hash} opts Optional hash of configuration options including
+          `willChange` and `didChange` option.
+        @return {Ember.Array} receiver
+      */
+      addArrayObserver: function(target, opts) {
+        var willChange = (opts && opts.willChange) || 'arrayWillChange',
+            didChange  = (opts && opts.didChange) || 'arrayDidChange';
+
+        var hasObservers = get(this, 'hasArrayObservers');
+        if (!hasObservers) propertyWillChange(this, 'hasArrayObservers');
+        addListener(this, '@array:before', target, willChange);
+        addListener(this, '@array:change', target, didChange);
+        if (!hasObservers) propertyDidChange(this, 'hasArrayObservers');
+        return this;
+      },
+
+      /**
+        Removes an array observer from the object if the observer is current
+        registered. Calling this method multiple times with the same object will
+        have no effect.
+
+        @method removeArrayObserver
+        @param {Object} target The object observing the array.
+        @param {Hash} opts Optional hash of configuration options including
+          `willChange` and `didChange` option.
+        @return {Ember.Array} receiver
+      */
+      removeArrayObserver: function(target, opts) {
+        var willChange = (opts && opts.willChange) || 'arrayWillChange',
+            didChange  = (opts && opts.didChange) || 'arrayDidChange';
+
+        var hasObservers = get(this, 'hasArrayObservers');
+        if (hasObservers) propertyWillChange(this, 'hasArrayObservers');
+        removeListener(this, '@array:before', target, willChange);
+        removeListener(this, '@array:change', target, didChange);
+        if (hasObservers) propertyDidChange(this, 'hasArrayObservers');
+        return this;
+      },
+
+      /**
+        Becomes true whenever the array currently has observers watching changes
+        on the array.
+
+        @property {Boolean} hasArrayObservers
+      */
+      hasArrayObservers: computed(function() {
+        return hasListeners(this, '@array:change') || hasListeners(this, '@array:before');
+      }),
+
+      /**
+        If you are implementing an object that supports `Ember.Array`, call this
+        method just before the array content changes to notify any observers and
+        invalidate any related properties. Pass the starting index of the change
+        as well as a delta of the amounts to change.
+
+        @method arrayContentWillChange
+        @param {Number} startIdx The starting index in the array that will change.
+        @param {Number} removeAmt The number of items that will be removed. If you
+          pass `null` assumes 0
+        @param {Number} addAmt The number of items that will be added. If you
+          pass `null` assumes 0.
+        @return {Ember.Array} receiver
+      */
+      arrayContentWillChange: function(startIdx, removeAmt, addAmt) {
+
+        // if no args are passed assume everything changes
+        if (startIdx===undefined) {
+          startIdx = 0;
+          removeAmt = addAmt = -1;
+        } else {
+          if (removeAmt === undefined) removeAmt=-1;
+          if (addAmt    === undefined) addAmt=-1;
+        }
+
+        // Make sure the @each proxy is set up if anyone is observing @each
+        if (isWatching(this, '@each')) { get(this, '@each'); }
+
+        sendEvent(this, '@array:before', [this, startIdx, removeAmt, addAmt]);
+
+        var removing, lim;
+        if (startIdx>=0 && removeAmt>=0 && get(this, 'hasEnumerableObservers')) {
+          removing = [];
+          lim = startIdx+removeAmt;
+          for(var idx=startIdx;idx<lim;idx++) removing.push(this.objectAt(idx));
+        } else {
+          removing = removeAmt;
+        }
+
+        this.enumerableContentWillChange(removing, addAmt);
+
+        return this;
+      },
+
+      /**
+        If you are implementing an object that supports `Ember.Array`, call this
+        method just after the array content changes to notify any observers and
+        invalidate any related properties. Pass the starting index of the change
+        as well as a delta of the amounts to change.
+
+        @method arrayContentDidChange
+        @param {Number} startIdx The starting index in the array that did change.
+        @param {Number} removeAmt The number of items that were removed. If you
+          pass `null` assumes 0
+        @param {Number} addAmt The number of items that were added. If you
+          pass `null` assumes 0.
+        @return {Ember.Array} receiver
+      */
+      arrayContentDidChange: function(startIdx, removeAmt, addAmt) {
+
+        // if no args are passed assume everything changes
+        if (startIdx===undefined) {
+          startIdx = 0;
+          removeAmt = addAmt = -1;
+        } else {
+          if (removeAmt === undefined) removeAmt=-1;
+          if (addAmt    === undefined) addAmt=-1;
+        }
+
+        var adding, lim;
+        if (startIdx>=0 && addAmt>=0 && get(this, 'hasEnumerableObservers')) {
+          adding = [];
+          lim = startIdx+addAmt;
+          for(var idx=startIdx;idx<lim;idx++) adding.push(this.objectAt(idx));
+        } else {
+          adding = addAmt;
+        }
+
+        this.enumerableContentDidChange(removeAmt, adding);
+        sendEvent(this, '@array:change', [this, startIdx, removeAmt, addAmt]);
+
+        var length      = get(this, 'length'),
+            cachedFirst = cacheFor(this, 'firstObject'),
+            cachedLast  = cacheFor(this, 'lastObject');
+        if (this.objectAt(0) !== cachedFirst) {
+          propertyWillChange(this, 'firstObject');
+          propertyDidChange(this, 'firstObject');
+        }
+        if (this.objectAt(length-1) !== cachedLast) {
+          propertyWillChange(this, 'lastObject');
+          propertyDidChange(this, 'lastObject');
+        }
+
+        return this;
+      },
+
+      // ..........................................................
+      // ENUMERATED PROPERTIES
+      //
+
+      /**
+        Returns a special object that can be used to observe individual properties
+        on the array. Just get an equivalent property on this object and it will
+        return an enumerable that maps automatically to the named key on the
+        member objects.
+
+        If you merely want to watch for any items being added or removed to the array,
+        use the `[]` property instead of `@each`.
+
+        @property @each
+      */
+      '@each': computed(function() {
+        if (!this.__each) {
+          // ES6TODO: GRRRRR
+          var EachProxy = requireModule('ember-runtime/system/each_proxy')['EachProxy'];
+
+          this.__each = new EachProxy(this);
+        }
+
+        return this.__each;
+      })
+
+    });
+
+    __exports__["default"] = EmberArray;
+  });
+define("ember-runtime/mixins/comparable",
+  ["ember-metal/mixin","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Mixin = __dependency1__.Mixin;
+    var required = __dependency1__.required;
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+
+    /**
+      Implements some standard methods for comparing objects. Add this mixin to
+      any class you create that can compare its instances.
+
+      You should implement the `compare()` method.
+
+      @class Comparable
+      @namespace Ember
+      @since Ember 0.9
+    */
+    var Comparable = Mixin.create({
+
+      /**
+        Override to return the result of the comparison of the two parameters. The
+        compare method should return:
+
+        - `-1` if `a < b`
+        - `0` if `a == b`
+        - `1` if `a > b`
+
+        Default implementation raises an exception.
+
+        @method compare
+        @param a {Object} the first object to compare
+        @param b {Object} the second object to compare
+        @return {Integer} the result of the comparison
+      */
+      compare: required(Function)
+
+    });
+
+    __exports__["default"] = Comparable;
+  });
+define("ember-runtime/mixins/copyable",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/freezable","ember-runtime/system/string","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var required = __dependency3__.required;
+    var Freezable = __dependency4__.Freezable;
+    var Mixin = __dependency3__.Mixin;
+    var fmt = __dependency5__.fmt;
+    var EmberError = __dependency6__["default"];
+
+
+    /**
+      Implements some standard methods for copying an object. Add this mixin to
+      any object you create that can create a copy of itself. This mixin is
+      added automatically to the built-in array.
+
+      You should generally implement the `copy()` method to return a copy of the
+      receiver.
+
+      Note that `frozenCopy()` will only work if you also implement
+      `Ember.Freezable`.
+
+      @class Copyable
+      @namespace Ember
+      @since Ember 0.9
+    */
+    var Copyable = Mixin.create({
+
+      /**
+        Override to return a copy of the receiver. Default implementation raises
+        an exception.
+
+        @method copy
+        @param {Boolean} deep if `true`, a deep copy of the object should be made
+        @return {Object} copy of receiver
+      */
+      copy: required(Function),
+
+      /**
+        If the object implements `Ember.Freezable`, then this will return a new
+        copy if the object is not frozen and the receiver if the object is frozen.
+
+        Raises an exception if you try to call this method on a object that does
+        not support freezing.
+
+        You should use this method whenever you want a copy of a freezable object
+        since a freezable object can simply return itself without actually
+        consuming more memory.
+
+        @method frozenCopy
+        @return {Object} copy of receiver or receiver
+      */
+      frozenCopy: function() {
+        if (Freezable && Freezable.detect(this)) {
+          return get(this, 'isFrozen') ? this : this.copy().freeze();
+        } else {
+          throw new EmberError(fmt("%@ does not support freezing", [this]));
+        }
+      }
+    });
+
+    __exports__["default"] = Copyable;
+  });
+define("ember-runtime/mixins/deferred",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-metal/run_loop","ember-runtime/ext/rsvp","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.FEATURES, Ember.Test
+    var get = __dependency2__.get;
+    var Mixin = __dependency3__.Mixin;
+    var computed = __dependency4__.computed;
+    var run = __dependency5__["default"];
+    var RSVP = __dependency6__["default"];
+
+    var asyncStart = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncStart();
+      }
+    };
+
+    var asyncEnd = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncEnd();
+      }
+    };
+
+    RSVP.configure('async', function(callback, promise) {
+      var async = !run.currentRunLoop;
+
+      if (Ember.testing && async) { asyncStart(); }
+
+      run.backburner.schedule('actions', function(){
+        if (Ember.testing && async) { asyncEnd(); }
+        callback(promise);
+      });
+    });
+
+    RSVP.Promise.prototype.fail = function(callback, label){
+      Ember.deprecate('RSVP.Promise.fail has been renamed as RSVP.Promise.catch');
+      return this['catch'](callback, label);
+    };
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+
+    /**
+      @class Deferred
+      @namespace Ember
+     */
+    var DeferredMixin = Mixin.create({
+      /**
+        Add handlers to be called when the Deferred object is resolved or rejected.
+
+        @method then
+        @param {Function} resolve a callback function to be called when done
+        @param {Function} reject  a callback function to be called when failed
+      */
+      then: function(resolve, reject, label) {
+        var deferred, promise, entity;
+
+        entity = this;
+        deferred = get(this, '_deferred');
+        promise = deferred.promise;
+
+        function fulfillmentHandler(fulfillment) {
+          if (fulfillment === promise) {
+            return resolve(entity);
+          } else {
+            return resolve(fulfillment);
+          }
+        }
+
+        return promise.then(resolve && fulfillmentHandler, reject, label);
+      },
+
+      /**
+        Resolve a Deferred object and call any `doneCallbacks` with the given args.
+
+        @method resolve
+      */
+      resolve: function(value) {
+        var deferred, promise;
+
+        deferred = get(this, '_deferred');
+        promise = deferred.promise;
+
+        if (value === this) {
+          deferred.resolve(promise);
+        } else {
+          deferred.resolve(value);
+        }
+      },
+
+      /**
+        Reject a Deferred object and call any `failCallbacks` with the given args.
+
+        @method reject
+      */
+      reject: function(value) {
+        get(this, '_deferred').reject(value);
+      },
+
+      _deferred: computed(function() {
+        return RSVP.defer('Ember: DeferredMixin - ' + this);
+      })
+    });
+
+    __exports__["default"] = DeferredMixin;
+  });
+define("ember-runtime/mixins/enumerable",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/property_events","ember-metal/events","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    // ..........................................................
+    // HELPERS
+    //
+
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var apply = __dependency4__.apply;
+    var Mixin = __dependency5__.Mixin;
+    var required = __dependency5__.required;
+    var aliasMethod = __dependency5__.aliasMethod;
+    var EnumerableUtils = __dependency6__["default"];
+    var computed = __dependency7__.computed;
+    var propertyWillChange = __dependency8__.propertyWillChange;
+    var propertyDidChange = __dependency8__.propertyDidChange;
+    var addListener = __dependency9__.addListener;
+    var removeListener = __dependency9__.removeListener;
+    var sendEvent = __dependency9__.sendEvent;
+    var hasListeners = __dependency9__.hasListeners;
+    var compare = __dependency10__["default"];
+
+    var a_slice = Array.prototype.slice;
+    var a_indexOf = EnumerableUtils.indexOf;
+
+    var contexts = [];
+
+    function popCtx() {
+      return contexts.length===0 ? {} : contexts.pop();
+    }
+
+    function pushCtx(ctx) {
+      contexts.push(ctx);
+      return null;
+    }
+
+    function iter(key, value) {
+      var valueProvided = arguments.length === 2;
+
+      function i(item) {
+        var cur = get(item, key);
+        return valueProvided ? value===cur : !!cur;
+      }
+      return i ;
+    }
+
+    /**
+      This mixin defines the common interface implemented by enumerable objects
+      in Ember. Most of these methods follow the standard Array iteration
+      API defined up to JavaScript 1.8 (excluding language-specific features that
+      cannot be emulated in older versions of JavaScript).
+
+      This mixin is applied automatically to the Array class on page load, so you
+      can use any of these methods on simple arrays. If Array already implements
+      one of these methods, the mixin will not override them.
+
+      ## Writing Your Own Enumerable
+
+      To make your own custom class enumerable, you need two items:
+
+      1. You must have a length property. This property should change whenever
+         the number of items in your enumerable object changes. If you use this
+         with an `Ember.Object` subclass, you should be sure to change the length
+         property using `set().`
+
+      2. You must implement `nextObject().` See documentation.
+
+      Once you have these two methods implemented, apply the `Ember.Enumerable` mixin
+      to your class and you will be able to enumerate the contents of your object
+      like any other collection.
+
+      ## Using Ember Enumeration with Other Libraries
+
+      Many other libraries provide some kind of iterator or enumeration like
+      facility. This is often where the most common API conflicts occur.
+      Ember's API is designed to be as friendly as possible with other
+      libraries by implementing only methods that mostly correspond to the
+      JavaScript 1.8 API.
+
+      @class Enumerable
+      @namespace Ember
+      @since Ember 0.9
+    */
+    var Enumerable = Mixin.create({
+
+      /**
+        Implement this method to make your class enumerable.
+
+        This method will be call repeatedly during enumeration. The index value
+        will always begin with 0 and increment monotonically. You don't have to
+        rely on the index value to determine what object to return, but you should
+        always check the value and start from the beginning when you see the
+        requested index is 0.
+
+        The `previousObject` is the object that was returned from the last call
+        to `nextObject` for the current iteration. This is a useful way to
+        manage iteration if you are tracing a linked list, for example.
+
+        Finally the context parameter will always contain a hash you can use as
+        a "scratchpad" to maintain any other state you need in order to iterate
+        properly. The context object is reused and is not reset between
+        iterations so make sure you setup the context with a fresh state whenever
+        the index parameter is 0.
+
+        Generally iterators will continue to call `nextObject` until the index
+        reaches the your current length-1. If you run out of data before this
+        time for some reason, you should simply return undefined.
+
+        The default implementation of this method simply looks up the index.
+        This works great on any Array-like objects.
+
+        @method nextObject
+        @param {Number} index the current index of the iteration
+        @param {Object} previousObject the value returned by the last call to
+          `nextObject`.
+        @param {Object} context a context object you can use to maintain state.
+        @return {Object} the next object in the iteration or undefined
+      */
+      nextObject: required(Function),
+
+      /**
+        Helper method returns the first object from a collection. This is usually
+        used by bindings and other parts of the framework to extract a single
+        object if the enumerable contains only one item.
+
+        If you override this method, you should implement it so that it will
+        always return the same value each time it is called. If your enumerable
+        contains only one object, this method should always return that object.
+        If your enumerable is empty, this method should return `undefined`.
+
+        ```javascript
+        var arr = ["a", "b", "c"];
+        arr.get('firstObject');  // "a"
+
+        var arr = [];
+        arr.get('firstObject');  // undefined
+        ```
+
+        @property firstObject
+        @return {Object} the object or undefined
+      */
+      firstObject: computed(function() {
+        if (get(this, 'length')===0) return undefined ;
+
+        // handle generic enumerables
+        var context = popCtx(), ret;
+        ret = this.nextObject(0, null, context);
+        pushCtx(context);
+        return ret ;
+      }).property('[]'),
+
+      /**
+        Helper method returns the last object from a collection. If your enumerable
+        contains only one object, this method should always return that object.
+        If your enumerable is empty, this method should return `undefined`.
+
+        ```javascript
+        var arr = ["a", "b", "c"];
+        arr.get('lastObject');  // "c"
+
+        var arr = [];
+        arr.get('lastObject');  // undefined
+        ```
+
+        @property lastObject
+        @return {Object} the last object or undefined
+      */
+      lastObject: computed(function() {
+        var len = get(this, 'length');
+        if (len===0) return undefined ;
+        var context = popCtx(), idx=0, cur, last = null;
+        do {
+          last = cur;
+          cur = this.nextObject(idx++, last, context);
+        } while (cur !== undefined);
+        pushCtx(context);
+        return last;
+      }).property('[]'),
+
+      /**
+        Returns `true` if the passed object can be found in the receiver. The
+        default version will iterate through the enumerable until the object
+        is found. You may want to override this with a more efficient version.
+
+        ```javascript
+        var arr = ["a", "b", "c"];
+        arr.contains("a"); // true
+        arr.contains("z"); // false
+        ```
+
+        @method contains
+        @param {Object} obj The object to search for.
+        @return {Boolean} `true` if object is found in enumerable.
+      */
+      contains: function(obj) {
+        return this.find(function(item) { return item===obj; }) !== undefined;
+      },
+
+      /**
+        Iterates through the enumerable, calling the passed function on each
+        item. This method corresponds to the `forEach()` method defined in
+        JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method forEach
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Object} receiver
+      */
+      forEach: function(callback, target) {
+        if (typeof callback !== "function") throw new TypeError() ;
+        var len = get(this, 'length'), last = null, context = popCtx();
+
+        if (target === undefined) target = null;
+
+        for(var idx=0;idx<len;idx++) {
+          var next = this.nextObject(idx, last, context) ;
+          callback.call(target, next, idx, this);
+          last = next ;
+        }
+        last = null ;
+        context = pushCtx(context);
+        return this ;
+      },
+
+      /**
+        Alias for `mapBy`
+
+        @method getEach
+        @param {String} key name of the property
+        @return {Array} The mapped array.
+      */
+      getEach: function(key) {
+        return this.mapBy(key);
+      },
+
+      /**
+        Sets the value on the named property for each member. This is more
+        efficient than using other methods defined on this helper. If the object
+        implements Ember.Observable, the value will be changed to `set(),` otherwise
+        it will be set directly. `null` objects are skipped.
+
+        @method setEach
+        @param {String} key The key to set
+        @param {Object} value The object to set
+        @return {Object} receiver
+      */
+      setEach: function(key, value) {
+        return this.forEach(function(item) {
+          set(item, key, value);
+        });
+      },
+
+      /**
+        Maps all of the items in the enumeration to another value, returning
+        a new array. This method corresponds to `map()` defined in JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the mapped value.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method map
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Array} The mapped array.
+      */
+      map: function(callback, target) {
+        var ret = Ember.A();
+        this.forEach(function(x, idx, i) {
+          ret[idx] = callback.call(target, x, idx,i);
+        });
+        return ret ;
+      },
+
+      /**
+        Similar to map, this specialized function returns the value of the named
+        property on all items in the enumeration.
+
+        @method mapBy
+        @param {String} key name of the property
+        @return {Array} The mapped array.
+      */
+      mapBy: function(key) {
+        return this.map(function(next) {
+          return get(next, key);
+        });
+      },
+
+      /**
+        Similar to map, this specialized function returns the value of the named
+        property on all items in the enumeration.
+
+        @method mapProperty
+        @param {String} key name of the property
+        @return {Array} The mapped array.
+        @deprecated Use `mapBy` instead
+      */
+
+      mapProperty: aliasMethod('mapBy'),
+
+      /**
+        Returns an array with all of the items in the enumeration that the passed
+        function returns true for. This method corresponds to `filter()` defined in
+        JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` to include the item in the results, `false`
+        otherwise.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method filter
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Array} A filtered array.
+      */
+      filter: function(callback, target) {
+        var ret = Ember.A();
+        this.forEach(function(x, idx, i) {
+          if (callback.call(target, x, idx, i)) ret.push(x);
+        });
+        return ret ;
+      },
+
+      /**
+        Returns an array with all of the items in the enumeration where the passed
+        function returns false for. This method is the inverse of filter().
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - *item* is the current item in the iteration.
+        - *index* is the current index in the iteration
+        - *enumerable* is the enumerable object itself.
+
+        It should return the a falsey value to include the item in the results.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as "this" on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method reject
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Array} A rejected array.
+       */
+      reject: function(callback, target) {
+        return this.filter(function() {
+          return !(apply(target, callback, arguments));
+        });
+      },
+
+      /**
+        Returns an array with just the items with the matched property. You
+        can pass an optional second argument with the target value. Otherwise
+        this will match any property that evaluates to `true`.
+
+        @method filterBy
+        @param {String} key the property to test
+        @param {*} [value] optional value to test against.
+        @return {Array} filtered array
+      */
+      filterBy: function(key, value) {
+        return this.filter(apply(this, iter, arguments));
+      },
+
+      /**
+        Returns an array with just the items with the matched property. You
+        can pass an optional second argument with the target value. Otherwise
+        this will match any property that evaluates to `true`.
+
+        @method filterProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Array} filtered array
+        @deprecated Use `filterBy` instead
+      */
+      filterProperty: aliasMethod('filterBy'),
+
+      /**
+        Returns an array with the items that do not have truthy values for
+        key.  You can pass an optional second argument with the target value.  Otherwise
+        this will match any property that evaluates to false.
+
+        @method rejectBy
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Array} rejected array
+      */
+      rejectBy: function(key, value) {
+        var exactValue = function(item) { return get(item, key) === value; },
+            hasValue = function(item) { return !!get(item, key); },
+            use = (arguments.length === 2 ? exactValue : hasValue);
+
+        return this.reject(use);
+      },
+
+      /**
+        Returns an array with the items that do not have truthy values for
+        key.  You can pass an optional second argument with the target value.  Otherwise
+        this will match any property that evaluates to false.
+
+        @method rejectProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Array} rejected array
+        @deprecated Use `rejectBy` instead
+      */
+      rejectProperty: aliasMethod('rejectBy'),
+
+      /**
+        Returns the first item in the array for which the callback returns true.
+        This method works similar to the `filter()` method defined in JavaScript 1.6
+        except that it will stop working on the array once a match is found.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` to include the item in the results, `false`
+        otherwise.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method find
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Object} Found item or `undefined`.
+      */
+      find: function(callback, target) {
+        var len = get(this, 'length') ;
+        if (target === undefined) target = null;
+
+        var last = null, next, found = false, ret ;
+        var context = popCtx();
+        for(var idx=0;idx<len && !found;idx++) {
+          next = this.nextObject(idx, last, context) ;
+          if (found = callback.call(target, next, idx, this)) ret = next ;
+          last = next ;
+        }
+        next = last = null ;
+        context = pushCtx(context);
+        return ret ;
+      },
+
+      /**
+        Returns the first item with a property matching the passed value. You
+        can pass an optional second argument with the target value. Otherwise
+        this will match any property that evaluates to `true`.
+
+        This method works much like the more generic `find()` method.
+
+        @method findBy
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Object} found item or `undefined`
+      */
+      findBy: function(key, value) {
+        return this.find(apply(this, iter, arguments));
+      },
+
+      /**
+        Returns the first item with a property matching the passed value. You
+        can pass an optional second argument with the target value. Otherwise
+        this will match any property that evaluates to `true`.
+
+        This method works much like the more generic `find()` method.
+
+        @method findProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Object} found item or `undefined`
+        @deprecated Use `findBy` instead
+      */
+      findProperty: aliasMethod('findBy'),
+
+      /**
+        Returns `true` if the passed function returns true for every item in the
+        enumeration. This corresponds with the `every()` method in JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` or `false`.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        Example Usage:
+
+        ```javascript
+        if (people.every(isEngineer)) { Paychecks.addBigBonus(); }
+        ```
+
+        @method every
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Boolean}
+      */
+      every: function(callback, target) {
+        return !this.find(function(x, idx, i) {
+          return !callback.call(target, x, idx, i);
+        });
+      },
+
+      /**
+        @method everyBy
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @deprecated Use `isEvery` instead
+        @return {Boolean}
+      */
+      everyBy: aliasMethod('isEvery'),
+
+      /**
+        @method everyProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @deprecated Use `isEvery` instead
+        @return {Boolean}
+      */
+      everyProperty: aliasMethod('isEvery'),
+
+      /**
+        Returns `true` if the passed property resolves to `true` for all items in
+        the enumerable. This method is often simpler/faster than using a callback.
+
+        @method isEvery
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Boolean}
+        @since 1.3.0
+      */
+      isEvery: function(key, value) {
+        return this.every(apply(this, iter, arguments));
+      },
+
+      /**
+        Returns `true` if the passed function returns true for any item in the
+        enumeration. This corresponds with the `some()` method in JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` to include the item in the results, `false`
+        otherwise.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        Usage Example:
+
+        ```javascript
+        if (people.any(isManager)) { Paychecks.addBiggerBonus(); }
+        ```
+
+        @method any
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Boolean} `true` if the passed function returns `true` for any item
+      */
+      any: function(callback, target) {
+        var len     = get(this, 'length'),
+            context = popCtx(),
+            found   = false,
+            last    = null,
+            next, idx;
+
+        if (target === undefined) { target = null; }
+
+        for (idx = 0; idx < len && !found; idx++) {
+          next  = this.nextObject(idx, last, context);
+          found = callback.call(target, next, idx, this);
+          last  = next;
+        }
+
+        next = last = null;
+        context = pushCtx(context);
+        return found;
+      },
+
+      /**
+        Returns `true` if the passed function returns true for any item in the
+        enumeration. This corresponds with the `some()` method in JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` to include the item in the results, `false`
+        otherwise.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        Usage Example:
+
+        ```javascript
+        if (people.some(isManager)) { Paychecks.addBiggerBonus(); }
+        ```
+
+        @method some
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Boolean} `true` if the passed function returns `true` for any item
+        @deprecated Use `any` instead
+      */
+      some: aliasMethod('any'),
+
+      /**
+        Returns `true` if the passed property resolves to `true` for any item in
+        the enumerable. This method is often simpler/faster than using a callback.
+
+        @method isAny
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Boolean} `true` if the passed function returns `true` for any item
+        @since 1.3.0
+      */
+      isAny: function(key, value) {
+        return this.any(apply(this, iter, arguments));
+      },
+
+      /**
+        @method anyBy
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Boolean} `true` if the passed function returns `true` for any item
+        @deprecated Use `isAny` instead
+      */
+      anyBy: aliasMethod('isAny'),
+
+      /**
+        @method someProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Boolean} `true` if the passed function returns `true` for any item
+        @deprecated Use `isAny` instead
+      */
+      someProperty: aliasMethod('isAny'),
+
+      /**
+        This will combine the values of the enumerator into a single value. It
+        is a useful way to collect a summary value from an enumeration. This
+        corresponds to the `reduce()` method defined in JavaScript 1.8.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(previousValue, item, index, enumerable);
+        ```
+
+        - `previousValue` is the value returned by the last call to the iterator.
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        Return the new cumulative value.
+
+        In addition to the callback you can also pass an `initialValue`. An error
+        will be raised if you do not pass an initial value and the enumerator is
+        empty.
+
+        Note that unlike the other methods, this method does not allow you to
+        pass a target object to set as this for the callback. It's part of the
+        spec. Sorry.
+
+        @method reduce
+        @param {Function} callback The callback to execute
+        @param {Object} initialValue Initial value for the reduce
+        @param {String} reducerProperty internal use only.
+        @return {Object} The reduced value.
+      */
+      reduce: function(callback, initialValue, reducerProperty) {
+        if (typeof callback !== "function") { throw new TypeError(); }
+
+        var ret = initialValue;
+
+        this.forEach(function(item, i) {
+          ret = callback(ret, item, i, this, reducerProperty);
+        }, this);
+
+        return ret;
+      },
+
+      /**
+        Invokes the named method on every object in the receiver that
+        implements it. This method corresponds to the implementation in
+        Prototype 1.6.
+
+        @method invoke
+        @param {String} methodName the name of the method
+        @param {Object...} args optional arguments to pass as well.
+        @return {Array} return values from calling invoke.
+      */
+      invoke: function(methodName) {
+        var args, ret = Ember.A();
+        if (arguments.length>1) args = a_slice.call(arguments, 1);
+
+        this.forEach(function(x, idx) {
+          var method = x && x[methodName];
+          if ('function' === typeof method) {
+            ret[idx] = args ? apply(x, method, args) : x[methodName]();
+          }
+        }, this);
+
+        return ret;
+      },
+
+      /**
+        Simply converts the enumerable into a genuine array. The order is not
+        guaranteed. Corresponds to the method implemented by Prototype.
+
+        @method toArray
+        @return {Array} the enumerable as an array.
+      */
+      toArray: function() {
+        var ret = Ember.A();
+        this.forEach(function(o, idx) { ret[idx] = o; });
+        return ret;
+      },
+
+      /**
+        Returns a copy of the array with all null and undefined elements removed.
+
+        ```javascript
+        var arr = ["a", null, "c", undefined];
+        arr.compact();  // ["a", "c"]
+        ```
+
+        @method compact
+        @return {Array} the array without null and undefined elements.
+      */
+      compact: function() {
+        return this.filter(function(value) { return value != null; });
+      },
+
+      /**
+        Returns a new enumerable that excludes the passed value. The default
+        implementation returns an array regardless of the receiver type unless
+        the receiver does not contain the value.
+
+        ```javascript
+        var arr = ["a", "b", "a", "c"];
+        arr.without("a");  // ["b", "c"]
+        ```
+
+        @method without
+        @param {Object} value
+        @return {Ember.Enumerable}
+      */
+      without: function(value) {
+        if (!this.contains(value)) return this; // nothing to do
+        var ret = Ember.A();
+        this.forEach(function(k) {
+          if (k !== value) ret[ret.length] = k;
+        }) ;
+        return ret ;
+      },
+
+      /**
+        Returns a new enumerable that contains only unique values. The default
+        implementation returns an array regardless of the receiver type.
+
+        ```javascript
+        var arr = ["a", "a", "b", "b"];
+        arr.uniq();  // ["a", "b"]
+        ```
+
+        @method uniq
+        @return {Ember.Enumerable}
+      */
+      uniq: function() {
+        var ret = Ember.A();
+        this.forEach(function(k) {
+          if (a_indexOf(ret, k)<0) ret.push(k);
+        });
+        return ret;
+      },
+
+      /**
+        This property will trigger anytime the enumerable's content changes.
+        You can observe this property to be notified of changes to the enumerables
+        content.
+
+        For plain enumerables, this property is read only. `Array` overrides
+        this method.
+
+        @property []
+        @type Array
+        @return this
+      */
+      '[]': computed(function(key, value) {
+        return this;
+      }),
+
+      // ..........................................................
+      // ENUMERABLE OBSERVERS
+      //
+
+      /**
+        Registers an enumerable observer. Must implement `Ember.EnumerableObserver`
+        mixin.
+
+        @method addEnumerableObserver
+        @param {Object} target
+        @param {Hash} [opts]
+        @return this
+      */
+      addEnumerableObserver: function(target, opts) {
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
+            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
+
+        var hasObservers = get(this, 'hasEnumerableObservers');
+        if (!hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
+        addListener(this, '@enumerable:before', target, willChange);
+        addListener(this, '@enumerable:change', target, didChange);
+        if (!hasObservers) propertyDidChange(this, 'hasEnumerableObservers');
+        return this;
+      },
+
+      /**
+        Removes a registered enumerable observer.
+
+        @method removeEnumerableObserver
+        @param {Object} target
+        @param {Hash} [opts]
+        @return this
+      */
+      removeEnumerableObserver: function(target, opts) {
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
+            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
+
+        var hasObservers = get(this, 'hasEnumerableObservers');
+        if (hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
+        removeListener(this, '@enumerable:before', target, willChange);
+        removeListener(this, '@enumerable:change', target, didChange);
+        if (hasObservers) propertyDidChange(this, 'hasEnumerableObservers');
+        return this;
+      },
+
+      /**
+        Becomes true whenever the array currently has observers watching changes
+        on the array.
+
+        @property hasEnumerableObservers
+        @type Boolean
+      */
+      hasEnumerableObservers: computed(function() {
+        return hasListeners(this, '@enumerable:change') || hasListeners(this, '@enumerable:before');
+      }),
+
+
+      /**
+        Invoke this method just before the contents of your enumerable will
+        change. You can either omit the parameters completely or pass the objects
+        to be removed or added if available or just a count.
+
+        @method enumerableContentWillChange
+        @param {Ember.Enumerable|Number} removing An enumerable of the objects to
+          be removed or the number of items to be removed.
+        @param {Ember.Enumerable|Number} adding An enumerable of the objects to be
+          added or the number of items to be added.
+        @chainable
+      */
+      enumerableContentWillChange: function(removing, adding) {
+
+        var removeCnt, addCnt, hasDelta;
+
+        if ('number' === typeof removing) removeCnt = removing;
+        else if (removing) removeCnt = get(removing, 'length');
+        else removeCnt = removing = -1;
+
+        if ('number' === typeof adding) addCnt = adding;
+        else if (adding) addCnt = get(adding,'length');
+        else addCnt = adding = -1;
+
+        hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
+
+        if (removing === -1) removing = null;
+        if (adding   === -1) adding   = null;
+
+        propertyWillChange(this, '[]');
+        if (hasDelta) propertyWillChange(this, 'length');
+        sendEvent(this, '@enumerable:before', [this, removing, adding]);
+
+        return this;
+      },
+
+      /**
+        Invoke this method when the contents of your enumerable has changed.
+        This will notify any observers watching for content changes. If your are
+        implementing an ordered enumerable (such as an array), also pass the
+        start and end values where the content changed so that it can be used to
+        notify range observers.
+
+        @method enumerableContentDidChange
+        @param {Ember.Enumerable|Number} removing An enumerable of the objects to
+          be removed or the number of items to be removed.
+        @param {Ember.Enumerable|Number} adding  An enumerable of the objects to
+          be added or the number of items to be added.
+        @chainable
+      */
+      enumerableContentDidChange: function(removing, adding) {
+        var removeCnt, addCnt, hasDelta;
+
+        if ('number' === typeof removing) removeCnt = removing;
+        else if (removing) removeCnt = get(removing, 'length');
+        else removeCnt = removing = -1;
+
+        if ('number' === typeof adding) addCnt = adding;
+        else if (adding) addCnt = get(adding, 'length');
+        else addCnt = adding = -1;
+
+        hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
+
+        if (removing === -1) removing = null;
+        if (adding   === -1) adding   = null;
+
+        sendEvent(this, '@enumerable:change', [this, removing, adding]);
+        if (hasDelta) propertyDidChange(this, 'length');
+        propertyDidChange(this, '[]');
+
+        return this ;
+      },
+
+      /**
+        Converts the enumerable into an array and sorts by the keys
+        specified in the argument.
+
+        You may provide multiple arguments to sort by multiple properties.
+
+        @method sortBy
+        @param {String} property name(s) to sort on
+        @return {Array} The sorted array.
+        @since 1.2.0
+        */
+      sortBy: function() {
+        var sortKeys = arguments;
+        return this.toArray().sort(function(a, b){
+          for(var i = 0; i < sortKeys.length; i++) {
+            var key = sortKeys[i],
+            propA = get(a, key),
+            propB = get(b, key);
+            // return 1 or -1 else continue to the next sortKey
+            var compareValue = compare(propA, propB);
+            if (compareValue) { return compareValue; }
+          }
+          return 0;
+        });
+      }
+    });
+
+    __exports__["default"] = Enumerable;
+  });
+define("ember-runtime/mixins/evented",
+  ["ember-metal/mixin","ember-metal/events","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Mixin = __dependency1__.Mixin;
+    var addListener = __dependency2__.addListener;
+    var removeListener = __dependency2__.removeListener;
+    var hasListeners = __dependency2__.hasListeners;
+    var sendEvent = __dependency2__.sendEvent;
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    /**
+      This mixin allows for Ember objects to subscribe to and emit events.
+
+      ```javascript
+      App.Person = Ember.Object.extend(Ember.Evented, {
+        greet: function() {
+          // ...
+          this.trigger('greet');
+        }
+      });
+
+      var person = App.Person.create();
+
+      person.on('greet', function() {
+        console.log('Our person has greeted');
+      });
+
+      person.greet();
+
+      // outputs: 'Our person has greeted'
+      ```
+
+      You can also chain multiple event subscriptions:
+
+      ```javascript
+      person.on('greet', function() {
+        console.log('Our person has greeted');
+      }).one('greet', function() {
+        console.log('Offer one-time special');
+      }).off('event', this, forgetThis);
+      ```
+
+      @class Evented
+      @namespace Ember
+     */
+    var Evented = Mixin.create({
+
+      /**
+       Subscribes to a named event with given function.
+
+       ```javascript
+       person.on('didLoad', function() {
+         // fired once the person has loaded
+       });
+       ```
+
+       An optional target can be passed in as the 2nd argument that will
+       be set as the "this" for the callback. This is a good way to give your
+       function access to the object triggering the event. When the target
+       parameter is used the callback becomes the third argument.
+
+       @method on
+       @param {String} name The name of the event
+       @param {Object} [target] The "this" binding for the callback
+       @param {Function} method The callback to execute
+       @return this
+      */
+      on: function(name, target, method) {
+        addListener(this, name, target, method);
+        return this;
+      },
+
+      /**
+        Subscribes a function to a named event and then cancels the subscription
+        after the first time the event is triggered. It is good to use ``one`` when
+        you only care about the first time an event has taken place.
+
+        This function takes an optional 2nd argument that will become the "this"
+        value for the callback. If this argument is passed then the 3rd argument
+        becomes the function.
+
+        @method one
+        @param {String} name The name of the event
+        @param {Object} [target] The "this" binding for the callback
+        @param {Function} method The callback to execute
+        @return this
+      */
+      one: function(name, target, method) {
+        if (!method) {
+          method = target;
+          target = null;
+        }
+
+        addListener(this, name, target, method, true);
+        return this;
+      },
+
+      /**
+        Triggers a named event for the object. Any additional arguments
+        will be passed as parameters to the functions that are subscribed to the
+        event.
+
+        ```javascript
+        person.on('didEat', function(food) {
+          console.log('person ate some ' + food);
+        });
+
+        person.trigger('didEat', 'broccoli');
+
+        // outputs: person ate some broccoli
+        ```
+        @method trigger
+        @param {String} name The name of the event
+        @param {Object...} args Optional arguments to pass on
+      */
+      trigger: function(name) {
+        var args = [], i, l;
+        for (i = 1, l = arguments.length; i < l; i++) {
+          args.push(arguments[i]);
+        }
+        sendEvent(this, name, args);
+      },
+
+      /**
+        Cancels subscription for given name, target, and method.
+
+        @method off
+        @param {String} name The name of the event
+        @param {Object} target The target of the subscription
+        @param {Function} method The function of the subscription
+        @return this
+      */
+      off: function(name, target, method) {
+        removeListener(this, name, target, method);
+        return this;
+      },
+
+      /**
+        Checks to see if object has any subscriptions for named event.
+
+        @method has
+        @param {String} name The name of the event
+        @return {Boolean} does the object have a subscription for event
+       */
+      has: function(name) {
+        return hasListeners(this, name);
+      }
+    });
+
+    __exports__["default"] = Evented;
+  });
+define("ember-runtime/mixins/freezable",
+  ["ember-metal/mixin","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Mixin = __dependency1__.Mixin;
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+
+    /**
+      The `Ember.Freezable` mixin implements some basic methods for marking an
+      object as frozen. Once an object is frozen it should be read only. No changes
+      may be made the internal state of the object.
+
+      ## Enforcement
+
+      To fully support freezing in your subclass, you must include this mixin and
+      override any method that might alter any property on the object to instead
+      raise an exception. You can check the state of an object by checking the
+      `isFrozen` property.
+
+      Although future versions of JavaScript may support language-level freezing
+      object objects, that is not the case today. Even if an object is freezable,
+      it is still technically possible to modify the object, even though it could
+      break other parts of your application that do not expect a frozen object to
+      change. It is, therefore, very important that you always respect the
+      `isFrozen` property on all freezable objects.
+
+      ## Example Usage
+
+      The example below shows a simple object that implement the `Ember.Freezable`
+      protocol.
+
+      ```javascript
+      Contact = Ember.Object.extend(Ember.Freezable, {
+        firstName: null,
+        lastName: null,
+
+        // swaps the names
+        swapNames: function() {
+          if (this.get('isFrozen')) throw Ember.FROZEN_ERROR;
+          var tmp = this.get('firstName');
+          this.set('firstName', this.get('lastName'));
+          this.set('lastName', tmp);
+          return this;
+        }
+
+      });
+
+      c = Contact.create({ firstName: "John", lastName: "Doe" });
+      c.swapNames();  // returns c
+      c.freeze();
+      c.swapNames();  // EXCEPTION
+      ```
+
+      ## Copying
+
+      Usually the `Ember.Freezable` protocol is implemented in cooperation with the
+      `Ember.Copyable` protocol, which defines a `frozenCopy()` method that will
+      return a frozen object, if the object implements this method as well.
+
+      @class Freezable
+      @namespace Ember
+      @since Ember 0.9
+    */
+    var Freezable = Mixin.create({
+
+      /**
+        Set to `true` when the object is frozen. Use this property to detect
+        whether your object is frozen or not.
+
+        @property isFrozen
+        @type Boolean
+      */
+      isFrozen: false,
+
+      /**
+        Freezes the object. Once this method has been called the object should
+        no longer allow any properties to be edited.
+
+        @method freeze
+        @return {Object} receiver
+      */
+      freeze: function() {
+        if (get(this, 'isFrozen')) return this;
+        set(this, 'isFrozen', true);
+        return this;
+      }
+
+    });
+
+    var FROZEN_ERROR = "Frozen object cannot be modified.";
+
+    __exports__.Freezable = Freezable;
+    __exports__.FROZEN_ERROR = FROZEN_ERROR;
+  });
+define("ember-runtime/mixins/mutable_array",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+
+    // require('ember-runtime/mixins/array');
+    // require('ember-runtime/mixins/mutable_enumerable');
+
+    // ..........................................................
+    // CONSTANTS
+    //
+
+    var OUT_OF_RANGE_EXCEPTION = "Index out of range";
+    var EMPTY = [];
+
+    // ..........................................................
+    // HELPERS
+    //
+
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var isArray = __dependency3__.isArray;
+    var EmberError = __dependency4__["default"];
+    var Mixin = __dependency5__.Mixin;
+    var required = __dependency5__.required;
+    var EmberArray = __dependency6__["default"];
+    var MutableEnumerable = __dependency7__["default"];
+    var Enumerable = __dependency8__["default"];
+    /**
+      This mixin defines the API for modifying array-like objects. These methods
+      can be applied only to a collection that keeps its items in an ordered set.
+      It builds upon the Array mixin and adds methods to modify the array.
+      Concrete implementations of this class include ArrayProxy and ArrayController.
+
+      It is important to use the methods in this class to modify arrays so that
+      changes are observable. This allows the binding system in Ember to function
+      correctly.
+
+
+      Note that an Array can change even if it does not implement this mixin.
+      For example, one might implement a SparseArray that cannot be directly
+      modified, but if its underlying enumerable changes, it will change also.
+
+      @class MutableArray
+      @namespace Ember
+      @uses Ember.Array
+      @uses Ember.MutableEnumerable
+    */
+    var MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
+
+      /**
+        __Required.__ You must implement this method to apply this mixin.
+
+        This is one of the primitives you must implement to support `Ember.Array`.
+        You should replace amt objects started at idx with the objects in the
+        passed array. You should also call `this.enumerableContentDidChange()`
+
+        @method replace
+        @param {Number} idx Starting index in the array to replace. If
+          idx >= length, then append to the end of the array.
+        @param {Number} amt Number of elements that should be removed from
+          the array, starting at *idx*.
+        @param {Array} objects An array of zero or more objects that should be
+          inserted into the array at *idx*
+      */
+      replace: required(),
+
+      /**
+        Remove all elements from the array. This is useful if you
+        want to reuse an existing array without having to recreate it.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        color.length();   //  3
+        colors.clear();   //  []
+        colors.length();  //  0
+        ```
+
+        @method clear
+        @return {Ember.Array} An empty Array.
+      */
+      clear: function () {
+        var len = get(this, 'length');
+        if (len === 0) return this;
+        this.replace(0, len, EMPTY);
+        return this;
+      },
+
+      /**
+        This will use the primitive `replace()` method to insert an object at the
+        specified index.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        colors.insertAt(2, "yellow");  // ["red", "green", "yellow", "blue"]
+        colors.insertAt(5, "orange");  // Error: Index out of range
+        ```
+
+        @method insertAt
+        @param {Number} idx index of insert the object at.
+        @param {Object} object object to insert
+        @return {Ember.Array} receiver
+      */
+      insertAt: function(idx, object) {
+        if (idx > get(this, 'length')) throw new EmberError(OUT_OF_RANGE_EXCEPTION);
+        this.replace(idx, 0, [object]);
+        return this;
+      },
+
+      /**
+        Remove an object at the specified index using the `replace()` primitive
+        method. You can pass either a single index, or a start and a length.
+
+        If you pass a start and length that is beyond the
+        length this method will throw an `OUT_OF_RANGE_EXCEPTION`.
+
+        ```javascript
+        var colors = ["red", "green", "blue", "yellow", "orange"];
+        colors.removeAt(0);     // ["green", "blue", "yellow", "orange"]
+        colors.removeAt(2, 2);  // ["green", "blue"]
+        colors.removeAt(4, 2);  // Error: Index out of range
+        ```
+
+        @method removeAt
+        @param {Number} start index, start of range
+        @param {Number} len length of passing range
+        @return {Ember.Array} receiver
+      */
+      removeAt: function(start, len) {
+        if ('number' === typeof start) {
+
+          if ((start < 0) || (start >= get(this, 'length'))) {
+            throw new EmberError(OUT_OF_RANGE_EXCEPTION);
+          }
+
+          // fast case
+          if (len === undefined) len = 1;
+          this.replace(start, len, EMPTY);
+        }
+
+        return this;
+      },
+
+      /**
+        Push the object onto the end of the array. Works just like `push()` but it
+        is KVO-compliant.
+
+        ```javascript
+        var colors = ["red", "green"];
+        colors.pushObject("black");     // ["red", "green", "black"]
+        colors.pushObject(["yellow"]);  // ["red", "green", ["yellow"]]
+        ```
+
+        @method pushObject
+        @param {*} obj object to push
+        @return object same object passed as a param
+      */
+      pushObject: function(obj) {
+        this.insertAt(get(this, 'length'), obj);
+        return obj;
+      },
+
+      /**
+        Add the objects in the passed numerable to the end of the array. Defers
+        notifying observers of the change until all objects are added.
+
+        ```javascript
+        var colors = ["red"];
+        colors.pushObjects(["yellow", "orange"]);  // ["red", "yellow", "orange"]
+        ```
+
+        @method pushObjects
+        @param {Ember.Enumerable} objects the objects to add
+        @return {Ember.Array} receiver
+      */
+      pushObjects: function(objects) {
+        if (!(Enumerable.detect(objects) || isArray(objects))) {
+          throw new TypeError("Must pass Ember.Enumerable to Ember.MutableArray#pushObjects");
+        }
+        this.replace(get(this, 'length'), 0, objects);
+        return this;
+      },
+
+      /**
+        Pop object from array or nil if none are left. Works just like `pop()` but
+        it is KVO-compliant.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        colors.popObject();   // "blue"
+        console.log(colors);  // ["red", "green"]
+        ```
+
+        @method popObject
+        @return object
+      */
+      popObject: function() {
+        var len = get(this, 'length');
+        if (len === 0) return null;
+
+        var ret = this.objectAt(len-1);
+        this.removeAt(len-1, 1);
+        return ret;
+      },
+
+      /**
+        Shift an object from start of array or nil if none are left. Works just
+        like `shift()` but it is KVO-compliant.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        colors.shiftObject();  // "red"
+        console.log(colors);   // ["green", "blue"]
+        ```
+
+        @method shiftObject
+        @return object
+      */
+      shiftObject: function() {
+        if (get(this, 'length') === 0) return null;
+        var ret = this.objectAt(0);
+        this.removeAt(0);
+        return ret;
+      },
+
+      /**
+        Unshift an object to start of array. Works just like `unshift()` but it is
+        KVO-compliant.
+
+        ```javascript
+        var colors = ["red"];
+        colors.unshiftObject("yellow");    // ["yellow", "red"]
+        colors.unshiftObject(["black"]);   // [["black"], "yellow", "red"]
+        ```
+
+        @method unshiftObject
+        @param {*} obj object to unshift
+        @return object same object passed as a param
+      */
+      unshiftObject: function(obj) {
+        this.insertAt(0, obj);
+        return obj;
+      },
+
+      /**
+        Adds the named objects to the beginning of the array. Defers notifying
+        observers until all objects have been added.
+
+        ```javascript
+        var colors = ["red"];
+        colors.unshiftObjects(["black", "white"]);   // ["black", "white", "red"]
+        colors.unshiftObjects("yellow"); // Type Error: 'undefined' is not a function
+        ```
+
+        @method unshiftObjects
+        @param {Ember.Enumerable} objects the objects to add
+        @return {Ember.Array} receiver
+      */
+      unshiftObjects: function(objects) {
+        this.replace(0, 0, objects);
+        return this;
+      },
+
+      /**
+        Reverse objects in the array. Works just like `reverse()` but it is
+        KVO-compliant.
+
+        @method reverseObjects
+        @return {Ember.Array} receiver
+       */
+      reverseObjects: function() {
+        var len = get(this, 'length');
+        if (len === 0) return this;
+        var objects = this.toArray().reverse();
+        this.replace(0, len, objects);
+        return this;
+      },
+
+      /**
+        Replace all the the receiver's content with content of the argument.
+        If argument is an empty array receiver will be cleared.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        colors.setObjects(["black", "white"]);  // ["black", "white"]
+        colors.setObjects([]);                  // []
+        ```
+
+        @method setObjects
+        @param {Ember.Array} objects array whose content will be used for replacing
+            the content of the receiver
+        @return {Ember.Array} receiver with the new content
+       */
+      setObjects: function(objects) {
+        if (objects.length === 0) return this.clear();
+
+        var len = get(this, 'length');
+        this.replace(0, len, objects);
+        return this;
+      },
+
+      // ..........................................................
+      // IMPLEMENT Ember.MutableEnumerable
+      //
+
+      /**
+        Remove all occurances of an object in the array.
+
+        ```javascript
+        var cities = ["Chicago", "Berlin", "Lima", "Chicago"];
+        cities.removeObject("Chicago");  // ["Berlin", "Lima"]
+        cities.removeObject("Lima");     // ["Berlin"]
+        cities.removeObject("Tokyo")     // ["Berlin"]
+        ```
+
+        @method removeObject
+        @param {*} obj object to remove
+        @return {Ember.Array} receiver
+      */
+      removeObject: function(obj) {
+        var loc = get(this, 'length') || 0;
+        while(--loc >= 0) {
+          var curObject = this.objectAt(loc);
+          if (curObject === obj) this.removeAt(loc);
+        }
+        return this;
+      },
+
+      /**
+        Push the object onto the end of the array if it is not already
+        present in the array.
+
+        ```javascript
+        var cities = ["Chicago", "Berlin"];
+        cities.addObject("Lima");    // ["Chicago", "Berlin", "Lima"]
+        cities.addObject("Berlin");  // ["Chicago", "Berlin", "Lima"]
+        ```
+
+        @method addObject
+        @param {*} obj object to add, if not already present
+        @return {Ember.Array} receiver
+      */
+      addObject: function(obj) {
+        if (!this.contains(obj)) this.pushObject(obj);
+        return this;
+      }
+
+    });
+
+    __exports__["default"] = MutableArray;
+  });
+define("ember-runtime/mixins/mutable_enumerable",
+  ["ember-metal/enumerable_utils","ember-runtime/mixins/enumerable","ember-metal/mixin","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var EnumerableUtils = __dependency1__["default"];
+    var Enumerable = __dependency2__["default"];
+    var Mixin = __dependency3__.Mixin;
+    var required = __dependency3__.required;
+    var beginPropertyChanges = __dependency4__.beginPropertyChanges;
+    var endPropertyChanges = __dependency4__.endPropertyChanges;
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var forEach = EnumerableUtils.forEach;
+
+    /**
+      This mixin defines the API for modifying generic enumerables. These methods
+      can be applied to an object regardless of whether it is ordered or
+      unordered.
+
+      Note that an Enumerable can change even if it does not implement this mixin.
+      For example, a MappedEnumerable cannot be directly modified but if its
+      underlying enumerable changes, it will change also.
+
+      ## Adding Objects
+
+      To add an object to an enumerable, use the `addObject()` method. This
+      method will only add the object to the enumerable if the object is not
+      already present and is of a type supported by the enumerable.
+
+      ```javascript
+      set.addObject(contact);
+      ```
+
+      ## Removing Objects
+
+      To remove an object from an enumerable, use the `removeObject()` method. This
+      will only remove the object if it is present in the enumerable, otherwise
+      this method has no effect.
+
+      ```javascript
+      set.removeObject(contact);
+      ```
+
+      ## Implementing In Your Own Code
+
+      If you are implementing an object and want to support this API, just include
+      this mixin in your class and implement the required methods. In your unit
+      tests, be sure to apply the Ember.MutableEnumerableTests to your object.
+
+      @class MutableEnumerable
+      @namespace Ember
+      @uses Ember.Enumerable
+    */
+    var MutableEnumerable = Mixin.create(Enumerable, {
+
+      /**
+        __Required.__ You must implement this method to apply this mixin.
+
+        Attempts to add the passed object to the receiver if the object is not
+        already present in the collection. If the object is present, this method
+        has no effect.
+
+        If the passed object is of a type not supported by the receiver,
+        then this method should raise an exception.
+
+        @method addObject
+        @param {Object} object The object to add to the enumerable.
+        @return {Object} the passed object
+      */
+      addObject: required(Function),
+
+      /**
+        Adds each object in the passed enumerable to the receiver.
+
+        @method addObjects
+        @param {Ember.Enumerable} objects the objects to add.
+        @return {Object} receiver
+      */
+      addObjects: function(objects) {
+        beginPropertyChanges(this);
+        forEach(objects, function(obj) { this.addObject(obj); }, this);
+        endPropertyChanges(this);
+        return this;
+      },
+
+      /**
+        __Required.__ You must implement this method to apply this mixin.
+
+        Attempts to remove the passed object from the receiver collection if the
+        object is present in the collection. If the object is not present,
+        this method has no effect.
+
+        If the passed object is of a type not supported by the receiver,
+        then this method should raise an exception.
+
+        @method removeObject
+        @param {Object} object The object to remove from the enumerable.
+        @return {Object} the passed object
+      */
+      removeObject: required(Function),
+
+
+      /**
+        Removes each object in the passed enumerable from the receiver.
+
+        @method removeObjects
+        @param {Ember.Enumerable} objects the objects to remove
+        @return {Object} receiver
+      */
+      removeObjects: function(objects) {
+        beginPropertyChanges(this);
+        for (var i = objects.length - 1; i >= 0; i--) {
+          this.removeObject(objects[i]);
+        }
+        endPropertyChanges(this);
+        return this;
+      }
+    });
+
+    __exports__["default"] = MutableEnumerable;
+  });
+define("ember-runtime/mixins/observable",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/get_properties","ember-metal/set_properties","ember-metal/mixin","ember-metal/events","ember-metal/property_events","ember-metal/observer","ember-metal/computed","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    var get = __dependency2__.get;
+    var getWithDefault = __dependency2__.getWithDefault;
+    var set = __dependency3__.set;
+    var apply = __dependency4__.apply;
+    var getProperties = __dependency5__["default"];
+    var setProperties = __dependency6__["default"];
+    var Mixin = __dependency7__.Mixin;
+    var hasListeners = __dependency8__.hasListeners;
+    var beginPropertyChanges = __dependency9__.beginPropertyChanges;
+    var propertyWillChange = __dependency9__.propertyWillChange;
+    var propertyDidChange = __dependency9__.propertyDidChange;
+    var endPropertyChanges = __dependency9__.endPropertyChanges;
+    var addObserver = __dependency10__.addObserver;
+    var addBeforeObserver = __dependency10__.addBeforeObserver;
+    var removeObserver = __dependency10__.removeObserver;
+    var observersFor = __dependency10__.observersFor;
+    var cacheFor = __dependency11__.cacheFor;
+    var isNone = __dependency12__.isNone;
+
+
+    var slice = Array.prototype.slice;
+    /**
+      ## Overview
+
+      This mixin provides properties and property observing functionality, core
+      features of the Ember object model.
+
+      Properties and observers allow one object to observe changes to a
+      property on another object. This is one of the fundamental ways that
+      models, controllers and views communicate with each other in an Ember
+      application.
+
+      Any object that has this mixin applied can be used in observer
+      operations. That includes `Ember.Object` and most objects you will
+      interact with as you write your Ember application.
+
+      Note that you will not generally apply this mixin to classes yourself,
+      but you will use the features provided by this module frequently, so it
+      is important to understand how to use it.
+
+      ## Using `get()` and `set()`
+
+      Because of Ember's support for bindings and observers, you will always
+      access properties using the get method, and set properties using the
+      set method. This allows the observing objects to be notified and
+      computed properties to be handled properly.
+
+      More documentation about `get` and `set` are below.
+
+      ## Observing Property Changes
+
+      You typically observe property changes simply by adding the `observes`
+      call to the end of your method declarations in classes that you write.
+      For example:
+
+      ```javascript
+      Ember.Object.extend({
+        valueObserver: function() {
+          // Executes whenever the "value" property changes
+        }.observes('value')
+      });
+      ```
+
+      Although this is the most common way to add an observer, this capability
+      is actually built into the `Ember.Object` class on top of two methods
+      defined in this mixin: `addObserver` and `removeObserver`. You can use
+      these two methods to add and remove observers yourself if you need to
+      do so at runtime.
+
+      To add an observer for a property, call:
+
+      ```javascript
+      object.addObserver('propertyKey', targetObject, targetAction)
+      ```
+
+      This will call the `targetAction` method on the `targetObject` whenever
+      the value of the `propertyKey` changes.
+
+      Note that if `propertyKey` is a computed property, the observer will be
+      called when any of the property dependencies are changed, even if the
+      resulting value of the computed property is unchanged. This is necessary
+      because computed properties are not computed until `get` is called.
+
+      @class Observable
+      @namespace Ember
+    */
+    var Observable = Mixin.create({
+
+      /**
+        Retrieves the value of a property from the object.
+
+        This method is usually similar to using `object[keyName]` or `object.keyName`,
+        however it supports both computed properties and the unknownProperty
+        handler.
+
+        Because `get` unifies the syntax for accessing all these kinds
+        of properties, it can make many refactorings easier, such as replacing a
+        simple property with a computed property, or vice versa.
+
+        ### Computed Properties
+
+        Computed properties are methods defined with the `property` modifier
+        declared at the end, such as:
+
+        ```javascript
+        fullName: function() {
+          return this.get('firstName') + ' ' + this.get('lastName');
+        }.property('firstName', 'lastName')
+        ```
+
+        When you call `get` on a computed property, the function will be
+        called and the return value will be returned instead of the function
+        itself.
+
+        ### Unknown Properties
+
+        Likewise, if you try to call `get` on a property whose value is
+        `undefined`, the `unknownProperty()` method will be called on the object.
+        If this method returns any value other than `undefined`, it will be returned
+        instead. This allows you to implement "virtual" properties that are
+        not defined upfront.
+
+        @method get
+        @param {String} keyName The property to retrieve
+        @return {Object} The property value or undefined.
+      */
+      get: function(keyName) {
+        return get(this, keyName);
+      },
+
+      /**
+        To get multiple properties at once, call `getProperties`
+        with a list of strings or an array:
+
+        ```javascript
+        record.getProperties('firstName', 'lastName', 'zipCode');  // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+        ```
+
+        is equivalent to:
+
+        ```javascript
+        record.getProperties(['firstName', 'lastName', 'zipCode']);  // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+        ```
+
+        @method getProperties
+        @param {String...|Array} list of keys to get
+        @return {Hash}
+      */
+      getProperties: function() {
+        return apply(null, getProperties, [this].concat(slice.call(arguments)));
+      },
+
+      /**
+        Sets the provided key or path to the value.
+
+        This method is generally very similar to calling `object[key] = value` or
+        `object.key = value`, except that it provides support for computed
+        properties, the `setUnknownProperty()` method and property observers.
+
+        ### Computed Properties
+
+        If you try to set a value on a key that has a computed property handler
+        defined (see the `get()` method for an example), then `set()` will call
+        that method, passing both the value and key instead of simply changing
+        the value itself. This is useful for those times when you need to
+        implement a property that is composed of one or more member
+        properties.
+
+        ### Unknown Properties
+
+        If you try to set a value on a key that is undefined in the target
+        object, then the `setUnknownProperty()` handler will be called instead. This
+        gives you an opportunity to implement complex "virtual" properties that
+        are not predefined on the object. If `setUnknownProperty()` returns
+        undefined, then `set()` will simply set the value on the object.
+
+        ### Property Observers
+
+        In addition to changing the property, `set()` will also register a property
+        change with the object. Unless you have placed this call inside of a
+        `beginPropertyChanges()` and `endPropertyChanges(),` any "local" observers
+        (i.e. observer methods declared on the same object), will be called
+        immediately. Any "remote" observers (i.e. observer methods declared on
+        another object) will be placed in a queue and called at a later time in a
+        coalesced manner.
+
+        ### Chaining
+
+        In addition to property changes, `set()` returns the value of the object
+        itself so you can do chaining like this:
+
+        ```javascript
+        record.set('firstName', 'Charles').set('lastName', 'Jolley');
+        ```
+
+        @method set
+        @param {String} keyName The property to set
+        @param {Object} value The value to set or `null`.
+        @return {Ember.Observable}
+      */
+      set: function(keyName, value) {
+        set(this, keyName, value);
+        return this;
+      },
+
+
+      /**
+        Sets a list of properties at once. These properties are set inside
+        a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+        observers will be buffered.
+
+        ```javascript
+        record.setProperties({ firstName: 'Charles', lastName: 'Jolley' });
+        ```
+
+        @method setProperties
+        @param {Hash} hash the hash of keys and values to set
+        @return {Ember.Observable}
+      */
+      setProperties: function(hash) {
+        return setProperties(this, hash);
+      },
+
+      /**
+        Begins a grouping of property changes.
+
+        You can use this method to group property changes so that notifications
+        will not be sent until the changes are finished. If you plan to make a
+        large number of changes to an object at one time, you should call this
+        method at the beginning of the changes to begin deferring change
+        notifications. When you are done making changes, call
+        `endPropertyChanges()` to deliver the deferred change notifications and end
+        deferring.
+
+        @method beginPropertyChanges
+        @return {Ember.Observable}
+      */
+      beginPropertyChanges: function() {
+        beginPropertyChanges();
+        return this;
+      },
+
+      /**
+        Ends a grouping of property changes.
+
+        You can use this method to group property changes so that notifications
+        will not be sent until the changes are finished. If you plan to make a
+        large number of changes to an object at one time, you should call
+        `beginPropertyChanges()` at the beginning of the changes to defer change
+        notifications. When you are done making changes, call this method to
+        deliver the deferred change notifications and end deferring.
+
+        @method endPropertyChanges
+        @return {Ember.Observable}
+      */
+      endPropertyChanges: function() {
+        endPropertyChanges();
+        return this;
+      },
+
+      /**
+        Notify the observer system that a property is about to change.
+
+        Sometimes you need to change a value directly or indirectly without
+        actually calling `get()` or `set()` on it. In this case, you can use this
+        method and `propertyDidChange()` instead. Calling these two methods
+        together will notify all observers that the property has potentially
+        changed value.
+
+        Note that you must always call `propertyWillChange` and `propertyDidChange`
+        as a pair. If you do not, it may get the property change groups out of
+        order and cause notifications to be delivered more often than you would
+        like.
+
+        @method propertyWillChange
+        @param {String} keyName The property key that is about to change.
+        @return {Ember.Observable}
+      */
+      propertyWillChange: function(keyName) {
+        propertyWillChange(this, keyName);
+        return this;
+      },
+
+      /**
+        Notify the observer system that a property has just changed.
+
+        Sometimes you need to change a value directly or indirectly without
+        actually calling `get()` or `set()` on it. In this case, you can use this
+        method and `propertyWillChange()` instead. Calling these two methods
+        together will notify all observers that the property has potentially
+        changed value.
+
+        Note that you must always call `propertyWillChange` and `propertyDidChange`
+        as a pair. If you do not, it may get the property change groups out of
+        order and cause notifications to be delivered more often than you would
+        like.
+
+        @method propertyDidChange
+        @param {String} keyName The property key that has just changed.
+        @return {Ember.Observable}
+      */
+      propertyDidChange: function(keyName) {
+        propertyDidChange(this, keyName);
+        return this;
+      },
+
+      /**
+        Convenience method to call `propertyWillChange` and `propertyDidChange` in
+        succession.
+
+        @method notifyPropertyChange
+        @param {String} keyName The property key to be notified about.
+        @return {Ember.Observable}
+      */
+      notifyPropertyChange: function(keyName) {
+        this.propertyWillChange(keyName);
+        this.propertyDidChange(keyName);
+        return this;
+      },
+
+      addBeforeObserver: function(key, target, method) {
+        addBeforeObserver(this, key, target, method);
+      },
+
+      /**
+        Adds an observer on a property.
+
+        This is the core method used to register an observer for a property.
+
+        Once you call this method, any time the key's value is set, your observer
+        will be notified. Note that the observers are triggered any time the
+        value is set, regardless of whether it has actually changed. Your
+        observer should be prepared to handle that.
+
+        You can also pass an optional context parameter to this method. The
+        context will be passed to your observer method whenever it is triggered.
+        Note that if you add the same target/method pair on a key multiple times
+        with different context parameters, your observer will only be called once
+        with the last context you passed.
+
+        ### Observer Methods
+
+        Observer methods you pass should generally have the following signature if
+        you do not pass a `context` parameter:
+
+        ```javascript
+        fooDidChange: function(sender, key, value, rev) { };
+        ```
+
+        The sender is the object that changed. The key is the property that
+        changes. The value property is currently reserved and unused. The rev
+        is the last property revision of the object when it changed, which you can
+        use to detect if the key value has really changed or not.
+
+        If you pass a `context` parameter, the context will be passed before the
+        revision like so:
+
+        ```javascript
+        fooDidChange: function(sender, key, value, context, rev) { };
+        ```
+
+        Usually you will not need the value, context or revision parameters at
+        the end. In this case, it is common to write observer methods that take
+        only a sender and key value as parameters or, if you aren't interested in
+        any of these values, to write an observer that has no parameters at all.
+
+        @method addObserver
+        @param {String} key The key to observer
+        @param {Object} target The target object to invoke
+        @param {String|Function} method The method to invoke.
+      */
+      addObserver: function(key, target, method) {
+        addObserver(this, key, target, method);
+      },
+
+      /**
+        Remove an observer you have previously registered on this object. Pass
+        the same key, target, and method you passed to `addObserver()` and your
+        target will no longer receive notifications.
+
+        @method removeObserver
+        @param {String} key The key to observer
+        @param {Object} target The target object to invoke
+        @param {String|Function} method The method to invoke.
+      */
+      removeObserver: function(key, target, method) {
+        removeObserver(this, key, target, method);
+      },
+
+      /**
+        Returns `true` if the object currently has observers registered for a
+        particular key. You can use this method to potentially defer performing
+        an expensive action until someone begins observing a particular property
+        on the object.
+
+        @method hasObserverFor
+        @param {String} key Key to check
+        @return {Boolean}
+      */
+      hasObserverFor: function(key) {
+        return hasListeners(this, key+':change');
+      },
+
+      /**
+        Retrieves the value of a property, or a default value in the case that the
+        property returns `undefined`.
+
+        ```javascript
+        person.getWithDefault('lastName', 'Doe');
+        ```
+
+        @method getWithDefault
+        @param {String} keyName The name of the property to retrieve
+        @param {Object} defaultValue The value to return if the property value is undefined
+        @return {Object} The property value or the defaultValue.
+      */
+      getWithDefault: function(keyName, defaultValue) {
+        return getWithDefault(this, keyName, defaultValue);
+      },
+
+      /**
+        Set the value of a property to the current value plus some amount.
+
+        ```javascript
+        person.incrementProperty('age');
+        team.incrementProperty('score', 2);
+        ```
+
+        @method incrementProperty
+        @param {String} keyName The name of the property to increment
+        @param {Number} increment The amount to increment by. Defaults to 1
+        @return {Number} The new property value
+      */
+      incrementProperty: function(keyName, increment) {
+        if (isNone(increment)) { increment = 1; }
+        Ember.assert("Must pass a numeric value to incrementProperty", (!isNaN(parseFloat(increment)) && isFinite(increment)));
+        set(this, keyName, (parseFloat(get(this, keyName)) || 0) + increment);
+        return get(this, keyName);
+      },
+
+      /**
+        Set the value of a property to the current value minus some amount.
+
+        ```javascript
+        player.decrementProperty('lives');
+        orc.decrementProperty('health', 5);
+        ```
+
+        @method decrementProperty
+        @param {String} keyName The name of the property to decrement
+        @param {Number} decrement The amount to decrement by. Defaults to 1
+        @return {Number} The new property value
+      */
+      decrementProperty: function(keyName, decrement) {
+        if (isNone(decrement)) { decrement = 1; }
+        Ember.assert("Must pass a numeric value to decrementProperty", (!isNaN(parseFloat(decrement)) && isFinite(decrement)));
+        set(this, keyName, (get(this, keyName) || 0) - decrement);
+        return get(this, keyName);
+      },
+
+      /**
+        Set the value of a boolean property to the opposite of it's
+        current value.
+
+        ```javascript
+        starship.toggleProperty('warpDriveEngaged');
+        ```
+
+        @method toggleProperty
+        @param {String} keyName The name of the property to toggle
+        @return {Object} The new property value
+      */
+      toggleProperty: function(keyName) {
+        set(this, keyName, !get(this, keyName));
+        return get(this, keyName);
+      },
+
+      /**
+        Returns the cached value of a computed property, if it exists.
+        This allows you to inspect the value of a computed property
+        without accidentally invoking it if it is intended to be
+        generated lazily.
+
+        @method cacheFor
+        @param {String} keyName
+        @return {Object} The cached value of the computed property, if any
+      */
+      cacheFor: function(keyName) {
+        return cacheFor(this, keyName);
+      },
+
+      // intended for debugging purposes
+      observersForKey: function(keyName) {
+        return observersFor(this, keyName);
+      }
+    });
+
+    __exports__["default"] = Observable;
+  });
+define("ember-runtime/mixins/promise_proxy",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var computed = __dependency3__.computed;
+    var Mixin = __dependency4__.Mixin;
+    var EmberError = __dependency5__["default"];
+
+    var not = computed.not, or = computed.or;
+
+    /**
+      @module ember
+      @submodule ember-runtime
+     */
+
+    function tap(proxy, promise) {
+      set(proxy, 'isFulfilled', false);
+      set(proxy, 'isRejected', false);
+
+      return promise.then(function(value) {
+        set(proxy, 'isFulfilled', true);
+        set(proxy, 'content', value);
+        return value;
+      }, function(reason) {
+        set(proxy, 'isRejected', true);
+        set(proxy, 'reason', reason);
+        throw reason;
+      }, "Ember: PromiseProxy");
+    }
+
+    /**
+      A low level mixin making ObjectProxy, ObjectController or ArrayController's promise aware.
+
+      ```javascript
+      var ObjectPromiseController = Ember.ObjectController.extend(Ember.PromiseProxyMixin);
+
+      var controller = ObjectPromiseController.create({
+        promise: $.getJSON('/some/remote/data.json')
+      });
+
+      controller.then(function(json){
+         // the json
+      }, function(reason) {
+         // the reason why you have no json
+      });
+      ```
+
+      the controller has bindable attributes which
+      track the promises life cycle
+
+      ```javascript
+      controller.get('isPending')   //=> true
+      controller.get('isSettled')  //=> false
+      controller.get('isRejected')  //=> false
+      controller.get('isFulfilled') //=> false
+      ```
+
+      When the the $.getJSON completes, and the promise is fulfilled
+      with json, the life cycle attributes will update accordingly.
+
+      ```javascript
+      controller.get('isPending')   //=> false
+      controller.get('isSettled')   //=> true
+      controller.get('isRejected')  //=> false
+      controller.get('isFulfilled') //=> true
+      ```
+
+      As the controller is an ObjectController, and the json now its content,
+      all the json properties will be available directly from the controller.
+
+      ```javascript
+      // Assuming the following json:
+      {
+        firstName: 'Stefan',
+        lastName: 'Penner'
+      }
+
+      // both properties will accessible on the controller
+      controller.get('firstName') //=> 'Stefan'
+      controller.get('lastName')  //=> 'Penner'
+      ```
+
+      If the controller is backing a template, the attributes are
+      bindable from within that template
+
+      ```handlebars
+      {{#if isPending}}
+        loading...
+      {{else}}
+        firstName: {{firstName}}
+        lastName: {{lastName}}
+      {{/if}}
+      ```
+      @class Ember.PromiseProxyMixin
+    */
+    var PromiseProxyMixin = Mixin.create({
+      /**
+        If the proxied promise is rejected this will contain the reason
+        provided.
+
+        @property reason
+        @default null
+      */
+      reason:    null,
+
+      /**
+        Once the proxied promise has settled this will become `false`.
+
+        @property isPending
+        @default true
+      */
+      isPending:  not('isSettled').readOnly(),
+
+      /**
+        Once the proxied promise has settled this will become `true`.
+
+        @property isSettled
+        @default false
+      */
+      isSettled:  or('isRejected', 'isFulfilled').readOnly(),
+
+      /**
+        Will become `true` if the proxied promise is rejected.
+
+        @property isRejected
+        @default false
+      */
+      isRejected:  false,
+
+      /**
+        Will become `true` if the proxied promise is fulfilled.
+
+        @property isFullfilled
+        @default false
+      */
+      isFulfilled: false,
+
+      /**
+        The promise whose fulfillment value is being proxied by this object.
+
+        This property must be specified upon creation, and should not be
+        changed once created.
+
+        Example:
+
+        ```javascript
+        Ember.ObjectController.extend(Ember.PromiseProxyMixin).create({
+          promise: <thenable>
+        });
+        ```
+
+        @property promise
+      */
+      promise: computed(function(key, promise) {
+        if (arguments.length === 2) {
+          return tap(this, promise);
+        } else {
+          throw new EmberError("PromiseProxy's promise must be set");
+        }
+      }),
+
+      /**
+        An alias to the proxied promise's `then`.
+
+        See RSVP.Promise.then.
+
+        @method then
+        @param {Function} callback
+        @return {RSVP.Promise}
+      */
+      then: promiseAlias('then'),
+
+      /**
+        An alias to the proxied promise's `catch`.
+
+        See RSVP.Promise.catch.
+
+        @method catch
+        @param {Function} callback
+        @return {RSVP.Promise}
+        @since 1.3.0
+      */
+      'catch': promiseAlias('catch'),
+
+      /**
+        An alias to the proxied promise's `finally`.
+
+        See RSVP.Promise.finally.
+
+        @method finally
+        @param {Function} callback
+        @return {RSVP.Promise}
+        @since 1.3.0
+      */
+      'finally': promiseAlias('finally')
+
+    });
+
+    function promiseAlias(name) {
+      return function () {
+        var promise = get(this, 'promise');
+        return promise[name].apply(promise, arguments);
+      };
+    }
+
+    __exports__["default"] = PromiseProxyMixin;
+  });
+define("ember-runtime/mixins/sortable",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/mutable_enumerable","ember-runtime/compare","ember-metal/observer","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.A
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EnumerableUtils = __dependency4__["default"];
+    var Mixin = __dependency5__.Mixin;
+    var MutableEnumerable = __dependency6__["default"];
+    var compare = __dependency7__["default"];
+    var addObserver = __dependency8__.addObserver;
+    var removeObserver = __dependency8__.removeObserver;
+    var computed = __dependency9__.computed;
+    var beforeObserver = __dependency5__.beforeObserver;
+    var observer = __dependency5__.observer;
+    //ES6TODO: should we access these directly from their package or from how thier exposed in ember-metal?
+
+    var forEach = EnumerableUtils.forEach;
+
+    /**
+      `Ember.SortableMixin` provides a standard interface for array proxies
+      to specify a sort order and maintain this sorting when objects are added,
+      removed, or updated without changing the implicit order of their underlying
+      content array:
+
+      ```javascript
+      songs = [
+        {trackNumber: 4, title: 'Ob-La-Di, Ob-La-Da'},
+        {trackNumber: 2, title: 'Back in the U.S.S.R.'},
+        {trackNumber: 3, title: 'Glass Onion'},
+      ];
+
+      songsController = Ember.ArrayController.create({
+        content: songs,
+        sortProperties: ['trackNumber'],
+        sortAscending: true
+      });
+
+      songsController.get('firstObject');  // {trackNumber: 2, title: 'Back in the U.S.S.R.'}
+
+      songsController.addObject({trackNumber: 1, title: 'Dear Prudence'});
+      songsController.get('firstObject');  // {trackNumber: 1, title: 'Dear Prudence'}
+      ```
+
+      If you add or remove the properties to sort by or change the sort direction the content
+      sort order will be automatically updated.
+
+      ```javascript
+      songsController.set('sortProperties', ['title']);
+      songsController.get('firstObject'); // {trackNumber: 2, title: 'Back in the U.S.S.R.'}
+
+      songsController.toggleProperty('sortAscending');
+      songsController.get('firstObject'); // {trackNumber: 4, title: 'Ob-La-Di, Ob-La-Da'}
+      ```
+
+      SortableMixin works by sorting the arrangedContent array, which is the array that
+      arrayProxy displays. Due to the fact that the underlying 'content' array is not changed, that
+      array will not display the sorted list:
+
+       ```javascript
+      songsController.get('content').get('firstObject'); // Returns the unsorted original content
+      songsController.get('firstObject'); // Returns the sorted content.
+      ```
+
+      Although the sorted content can also be accessed through the arrangedContent property,
+      it is preferable to use the proxied class and not the arrangedContent array directly.
+
+      @class SortableMixin
+      @namespace Ember
+      @uses Ember.MutableEnumerable
+    */
+    var SortableMixin = Mixin.create(MutableEnumerable, {
+
+      /**
+        Specifies which properties dictate the arrangedContent's sort order.
+
+        When specifying multiple properties the sorting will use properties
+        from the `sortProperties` array prioritized from first to last.
+
+        @property {Array} sortProperties
+      */
+      sortProperties: null,
+
+      /**
+        Specifies the arrangedContent's sort direction.
+        Sorts the content in ascending order by default. Set to `false` to
+        use descending order.
+
+        @property {Boolean} sortAscending
+        @default true
+      */
+      sortAscending: true,
+
+      /**
+        The function used to compare two values. You can override this if you
+        want to do custom comparisons. Functions must be of the type expected by
+        Array#sort, i.e.
+          return 0 if the two parameters are equal,
+          return a negative value if the first parameter is smaller than the second or
+          return a positive value otherwise:
+
+        ```javascript
+        function(x,y) { // These are assumed to be integers
+          if (x === y)
+            return 0;
+          return x < y ? -1 : 1;
+        }
+        ```
+
+        @property sortFunction
+        @type {Function}
+        @default Ember.compare
+      */
+      sortFunction: compare,
+
+      orderBy: function(item1, item2) {
+        var result = 0,
+            sortProperties = get(this, 'sortProperties'),
+            sortAscending = get(this, 'sortAscending'),
+            sortFunction = get(this, 'sortFunction');
+
+        Ember.assert("you need to define `sortProperties`", !!sortProperties);
+
+        forEach(sortProperties, function(propertyName) {
+          if (result === 0) {
+            result = sortFunction.call(this, get(item1, propertyName), get(item2, propertyName));
+            if ((result !== 0) && !sortAscending) {
+              result = (-1) * result;
+            }
+          }
+        }, this);
+
+        return result;
+      },
+
+      destroy: function() {
+        var content = get(this, 'content'),
+            sortProperties = get(this, 'sortProperties');
+
+        if (content && sortProperties) {
+          forEach(content, function(item) {
+            forEach(sortProperties, function(sortProperty) {
+              removeObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+        }
+
+        return this._super();
+      },
+
+      isSorted: computed.notEmpty('sortProperties'),
+
+      /**
+        Overrides the default arrangedContent from arrayProxy in order to sort by sortFunction.
+        Also sets up observers for each sortProperty on each item in the content Array.
+
+        @property arrangedContent
+      */
+
+      arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
+        var content = get(this, 'content'),
+            isSorted = get(this, 'isSorted'),
+            sortProperties = get(this, 'sortProperties'),
+            self = this;
+
+        if (content && isSorted) {
+          content = content.slice();
+          content.sort(function(item1, item2) {
+            return self.orderBy(item1, item2);
+          });
+          forEach(content, function(item) {
+            forEach(sortProperties, function(sortProperty) {
+              addObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+          return Ember.A(content);
+        }
+
+        return content;
+      }),
+
+      _contentWillChange: beforeObserver('content', function() {
+        var content = get(this, 'content'),
+            sortProperties = get(this, 'sortProperties');
+
+        if (content && sortProperties) {
+          forEach(content, function(item) {
+            forEach(sortProperties, function(sortProperty) {
+              removeObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+        }
+
+        this._super();
+      }),
+
+      sortPropertiesWillChange: beforeObserver('sortProperties', function() {
+        this._lastSortAscending = undefined;
+      }),
+
+      sortPropertiesDidChange: observer('sortProperties', function() {
+        this._lastSortAscending = undefined;
+      }),
+
+      sortAscendingWillChange: beforeObserver('sortAscending', function() {
+        this._lastSortAscending = get(this, 'sortAscending');
+      }),
+
+      sortAscendingDidChange: observer('sortAscending', function() {
+        if (this._lastSortAscending !== undefined && get(this, 'sortAscending') !== this._lastSortAscending) {
+          var arrangedContent = get(this, 'arrangedContent');
+          arrangedContent.reverseObjects();
+        }
+      }),
+
+      contentArrayWillChange: function(array, idx, removedCount, addedCount) {
+        var isSorted = get(this, 'isSorted');
+
+        if (isSorted) {
+          var arrangedContent = get(this, 'arrangedContent');
+          var removedObjects = array.slice(idx, idx+removedCount);
+          var sortProperties = get(this, 'sortProperties');
+
+          forEach(removedObjects, function(item) {
+            arrangedContent.removeObject(item);
+
+            forEach(sortProperties, function(sortProperty) {
+              removeObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+        }
+
+        return this._super(array, idx, removedCount, addedCount);
+      },
+
+      contentArrayDidChange: function(array, idx, removedCount, addedCount) {
+        var isSorted = get(this, 'isSorted'),
+            sortProperties = get(this, 'sortProperties');
+
+        if (isSorted) {
+          var addedObjects = array.slice(idx, idx+addedCount);
+
+          forEach(addedObjects, function(item) {
+            this.insertItemSorted(item);
+
+            forEach(sortProperties, function(sortProperty) {
+              addObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+        }
+
+        return this._super(array, idx, removedCount, addedCount);
+      },
+
+      insertItemSorted: function(item) {
+        var arrangedContent = get(this, 'arrangedContent');
+        var length = get(arrangedContent, 'length');
+
+        var idx = this._binarySearch(item, 0, length);
+        arrangedContent.insertAt(idx, item);
+      },
+
+      contentItemSortPropertyDidChange: function(item) {
+        var arrangedContent = get(this, 'arrangedContent'),
+            oldIndex = arrangedContent.indexOf(item),
+            leftItem = arrangedContent.objectAt(oldIndex - 1),
+            rightItem = arrangedContent.objectAt(oldIndex + 1),
+            leftResult = leftItem && this.orderBy(item, leftItem),
+            rightResult = rightItem && this.orderBy(item, rightItem);
+
+        if (leftResult < 0 || rightResult > 0) {
+          arrangedContent.removeObject(item);
+          this.insertItemSorted(item);
+        }
+      },
+
+      _binarySearch: function(item, low, high) {
+        var mid, midItem, res, arrangedContent;
+
+        if (low === high) {
+          return low;
+        }
+
+        arrangedContent = get(this, 'arrangedContent');
+
+        mid = low + Math.floor((high - low) / 2);
+        midItem = arrangedContent.objectAt(mid);
+
+        res = this.orderBy(midItem, item);
+
+        if (res < 0) {
+          return this._binarySearch(item, mid+1, high);
+        } else if (res > 0) {
+          return this._binarySearch(item, low, mid);
+        }
+
+        return mid;
+      }
+    });
+
+    __exports__["default"] = SortableMixin;
+  });
+define("ember-runtime/mixins/target_action_support",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.lookup, Ember.assert
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var typeOf = __dependency4__.typeOf;
+    var Mixin = __dependency5__.Mixin;
+    var computed = __dependency6__.computed;
+
+    /**
+    `Ember.TargetActionSupport` is a mixin that can be included in a class
+    to add a `triggerAction` method with semantics similar to the Handlebars
+    `{{action}}` helper. In normal Ember usage, the `{{action}}` helper is
+    usually the best choice. This mixin is most often useful when you are
+    doing more complex event handling in View objects.
+
+    See also `Ember.ViewTargetActionSupport`, which has
+    view-aware defaults for target and actionContext.
+
+    @class TargetActionSupport
+    @namespace Ember
+    @extends Ember.Mixin
+    */
+    var TargetActionSupport = Mixin.create({
+      target: null,
+      action: null,
+      actionContext: null,
+
+      targetObject: computed(function() {
+        var target = get(this, 'target');
+
+        if (typeOf(target) === "string") {
+          var value = get(this, target);
+          if (value === undefined) { value = get(Ember.lookup, target); }
+          return value;
+        } else {
+          return target;
+        }
+      }).property('target'),
+
+      actionContextObject: computed(function() {
+        var actionContext = get(this, 'actionContext');
+
+        if (typeOf(actionContext) === "string") {
+          var value = get(this, actionContext);
+          if (value === undefined) { value = get(Ember.lookup, actionContext); }
+          return value;
+        } else {
+          return actionContext;
+        }
+      }).property('actionContext'),
+
+      /**
+      Send an `action` with an `actionContext` to a `target`. The action, actionContext
+      and target will be retrieved from properties of the object. For example:
+
+      ```javascript
+      App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
+        target: Ember.computed.alias('controller'),
+        action: 'save',
+        actionContext: Ember.computed.alias('context'),
+        click: function() {
+          this.triggerAction(); // Sends the `save` action, along with the current context
+                                // to the current controller
+        }
+      });
+      ```
+
+      The `target`, `action`, and `actionContext` can be provided as properties of
+      an optional object argument to `triggerAction` as well.
+
+      ```javascript
+      App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
+        click: function() {
+          this.triggerAction({
+            action: 'save',
+            target: this.get('controller'),
+            actionContext: this.get('context'),
+          }); // Sends the `save` action, along with the current context
+              // to the current controller
+        }
+      });
+      ```
+
+      The `actionContext` defaults to the object you are mixing `TargetActionSupport` into.
+      But `target` and `action` must be specified either as properties or with the argument
+      to `triggerAction`, or a combination:
+
+      ```javascript
+      App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
+        target: Ember.computed.alias('controller'),
+        click: function() {
+          this.triggerAction({
+            action: 'save'
+          }); // Sends the `save` action, along with a reference to `this`,
+              // to the current controller
+        }
+      });
+      ```
+
+      @method triggerAction
+      @param opts {Hash} (optional, with the optional keys action, target and/or actionContext)
+      @return {Boolean} true if the action was sent successfully and did not return false
+      */
+      triggerAction: function(opts) {
+        opts = opts || {};
+        var action = opts.action || get(this, 'action'),
+            target = opts.target || get(this, 'targetObject'),
+            actionContext = opts.actionContext;
+
+        function args(options, actionName) {
+          var ret = [];
+          if (actionName) { ret.push(actionName); }
+
+          return ret.concat(options);
+        }
+
+        if (typeof actionContext === 'undefined') {
+          actionContext = get(this, 'actionContextObject') || this;
+        }
+
+        if (target && action) {
+          var ret;
+
+          if (target.send) {
+            ret = target.send.apply(target, args(actionContext, action));
+          } else {
+            Ember.assert("The action '" + action + "' did not exist on " + target, typeof target[action] === 'function');
+            ret = target[action].apply(target, args(actionContext));
+          }
+
+          if (ret !== false) ret = true;
+
+          return ret;
+        } else {
+          return false;
+        }
+      }
+    });
+
+    __exports__["default"] = TargetActionSupport;
+  });
+define("ember-runtime/system/application",
+  ["ember-runtime/system/namespace","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Namespace = __dependency1__["default"];
+
+    var Application = Namespace.extend();
+    __exports__["default"] = Application;
+  });
+define("ember-runtime/system/array_proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/property_events","ember-metal/error","ember-runtime/system/object","ember-runtime/mixins/mutable_array","ember-runtime/mixins/enumerable","ember-runtime/system/string","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.K, Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var isArray = __dependency4__.isArray;
+    var apply = __dependency4__.apply;
+    var computed = __dependency5__.computed;
+    var beforeObserver = __dependency6__.beforeObserver;
+    var observer = __dependency6__.observer;
+    var beginPropertyChanges = __dependency7__.beginPropertyChanges;
+    var endPropertyChanges = __dependency7__.endPropertyChanges;
+    var EmberError = __dependency8__["default"];
+    var EmberObject = __dependency9__["default"];var MutableArray = __dependency10__["default"];var Enumerable = __dependency11__["default"];
+    var fmt = __dependency12__.fmt;
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var OUT_OF_RANGE_EXCEPTION = "Index out of range";
+    var EMPTY = [];
+    var alias = computed.alias;
+    var K = Ember.K;
+
+    /**
+      An ArrayProxy wraps any other object that implements `Ember.Array` and/or
+      `Ember.MutableArray,` forwarding all requests. This makes it very useful for
+      a number of binding use cases or other cases where being able to swap
+      out the underlying array is useful.
+
+      A simple example of usage:
+
+      ```javascript
+      var pets = ['dog', 'cat', 'fish'];
+      var ap = Ember.ArrayProxy.create({ content: Ember.A(pets) });
+
+      ap.get('firstObject');                        // 'dog'
+      ap.set('content', ['amoeba', 'paramecium']);
+      ap.get('firstObject');                        // 'amoeba'
+      ```
+
+      This class can also be useful as a layer to transform the contents of
+      an array, as they are accessed. This can be done by overriding
+      `objectAtContent`:
+
+      ```javascript
+      var pets = ['dog', 'cat', 'fish'];
+      var ap = Ember.ArrayProxy.create({
+          content: Ember.A(pets),
+          objectAtContent: function(idx) {
+              return this.get('content').objectAt(idx).toUpperCase();
+          }
+      });
+
+      ap.get('firstObject'); // . 'DOG'
+      ```
+
+      @class ArrayProxy
+      @namespace Ember
+      @extends Ember.Object
+      @uses Ember.MutableArray
+    */
+    var ArrayProxy = EmberObject.extend(MutableArray, {
+
+      /**
+        The content array. Must be an object that implements `Ember.Array` and/or
+        `Ember.MutableArray.`
+
+        @property content
+        @type Ember.Array
+      */
+      content: null,
+
+      /**
+       The array that the proxy pretends to be. In the default `ArrayProxy`
+       implementation, this and `content` are the same. Subclasses of `ArrayProxy`
+       can override this property to provide things like sorting and filtering.
+
+       @property arrangedContent
+      */
+      arrangedContent: alias('content'),
+
+      /**
+        Should actually retrieve the object at the specified index from the
+        content. You can override this method in subclasses to transform the
+        content item to something new.
+
+        This method will only be called if content is non-`null`.
+
+        @method objectAtContent
+        @param {Number} idx The index to retrieve.
+        @return {Object} the value or undefined if none found
+      */
+      objectAtContent: function(idx) {
+        return get(this, 'arrangedContent').objectAt(idx);
+      },
+
+      /**
+        Should actually replace the specified objects on the content array.
+        You can override this method in subclasses to transform the content item
+        into something new.
+
+        This method will only be called if content is non-`null`.
+
+        @method replaceContent
+        @param {Number} idx The starting index
+        @param {Number} amt The number of items to remove from the content.
+        @param {Array} objects Optional array of objects to insert or null if no
+          objects.
+        @return {void}
+      */
+      replaceContent: function(idx, amt, objects) {
+        get(this, 'content').replace(idx, amt, objects);
+      },
+
+      /**
+        Invoked when the content property is about to change. Notifies observers that the
+        entire array content will change.
+
+        @private
+        @method _contentWillChange
+      */
+      _contentWillChange: beforeObserver('content', function() {
+        this._teardownContent();
+      }),
+
+      _teardownContent: function() {
+        var content = get(this, 'content');
+
+        if (content) {
+          content.removeArrayObserver(this, {
+            willChange: 'contentArrayWillChange',
+            didChange: 'contentArrayDidChange'
+          });
+        }
+      },
+
+      contentArrayWillChange: K,
+      contentArrayDidChange: K,
+
+      /**
+        Invoked when the content property changes. Notifies observers that the
+        entire array content has changed.
+
+        @private
+        @method _contentDidChange
+      */
+      _contentDidChange: observer('content', function() {
+        var content = get(this, 'content');
+
+        Ember.assert("Can't set ArrayProxy's content to itself", content !== this);
+
+        this._setupContent();
+      }),
+
+      _setupContent: function() {
+        var content = get(this, 'content');
+
+        if (content) {
+          Ember.assert(fmt('ArrayProxy expects an Array or ' +
+            'Ember.ArrayProxy, but you passed %@', [typeof content]),
+            isArray(content) || content.isDestroyed);
+
+          content.addArrayObserver(this, {
+            willChange: 'contentArrayWillChange',
+            didChange: 'contentArrayDidChange'
+          });
+        }
+      },
+
+      _arrangedContentWillChange: beforeObserver('arrangedContent', function() {
+        var arrangedContent = get(this, 'arrangedContent'),
+            len = arrangedContent ? get(arrangedContent, 'length') : 0;
+
+        this.arrangedContentArrayWillChange(this, 0, len, undefined);
+        this.arrangedContentWillChange(this);
+
+        this._teardownArrangedContent(arrangedContent);
+      }),
+
+      _arrangedContentDidChange: observer('arrangedContent', function() {
+        var arrangedContent = get(this, 'arrangedContent'),
+            len = arrangedContent ? get(arrangedContent, 'length') : 0;
+
+        Ember.assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
+
+        this._setupArrangedContent();
+
+        this.arrangedContentDidChange(this);
+        this.arrangedContentArrayDidChange(this, 0, undefined, len);
+      }),
+
+      _setupArrangedContent: function() {
+        var arrangedContent = get(this, 'arrangedContent');
+
+        if (arrangedContent) {
+          Ember.assert(fmt('ArrayProxy expects an Array or ' +
+            'Ember.ArrayProxy, but you passed %@', [typeof arrangedContent]),
+            isArray(arrangedContent) || arrangedContent.isDestroyed);
+
+          arrangedContent.addArrayObserver(this, {
+            willChange: 'arrangedContentArrayWillChange',
+            didChange: 'arrangedContentArrayDidChange'
+          });
+        }
+      },
+
+      _teardownArrangedContent: function() {
+        var arrangedContent = get(this, 'arrangedContent');
+
+        if (arrangedContent) {
+          arrangedContent.removeArrayObserver(this, {
+            willChange: 'arrangedContentArrayWillChange',
+            didChange: 'arrangedContentArrayDidChange'
+          });
+        }
+      },
+
+      arrangedContentWillChange: K,
+      arrangedContentDidChange: K,
+
+      objectAt: function(idx) {
+        return get(this, 'content') && this.objectAtContent(idx);
+      },
+
+      length: computed(function() {
+        var arrangedContent = get(this, 'arrangedContent');
+        return arrangedContent ? get(arrangedContent, 'length') : 0;
+        // No dependencies since Enumerable notifies length of change
+      }),
+
+      _replace: function(idx, amt, objects) {
+        var content = get(this, 'content');
+        Ember.assert('The content property of '+ this.constructor + ' should be set before modifying it', content);
+        if (content) this.replaceContent(idx, amt, objects);
+        return this;
+      },
+
+      replace: function() {
+        if (get(this, 'arrangedContent') === get(this, 'content')) {
+          apply(this, this._replace, arguments);
+        } else {
+          throw new EmberError("Using replace on an arranged ArrayProxy is not allowed.");
+        }
+      },
+
+      _insertAt: function(idx, object) {
+        if (idx > get(this, 'content.length')) throw new EmberError(OUT_OF_RANGE_EXCEPTION);
+        this._replace(idx, 0, [object]);
+        return this;
+      },
+
+      insertAt: function(idx, object) {
+        if (get(this, 'arrangedContent') === get(this, 'content')) {
+          return this._insertAt(idx, object);
+        } else {
+          throw new EmberError("Using insertAt on an arranged ArrayProxy is not allowed.");
+        }
+      },
+
+      removeAt: function(start, len) {
+        if ('number' === typeof start) {
+          var content = get(this, 'content'),
+              arrangedContent = get(this, 'arrangedContent'),
+              indices = [], i;
+
+          if ((start < 0) || (start >= get(this, 'length'))) {
+            throw new EmberError(OUT_OF_RANGE_EXCEPTION);
+          }
+
+          if (len === undefined) len = 1;
+
+          // Get a list of indices in original content to remove
+          for (i=start; i<start+len; i++) {
+            // Use arrangedContent here so we avoid confusion with objects transformed by objectAtContent
+            indices.push(content.indexOf(arrangedContent.objectAt(i)));
+          }
+
+          // Replace in reverse order since indices will change
+          indices.sort(function(a,b) { return b - a; });
+
+          beginPropertyChanges();
+          for (i=0; i<indices.length; i++) {
+            this._replace(indices[i], 1, EMPTY);
+          }
+          endPropertyChanges();
+        }
+
+        return this ;
+      },
+
+      pushObject: function(obj) {
+        this._insertAt(get(this, 'content.length'), obj) ;
+        return obj ;
+      },
+
+      pushObjects: function(objects) {
+        if (!(Enumerable.detect(objects) || isArray(objects))) {
+          throw new TypeError("Must pass Ember.Enumerable to Ember.MutableArray#pushObjects");
+        }
+        this._replace(get(this, 'length'), 0, objects);
+        return this;
+      },
+
+      setObjects: function(objects) {
+        if (objects.length === 0) return this.clear();
+
+        var len = get(this, 'length');
+        this._replace(0, len, objects);
+        return this;
+      },
+
+      unshiftObject: function(obj) {
+        this._insertAt(0, obj) ;
+        return obj ;
+      },
+
+      unshiftObjects: function(objects) {
+        this._replace(0, 0, objects);
+        return this;
+      },
+
+      slice: function() {
+        var arr = this.toArray();
+        return arr.slice.apply(arr, arguments);
+      },
+
+      arrangedContentArrayWillChange: function(item, idx, removedCnt, addedCnt) {
+        this.arrayContentWillChange(idx, removedCnt, addedCnt);
+      },
+
+      arrangedContentArrayDidChange: function(item, idx, removedCnt, addedCnt) {
+        this.arrayContentDidChange(idx, removedCnt, addedCnt);
+      },
+
+      init: function() {
+        this._super();
+        this._setupContent();
+        this._setupArrangedContent();
+      },
+
+      willDestroy: function() {
+        this._teardownArrangedContent();
+        this._teardownContent();
+      }
+    });
+
+    __exports__["default"] = ArrayProxy;
+  });
+define("ember-runtime/system/container",
+  ["ember-metal/property_set","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var set = __dependency1__["default"];
+
+    var Container = requireModule('container')["default"];
+    Container.set = set;
+
+    __exports__["default"] = Container;
+  });
+define("ember-runtime/system/core_object",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-runtime/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+    "use strict";
+    /**
+      @module ember
+      @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.ENV.MANDATORY_SETTER, Ember.assert, Ember.K, Ember.config
+
+    // NOTE: this object should never be included directly. Instead use `Ember.Object`.
+    // We only define this separately so that `Ember.Set` can depend on it.
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+    var apply = __dependency4__.apply;
+    var create = __dependency5__.create;
+    var generateGuid = __dependency4__.generateGuid;
+    var GUID_KEY = __dependency4__.GUID_KEY;
+    var meta = __dependency4__.meta;
+    var META_KEY = __dependency4__.META_KEY;
+    var makeArray = __dependency4__.makeArray;
+    var rewatch = __dependency6__.rewatch;
+    var finishChains = __dependency7__.finishChains;
+    var sendEvent = __dependency8__.sendEvent;
+    var IS_BINDING = __dependency9__.IS_BINDING;
+    var Mixin = __dependency9__.Mixin;
+    var required = __dependency9__.required;
+    var EnumerableUtils = __dependency10__["default"];
+    var EmberError = __dependency11__["default"];
+    var platform = __dependency5__.platform;
+    var keys = __dependency12__["default"];
+    var ActionHandler = __dependency13__["default"];
+    var defineProperty = __dependency14__.defineProperty;
+    var Binding = __dependency15__.Binding;
+    var ComputedProperty = __dependency16__.ComputedProperty;
+    var run = __dependency17__["default"];
+    var destroy = __dependency6__.destroy;
+
+
+    var o_create = create,
+        o_defineProperty = platform.defineProperty,
+        schedule = run.schedule,
+        applyMixin = Mixin._apply,
+        finishPartial = Mixin.finishPartial,
+        reopen = Mixin.prototype.reopen,
+        MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER,
+        indexOf = EnumerableUtils.indexOf,
+        K = Ember.K;
+
+    var undefinedDescriptor = {
+      configurable: true,
+      writable: true,
+      enumerable: false,
+      value: undefined
+    };
+
+    var nullDescriptor = {
+      configurable: true,
+      writable: true,
+      enumerable: false,
+      value: null
+    };
+
+    function makeCtor() {
+
+      // Note: avoid accessing any properties on the object since it makes the
+      // method a lot faster. This is glue code so we want it to be as fast as
+      // possible.
+
+      var wasApplied = false, initMixins, initProperties;
+
+      var Class = function() {
+        if (!wasApplied) {
+          Class.proto(); // prepare prototype...
+        }
+        o_defineProperty(this, GUID_KEY, nullDescriptor);
+        o_defineProperty(this, '__nextSuper', undefinedDescriptor);
+        var m = meta(this), proto = m.proto;
+        m.proto = this;
+        if (initMixins) {
+          // capture locally so we can clear the closed over variable
+          var mixins = initMixins;
+          initMixins = null;
+          apply(this, this.reopen, mixins);
+        }
+        if (initProperties) {
+          // capture locally so we can clear the closed over variable
+          var props = initProperties;
+          initProperties = null;
+
+          var concatenatedProperties = this.concatenatedProperties;
+
+          for (var i = 0, l = props.length; i < l; i++) {
+            var properties = props[i];
+
+            Ember.assert("Ember.Object.create no longer supports mixing in other definitions, use createWithMixins instead.", !(properties instanceof Mixin));
+
+            if (typeof properties !== 'object' && properties !== undefined) {
+              throw new EmberError("Ember.Object.create only accepts objects.");
+            }
+
+            if (!properties) { continue; }
+
+            var keyNames = keys(properties);
+
+            for (var j = 0, ll = keyNames.length; j < ll; j++) {
+              var keyName = keyNames[j];
+              if (!properties.hasOwnProperty(keyName)) { continue; }
+
+              var value = properties[keyName];
+
+              if (IS_BINDING.test(keyName)) {
+                var bindings = m.bindings;
+                if (!bindings) {
+                  bindings = m.bindings = {};
+                } else if (!m.hasOwnProperty('bindings')) {
+                  bindings = m.bindings = o_create(m.bindings);
+                }
+                bindings[keyName] = value;
+              }
+
+              var desc = m.descs[keyName];
+
+              Ember.assert("Ember.Object.create no longer supports defining computed properties. Define computed properties using extend() or reopen() before calling create().", !(value instanceof ComputedProperty));
+              Ember.assert("Ember.Object.create no longer supports defining methods that call _super.", !(typeof value === 'function' && value.toString().indexOf('._super') !== -1));
+              Ember.assert("`actions` must be provided at extend time, not at create " +
+                           "time, when Ember.ActionHandler is used (i.e. views, " +
+                           "controllers & routes).", !((keyName === 'actions') && ActionHandler.detect(this)));
+
+              if (concatenatedProperties && indexOf(concatenatedProperties, keyName) >= 0) {
+                var baseValue = this[keyName];
+
+                if (baseValue) {
+                  if ('function' === typeof baseValue.concat) {
+                    value = baseValue.concat(value);
+                  } else {
+                    value = makeArray(baseValue).concat(value);
+                  }
+                } else {
+                  value = makeArray(value);
+                }
+              }
+
+              if (desc) {
+                desc.set(this, keyName, value);
+              } else {
+                if (typeof this.setUnknownProperty === 'function' && !(keyName in this)) {
+                  this.setUnknownProperty(keyName, value);
+                } else if (MANDATORY_SETTER) {
+                  defineProperty(this, keyName, null, value); // setup mandatory setter
+                } else {
+                  this[keyName] = value;
+                }
+              }
+            }
+          }
+        }
+        finishPartial(this, m);
+        apply(this, this.init, arguments);
+        m.proto = proto;
+        finishChains(this);
+        sendEvent(this, "init");
+      };
+
+      Class.toString = Mixin.prototype.toString;
+      Class.willReopen = function() {
+        if (wasApplied) {
+          Class.PrototypeMixin = Mixin.create(Class.PrototypeMixin);
+        }
+
+        wasApplied = false;
+      };
+      Class._initMixins = function(args) { initMixins = args; };
+      Class._initProperties = function(args) { initProperties = args; };
+
+      Class.proto = function() {
+        var superclass = Class.superclass;
+        if (superclass) { superclass.proto(); }
+
+        if (!wasApplied) {
+          wasApplied = true;
+          Class.PrototypeMixin.applyPartial(Class.prototype);
+          rewatch(Class.prototype);
+        }
+
+        return this.prototype;
+      };
+
+      return Class;
+
+    }
+
+    /**
+      @class CoreObject
+      @namespace Ember
+    */
+    var CoreObject = makeCtor();
+    CoreObject.toString = function() { return "Ember.CoreObject"; };
+
+    CoreObject.PrototypeMixin = Mixin.create({
+      reopen: function() {
+        applyMixin(this, arguments, true);
+        return this;
+      },
+
+      /**
+        An overridable method called when objects are instantiated. By default,
+        does nothing unless it is overridden during class definition.
+
+        Example:
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          init: function() {
+            alert('Name is ' + this.get('name'));
+          }
+        });
+
+        var steve = App.Person.create({
+          name: "Steve"
+        });
+
+        // alerts 'Name is Steve'.
+        ```
+
+        NOTE: If you do override `init` for a framework class like `Ember.View` or
+        `Ember.ArrayController`, be sure to call `this._super()` in your
+        `init` declaration! If you don't, Ember may not have an opportunity to
+        do important setup work, and you'll see strange behavior in your
+        application.
+
+        @method init
+      */
+      init: function() {},
+
+      /**
+        Defines the properties that will be concatenated from the superclass
+        (instead of overridden).
+
+        By default, when you extend an Ember class a property defined in
+        the subclass overrides a property with the same name that is defined
+        in the superclass. However, there are some cases where it is preferable
+        to build up a property's value by combining the superclass' property
+        value with the subclass' value. An example of this in use within Ember
+        is the `classNames` property of `Ember.View`.
+
+        Here is some sample code showing the difference between a concatenated
+        property and a normal one:
+
+        ```javascript
+        App.BarView = Ember.View.extend({
+          someNonConcatenatedProperty: ['bar'],
+          classNames: ['bar']
+        });
+
+        App.FooBarView = App.BarView.extend({
+          someNonConcatenatedProperty: ['foo'],
+          classNames: ['foo'],
+        });
+
+        var fooBarView = App.FooBarView.create();
+        fooBarView.get('someNonConcatenatedProperty'); // ['foo']
+        fooBarView.get('classNames'); // ['ember-view', 'bar', 'foo']
+        ```
+
+        This behavior extends to object creation as well. Continuing the
+        above example:
+
+        ```javascript
+        var view = App.FooBarView.create({
+          someNonConcatenatedProperty: ['baz'],
+          classNames: ['baz']
+        })
+        view.get('someNonConcatenatedProperty'); // ['baz']
+        view.get('classNames'); // ['ember-view', 'bar', 'foo', 'baz']
+        ```
+        Adding a single property that is not an array will just add it in the array:
+
+        ```javascript
+        var view = App.FooBarView.create({
+          classNames: 'baz'
+        })
+        view.get('classNames'); // ['ember-view', 'bar', 'foo', 'baz']
+        ```
+
+        Using the `concatenatedProperties` property, we can tell to Ember that mix
+        the content of the properties.
+
+        In `Ember.View` the `classNameBindings` and `attributeBindings` properties
+        are also concatenated, in addition to `classNames`.
+
+        This feature is available for you to use throughout the Ember object model,
+        although typical app developers are likely to use it infrequently. Since
+        it changes expectations about behavior of properties, you should properly
+        document its usage in each individual concatenated property (to not
+        mislead your users to think they can override the property in a subclass).
+
+        @property concatenatedProperties
+        @type Array
+        @default null
+      */
+      concatenatedProperties: null,
+
+      /**
+        Destroyed object property flag.
+
+        if this property is `true` the observers and bindings were already
+        removed by the effect of calling the `destroy()` method.
+
+        @property isDestroyed
+        @default false
+      */
+      isDestroyed: false,
+
+      /**
+        Destruction scheduled flag. The `destroy()` method has been called.
+
+        The object stays intact until the end of the run loop at which point
+        the `isDestroyed` flag is set.
+
+        @property isDestroying
+        @default false
+      */
+      isDestroying: false,
+
+      /**
+        Destroys an object by setting the `isDestroyed` flag and removing its
+        metadata, which effectively destroys observers and bindings.
+
+        If you try to set a property on a destroyed object, an exception will be
+        raised.
+
+        Note that destruction is scheduled for the end of the run loop and does not
+        happen immediately.  It will set an isDestroying flag immediately.
+
+        @method destroy
+        @return {Ember.Object} receiver
+      */
+      destroy: function() {
+        if (this.isDestroying) { return; }
+        this.isDestroying = true;
+
+        schedule('actions', this, this.willDestroy);
+        schedule('destroy', this, this._scheduledDestroy);
+        return this;
+      },
+
+      /**
+        Override to implement teardown.
+
+        @method willDestroy
+       */
+      willDestroy: K,
+
+      /**
+        Invoked by the run loop to actually destroy the object. This is
+        scheduled for execution by the `destroy` method.
+
+        @private
+        @method _scheduledDestroy
+      */
+      _scheduledDestroy: function() {
+        if (this.isDestroyed) { return; }
+        destroy(this);
+        this.isDestroyed = true;
+      },
+
+      bind: function(to, from) {
+        if (!(from instanceof Binding)) { from = Binding.from(from); }
+        from.to(to).connect(this);
+        return from;
+      },
+
+      /**
+        Returns a string representation which attempts to provide more information
+        than Javascript's `toString` typically does, in a generic way for all Ember
+        objects.
+
+        ```javascript
+        App.Person = Em.Object.extend()
+        person = App.Person.create()
+        person.toString() //=> "<App.Person:ember1024>"
+        ```
+
+        If the object's class is not defined on an Ember namespace, it will
+        indicate it is a subclass of the registered superclass:
+
+       ```javascript
+        Student = App.Person.extend()
+        student = Student.create()
+        student.toString() //=> "<(subclass of App.Person):ember1025>"
+        ```
+
+        If the method `toStringExtension` is defined, its return value will be
+        included in the output.
+
+        ```javascript
+        App.Teacher = App.Person.extend({
+          toStringExtension: function() {
+            return this.get('fullName');
+          }
+        });
+        teacher = App.Teacher.create()
+        teacher.toString(); //=> "<App.Teacher:ember1026:Tom Dale>"
+        ```
+
+        @method toString
+        @return {String} string representation
+      */
+      toString: function toString() {
+        var hasToStringExtension = typeof this.toStringExtension === 'function',
+            extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
+        var ret = '<'+this.constructor.toString()+':'+guidFor(this)+extension+'>';
+        this.toString = makeToString(ret);
+        return ret;
+      }
+    });
+
+    CoreObject.PrototypeMixin.ownerConstructor = CoreObject;
+
+    function makeToString(ret) {
+      return function() { return ret; };
+    }
+
+    if (Ember.config.overridePrototypeMixin) {
+      Ember.config.overridePrototypeMixin(CoreObject.PrototypeMixin);
+    }
+
+    CoreObject.__super__ = null;
+
+    var ClassMixin = Mixin.create({
+
+      ClassMixin: required(),
+
+      PrototypeMixin: required(),
+
+      isClass: true,
+
+      isMethod: false,
+
+      /**
+        Creates a new subclass.
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          say: function(thing) {
+            alert(thing);
+           }
+        });
+        ```
+
+        This defines a new subclass of Ember.Object: `App.Person`. It contains one method: `say()`.
+
+        You can also create a subclass from any existing class by calling its `extend()`  method. For example, you might want to create a subclass of Ember's built-in `Ember.View` class:
+
+        ```javascript
+        App.PersonView = Ember.View.extend({
+          tagName: 'li',
+          classNameBindings: ['isAdministrator']
+        });
+        ```
+
+        When defining a subclass, you can override methods but still access the implementation of your parent class by calling the special `_super()` method:
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          say: function(thing) {
+            var name = this.get('name');
+            alert(name + ' says: ' + thing);
+          }
+        });
+
+        App.Soldier = App.Person.extend({
+          say: function(thing) {
+            this._super(thing + ", sir!");
+          },
+          march: function(numberOfHours) {
+            alert(this.get('name') + ' marches for ' + numberOfHours + ' hours.')
+          }
+        });
+
+        var yehuda = App.Soldier.create({
+          name: "Yehuda Katz"
+        });
+
+        yehuda.say("Yes");  // alerts "Yehuda Katz says: Yes, sir!"
+        ```
+
+        The `create()` on line #17 creates an *instance* of the `App.Soldier` class. The `extend()` on line #8 creates a *subclass* of `App.Person`. Any instance of the `App.Person` class will *not* have the `march()` method.
+
+        You can also pass `Mixin` classes to add additional properties to the subclass.
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          say: function(thing) {
+            alert(this.get('name') + ' says: ' + thing);
+          }
+        });
+
+        App.SingingMixin = Mixin.create({
+          sing: function(thing){
+            alert(this.get('name') + ' sings: la la la ' + thing);
+          }
+        });
+
+        App.BroadwayStar = App.Person.extend(App.SingingMixin, {
+          dance: function() {
+            alert(this.get('name') + ' dances: tap tap tap tap ');
+          }
+        });
+        ```
+
+        The `App.BroadwayStar` class contains three methods: `say()`, `sing()`, and `dance()`.
+
+        @method extend
+        @static
+
+        @param {Mixin} [mixins]* One or more Mixin classes
+        @param {Object} [arguments]* Object containing values to use within the new class
+      */
+      extend: function() {
+        var Class = makeCtor(), proto;
+        Class.ClassMixin = Mixin.create(this.ClassMixin);
+        Class.PrototypeMixin = Mixin.create(this.PrototypeMixin);
+
+        Class.ClassMixin.ownerConstructor = Class;
+        Class.PrototypeMixin.ownerConstructor = Class;
+
+        reopen.apply(Class.PrototypeMixin, arguments);
+
+        Class.superclass = this;
+        Class.__super__  = this.prototype;
+
+        proto = Class.prototype = o_create(this.prototype);
+        proto.constructor = Class;
+        generateGuid(proto);
+        meta(proto).proto = proto; // this will disable observers on prototype
+
+        Class.ClassMixin.apply(Class);
+        return Class;
+      },
+
+      /**
+        Equivalent to doing `extend(arguments).create()`.
+        If possible use the normal `create` method instead.
+
+        @method createWithMixins
+        @static
+        @param [arguments]*
+      */
+      createWithMixins: function() {
+        var C = this;
+        if (arguments.length>0) { this._initMixins(arguments); }
+        return new C();
+      },
+
+      /**
+        Creates an instance of a class. Accepts either no arguments, or an object
+        containing values to initialize the newly instantiated object with.
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          helloWorld: function() {
+            alert("Hi, my name is " + this.get('name'));
+          }
+        });
+
+        var tom = App.Person.create({
+          name: 'Tom Dale'
+        });
+
+        tom.helloWorld(); // alerts "Hi, my name is Tom Dale".
+        ```
+
+        `create` will call the `init` function if defined during
+        `Ember.AnyObject.extend`
+
+        If no arguments are passed to `create`, it will not set values to the new
+        instance during initialization:
+
+        ```javascript
+        var noName = App.Person.create();
+        noName.helloWorld(); // alerts undefined
+        ```
+
+        NOTE: For performance reasons, you cannot declare methods or computed
+        properties during `create`. You should instead declare methods and computed
+        properties when using `extend` or use the `createWithMixins` shorthand.
+
+        @method create
+        @static
+        @param [arguments]*
+      */
+      create: function() {
+        var C = this;
+        if (arguments.length>0) { this._initProperties(arguments); }
+        return new C();
+      },
+
+      /**
+        Augments a constructor's prototype with additional
+        properties and functions:
+
+        ```javascript
+        MyObject = Ember.Object.extend({
+          name: 'an object'
+        });
+
+        o = MyObject.create();
+        o.get('name'); // 'an object'
+
+        MyObject.reopen({
+          say: function(msg){
+            console.log(msg);
+          }
+        })
+
+        o2 = MyObject.create();
+        o2.say("hello"); // logs "hello"
+
+        o.say("goodbye"); // logs "goodbye"
+        ```
+
+        To add functions and properties to the constructor itself,
+        see `reopenClass`
+
+        @method reopen
+      */
+      reopen: function() {
+        this.willReopen();
+        apply(this.PrototypeMixin, reopen, arguments);
+        return this;
+      },
+
+      /**
+        Augments a constructor's own properties and functions:
+
+        ```javascript
+        MyObject = Ember.Object.extend({
+          name: 'an object'
+        });
+
+        MyObject.reopenClass({
+          canBuild: false
+        });
+
+        MyObject.canBuild; // false
+        o = MyObject.create();
+        ```
+
+        In other words, this creates static properties and functions for the class. These are only available on the class
+        and not on any instance of that class.
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          name : "",
+          sayHello : function(){
+            alert("Hello. My name is " + this.get('name'));
+          }
+        });
+
+        App.Person.reopenClass({
+          species : "Homo sapiens",
+          createPerson: function(newPersonsName){
+            return App.Person.create({
+              name:newPersonsName
+            });
+          }
+        });
+
+        var tom = App.Person.create({
+          name : "Tom Dale"
+        });
+        var yehuda = App.Person.createPerson("Yehuda Katz");
+
+        tom.sayHello(); // "Hello. My name is Tom Dale"
+        yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
+        alert(App.Person.species); // "Homo sapiens"
+        ```
+
+        Note that `species` and `createPerson` are *not* valid on the `tom` and `yehuda`
+        variables. They are only valid on `App.Person`.
+
+        To add functions and properties to instances of
+        a constructor by extending the constructor's prototype
+        see `reopen`
+
+        @method reopenClass
+      */
+      reopenClass: function() {
+        apply(this.ClassMixin, reopen, arguments);
+        applyMixin(this, arguments, false);
+        return this;
+      },
+
+      detect: function(obj) {
+        if ('function' !== typeof obj) { return false; }
+        while(obj) {
+          if (obj===this) { return true; }
+          obj = obj.superclass;
+        }
+        return false;
+      },
+
+      detectInstance: function(obj) {
+        return obj instanceof this;
+      },
+
+      /**
+        In some cases, you may want to annotate computed properties with additional
+        metadata about how they function or what values they operate on. For
+        example, computed property functions may close over variables that are then
+        no longer available for introspection.
+
+        You can pass a hash of these values to a computed property like this:
+
+        ```javascript
+        person: function() {
+          var personId = this.get('personId');
+          return App.Person.create({ id: personId });
+        }.property().meta({ type: App.Person })
+        ```
+
+        Once you've done this, you can retrieve the values saved to the computed
+        property from your class like this:
+
+        ```javascript
+        MyClass.metaForProperty('person');
+        ```
+
+        This will return the original hash that was passed to `meta()`.
+
+        @method metaForProperty
+        @param key {String} property name
+      */
+      metaForProperty: function(key) {
+        var meta = this.proto()[META_KEY],
+            desc = meta && meta.descs[key];
+
+        Ember.assert("metaForProperty() could not find a computed property with key '"+key+"'.", !!desc && desc instanceof ComputedProperty);
+        return desc._meta || {};
+      },
+
+      /**
+        Iterate over each computed property for the class, passing its name
+        and any associated metadata (see `metaForProperty`) to the callback.
+
+        @method eachComputedProperty
+        @param {Function} callback
+        @param {Object} binding
+      */
+      eachComputedProperty: function(callback, binding) {
+        var proto = this.proto(),
+            descs = meta(proto).descs,
+            empty = {},
+            property;
+
+        for (var name in descs) {
+          property = descs[name];
+
+          if (property instanceof ComputedProperty) {
+            callback.call(binding || this, name, property._meta || empty);
+          }
+        }
+      }
+
+    });
+
+    ClassMixin.ownerConstructor = CoreObject;
+
+    if (Ember.config.overrideClassMixin) {
+      Ember.config.overrideClassMixin(ClassMixin);
+    }
+
+    CoreObject.ClassMixin = ClassMixin;
+    ClassMixin.apply(CoreObject);
+
+    __exports__["default"] = CoreObject;
+  });
+define("ember-runtime/system/deferred",
+  ["ember-runtime/mixins/deferred","ember-metal/property_get","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var DeferredMixin = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var EmberObject = __dependency3__["default"];
+
+    var Deferred = EmberObject.extend(DeferredMixin);
+
+    Deferred.reopenClass({
+      promise: function(callback, binding) {
+        var deferred = Deferred.create();
+        callback.call(binding, deferred);
+        return deferred;
+      }
+    });
+
+    __exports__["default"] = Deferred;
+  });
+define("ember-runtime/system/each_proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/enumerable_utils","ember-metal/array","ember-runtime/mixins/array","ember-runtime/system/object","ember-metal/computed","ember-metal/observer","ember-metal/events","ember-metal/properties","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+    var EnumerableUtils = __dependency5__["default"];
+    var indexOf = __dependency6__.indexOf;
+    var EmberArray = __dependency7__["default"];
+    // ES6TODO: WAT? Circular dep?
+    var EmberObject = __dependency8__["default"];
+    var computed = __dependency9__.computed;
+    var addObserver = __dependency10__.addObserver;
+    var addBeforeObserver = __dependency10__.addBeforeObserver;
+    var removeBeforeObserver = __dependency10__.removeBeforeObserver;
+    var removeObserver = __dependency10__.removeObserver;
+    var typeOf = __dependency4__.typeOf;
+    var watchedEvents = __dependency11__.watchedEvents;
+    var defineProperty = __dependency12__.defineProperty;
+    var beginPropertyChanges = __dependency13__.beginPropertyChanges;
+    var propertyDidChange = __dependency13__.propertyDidChange;
+    var propertyWillChange = __dependency13__.propertyWillChange;
+    var endPropertyChanges = __dependency13__.endPropertyChanges;
+    var changeProperties = __dependency13__.changeProperties;
+
+    var forEach = EnumerableUtils.forEach;
+
+    var EachArray = EmberObject.extend(EmberArray, {
+
+      init: function(content, keyName, owner) {
+        this._super();
+        this._keyName = keyName;
+        this._owner   = owner;
+        this._content = content;
+      },
+
+      objectAt: function(idx) {
+        var item = this._content.objectAt(idx);
+        return item && get(item, this._keyName);
+      },
+
+      length: computed(function() {
+        var content = this._content;
+        return content ? get(content, 'length') : 0;
+      })
+
+    });
+
+    var IS_OBSERVER = /^.+:(before|change)$/;
+
+    function addObserverForContentKey(content, keyName, proxy, idx, loc) {
+      var objects = proxy._objects, guid;
+      if (!objects) objects = proxy._objects = {};
+
+      while(--loc>=idx) {
+        var item = content.objectAt(loc);
+        if (item) {
+          Ember.assert('When using @each to observe the array ' + content + ', the array must return an object', typeOf(item) === 'instance' || typeOf(item) === 'object');
+          addBeforeObserver(item, keyName, proxy, 'contentKeyWillChange');
+          addObserver(item, keyName, proxy, 'contentKeyDidChange');
+
+          // keep track of the index each item was found at so we can map
+          // it back when the obj changes.
+          guid = guidFor(item);
+          if (!objects[guid]) objects[guid] = [];
+          objects[guid].push(loc);
+        }
+      }
+    }
+
+    function removeObserverForContentKey(content, keyName, proxy, idx, loc) {
+      var objects = proxy._objects;
+      if (!objects) objects = proxy._objects = {};
+      var indicies, guid;
+
+      while(--loc>=idx) {
+        var item = content.objectAt(loc);
+        if (item) {
+          removeBeforeObserver(item, keyName, proxy, 'contentKeyWillChange');
+          removeObserver(item, keyName, proxy, 'contentKeyDidChange');
+
+          guid = guidFor(item);
+          indicies = objects[guid];
+          indicies[indexOf.call(indicies, loc)] = null;
+        }
+      }
+    }
+
+    /**
+      This is the object instance returned when you get the `@each` property on an
+      array. It uses the unknownProperty handler to automatically create
+      EachArray instances for property names.
+
+      @private
+      @class EachProxy
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var EachProxy = EmberObject.extend({
+
+      init: function(content) {
+        this._super();
+        this._content = content;
+        content.addArrayObserver(this);
+
+        // in case someone is already observing some keys make sure they are
+        // added
+        forEach(watchedEvents(this), function(eventName) {
+          this.didAddListener(eventName);
+        }, this);
+      },
+
+      /**
+        You can directly access mapped properties by simply requesting them.
+        The `unknownProperty` handler will generate an EachArray of each item.
+
+        @method unknownProperty
+        @param keyName {String}
+        @param value {*}
+      */
+      unknownProperty: function(keyName, value) {
+        var ret;
+        ret = new EachArray(this._content, keyName, this);
+        defineProperty(this, keyName, null, ret);
+        this.beginObservingContentKey(keyName);
+        return ret;
+      },
+
+      // ..........................................................
+      // ARRAY CHANGES
+      // Invokes whenever the content array itself changes.
+
+      arrayWillChange: function(content, idx, removedCnt, addedCnt) {
+        var keys = this._keys, key, lim;
+
+        lim = removedCnt>0 ? idx+removedCnt : -1;
+        beginPropertyChanges(this);
+
+        for(key in keys) {
+          if (!keys.hasOwnProperty(key)) { continue; }
+
+          if (lim>0) { removeObserverForContentKey(content, key, this, idx, lim); }
+
+          propertyWillChange(this, key);
+        }
+
+        propertyWillChange(this._content, '@each');
+        endPropertyChanges(this);
+      },
+
+      arrayDidChange: function(content, idx, removedCnt, addedCnt) {
+        var keys = this._keys, lim;
+
+        lim = addedCnt>0 ? idx+addedCnt : -1;
+        changeProperties(function() {
+          for(var key in keys) {
+            if (!keys.hasOwnProperty(key)) { continue; }
+
+            if (lim>0) { addObserverForContentKey(content, key, this, idx, lim); }
+
+            propertyDidChange(this, key);
+          }
+
+          propertyDidChange(this._content, '@each');
+        }, this);
+      },
+
+      // ..........................................................
+      // LISTEN FOR NEW OBSERVERS AND OTHER EVENT LISTENERS
+      // Start monitoring keys based on who is listening...
+
+      didAddListener: function(eventName) {
+        if (IS_OBSERVER.test(eventName)) {
+          this.beginObservingContentKey(eventName.slice(0, -7));
+        }
+      },
+
+      didRemoveListener: function(eventName) {
+        if (IS_OBSERVER.test(eventName)) {
+          this.stopObservingContentKey(eventName.slice(0, -7));
+        }
+      },
+
+      // ..........................................................
+      // CONTENT KEY OBSERVING
+      // Actual watch keys on the source content.
+
+      beginObservingContentKey: function(keyName) {
+        var keys = this._keys;
+        if (!keys) keys = this._keys = {};
+        if (!keys[keyName]) {
+          keys[keyName] = 1;
+          var content = this._content,
+              len = get(content, 'length');
+          addObserverForContentKey(content, keyName, this, 0, len);
+        } else {
+          keys[keyName]++;
+        }
+      },
+
+      stopObservingContentKey: function(keyName) {
+        var keys = this._keys;
+        if (keys && (keys[keyName]>0) && (--keys[keyName]<=0)) {
+          var content = this._content,
+              len     = get(content, 'length');
+          removeObserverForContentKey(content, keyName, this, 0, len);
+        }
+      },
+
+      contentKeyWillChange: function(obj, keyName) {
+        propertyWillChange(this, keyName);
+      },
+
+      contentKeyDidChange: function(obj, keyName) {
+        propertyDidChange(this, keyName);
+      }
+
+    });
+
+    __exports__.EachArray = EachArray;
+    __exports__.EachProxy = EachProxy;
+  });
+define("ember-runtime/system/lazy_load",
+  ["ember-metal/core","ember-metal/array","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /*globals CustomEvent */
+
+    var Ember = __dependency1__["default"];
+    // Ember.ENV.EMBER_LOAD_HOOKS
+    var forEach = __dependency2__.forEach;
+    // make sure Ember.A is setup.
+
+    /**
+      @module ember
+      @submodule ember-runtime
+    */
+
+    var loadHooks = Ember.ENV.EMBER_LOAD_HOOKS || {};
+    var loaded = {};
+
+    /**
+      Detects when a specific package of Ember (e.g. 'Ember.Handlebars')
+      has fully loaded and is available for extension.
+
+      The provided `callback` will be called with the `name` passed
+      resolved from a string into the object:
+
+      ``` javascript
+      Ember.onLoad('Ember.Handlebars' function(hbars) {
+        hbars.registerHelper(...);
+      });
+      ```
+
+      @method onLoad
+      @for Ember
+      @param name {String} name of hook
+      @param callback {Function} callback to be called
+    */
+    function onLoad(name, callback) {
+      var object;
+
+      loadHooks[name] = loadHooks[name] || Ember.A();
+      loadHooks[name].pushObject(callback);
+
+      if (object = loaded[name]) {
+        callback(object);
+      }
+    };
+
+    /**
+      Called when an Ember.js package (e.g Ember.Handlebars) has finished
+      loading. Triggers any callbacks registered for this event.
+
+      @method runLoadHooks
+      @for Ember
+      @param name {String} name of hook
+      @param object {Object} object to pass to callbacks
+    */
+    function runLoadHooks(name, object) {
+      loaded[name] = object;
+
+      if (typeof window === 'object' && typeof window.dispatchEvent === 'function' && typeof CustomEvent === "function") {
+        var event = new CustomEvent(name, {detail: object, name: name});
+        window.dispatchEvent(event);
+      }
+
+      if (loadHooks[name]) {
+        forEach.call(loadHooks[name], function(callback) {
+          callback(object);
+        });
+      }
+    };
+
+    __exports__.onLoad = onLoad;
+    __exports__.runLoadHooks = runLoadHooks;
+  });
+define("ember-runtime/system/namespace",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/mixin","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    // Ember.lookup, Ember.BOOTED, Ember.deprecate, Ember.NAME_KEY, Ember.anyUnprocessedMixins
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var indexOf = __dependency3__.indexOf;
+    var GUID_KEY = __dependency4__.GUID_KEY;
+    var guidFor = __dependency4__.guidFor;
+    var Mixin = __dependency5__.Mixin;
+
+    var EmberObject = __dependency6__["default"];
+
+    /**
+      A Namespace is an object usually used to contain other objects or methods
+      such as an application or framework. Create a namespace anytime you want
+      to define one of these new containers.
+
+      # Example Usage
+
+      ```javascript
+      MyFramework = Ember.Namespace.create({
+        VERSION: '1.0.0'
+      });
+      ```
+
+      @class Namespace
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var Namespace = EmberObject.extend({
+      isNamespace: true,
+
+      init: function() {
+        Namespace.NAMESPACES.push(this);
+        Namespace.PROCESSED = false;
+      },
+
+      toString: function() {
+        var name = get(this, 'name');
+        if (name) { return name; }
+
+        findNamespaces();
+        return this[NAME_KEY];
+      },
+
+      nameClasses: function() {
+        processNamespace([this.toString()], this, {});
+      },
+
+      destroy: function() {
+        var namespaces = Namespace.NAMESPACES,
+            toString = this.toString();
+
+        if (toString) {
+          Ember.lookup[toString] = undefined;
+          delete Namespace.NAMESPACES_BY_ID[toString];
+        }
+        namespaces.splice(indexOf.call(namespaces, this), 1);
+        this._super();
+      }
+    });
+
+    Namespace.reopenClass({
+      NAMESPACES: [Ember],
+      NAMESPACES_BY_ID: {},
+      PROCESSED: false,
+      processAll: processAllNamespaces,
+      byName: function(name) {
+        if (!Ember.BOOTED) {
+          processAllNamespaces();
+        }
+
+        return NAMESPACES_BY_ID[name];
+      }
+    });
+
+    var NAMESPACES_BY_ID = Namespace.NAMESPACES_BY_ID;
+
+    var hasOwnProp = ({}).hasOwnProperty;
+
+    function processNamespace(paths, root, seen) {
+      var idx = paths.length;
+
+      NAMESPACES_BY_ID[paths.join('.')] = root;
+
+      // Loop over all of the keys in the namespace, looking for classes
+      for(var key in root) {
+        if (!hasOwnProp.call(root, key)) { continue; }
+        var obj = root[key];
+
+        // If we are processing the `Ember` namespace, for example, the
+        // `paths` will start with `["Ember"]`. Every iteration through
+        // the loop will update the **second** element of this list with
+        // the key, so processing `Ember.View` will make the Array
+        // `['Ember', 'View']`.
+        paths[idx] = key;
+
+        // If we have found an unprocessed class
+        if (obj && obj.toString === classToString) {
+          // Replace the class' `toString` with the dot-separated path
+          // and set its `NAME_KEY`
+          obj.toString = makeToString(paths.join('.'));
+          obj[NAME_KEY] = paths.join('.');
+
+        // Support nested namespaces
+        } else if (obj && obj.isNamespace) {
+          // Skip aliased namespaces
+          if (seen[guidFor(obj)]) { continue; }
+          seen[guidFor(obj)] = true;
+
+          // Process the child namespace
+          processNamespace(paths, obj, seen);
+        }
+      }
+
+      paths.length = idx; // cut out last item
+    }
+
+    var STARTS_WITH_UPPERCASE = /^[A-Z]/;
+
+    function findNamespaces() {
+      var lookup = Ember.lookup, obj, isNamespace;
+
+      if (Namespace.PROCESSED) { return; }
+
+      for (var prop in lookup) {
+        // Only process entities that start with uppercase A-Z
+        if (!STARTS_WITH_UPPERCASE.test(prop)) { continue; }
+
+        // Unfortunately, some versions of IE don't support window.hasOwnProperty
+        if (lookup.hasOwnProperty && !lookup.hasOwnProperty(prop)) { continue; }
+
+        // At times we are not allowed to access certain properties for security reasons.
+        // There are also times where even if we can access them, we are not allowed to access their properties.
+        try {
+          obj = lookup[prop];
+          isNamespace = obj && obj.isNamespace;
+        } catch (e) {
+          continue;
+        }
+
+        if (isNamespace) {
+          obj[NAME_KEY] = prop;
+        }
+      }
+    }
+
+    var NAME_KEY = Ember.NAME_KEY = GUID_KEY + '_name';
+
+    function superClassString(mixin) {
+      var superclass = mixin.superclass;
+      if (superclass) {
+        if (superclass[NAME_KEY]) { return superclass[NAME_KEY]; }
+        else { return superClassString(superclass); }
+      } else {
+        return;
+      }
+    }
+
+    function classToString() {
+      if (!Ember.BOOTED && !this[NAME_KEY]) {
+        processAllNamespaces();
+      }
+
+      var ret;
+
+      if (this[NAME_KEY]) {
+        ret = this[NAME_KEY];
+      } else if (this._toString) {
+        ret = this._toString;
+      } else {
+        var str = superClassString(this);
+        if (str) {
+          ret = "(subclass of " + str + ")";
+        } else {
+          ret = "(unknown mixin)";
+        }
+        this.toString = makeToString(ret);
+      }
+
+      return ret;
+    }
+
+    function processAllNamespaces() {
+      var unprocessedNamespaces = !Namespace.PROCESSED,
+          unprocessedMixins = Ember.anyUnprocessedMixins;
+
+      if (unprocessedNamespaces) {
+        findNamespaces();
+        Namespace.PROCESSED = true;
+      }
+
+      if (unprocessedNamespaces || unprocessedMixins) {
+        var namespaces = Namespace.NAMESPACES, namespace;
+        for (var i=0, l=namespaces.length; i<l; i++) {
+          namespace = namespaces[i];
+          processNamespace([namespace.toString()], namespace, {});
+        }
+
+        Ember.anyUnprocessedMixins = false;
+      }
+    }
+
+    function makeToString(ret) {
+      return function() { return ret; };
+    }
+
+    Mixin.prototype.toString = classToString; // ES6TODO: altering imported objects. SBB.
+
+    __exports__["default"] = Namespace;
+  });
+define("ember-runtime/system/native_array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.EXTEND_PROTOTYPES
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EnumerableUtils = __dependency4__["default"];
+    var Mixin = __dependency5__.Mixin;
+    var EmberArray = __dependency6__["default"];
+    var MutableArray = __dependency7__["default"];
+    var Observable = __dependency8__["default"];
+    var Copyable = __dependency9__["default"];
+    var FROZEN_ERROR = __dependency10__.FROZEN_ERROR;
+    var copy = __dependency11__["default"];
+
+    var replace = EnumerableUtils._replace,
+        forEach = EnumerableUtils.forEach;
+
+    // Add Ember.Array to Array.prototype. Remove methods with native
+    // implementations and supply some more optimized versions of generic methods
+    // because they are so common.
+
+    /**
+      The NativeArray mixin contains the properties needed to to make the native
+      Array support Ember.MutableArray and all of its dependent APIs. Unless you
+      have `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Array` set to
+      false, this will be applied automatically. Otherwise you can apply the mixin
+      at anytime by calling `Ember.NativeArray.activate`.
+
+      @class NativeArray
+      @namespace Ember
+      @uses Ember.MutableArray
+      @uses Ember.Observable
+      @uses Ember.Copyable
+    */
+    var NativeArray = Mixin.create(MutableArray, Observable, Copyable, {
+
+      // because length is a built-in property we need to know to just get the
+      // original property.
+      get: function(key) {
+        if (key==='length') return this.length;
+        else if ('number' === typeof key) return this[key];
+        else return this._super(key);
+      },
+
+      objectAt: function(idx) {
+        return this[idx];
+      },
+
+      // primitive for array support.
+      replace: function(idx, amt, objects) {
+
+        if (this.isFrozen) throw FROZEN_ERROR;
+
+        // if we replaced exactly the same number of items, then pass only the
+        // replaced range. Otherwise, pass the full remaining array length
+        // since everything has shifted
+        var len = objects ? get(objects, 'length') : 0;
+        this.arrayContentWillChange(idx, amt, len);
+
+        if (len === 0) {
+          this.splice(idx, amt);
+        } else {
+          replace(this, idx, amt, objects);
+        }
+
+        this.arrayContentDidChange(idx, amt, len);
+        return this;
+      },
+
+      // If you ask for an unknown property, then try to collect the value
+      // from member items.
+      unknownProperty: function(key, value) {
+        var ret;// = this.reducedProperty(key, value) ;
+        if ((value !== undefined) && ret === undefined) {
+          ret = this[key] = value;
+        }
+        return ret ;
+      },
+
+      // If browser did not implement indexOf natively, then override with
+      // specialized version
+      indexOf: function(object, startAt) {
+        var idx, len = this.length;
+
+        if (startAt === undefined) startAt = 0;
+        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
+        if (startAt < 0) startAt += len;
+
+        for(idx=startAt;idx<len;idx++) {
+          if (this[idx] === object) return idx ;
+        }
+        return -1;
+      },
+
+      lastIndexOf: function(object, startAt) {
+        var idx, len = this.length;
+
+        if (startAt === undefined) startAt = len-1;
+        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
+        if (startAt < 0) startAt += len;
+
+        for(idx=startAt;idx>=0;idx--) {
+          if (this[idx] === object) return idx ;
+        }
+        return -1;
+      },
+
+      copy: function(deep) {
+        if (deep) {
+          return this.map(function(item) { return copy(item, true); });
+        }
+
+        return this.slice();
+      }
+    });
+
+    // Remove any methods implemented natively so we don't override them
+    var ignore = ['length'];
+    forEach(NativeArray.keys(), function(methodName) {
+      if (Array.prototype[methodName]) ignore.push(methodName);
+    });
+
+    if (ignore.length>0) {
+      NativeArray = NativeArray.without.apply(NativeArray, ignore);
+    }
+
+    /**
+      Creates an `Ember.NativeArray` from an Array like object.
+      Does not modify the original object. Ember.A is not needed if
+      `Ember.EXTEND_PROTOTYPES` is `true` (the default value). However,
+      it is recommended that you use Ember.A when creating addons for
+      ember or when you can not guarantee that `Ember.EXTEND_PROTOTYPES`
+      will be `true`.
+
+      Example
+
+      ```js
+      var Pagination = Ember.CollectionView.extend({
+        tagName: 'ul',
+        classNames: ['pagination'],
+
+        init: function() {
+          this._super();
+          if (!this.get('content')) {
+            this.set('content', Ember.A());
+          }
+        }
+      });
+      ```
+
+      @method A
+      @for Ember
+      @return {Ember.NativeArray}
+    */
+    var A = function(arr) {
+      if (arr === undefined) { arr = []; }
+      return EmberArray.detect(arr) ? arr : NativeArray.apply(arr);
+    };
+
+    /**
+      Activates the mixin on the Array.prototype if not already applied. Calling
+      this method more than once is safe. This will be called when ember is loaded
+      unless you have `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Array`
+      set to `false`.
+
+      Example
+
+      ```js
+      if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Array) {
+        Ember.NativeArray.activate();
+      }
+      ```
+
+      @method activate
+      @for Ember.NativeArray
+      @static
+      @return {void}
+    */
+    NativeArray.activate = function() {
+      NativeArray.apply(Array.prototype);
+
+      A = function(arr) { return arr || []; };
+    };
+
+    if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Array) {
+      NativeArray.activate();
+    }
+
+    Ember.A = A; // ES6TODO: Setting A onto the object returned by ember-metal/core to avoid circles
+    __exports__.A = A;
+    __exports__.NativeArray = NativeArray;__exports__["default"] = NativeArray;
+  });
+define("ember-runtime/system/object",
+  ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var CoreObject = __dependency1__["default"];
+    var Observable = __dependency2__["default"];
+
+    /**
+      `Ember.Object` is the main base class for all Ember objects. It is a subclass
+      of `Ember.CoreObject` with the `Ember.Observable` mixin applied. For details,
+      see the documentation for each of these.
+
+      @class Object
+      @namespace Ember
+      @extends Ember.CoreObject
+      @uses Ember.Observable
+    */
+    var EmberObject = CoreObject.extend(Observable);
+    EmberObject.toString = function() { return "Ember.Object"; };
+
+    __exports__["default"] = EmberObject;
+  });
+define("ember-runtime/system/object_proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var meta = __dependency4__.meta;
+    var addObserver = __dependency5__.addObserver;
+    var removeObserver = __dependency5__.removeObserver;
+    var addBeforeObserver = __dependency5__.addBeforeObserver;
+    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var computed = __dependency7__.computed;
+    var defineProperty = __dependency8__.defineProperty;
+    var observer = __dependency9__.observer;
+    var fmt = __dependency10__.fmt;
+    var EmberObject = __dependency11__["default"];
+
+    function contentPropertyWillChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; }  // if shadowed in proxy
+      propertyWillChange(this, key);
+    }
+
+    function contentPropertyDidChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; } // if shadowed in proxy
+      propertyDidChange(this, key);
+    }
+
+    /**
+      `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
+      to a proxied `content` object.
+
+      ```javascript
+      object = Ember.Object.create({
+        name: 'Foo'
+      });
+
+      proxy = Ember.ObjectProxy.create({
+        content: object
+      });
+
+      // Access and change existing properties
+      proxy.get('name')          // 'Foo'
+      proxy.set('name', 'Bar');
+      object.get('name')         // 'Bar'
+
+      // Create new 'description' property on `object`
+      proxy.set('description', 'Foo is a whizboo baz');
+      object.get('description')  // 'Foo is a whizboo baz'
+      ```
+
+      While `content` is unset, setting a property to be delegated will throw an
+      Error.
+
+      ```javascript
+      proxy = Ember.ObjectProxy.create({
+        content: null,
+        flag: null
+      });
+      proxy.set('flag', true);
+      proxy.get('flag');         // true
+      proxy.get('foo');          // undefined
+      proxy.set('foo', 'data');  // throws Error
+      ```
+
+      Delegated properties can be bound to and will change when content is updated.
+
+      Computed properties on the proxy itself can depend on delegated properties.
+
+      ```javascript
+      ProxyWithComputedProperty = Ember.ObjectProxy.extend({
+        fullName: function () {
+          var firstName = this.get('firstName'),
+              lastName = this.get('lastName');
+          if (firstName && lastName) {
+            return firstName + ' ' + lastName;
+          }
+          return firstName || lastName;
+        }.property('firstName', 'lastName')
+      });
+
+      proxy = ProxyWithComputedProperty.create();
+
+      proxy.get('fullName');  // undefined
+      proxy.set('content', {
+        firstName: 'Tom', lastName: 'Dale'
+      }); // triggers property change for fullName on proxy
+
+      proxy.get('fullName');  // 'Tom Dale'
+      ```
+
+      @class ObjectProxy
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var ObjectProxy = EmberObject.extend({
+      /**
+        The object whose properties will be forwarded.
+
+        @property content
+        @type Ember.Object
+        @default null
+      */
+      content: null,
+      _contentDidChange: observer('content', function() {
+        Ember.assert("Can't set ObjectProxy's content to itself", get(this, 'content') !== this);
+      }),
+
+      isTruthy: computed.bool('content'),
+
+      _debugContainerKey: null,
+
+      willWatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        addObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      didUnwatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        removeObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      unknownProperty: function (key) {
+        var content = get(this, 'content');
+        if (content) {
+          return get(content, key);
+        }
+      },
+
+      setUnknownProperty: function (key, value) {
+        var m = meta(this);
+        if (m.proto === this) {
+          // if marked as prototype then just defineProperty
+          // rather than delegate
+          defineProperty(this, key, null, value);
+          return value;
+        }
+
+        var content = get(this, 'content');
+        Ember.assert(fmt("Cannot delegate set('%@', %@) to the 'content' property of object proxy %@: its 'content' is undefined.", [key, value, this]), content);
+        return set(content, key, value);
+      }
+
+    });
+
+    __exports__["default"] = ObjectProxy;
+  });
+define("ember-runtime/system/set",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/is_none","ember-runtime/system/string","ember-runtime/system/core_object","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-metal/error","ember-metal/property_events","ember-metal/mixin","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.isNone
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+    var isNone = __dependency5__.isNone;
+    var fmt = __dependency6__.fmt;
+    var CoreObject = __dependency7__["default"];
+    var MutableEnumerable = __dependency8__["default"];
+    var Enumerable = __dependency9__["default"];
+    var Copyable = __dependency10__["default"];
+    var Freezable = __dependency11__.Freezable;
+    var FROZEN_ERROR = __dependency11__.FROZEN_ERROR;
+    var EmberError = __dependency12__["default"];
+    var propertyWillChange = __dependency13__.propertyWillChange;
+    var propertyDidChange = __dependency13__.propertyDidChange;
+    var aliasMethod = __dependency14__.aliasMethod;
+    var computed = __dependency15__.computed;
+
+    /**
+      An unordered collection of objects.
+
+      A Set works a bit like an array except that its items are not ordered. You
+      can create a set to efficiently test for membership for an object. You can
+      also iterate through a set just like an array, even accessing objects by
+      index, however there is no guarantee as to their order.
+
+      All Sets are observable via the Enumerable Observer API - which works
+      on any enumerable object including both Sets and Arrays.
+
+      ## Creating a Set
+
+      You can create a set like you would most objects using
+      `new Ember.Set()`. Most new sets you create will be empty, but you can
+      also initialize the set with some content by passing an array or other
+      enumerable of objects to the constructor.
+
+      Finally, you can pass in an existing set and the set will be copied. You
+      can also create a copy of a set by calling `Ember.Set#copy()`.
+
+      ```javascript
+      // creates a new empty set
+      var foundNames = new Ember.Set();
+
+      // creates a set with four names in it.
+      var names = new Ember.Set(["Charles", "Tom", "Juan", "Alex"]); // :P
+
+      // creates a copy of the names set.
+      var namesCopy = new Ember.Set(names);
+
+      // same as above.
+      var anotherNamesCopy = names.copy();
+      ```
+
+      ## Adding/Removing Objects
+
+      You generally add or remove objects from a set using `add()` or
+      `remove()`. You can add any type of object including primitives such as
+      numbers, strings, and booleans.
+
+      Unlike arrays, objects can only exist one time in a set. If you call `add()`
+      on a set with the same object multiple times, the object will only be added
+      once. Likewise, calling `remove()` with the same object multiple times will
+      remove the object the first time and have no effect on future calls until
+      you add the object to the set again.
+
+      NOTE: You cannot add/remove `null` or `undefined` to a set. Any attempt to do
+      so will be ignored.
+
+      In addition to add/remove you can also call `push()`/`pop()`. Push behaves
+      just like `add()` but `pop()`, unlike `remove()` will pick an arbitrary
+      object, remove it and return it. This is a good way to use a set as a job
+      queue when you don't care which order the jobs are executed in.
+
+      ## Testing for an Object
+
+      To test for an object's presence in a set you simply call
+      `Ember.Set#contains()`.
+
+      ## Observing changes
+
+      When using `Ember.Set`, you can observe the `"[]"` property to be
+      alerted whenever the content changes. You can also add an enumerable
+      observer to the set to be notified of specific objects that are added and
+      removed from the set. See [Ember.Enumerable](/api/classes/Ember.Enumerable.html)
+      for more information on enumerables.
+
+      This is often unhelpful. If you are filtering sets of objects, for instance,
+      it is very inefficient to re-filter all of the items each time the set
+      changes. It would be better if you could just adjust the filtered set based
+      on what was changed on the original set. The same issue applies to merging
+      sets, as well.
+
+      ## Other Methods
+
+      `Ember.Set` primary implements other mixin APIs. For a complete reference
+      on the methods you will use with `Ember.Set`, please consult these mixins.
+      The most useful ones will be `Ember.Enumerable` and
+      `Ember.MutableEnumerable` which implement most of the common iterator
+      methods you are used to on Array.
+
+      Note that you can also use the `Ember.Copyable` and `Ember.Freezable`
+      APIs on `Ember.Set` as well. Once a set is frozen it can no longer be
+      modified. The benefit of this is that when you call `frozenCopy()` on it,
+      Ember will avoid making copies of the set. This allows you to write
+      code that can know with certainty when the underlying set data will or
+      will not be modified.
+
+      @class Set
+      @namespace Ember
+      @extends Ember.CoreObject
+      @uses Ember.MutableEnumerable
+      @uses Ember.Copyable
+      @uses Ember.Freezable
+      @since Ember 0.9
+    */
+    var Set = CoreObject.extend(MutableEnumerable, Copyable, Freezable,
+      {
+
+      // ..........................................................
+      // IMPLEMENT ENUMERABLE APIS
+      //
+
+      /**
+        This property will change as the number of objects in the set changes.
+
+        @property length
+        @type number
+        @default 0
+      */
+      length: 0,
+
+      /**
+        Clears the set. This is useful if you want to reuse an existing set
+        without having to recreate it.
+
+        ```javascript
+        var colors = new Ember.Set(["red", "green", "blue"]);
+        colors.length;  // 3
+        colors.clear();
+        colors.length;  // 0
+        ```
+
+        @method clear
+        @return {Ember.Set} An empty Set
+      */
+      clear: function() {
+        if (this.isFrozen) { throw new EmberError(FROZEN_ERROR); }
+
+        var len = get(this, 'length');
+        if (len === 0) { return this; }
+
+        var guid;
+
+        this.enumerableContentWillChange(len, 0);
+        propertyWillChange(this, 'firstObject');
+        propertyWillChange(this, 'lastObject');
+
+        for (var i=0; i < len; i++) {
+          guid = guidFor(this[i]);
+          delete this[guid];
+          delete this[i];
+        }
+
+        set(this, 'length', 0);
+
+        propertyDidChange(this, 'firstObject');
+        propertyDidChange(this, 'lastObject');
+        this.enumerableContentDidChange(len, 0);
+
+        return this;
+      },
+
+      /**
+        Returns true if the passed object is also an enumerable that contains the
+        same objects as the receiver.
+
+        ```javascript
+        var colors = ["red", "green", "blue"],
+            same_colors = new Ember.Set(colors);
+
+        same_colors.isEqual(colors);               // true
+        same_colors.isEqual(["purple", "brown"]);  // false
+        ```
+
+        @method isEqual
+        @param {Ember.Set} obj the other object.
+        @return {Boolean}
+      */
+      isEqual: function(obj) {
+        // fail fast
+        if (!Enumerable.detect(obj)) return false;
+
+        var loc = get(this, 'length');
+        if (get(obj, 'length') !== loc) return false;
+
+        while(--loc >= 0) {
+          if (!obj.contains(this[loc])) return false;
+        }
+
+        return true;
+      },
+
+      /**
+        Adds an object to the set. Only non-`null` objects can be added to a set
+        and those can only be added once. If the object is already in the set or
+        the passed value is null this method will have no effect.
+
+        This is an alias for `Ember.MutableEnumerable.addObject()`.
+
+        ```javascript
+        var colors = new Ember.Set();
+        colors.add("blue");     // ["blue"]
+        colors.add("blue");     // ["blue"]
+        colors.add("red");      // ["blue", "red"]
+        colors.add(null);       // ["blue", "red"]
+        colors.add(undefined);  // ["blue", "red"]
+        ```
+
+        @method add
+        @param {Object} obj The object to add.
+        @return {Ember.Set} The set itself.
+      */
+      add: aliasMethod('addObject'),
+
+      /**
+        Removes the object from the set if it is found. If you pass a `null` value
+        or an object that is already not in the set, this method will have no
+        effect. This is an alias for `Ember.MutableEnumerable.removeObject()`.
+
+        ```javascript
+        var colors = new Ember.Set(["red", "green", "blue"]);
+        colors.remove("red");     // ["blue", "green"]
+        colors.remove("purple");  // ["blue", "green"]
+        colors.remove(null);      // ["blue", "green"]
+        ```
+
+        @method remove
+        @param {Object} obj The object to remove
+        @return {Ember.Set} The set itself.
+      */
+      remove: aliasMethod('removeObject'),
+
+      /**
+        Removes the last element from the set and returns it, or `null` if it's empty.
+
+        ```javascript
+        var colors = new Ember.Set(["green", "blue"]);
+        colors.pop();  // "blue"
+        colors.pop();  // "green"
+        colors.pop();  // null
+        ```
+
+        @method pop
+        @return {Object} The removed object from the set or null.
+      */
+      pop: function() {
+        if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
+        var obj = this.length > 0 ? this[this.length-1] : null;
+        this.remove(obj);
+        return obj;
+      },
+
+      /**
+        Inserts the given object on to the end of the set. It returns
+        the set itself.
+
+        This is an alias for `Ember.MutableEnumerable.addObject()`.
+
+        ```javascript
+        var colors = new Ember.Set();
+        colors.push("red");   // ["red"]
+        colors.push("green"); // ["red", "green"]
+        colors.push("blue");  // ["red", "green", "blue"]
+        ```
+
+        @method push
+        @return {Ember.Set} The set itself.
+      */
+      push: aliasMethod('addObject'),
+
+      /**
+        Removes the last element from the set and returns it, or `null` if it's empty.
+
+        This is an alias for `Ember.Set.pop()`.
+
+        ```javascript
+        var colors = new Ember.Set(["green", "blue"]);
+        colors.shift();  // "blue"
+        colors.shift();  // "green"
+        colors.shift();  // null
+        ```
+
+        @method shift
+        @return {Object} The removed object from the set or null.
+      */
+      shift: aliasMethod('pop'),
+
+      /**
+        Inserts the given object on to the end of the set. It returns
+        the set itself.
+
+        This is an alias of `Ember.Set.push()`
+
+        ```javascript
+        var colors = new Ember.Set();
+        colors.unshift("red");    // ["red"]
+        colors.unshift("green");  // ["red", "green"]
+        colors.unshift("blue");   // ["red", "green", "blue"]
+        ```
+
+        @method unshift
+        @return {Ember.Set} The set itself.
+      */
+      unshift: aliasMethod('push'),
+
+      /**
+        Adds each object in the passed enumerable to the set.
+
+        This is an alias of `Ember.MutableEnumerable.addObjects()`
+
+        ```javascript
+        var colors = new Ember.Set();
+        colors.addEach(["red", "green", "blue"]);  // ["red", "green", "blue"]
+        ```
+
+        @method addEach
+        @param {Ember.Enumerable} objects the objects to add.
+        @return {Ember.Set} The set itself.
+      */
+      addEach: aliasMethod('addObjects'),
+
+      /**
+        Removes each object in the passed enumerable to the set.
+
+        This is an alias of `Ember.MutableEnumerable.removeObjects()`
+
+        ```javascript
+        var colors = new Ember.Set(["red", "green", "blue"]);
+        colors.removeEach(["red", "blue"]);  //  ["green"]
+        ```
+
+        @method removeEach
+        @param {Ember.Enumerable} objects the objects to remove.
+        @return {Ember.Set} The set itself.
+      */
+      removeEach: aliasMethod('removeObjects'),
+
+      // ..........................................................
+      // PRIVATE ENUMERABLE SUPPORT
+      //
+
+      init: function(items) {
+        this._super();
+        if (items) this.addObjects(items);
+      },
+
+      // implement Ember.Enumerable
+      nextObject: function(idx) {
+        return this[idx];
+      },
+
+      // more optimized version
+      firstObject: computed(function() {
+        return this.length > 0 ? this[0] : undefined;
+      }),
+
+      // more optimized version
+      lastObject: computed(function() {
+        return this.length > 0 ? this[this.length-1] : undefined;
+      }),
+
+      // implements Ember.MutableEnumerable
+      addObject: function(obj) {
+        if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
+        if (isNone(obj)) return this; // nothing to do
+
+        var guid = guidFor(obj),
+            idx  = this[guid],
+            len  = get(this, 'length'),
+            added ;
+
+        if (idx>=0 && idx<len && (this[idx] === obj)) return this; // added
+
+        added = [obj];
+
+        this.enumerableContentWillChange(null, added);
+        propertyWillChange(this, 'lastObject');
+
+        len = get(this, 'length');
+        this[guid] = len;
+        this[len] = obj;
+        set(this, 'length', len+1);
+
+        propertyDidChange(this, 'lastObject');
+        this.enumerableContentDidChange(null, added);
+
+        return this;
+      },
+
+      // implements Ember.MutableEnumerable
+      removeObject: function(obj) {
+        if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
+        if (isNone(obj)) return this; // nothing to do
+
+        var guid = guidFor(obj),
+            idx  = this[guid],
+            len = get(this, 'length'),
+            isFirst = idx === 0,
+            isLast = idx === len-1,
+            last, removed;
+
+
+        if (idx>=0 && idx<len && (this[idx] === obj)) {
+          removed = [obj];
+
+          this.enumerableContentWillChange(removed, null);
+          if (isFirst) { propertyWillChange(this, 'firstObject'); }
+          if (isLast)  { propertyWillChange(this, 'lastObject'); }
+
+          // swap items - basically move the item to the end so it can be removed
+          if (idx < len-1) {
+            last = this[len-1];
+            this[idx] = last;
+            this[guidFor(last)] = idx;
+          }
+
+          delete this[guid];
+          delete this[len-1];
+          set(this, 'length', len-1);
+
+          if (isFirst) { propertyDidChange(this, 'firstObject'); }
+          if (isLast)  { propertyDidChange(this, 'lastObject'); }
+          this.enumerableContentDidChange(removed, null);
+        }
+
+        return this;
+      },
+
+      // optimized version
+      contains: function(obj) {
+        return this[guidFor(obj)]>=0;
+      },
+
+      copy: function() {
+        var C = this.constructor, ret = new C(), loc = get(this, 'length');
+        set(ret, 'length', loc);
+        while(--loc>=0) {
+          ret[loc] = this[loc];
+          ret[guidFor(this[loc])] = loc;
+        }
+        return ret;
+      },
+
+      toString: function() {
+        var len = this.length, idx, array = [];
+        for(idx = 0; idx < len; idx++) {
+          array[idx] = this[idx];
+        }
+        return fmt("Ember.Set<%@>", [array.join(',')]);
+      }
+
+    });
+
+
+    __exports__["default"] = Set;
+  });
+define("ember-runtime/system/string",
+  ["ember-metal/core","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.STRINGS, Ember.FEATURES
+    var EmberInspect = __dependency2__.inspect;
+
+
+    var STRING_DASHERIZE_REGEXP = (/[ _]/g);
+    var STRING_DASHERIZE_CACHE = {};
+    var STRING_DECAMELIZE_REGEXP = (/([a-z\d])([A-Z])/g);
+    var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
+    var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
+    var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
+
+    function fmt(str, formats) {
+      // first, replace any ORDERED replacements.
+      var idx  = 0; // the current index for non-numerical replacements
+      return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
+        argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
+        s = formats[argIndex];
+        return (s === null) ? '(null)' : (s === undefined) ? '' : EmberInspect(s);
+      }) ;
+    }
+
+    function loc(str, formats) {
+      str = Ember.STRINGS[str] || str;
+      return fmt(str, formats);
+    }
+
+    function w(str) {
+      return str.split(/\s+/);
+    }
+
+    function decamelize(str) {
+      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+    }
+
+    function dasherize(str) {
+      var cache = STRING_DASHERIZE_CACHE,
+          hit   = cache.hasOwnProperty(str),
+          ret;
+
+      if (hit) {
+        return cache[str];
+      } else {
+        ret = decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
+        cache[str] = ret;
+      }
+
+      return ret;
+    }
+
+    function camelize(str) {
+      return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
+        return chr ? chr.toUpperCase() : '';
+      }).replace(/^([A-Z])/, function(match, separator, chr) {
+        return match.toLowerCase();
+      });
+    }
+
+    function classify(str) {
+      var parts = str.split("."),
+          out = [];
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var camelized = camelize(parts[i]);
+        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
+      }
+
+      return out.join(".");
+    }
+
+    function underscore(str) {
+      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
+        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
+    }
+
+    function capitalize(str) {
+      return str.charAt(0).toUpperCase() + str.substr(1);
+    }
+
+    /**
+      Defines the hash of localized strings for the current language. Used by
+      the `Ember.String.loc()` helper. To localize, add string values to this
+      hash.
+
+      @property STRINGS
+      @for Ember
+      @type Hash
+    */
+    Ember.STRINGS = {};
+
+    /**
+      Defines string helper methods including string formatting and localization.
+      Unless `Ember.EXTEND_PROTOTYPES.String` is `false` these methods will also be
+      added to the `String.prototype` as well.
+
+      @class String
+      @namespace Ember
+      @static
+    */
+    var EmberStringUtils = {
+
+      /**
+        Apply formatting options to the string. This will look for occurrences
+        of "%@" in your string and substitute them with the arguments you pass into
+        this method. If you want to control the specific order of replacement,
+        you can add a number after the key as well to indicate which argument
+        you want to insert.
+
+        Ordered insertions are most useful when building loc strings where values
+        you need to insert may appear in different orders.
+
+        ```javascript
+        "Hello %@ %@".fmt('John', 'Doe');     // "Hello John Doe"
+        "Hello %@2, %@1".fmt('John', 'Doe');  // "Hello Doe, John"
+        ```
+
+        @method fmt
+        @param {String} str The string to format
+        @param {Array} formats An array of parameters to interpolate into string.
+        @return {String} formatted string
+      */
+      fmt: fmt,
+
+      /**
+        Formats the passed string, but first looks up the string in the localized
+        strings hash. This is a convenient way to localize text. See
+        `Ember.String.fmt()` for more information on formatting.
+
+        Note that it is traditional but not required to prefix localized string
+        keys with an underscore or other character so you can easily identify
+        localized strings.
+
+        ```javascript
+        Ember.STRINGS = {
+          '_Hello World': 'Bonjour le monde',
+          '_Hello %@ %@': 'Bonjour %@ %@'
+        };
+
+        Ember.String.loc("_Hello World");  // 'Bonjour le monde';
+        Ember.String.loc("_Hello %@ %@", ["John", "Smith"]);  // "Bonjour John Smith";
+        ```
+
+        @method loc
+        @param {String} str The string to format
+        @param {Array} formats Optional array of parameters to interpolate into string.
+        @return {String} formatted string
+      */
+      loc: loc,
+
+      /**
+        Splits a string into separate units separated by spaces, eliminating any
+        empty strings in the process. This is a convenience method for split that
+        is mostly useful when applied to the `String.prototype`.
+
+        ```javascript
+        Ember.String.w("alpha beta gamma").forEach(function(key) {
+          console.log(key);
+        });
+
+        // > alpha
+        // > beta
+        // > gamma
+        ```
+
+        @method w
+        @param {String} str The string to split
+        @return {Array} array containing the split strings
+      */
+      w: w,
+
+      /**
+        Converts a camelized string into all lower case separated by underscores.
+
+        ```javascript
+        'innerHTML'.decamelize();           // 'inner_html'
+        'action_name'.decamelize();        // 'action_name'
+        'css-class-name'.decamelize();     // 'css-class-name'
+        'my favorite items'.decamelize();  // 'my favorite items'
+        ```
+
+        @method decamelize
+        @param {String} str The string to decamelize.
+        @return {String} the decamelized string.
+      */
+      decamelize: decamelize,
+
+      /**
+        Replaces underscores, spaces, or camelCase with dashes.
+
+        ```javascript
+        'innerHTML'.dasherize();          // 'inner-html'
+        'action_name'.dasherize();        // 'action-name'
+        'css-class-name'.dasherize();     // 'css-class-name'
+        'my favorite items'.dasherize();  // 'my-favorite-items'
+        ```
+
+        @method dasherize
+        @param {String} str The string to dasherize.
+        @return {String} the dasherized string.
+      */
+      dasherize: dasherize,
+
+      /**
+        Returns the lowerCamelCase form of a string.
+
+        ```javascript
+        'innerHTML'.camelize();          // 'innerHTML'
+        'action_name'.camelize();        // 'actionName'
+        'css-class-name'.camelize();     // 'cssClassName'
+        'my favorite items'.camelize();  // 'myFavoriteItems'
+        'My Favorite Items'.camelize();  // 'myFavoriteItems'
+        ```
+
+        @method camelize
+        @param {String} str The string to camelize.
+        @return {String} the camelized string.
+      */
+      camelize: camelize,
+
+      /**
+        Returns the UpperCamelCase form of a string.
+
+        ```javascript
+        'innerHTML'.classify();          // 'InnerHTML'
+        'action_name'.classify();        // 'ActionName'
+        'css-class-name'.classify();     // 'CssClassName'
+        'my favorite items'.classify();  // 'MyFavoriteItems'
+        ```
+
+        @method classify
+        @param {String} str the string to classify
+        @return {String} the classified string
+      */
+      classify: classify,
+
+      /**
+        More general than decamelize. Returns the lower\_case\_and\_underscored
+        form of a string.
+
+        ```javascript
+        'innerHTML'.underscore();          // 'inner_html'
+        'action_name'.underscore();        // 'action_name'
+        'css-class-name'.underscore();     // 'css_class_name'
+        'my favorite items'.underscore();  // 'my_favorite_items'
+        ```
+
+        @method underscore
+        @param {String} str The string to underscore.
+        @return {String} the underscored string.
+      */
+      underscore: underscore,
+
+      /**
+        Returns the Capitalized form of a string
+
+        ```javascript
+        'innerHTML'.capitalize()         // 'InnerHTML'
+        'action_name'.capitalize()       // 'Action_name'
+        'css-class-name'.capitalize()    // 'Css-class-name'
+        'my favorite items'.capitalize() // 'My favorite items'
+        ```
+
+        @method capitalize
+        @param {String} str The string to capitalize.
+        @return {String} The capitalized string.
+      */
+      capitalize: capitalize
+    };
+
+    __exports__["default"] = EmberStringUtils;
+    __exports__.fmt = fmt;
+    __exports__.loc = loc;
+    __exports__.w = w;
+    __exports__.decamelize = decamelize;
+    __exports__.dasherize = dasherize;
+    __exports__.camelize = camelize;
+    __exports__.classify = classify;
+    __exports__.underscore = underscore;
+    __exports__.capitalize = capitalize;
+  });
+define("ember-runtime/system/subarray",
+  ["ember-metal/property_get","ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var EmberError = __dependency2__["default"];
+    var EnumerableUtils = __dependency3__["default"];
+
+    var RETAIN = 'r',
+        FILTER = 'f';
+
+    function Operation (type, count) {
+      this.type = type;
+      this.count = count;
+    }
+
+    /**
+      An `Ember.SubArray` tracks an array in a way similar to, but more specialized
+      than, `Ember.TrackedArray`.  It is useful for keeping track of the indexes of
+      items within a filtered array.
+
+      @class SubArray
+      @namespace Ember
+    */
+    function SubArray (length) {
+      if (arguments.length < 1) { length = 0; }
+
+      if (length > 0) {
+        this._operations = [new Operation(RETAIN, length)];
+      } else {
+        this._operations = [];
+      }
+    };
+
+    SubArray.prototype = {
+      /**
+        Track that an item was added to the tracked array.
+
+        @method addItem
+
+        @param {number} index The index of the item in the tracked array.
+        @param {boolean} match `true` iff the item is included in the subarray.
+
+        @return {number} The index of the item in the subarray.
+      */
+      addItem: function(index, match) {
+        var returnValue = -1,
+            itemType = match ? RETAIN : FILTER,
+            self = this;
+
+        this._findOperation(index, function(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
+          var newOperation, splitOperation;
+
+          if (itemType === operation.type) {
+            ++operation.count;
+          } else if (index === rangeStart) {
+            // insert to the left of `operation`
+            self._operations.splice(operationIndex, 0, new Operation(itemType, 1));
+          } else {
+            newOperation = new Operation(itemType, 1);
+            splitOperation = new Operation(operation.type, rangeEnd - index + 1);
+            operation.count = index - rangeStart;
+
+            self._operations.splice(operationIndex + 1, 0, newOperation, splitOperation);
+          }
+
+          if (match) {
+            if (operation.type === RETAIN) {
+              returnValue = seenInSubArray + (index - rangeStart);
+            } else {
+              returnValue = seenInSubArray;
+            }
+          }
+
+          self._composeAt(operationIndex);
+        }, function(seenInSubArray) {
+          self._operations.push(new Operation(itemType, 1));
+
+          if (match) {
+            returnValue = seenInSubArray;
+          }
+
+          self._composeAt(self._operations.length-1);
+        });
+
+        return returnValue;
+      },
+
+      /**
+        Track that an item was removed from the tracked array.
+
+        @method removeItem
+
+        @param {number} index The index of the item in the tracked array.
+
+        @return {number} The index of the item in the subarray, or `-1` if the item
+        was not in the subarray.
+      */
+      removeItem: function(index) {
+        var returnValue = -1,
+            self = this;
+
+        this._findOperation(index, function (operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
+          if (operation.type === RETAIN) {
+            returnValue = seenInSubArray + (index - rangeStart);
+          }
+
+          if (operation.count > 1) {
+            --operation.count;
+          } else {
+            self._operations.splice(operationIndex, 1);
+            self._composeAt(operationIndex);
+          }
+        }, function() {
+          throw new EmberError("Can't remove an item that has never been added.");
+        });
+
+        return returnValue;
+      },
+
+
+      _findOperation: function (index, foundCallback, notFoundCallback) {
+        var operationIndex,
+            len,
+            operation,
+            rangeStart,
+            rangeEnd,
+            seenInSubArray = 0;
+
+        // OPTIMIZE: change to balanced tree
+        // find leftmost operation to the right of `index`
+        for (operationIndex = rangeStart = 0, len = this._operations.length; operationIndex < len; rangeStart = rangeEnd + 1, ++operationIndex) {
+          operation = this._operations[operationIndex];
+          rangeEnd = rangeStart + operation.count - 1;
+
+          if (index >= rangeStart && index <= rangeEnd) {
+            foundCallback(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray);
+            return;
+          } else if (operation.type === RETAIN) {
+            seenInSubArray += operation.count;
+          }
+        }
+
+        notFoundCallback(seenInSubArray);
+      },
+
+      _composeAt: function(index) {
+        var op = this._operations[index],
+            otherOp;
+
+        if (!op) {
+          // Composing out of bounds is a no-op, as when removing the last operation
+          // in the list.
+          return;
+        }
+
+        if (index > 0) {
+          otherOp = this._operations[index-1];
+          if (otherOp.type === op.type) {
+            op.count += otherOp.count;
+            this._operations.splice(index-1, 1);
+            --index;
+          }
+        }
+
+        if (index < this._operations.length-1) {
+          otherOp = this._operations[index+1];
+          if (otherOp.type === op.type) {
+            op.count += otherOp.count;
+            this._operations.splice(index+1, 1);
+          }
+        }
+      },
+
+      toString: function () {
+        var str = "";
+        forEach(this._operations, function (operation) {
+          str += " " + operation.type + ":" + operation.count;
+        });
+        return str.substring(1);
+      }
+    };
+
+    __exports__["default"] = SubArray;
+  });
+define("ember-runtime/system/tracked_array",
+  ["ember-metal/property_get","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var EnumerableUtils = __dependency2__["default"];
+
+    var forEach = EnumerableUtils.forEach,
+        RETAIN = 'r',
+        INSERT = 'i',
+        DELETE = 'd';
+
+
+    /**
+      An `Ember.TrackedArray` tracks array operations.  It's useful when you want to
+      lazily compute the indexes of items in an array after they've been shifted by
+      subsequent operations.
+
+      @class TrackedArray
+      @namespace Ember
+      @param {array} [items=[]] The array to be tracked.  This is used just to get
+      the initial items for the starting state of retain:n.
+    */
+    function TrackedArray(items) {
+      if (arguments.length < 1) { items = []; }
+
+      var length = get(items, 'length');
+
+      if (length) {
+        this._operations = [new ArrayOperation(RETAIN, length, items)];
+      } else {
+        this._operations = [];
+      }
+    }
+
+    TrackedArray.RETAIN = RETAIN;
+    TrackedArray.INSERT = INSERT;
+    TrackedArray.DELETE = DELETE;
+
+    TrackedArray.prototype = {
+
+      /**
+        Track that `newItems` were added to the tracked array at `index`.
+
+        @method addItems
+        @param index
+        @param newItems
+      */
+      addItems: function (index, newItems) {
+        var count = get(newItems, 'length');
+        if (count < 1) { return; }
+
+        var match = this._findArrayOperation(index),
+            arrayOperation = match.operation,
+            arrayOperationIndex = match.index,
+            arrayOperationRangeStart = match.rangeStart,
+            composeIndex,
+            splitIndex,
+            splitItems,
+            splitArrayOperation,
+            newArrayOperation;
+
+        newArrayOperation = new ArrayOperation(INSERT, count, newItems);
+
+        if (arrayOperation) {
+          if (!match.split) {
+            // insert left of arrayOperation
+            this._operations.splice(arrayOperationIndex, 0, newArrayOperation);
+            composeIndex = arrayOperationIndex;
+          } else {
+            this._split(arrayOperationIndex, index - arrayOperationRangeStart, newArrayOperation);
+            composeIndex = arrayOperationIndex + 1;
+          }
+        } else {
+          // insert at end
+          this._operations.push(newArrayOperation);
+          composeIndex = arrayOperationIndex;
+        }
+
+        this._composeInsert(composeIndex);
+      },
+
+      /**
+        Track that `count` items were removed at `index`.
+
+        @method removeItems
+        @param index
+        @param count
+      */
+      removeItems: function (index, count) {
+        if (count < 1) { return; }
+
+        var match = this._findArrayOperation(index),
+            arrayOperation = match.operation,
+            arrayOperationIndex = match.index,
+            arrayOperationRangeStart = match.rangeStart,
+            newArrayOperation,
+            composeIndex;
+
+        newArrayOperation = new ArrayOperation(DELETE, count);
+        if (!match.split) {
+          // insert left of arrayOperation
+          this._operations.splice(arrayOperationIndex, 0, newArrayOperation);
+          composeIndex = arrayOperationIndex;
+        } else {
+          this._split(arrayOperationIndex, index - arrayOperationRangeStart, newArrayOperation);
+          composeIndex = arrayOperationIndex + 1;
+        }
+
+        return this._composeDelete(composeIndex);
+      },
+
+      /**
+        Apply all operations, reducing them to retain:n, for `n`, the number of
+        items in the array.
+
+        `callback` will be called for each operation and will be passed the following arguments:
+
+        * {array} items The items for the given operation
+        * {number} offset The computed offset of the items, ie the index in the
+        array of the first item for this operation.
+        * {string} operation The type of the operation.  One of
+        `Ember.TrackedArray.{RETAIN, DELETE, INSERT}`
+
+        @method apply
+        @param {function} callback
+      */
+      apply: function (callback) {
+        var items = [],
+            offset = 0;
+
+        forEach(this._operations, function (arrayOperation, operationIndex) {
+          callback(arrayOperation.items, offset, arrayOperation.type, operationIndex);
+
+          if (arrayOperation.type !== DELETE) {
+            offset += arrayOperation.count;
+            items = items.concat(arrayOperation.items);
+          }
+        });
+
+        this._operations = [new ArrayOperation(RETAIN, items.length, items)];
+      },
+
+      /**
+        Return an `ArrayOperationMatch` for the operation that contains the item at `index`.
+
+        @method _findArrayOperation
+
+        @param {number} index the index of the item whose operation information
+        should be returned.
+        @private
+      */
+      _findArrayOperation: function (index) {
+        var arrayOperationIndex,
+            len,
+            split = false,
+            arrayOperation,
+            arrayOperationRangeStart,
+            arrayOperationRangeEnd;
+
+        // OPTIMIZE: we could search these faster if we kept a balanced tree.
+        // find leftmost arrayOperation to the right of `index`
+        for (arrayOperationIndex = arrayOperationRangeStart = 0, len = this._operations.length; arrayOperationIndex < len; ++arrayOperationIndex) {
+          arrayOperation = this._operations[arrayOperationIndex];
+
+          if (arrayOperation.type === DELETE) { continue; }
+
+          arrayOperationRangeEnd = arrayOperationRangeStart + arrayOperation.count - 1;
+
+          if (index === arrayOperationRangeStart) {
+            break;
+          } else if (index > arrayOperationRangeStart && index <= arrayOperationRangeEnd) {
+            split = true;
+            break;
+          } else {
+            arrayOperationRangeStart = arrayOperationRangeEnd + 1;
+          }
+        }
+
+        return new ArrayOperationMatch(arrayOperation, arrayOperationIndex, split, arrayOperationRangeStart);
+      },
+
+      _split: function (arrayOperationIndex, splitIndex, newArrayOperation) {
+        var arrayOperation = this._operations[arrayOperationIndex],
+            splitItems = arrayOperation.items.slice(splitIndex),
+            splitArrayOperation = new ArrayOperation(arrayOperation.type, splitItems.length, splitItems);
+
+        // truncate LHS
+        arrayOperation.count = splitIndex;
+        arrayOperation.items = arrayOperation.items.slice(0, splitIndex);
+
+        this._operations.splice(arrayOperationIndex + 1, 0, newArrayOperation, splitArrayOperation);
+      },
+
+      // see SubArray for a better implementation.
+      _composeInsert: function (index) {
+        var newArrayOperation = this._operations[index],
+            leftArrayOperation = this._operations[index-1], // may be undefined
+            rightArrayOperation = this._operations[index+1], // may be undefined
+            leftOp = leftArrayOperation && leftArrayOperation.type,
+            rightOp = rightArrayOperation && rightArrayOperation.type;
+
+        if (leftOp === INSERT) {
+            // merge left
+            leftArrayOperation.count += newArrayOperation.count;
+            leftArrayOperation.items = leftArrayOperation.items.concat(newArrayOperation.items);
+
+          if (rightOp === INSERT) {
+            // also merge right (we have split an insert with an insert)
+            leftArrayOperation.count += rightArrayOperation.count;
+            leftArrayOperation.items = leftArrayOperation.items.concat(rightArrayOperation.items);
+            this._operations.splice(index, 2);
+          } else {
+            // only merge left
+            this._operations.splice(index, 1);
+          }
+        } else if (rightOp === INSERT) {
+          // merge right
+          newArrayOperation.count += rightArrayOperation.count;
+          newArrayOperation.items = newArrayOperation.items.concat(rightArrayOperation.items);
+          this._operations.splice(index + 1, 1);
+        }
+      },
+
+      _composeDelete: function (index) {
+        var arrayOperation = this._operations[index],
+            deletesToGo = arrayOperation.count,
+            leftArrayOperation = this._operations[index-1], // may be undefined
+            leftOp = leftArrayOperation && leftArrayOperation.type,
+            nextArrayOperation,
+            nextOp,
+            nextCount,
+            removeNewAndNextOp = false,
+            removedItems = [];
+
+        if (leftOp === DELETE) {
+          arrayOperation = leftArrayOperation;
+          index -= 1;
+        }
+
+        for (var i = index + 1; deletesToGo > 0; ++i) {
+          nextArrayOperation = this._operations[i];
+          nextOp = nextArrayOperation.type;
+          nextCount = nextArrayOperation.count;
+
+          if (nextOp === DELETE) {
+            arrayOperation.count += nextCount;
+            continue;
+          }
+
+          if (nextCount > deletesToGo) {
+            // d:2 {r,i}:5  we reduce the retain or insert, but it stays
+            removedItems = removedItems.concat(nextArrayOperation.items.splice(0, deletesToGo));
+            nextArrayOperation.count -= deletesToGo;
+
+            // In the case where we truncate the last arrayOperation, we don't need to
+            // remove it; also the deletesToGo reduction is not the entirety of
+            // nextCount
+            i -= 1;
+            nextCount = deletesToGo;
+
+            deletesToGo = 0;
+          } else {
+            if (nextCount === deletesToGo) {
+              // Handle edge case of d:2 i:2 in which case both operations go away
+              // during composition.
+              removeNewAndNextOp = true;
+            }
+            removedItems = removedItems.concat(nextArrayOperation.items);
+            deletesToGo -= nextCount;
+          }
+
+          if (nextOp === INSERT) {
+            // d:2 i:3 will result in delete going away
+            arrayOperation.count -= nextCount;
+          }
+        }
+
+        if (arrayOperation.count > 0) {
+          // compose our new delete with possibly several operations to the right of
+          // disparate types
+          this._operations.splice(index+1, i-1-index);
+        } else {
+          // The delete operation can go away; it has merely reduced some other
+          // operation, as in d:3 i:4; it may also have eliminated that operation,
+          // as in d:3 i:3.
+          this._operations.splice(index, removeNewAndNextOp ? 2 : 1);
+        }
+
+        return removedItems;
+      },
+
+      toString: function () {
+        var str = "";
+        forEach(this._operations, function (operation) {
+          str += " " + operation.type + ":" + operation.count;
+        });
+        return str.substring(1);
+      }
+    };
+
+    /**
+      Internal data structure to represent an array operation.
+
+      @method ArrayOperation
+      @private
+      @param {string} type The type of the operation.  One of
+      `Ember.TrackedArray.{RETAIN, INSERT, DELETE}`
+      @param {number} count The number of items in this operation.
+      @param {array} items The items of the operation, if included.  RETAIN and
+      INSERT include their items, DELETE does not.
+    */
+    function ArrayOperation (operation, count, items) {
+      this.type = operation; // RETAIN | INSERT | DELETE
+      this.count = count;
+      this.items = items;
+    }
+
+    /**
+      Internal data structure used to include information when looking up operations
+      by item index.
+
+      @method ArrayOperationMatch
+      @private
+      @param {ArrayOperation} operation
+      @param {number} index The index of `operation` in the array of operations.
+      @param {boolean} split Whether or not the item index searched for would
+      require a split for a new operation type.
+      @param {number} rangeStart The index of the first item in the operation,
+      with respect to the tracked array.  The index of the last item can be computed
+      from `rangeStart` and `operation.count`.
+    */
+    function ArrayOperationMatch(operation, index, split, rangeStart) {
+      this.operation = operation;
+      this.index = index;
+      this.split = split;
+      this.rangeStart = rangeStart;
+    }
+
+    __exports__["default"] = TrackedArray;
+  });
+})();
+
+(function() {
+define("ember-views",
+  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/view","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    /**
+    Ember Views
+
+    @module ember
+    @submodule ember-views
+    @requires ember-runtime
+    @main ember-views
+    */
+
+    // BEGIN EXPORTS
+    Ember.$ = __dependency2__["default"];
+
+    Ember.ViewTargetActionSupport = __dependency12__["default"];
+    Ember.RenderBuffer = __dependency4__["default"];
+
+    var ViewUtils = Ember.ViewUtils = {};
+    ViewUtils.setInnerHTML = __dependency3__.setInnerHTML;
+    ViewUtils.isSimpleClick = __dependency3__.isSimpleClick;
+
+    Ember.CoreView = __dependency7__.CoreView;
+    Ember.View = __dependency7__.View;
+    Ember.View.states = __dependency6__.states;
+    Ember.View.cloneStates = __dependency6__.cloneStates;
+
+    Ember._ViewCollection = __dependency7__.ViewCollection;
+    Ember.ContainerView = __dependency8__["default"];
+    Ember.CollectionView = __dependency9__["default"];
+    Ember.Component = __dependency10__["default"];
+    Ember.EventDispatcher = __dependency11__["default"];
+    // END EXPORTS
+
+    __exports__["default"] = Ember;
+  });
+define("ember-views/mixins/component_template_deprecation",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.deprecate
+    var get = __dependency2__.get;
+    var Mixin = __dependency3__.Mixin;
+
+    /**
+      The ComponentTemplateDeprecation mixin is used to provide a useful
+      deprecation warning when using either `template` or `templateName` with
+      a component. The `template` and `templateName` properties specified at
+      extend time are moved to `layout` and `layoutName` respectively.
+
+      `Ember.ComponentTemplateDeprecation` is used internally by Ember in
+      `Ember.Component`.
+
+      @class ComponentTemplateDeprecation
+      @namespace Ember
+    */
+    var ComponentTemplateDeprecation = Mixin.create({
+      /**
+        @private
+
+        Moves `templateName` to `layoutName` and `template` to `layout` at extend
+        time if a layout is not also specified.
+
+        Note that this currently modifies the mixin themselves, which is technically
+        dubious but is practically of little consequence. This may change in the
+        future.
+
+        @method willMergeMixin
+        @since 1.4.0
+      */
+      willMergeMixin: function(props) {
+        // must call _super here to ensure that the ActionHandler
+        // mixin is setup properly (moves actions -> _actions)
+        //
+        // Calling super is only OK here since we KNOW that
+        // there is another Mixin loaded first.
+        this._super.apply(this, arguments);
+
+        var deprecatedProperty, replacementProperty,
+            layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
+
+        if (props.templateName && !layoutSpecified) {
+          deprecatedProperty = 'templateName';
+          replacementProperty = 'layoutName';
+
+          props.layoutName = props.templateName;
+          delete props['templateName'];
+        }
+
+        if (props.template && !layoutSpecified) {
+          deprecatedProperty = 'template';
+          replacementProperty = 'layout';
+
+          props.layout = props.template;
+          delete props['template'];
+        }
+
+        if (deprecatedProperty) {
+          Ember.deprecate('Do not specify ' + deprecatedProperty + ' on a Component, use ' + replacementProperty + ' instead.', false);
+        }
+      }
+    });
+
+    __exports__["default"] = ComponentTemplateDeprecation;
+  });
+define("ember-views/mixins/view_target_action_support",
+  ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Mixin = __dependency1__.Mixin;
+    var TargetActionSupport = __dependency2__["default"];
+
+    // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
+    var computed = __dependency3__.computed;
+    var alias = computed.alias;
+
+    /**
+    `Ember.ViewTargetActionSupport` is a mixin that can be included in a
+    view class to add a `triggerAction` method with semantics similar to
+    the Handlebars `{{action}}` helper. It provides intelligent defaults
+    for the action's target: the view's controller; and the context that is
+    sent with the action: the view's context.
+
+    Note: In normal Ember usage, the `{{action}}` helper is usually the best
+    choice. This mixin is most often useful when you are doing more complex
+    event handling in custom View subclasses.
+
+    For example:
+
+    ```javascript
+    App.SaveButtonView = Ember.View.extend(Ember.ViewTargetActionSupport, {
+      action: 'save',
+      click: function() {
+        this.triggerAction(); // Sends the `save` action, along with the current context
+                              // to the current controller
+      }
+    });
+    ```
+
+    The `action` can be provided as properties of an optional object argument
+    to `triggerAction` as well.
+
+    ```javascript
+    App.SaveButtonView = Ember.View.extend(Ember.ViewTargetActionSupport, {
+      click: function() {
+        this.triggerAction({
+          action: 'save'
+        }); // Sends the `save` action, along with the current context
+            // to the current controller
+      }
+    });
+    ```
+
+    @class ViewTargetActionSupport
+    @namespace Ember
+    @extends Ember.TargetActionSupport
+    */
+    var ViewTargetActionSupport = Mixin.create(TargetActionSupport, {
+      /**
+      @property target
+      */
+      target: alias('controller'),
+      /**
+      @property actionContext
+      */
+      actionContext: alias('context')
+    });
+
+    __exports__["default"] = ViewTargetActionSupport;
+  });
+define("ember-views/system/event_dispatcher",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/views/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-views
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var isNone = __dependency4__.isNone;
+    var run = __dependency5__["default"];
+    var typeOf = __dependency6__.typeOf;
+    var fmt = __dependency7__.fmt;
+    var EmberObject = __dependency8__["default"];
+    var jQuery = __dependency9__["default"];
+    var View = __dependency10__.View;
+
+    var ActionHelper;
+
+    //ES6TODO:
+    // find a better way to do Ember.View.views without global state
+
+    /**
+      `Ember.EventDispatcher` handles delegating browser events to their
+      corresponding `Ember.Views.` For example, when you click on a view,
+      `Ember.EventDispatcher` ensures that that view's `mouseDown` method gets
+      called.
+
+      @class EventDispatcher
+      @namespace Ember
+      @private
+      @extends Ember.Object
+    */
+    var EventDispatcher = EmberObject.extend({
+
+      /**
+        The set of events names (and associated handler function names) to be setup
+        and dispatched by the `EventDispatcher`. Custom events can added to this list at setup
+        time, generally via the `Ember.Application.customEvents` hash. Only override this
+        default set to prevent the EventDispatcher from listening on some events all together.
+
+        This set will be modified by `setup` to also include any events added at that time.
+
+        @property events
+        @type Object
+      */
+      events: {
+        touchstart  : 'touchStart',
+        touchmove   : 'touchMove',
+        touchend    : 'touchEnd',
+        touchcancel : 'touchCancel',
+        keydown     : 'keyDown',
+        keyup       : 'keyUp',
+        keypress    : 'keyPress',
+        mousedown   : 'mouseDown',
+        mouseup     : 'mouseUp',
+        contextmenu : 'contextMenu',
+        click       : 'click',
+        dblclick    : 'doubleClick',
+        mousemove   : 'mouseMove',
+        focusin     : 'focusIn',
+        focusout    : 'focusOut',
+        mouseenter  : 'mouseEnter',
+        mouseleave  : 'mouseLeave',
+        submit      : 'submit',
+        input       : 'input',
+        change      : 'change',
+        dragstart   : 'dragStart',
+        drag        : 'drag',
+        dragenter   : 'dragEnter',
+        dragleave   : 'dragLeave',
+        dragover    : 'dragOver',
+        drop        : 'drop',
+        dragend     : 'dragEnd'
+      },
+
+      /**
+        The root DOM element to which event listeners should be attached. Event
+        listeners will be attached to the document unless this is overridden.
+
+        Can be specified as a DOMElement or a selector string.
+
+        The default body is a string since this may be evaluated before document.body
+        exists in the DOM.
+
+        @private
+        @property rootElement
+        @type DOMElement
+        @default 'body'
+      */
+      rootElement: 'body',
+
+      /**
+        Sets up event listeners for standard browser events.
+
+        This will be called after the browser sends a `DOMContentReady` event. By
+        default, it will set up all of the listeners on the document body. If you
+        would like to register the listeners on a different element, set the event
+        dispatcher's `root` property.
+
+        @private
+        @method setup
+        @param addedEvents {Hash}
+      */
+      setup: function(addedEvents, rootElement) {
+        var event, events = get(this, 'events');
+
+        jQuery.extend(events, addedEvents || {});
+
+
+        if (!isNone(rootElement)) {
+          set(this, 'rootElement', rootElement);
+        }
+
+        rootElement = jQuery(get(this, 'rootElement'));
+
+        Ember.assert(fmt('You cannot use the same root element (%@) multiple times in an Ember.Application', [rootElement.selector || rootElement[0].tagName]), !rootElement.is('.ember-application'));
+        Ember.assert('You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application', !rootElement.closest('.ember-application').length);
+        Ember.assert('You cannot make a new Ember.Application using a root element that is an ancestor of an existing Ember.Application', !rootElement.find('.ember-application').length);
+
+        rootElement.addClass('ember-application');
+
+        Ember.assert('Unable to add "ember-application" class to rootElement. Make sure you set rootElement to the body or an element in the body.', rootElement.is('.ember-application'));
+
+        for (event in events) {
+          if (events.hasOwnProperty(event)) {
+            this.setupHandler(rootElement, event, events[event]);
+          }
+        }
+      },
+
+      /**
+        Registers an event listener on the document. If the given event is
+        triggered, the provided event handler will be triggered on the target view.
+
+        If the target view does not implement the event handler, or if the handler
+        returns `false`, the parent view will be called. The event will continue to
+        bubble to each successive parent view until it reaches the top.
+
+        For example, to have the `mouseDown` method called on the target view when
+        a `mousedown` event is received from the browser, do the following:
+
+        ```javascript
+        setupHandler('mousedown', 'mouseDown');
+        ```
+
+        @private
+        @method setupHandler
+        @param {Element} rootElement
+        @param {String} event the browser-originated event to listen to
+        @param {String} eventName the name of the method to call on the view
+      */
+      setupHandler: function(rootElement, event, eventName) {
+        var self = this;
+
+        rootElement.on(event + '.ember', '.ember-view', function(evt, triggeringManager) {
+          var view = View.views[this.id],
+              result = true, manager = null;
+
+          manager = self._findNearestEventManager(view, eventName);
+
+          if (manager && manager !== triggeringManager) {
+            result = self._dispatchEvent(manager, evt, eventName, view);
+          } else if (view) {
+            result = self._bubbleEvent(view, evt, eventName);
+          } else {
+            evt.stopPropagation();
+          }
+
+          return result;
+        });
+
+        rootElement.on(event + '.ember', '[data-ember-action]', function(evt) {
+          //ES6TODO: Needed for ActionHelper (generally not available in ember-views test suite)
+          if (!ActionHelper) { ActionHelper = requireModule("ember-routing/helpers/action")["ActionHelper"]; };
+
+          var actionId = jQuery(evt.currentTarget).attr('data-ember-action'),
+              action   = ActionHelper.registeredActions[actionId];
+
+          // We have to check for action here since in some cases, jQuery will trigger
+          // an event on `removeChild` (i.e. focusout) after we've already torn down the
+          // action handlers for the view.
+          if (action && action.eventName === eventName) {
+            return action.handler(evt);
+          }
+        });
+      },
+
+      _findNearestEventManager: function(view, eventName) {
+        var manager = null;
+
+        while (view) {
+          manager = get(view, 'eventManager');
+          if (manager && manager[eventName]) { break; }
+
+          view = get(view, 'parentView');
+        }
+
+        return manager;
+      },
+
+      _dispatchEvent: function(object, evt, eventName, view) {
+        var result = true;
+
+        var handler = object[eventName];
+        if (typeOf(handler) === 'function') {
+          result = run(object, handler, evt, view);
+          // Do not preventDefault in eventManagers.
+          evt.stopPropagation();
+        }
+        else {
+          result = this._bubbleEvent(view, evt, eventName);
+        }
+
+        return result;
+      },
+
+      _bubbleEvent: function(view, evt, eventName) {
+        return run(view, view.handleEvent, eventName, evt);
+      },
+
+      destroy: function() {
+        var rootElement = get(this, 'rootElement');
+        jQuery(rootElement).off('.ember', '**').removeClass('ember-application');
+        return this._super();
+      }
+    });
+
+    __exports__["default"] = EventDispatcher;
+  });
+define("ember-views/system/ext",
+  ["ember-metal/run_loop"],
+  function(__dependency1__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var run = __dependency1__["default"];
+
+    // Add a new named queue for rendering views that happens
+    // after bindings have synced, and a queue for scheduling actions
+    // that that should occur after view rendering.
+    var queues = run.queues;
+    run._addQueue('render', 'actions');
+    run._addQueue('afterRender', 'render');
+  });
+define("ember-views/system/jquery",
+  ["ember-metal/core","ember-runtime/system/string","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var w = __dependency2__.w;
+
+    // ES6TODO: the functions on EnumerableUtils need their own exports
+    var EnumerableUtils = __dependency3__["default"];
+    var forEach = EnumerableUtils.forEach;
+
+    /**
+    Ember Views
+
+    @module ember
+    @submodule ember-views
+    @requires ember-runtime
+    @main ember-views
+    */
+
+    var jQuery = (Ember.imports && Ember.imports.jQuery) || (this && this.jQuery);
+    if (!jQuery && typeof require === 'function') {
+      jQuery = require('jquery');
+    }
+
+    Ember.assert("Ember Views require jQuery between 1.7 and 2.1", jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10|11))|(2\.(0|1)))(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY));
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+    if (jQuery) {
+      // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
+      var dragEvents = w('dragstart drag dragenter dragleave dragover drop dragend');
+
+      // Copies the `dataTransfer` property from a browser event object onto the
+      // jQuery event object for the specified events
+      forEach(dragEvents, function(eventName) {
+        jQuery.event.fixHooks[eventName] = { props: ['dataTransfer'] };
+      });
+    }
+
+    __exports__["default"] = jQuery;
+  });
+define("ember-views/system/render_buffer",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/system/utils","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var Ember = __dependency1__["default"];
+    // jQuery
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var setInnerHTML = __dependency4__.setInnerHTML;
+    var jQuery = __dependency5__["default"];
+
+    function ClassSet() {
+      this.seen = {};
+      this.list = [];
+    };
+
+
+    ClassSet.prototype = {
+      add: function(string) {
+        if (string in this.seen) { return; }
+        this.seen[string] = true;
+
+        this.list.push(string);
+      },
+
+      toDOM: function() {
+        return this.list.join(" ");
+      }
+    };
+
+    var BAD_TAG_NAME_TEST_REGEXP = /[^a-zA-Z0-9\-]/;
+    var BAD_TAG_NAME_REPLACE_REGEXP = /[^a-zA-Z0-9\-]/g;
+
+    function stripTagName(tagName) {
+      if (!tagName) {
+        return tagName;
+      }
+
+      if (!BAD_TAG_NAME_TEST_REGEXP.test(tagName)) {
+        return tagName;
+      }
+
+      return tagName.replace(BAD_TAG_NAME_REPLACE_REGEXP, '');
+    }
+
+    var BAD_CHARS_REGEXP = /&(?!\w+;)|[<>"'`]/g;
+    var POSSIBLE_CHARS_REGEXP = /[&<>"'`]/;
+
+    function escapeAttribute(value) {
+      // Stolen shamelessly from Handlebars
+
+      var escape = {
+        "<": "&lt;",
+        ">": "&gt;",
+        '"': "&quot;",
+        "'": "&#x27;",
+        "`": "&#x60;"
+      };
+
+      var escapeChar = function(chr) {
+        return escape[chr] || "&amp;";
+      };
+
+      var string = value.toString();
+
+      if(!POSSIBLE_CHARS_REGEXP.test(string)) { return string; }
+      return string.replace(BAD_CHARS_REGEXP, escapeChar);
+    }
+
+    // IE 6/7 have bugs around setting names on inputs during creation.
+    // From http://msdn.microsoft.com/en-us/library/ie/ms536389(v=vs.85).aspx:
+    // "To include the NAME attribute at run time on objects created with the createElement method, use the eTag."
+    var canSetNameOnInputs = (function() {
+      var div = document.createElement('div'),
+          el = document.createElement('input');
+
+      el.setAttribute('name', 'foo');
+      div.appendChild(el);
+
+      return !!div.innerHTML.match('foo');
+    })();
+
+    /**
+      `Ember.RenderBuffer` gathers information regarding the view and generates the
+      final representation. `Ember.RenderBuffer` will generate HTML which can be pushed
+      to the DOM.
+
+       ```javascript
+       var buffer = Ember.RenderBuffer('div');
+      ```
+
+      @class RenderBuffer
+      @namespace Ember
+      @constructor
+      @param {String} tagName tag name (such as 'div' or 'p') used for the buffer
+    */
+    var RenderBuffer = function(tagName) {
+      return new _RenderBuffer(tagName);
+    };
+
+    var _RenderBuffer = function(tagName) {
+      this.tagNames = [tagName || null];
+      this.buffer = "";
+    };
+
+    _RenderBuffer.prototype = {
+
+      // The root view's element
+      _element: null,
+
+      _hasElement: true,
+
+      /**
+        An internal set used to de-dupe class names when `addClass()` is
+        used. After each call to `addClass()`, the `classes` property
+        will be updated.
+
+        @private
+        @property elementClasses
+        @type Array
+        @default null
+      */
+      elementClasses: null,
+
+      /**
+        Array of class names which will be applied in the class attribute.
+
+        You can use `setClasses()` to set this property directly. If you
+        use `addClass()`, it will be maintained for you.
+
+        @property classes
+        @type Array
+        @default null
+      */
+      classes: null,
+
+      /**
+        The id in of the element, to be applied in the id attribute.
+
+        You should not set this property yourself, rather, you should use
+        the `id()` method of `Ember.RenderBuffer`.
+
+        @property elementId
+        @type String
+        @default null
+      */
+      elementId: null,
+
+      /**
+        A hash keyed on the name of the attribute and whose value will be
+        applied to that attribute. For example, if you wanted to apply a
+        `data-view="Foo.bar"` property to an element, you would set the
+        elementAttributes hash to `{'data-view':'Foo.bar'}`.
+
+        You should not maintain this hash yourself, rather, you should use
+        the `attr()` method of `Ember.RenderBuffer`.
+
+        @property elementAttributes
+        @type Hash
+        @default {}
+      */
+      elementAttributes: null,
+
+      /**
+        A hash keyed on the name of the properties and whose value will be
+        applied to that property. For example, if you wanted to apply a
+        `checked=true` property to an element, you would set the
+        elementProperties hash to `{'checked':true}`.
+
+        You should not maintain this hash yourself, rather, you should use
+        the `prop()` method of `Ember.RenderBuffer`.
+
+        @property elementProperties
+        @type Hash
+        @default {}
+      */
+      elementProperties: null,
+
+      /**
+        The tagname of the element an instance of `Ember.RenderBuffer` represents.
+
+        Usually, this gets set as the first parameter to `Ember.RenderBuffer`. For
+        example, if you wanted to create a `p` tag, then you would call
+
+        ```javascript
+        Ember.RenderBuffer('p')
+        ```
+
+        @property elementTag
+        @type String
+        @default null
+      */
+      elementTag: null,
+
+      /**
+        A hash keyed on the name of the style attribute and whose value will
+        be applied to that attribute. For example, if you wanted to apply a
+        `background-color:black;` style to an element, you would set the
+        elementStyle hash to `{'background-color':'black'}`.
+
+        You should not maintain this hash yourself, rather, you should use
+        the `style()` method of `Ember.RenderBuffer`.
+
+        @property elementStyle
+        @type Hash
+        @default {}
+      */
+      elementStyle: null,
+
+      /**
+        Nested `RenderBuffers` will set this to their parent `RenderBuffer`
+        instance.
+
+        @property parentBuffer
+        @type Ember._RenderBuffer
+      */
+      parentBuffer: null,
+
+      /**
+        Adds a string of HTML to the `RenderBuffer`.
+
+        @method push
+        @param {String} string HTML to push into the buffer
+        @chainable
+      */
+      push: function(string) {
+        this.buffer += string;
+        return this;
+      },
+
+      /**
+        Adds a class to the buffer, which will be rendered to the class attribute.
+
+        @method addClass
+        @param {String} className Class name to add to the buffer
+        @chainable
+      */
+      addClass: function(className) {
+        // lazily create elementClasses
+        this.elementClasses = (this.elementClasses || new ClassSet());
+        this.elementClasses.add(className);
+        this.classes = this.elementClasses.list;
+
+        return this;
+      },
+
+      setClasses: function(classNames) {
+        this.elementClasses = null;
+        var len = classNames.length, i;
+        for (i = 0; i < len; i++) {
+          this.addClass(classNames[i]);
+        }
+      },
+
+      /**
+        Sets the elementID to be used for the element.
+
+        @method id
+        @param {String} id
+        @chainable
+      */
+      id: function(id) {
+        this.elementId = id;
+        return this;
+      },
+
+      // duck type attribute functionality like jQuery so a render buffer
+      // can be used like a jQuery object in attribute binding scenarios.
+
+      /**
+        Adds an attribute which will be rendered to the element.
+
+        @method attr
+        @param {String} name The name of the attribute
+        @param {String} value The value to add to the attribute
+        @chainable
+        @return {Ember.RenderBuffer|String} this or the current attribute value
+      */
+      attr: function(name, value) {
+        var attributes = this.elementAttributes = (this.elementAttributes || {});
+
+        if (arguments.length === 1) {
+          return attributes[name];
+        } else {
+          attributes[name] = value;
+        }
+
+        return this;
+      },
+
+      /**
+        Remove an attribute from the list of attributes to render.
+
+        @method removeAttr
+        @param {String} name The name of the attribute
+        @chainable
+      */
+      removeAttr: function(name) {
+        var attributes = this.elementAttributes;
+        if (attributes) { delete attributes[name]; }
+
+        return this;
+      },
+
+      /**
+        Adds a property which will be rendered to the element.
+
+        @method prop
+        @param {String} name The name of the property
+        @param {String} value The value to add to the property
+        @chainable
+        @return {Ember.RenderBuffer|String} this or the current property value
+      */
+      prop: function(name, value) {
+        var properties = this.elementProperties = (this.elementProperties || {});
+
+        if (arguments.length === 1) {
+          return properties[name];
+        } else {
+          properties[name] = value;
+        }
+
+        return this;
+      },
+
+      /**
+        Remove an property from the list of properties to render.
+
+        @method removeProp
+        @param {String} name The name of the property
+        @chainable
+      */
+      removeProp: function(name) {
+        var properties = this.elementProperties;
+        if (properties) { delete properties[name]; }
+
+        return this;
+      },
+
+      /**
+        Adds a style to the style attribute which will be rendered to the element.
+
+        @method style
+        @param {String} name Name of the style
+        @param {String} value
+        @chainable
+      */
+      style: function(name, value) {
+        this.elementStyle = (this.elementStyle || {});
+
+        this.elementStyle[name] = value;
+        return this;
+      },
+
+      begin: function(tagName) {
+        this.tagNames.push(tagName || null);
+        return this;
+      },
+
+      pushOpeningTag: function() {
+        var tagName = this.currentTagName();
+        if (!tagName) { return; }
+
+        if (this._hasElement && !this._element && this.buffer.length === 0) {
+          this._element = this.generateElement();
+          return;
+        }
+
+        var buffer = this.buffer,
+            id = this.elementId,
+            classes = this.classes,
+            attrs = this.elementAttributes,
+            props = this.elementProperties,
+            style = this.elementStyle,
+            attr, prop;
+
+        buffer += '<' + stripTagName(tagName);
+
+        if (id) {
+          buffer += ' id="' + escapeAttribute(id) + '"';
+          this.elementId = null;
+        }
+        if (classes) {
+          buffer += ' class="' + escapeAttribute(classes.join(' ')) + '"';
+          this.classes = null;
+          this.elementClasses = null;
+        }
+
+        if (style) {
+          buffer += ' style="';
+
+          for (prop in style) {
+            if (style.hasOwnProperty(prop)) {
+              buffer += prop + ':' + escapeAttribute(style[prop]) + ';';
+            }
+          }
+
+          buffer += '"';
+
+          this.elementStyle = null;
+        }
+
+        if (attrs) {
+          for (attr in attrs) {
+            if (attrs.hasOwnProperty(attr)) {
+              buffer += ' ' + attr + '="' + escapeAttribute(attrs[attr]) + '"';
+            }
+          }
+
+          this.elementAttributes = null;
+        }
+
+        if (props) {
+          for (prop in props) {
+            if (props.hasOwnProperty(prop)) {
+              var value = props[prop];
+              if (value || typeof(value) === 'number') {
+                if (value === true) {
+                  buffer += ' ' + prop + '="' + prop + '"';
+                } else {
+                  buffer += ' ' + prop + '="' + escapeAttribute(props[prop]) + '"';
+                }
+              }
+            }
+          }
+
+          this.elementProperties = null;
+        }
+
+        buffer += '>';
+        this.buffer = buffer;
+      },
+
+      pushClosingTag: function() {
+        var tagName = this.tagNames.pop();
+        if (tagName) { this.buffer += '</' + stripTagName(tagName) + '>'; }
+      },
+
+      currentTagName: function() {
+        return this.tagNames[this.tagNames.length-1];
+      },
+
+      generateElement: function() {
+        var tagName = this.tagNames.pop(), // pop since we don't need to close
+            id = this.elementId,
+            classes = this.classes,
+            attrs = this.elementAttributes,
+            props = this.elementProperties,
+            style = this.elementStyle,
+            styleBuffer = '', attr, prop, tagString;
+
+        if (attrs && attrs.name && !canSetNameOnInputs) {
+          // IE allows passing a tag to createElement. See note on `canSetNameOnInputs` above as well.
+          tagString = '<'+stripTagName(tagName)+' name="'+escapeAttribute(attrs.name)+'">';
+        } else {
+          tagString = tagName;
+        }
+
+        var element = document.createElement(tagString),
+            $element = jQuery(element);
+
+        if (id) {
+          $element.attr('id', id);
+          this.elementId = null;
+        }
+        if (classes) {
+          $element.attr('class', classes.join(' '));
+          this.classes = null;
+          this.elementClasses = null;
+        }
+
+        if (style) {
+          for (prop in style) {
+            if (style.hasOwnProperty(prop)) {
+              styleBuffer += (prop + ':' + style[prop] + ';');
+            }
+          }
+
+          $element.attr('style', styleBuffer);
+
+          this.elementStyle = null;
+        }
+
+        if (attrs) {
+          for (attr in attrs) {
+            if (attrs.hasOwnProperty(attr)) {
+              $element.attr(attr, attrs[attr]);
+            }
+          }
+
+          this.elementAttributes = null;
+        }
+
+        if (props) {
+          for (prop in props) {
+            if (props.hasOwnProperty(prop)) {
+              $element.prop(prop, props[prop]);
+            }
+          }
+
+          this.elementProperties = null;
+        }
+
+        return element;
+      },
+
+      /**
+        @method element
+        @return {DOMElement} The element corresponding to the generated HTML
+          of this buffer
+      */
+      element: function() {
+        var html = this.innerString();
+
+        if (html) {
+          this._element = setInnerHTML(this._element, html);
+        }
+
+        return this._element;
+      },
+
+      /**
+        Generates the HTML content for this buffer.
+
+        @method string
+        @return {String} The generated HTML
+      */
+      string: function() {
+        if (this._hasElement && this._element) {
+          // Firefox versions < 11 do not have support for element.outerHTML.
+          var thisElement = this.element(), outerHTML = thisElement.outerHTML;
+          if (typeof outerHTML === 'undefined') {
+            return jQuery('<div/>').append(thisElement).html();
+          }
+          return outerHTML;
+        } else {
+          return this.innerString();
+        }
+      },
+
+      innerString: function() {
+        return this.buffer;
+      }
+    };
+
+    __exports__["default"] = RenderBuffer;
+  });
+define("ember-views/system/utils",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    /* BEGIN METAMORPH HELPERS */
+
+    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+    // is a "zero-scope" element. This problem can be worked around by making
+    // the first node an invisible text node. We, like Modernizr, use &shy;
+
+    var needsShy = typeof document !== 'undefined' && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "<div></div>";
+      testEl.firstChild.innerHTML = "<script></script>";
+      return testEl.firstChild.innerHTML === '';
+    })();
+
+    // IE 8 (and likely earlier) likes to move whitespace preceeding
+    // a script tag to appear after it. This means that we can
+    // accidentally remove whitespace when updating a morph.
+    var movesWhitespace = typeof document !== 'undefined' && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
+      return testEl.childNodes[0].nodeValue === 'Test:' &&
+              testEl.childNodes[2].nodeValue === ' Value';
+    })();
+
+    // Use this to find children by ID instead of using jQuery
+    var findChildById = function(element, id) {
+      if (element.getAttribute('id') === id) { return element; }
+
+      var len = element.childNodes.length, idx, node, found;
+      for (idx=0; idx<len; idx++) {
+        node = element.childNodes[idx];
+        found = node.nodeType === 1 && findChildById(node, id);
+        if (found) { return found; }
+      }
+    };
+
+    var setInnerHTMLWithoutFix = function(element, html) {
+      if (needsShy) {
+        html = '&shy;' + html;
+      }
+
+      var matches = [];
+      if (movesWhitespace) {
+        // Right now we only check for script tags with ids with the
+        // goal of targeting morphs.
+        html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
+          matches.push([id, spaces]);
+          return tag;
+        });
+      }
+
+      element.innerHTML = html;
+
+      // If we have to do any whitespace adjustments do them now
+      if (matches.length > 0) {
+        var len = matches.length, idx;
+        for (idx=0; idx<len; idx++) {
+          var script = findChildById(element, matches[idx][0]),
+              node = document.createTextNode(matches[idx][1]);
+          script.parentNode.insertBefore(node, script);
+        }
+      }
+
+      if (needsShy) {
+        var shyElement = element.firstChild;
+        while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+          shyElement = shyElement.firstChild;
+        }
+        if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+          shyElement.nodeValue = shyElement.nodeValue.slice(1);
+        }
+      }
+    };
+
+    /* END METAMORPH HELPERS */
+
+
+    var innerHTMLTags = {};
+    var canSetInnerHTML = function(tagName) {
+      if (innerHTMLTags[tagName] !== undefined) {
+        return innerHTMLTags[tagName];
+      }
+
+      var canSet = true;
+
+      // IE 8 and earlier don't allow us to do innerHTML on select
+      if (tagName.toLowerCase() === 'select') {
+        var el = document.createElement('select');
+        setInnerHTMLWithoutFix(el, '<option value="test">Test</option>');
+        canSet = el.options.length === 1;
+      }
+
+      innerHTMLTags[tagName] = canSet;
+
+      return canSet;
+    };
+
+    var setInnerHTML = function(element, html) {
+      var tagName = element.tagName;
+
+      if (canSetInnerHTML(tagName)) {
+        setInnerHTMLWithoutFix(element, html);
+      } else {
+        // Firefox versions < 11 do not have support for element.outerHTML.
+        var outerHTML = element.outerHTML || new XMLSerializer().serializeToString(element);
+        Ember.assert("Can't set innerHTML on "+element.tagName+" in this browser", outerHTML);
+
+        var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0],
+            endTag = '</'+tagName+'>';
+
+        var wrapper = document.createElement('div');
+        setInnerHTMLWithoutFix(wrapper, startTag + html + endTag);
+        element = wrapper.firstChild;
+        while (element.tagName !== tagName) {
+          element = element.nextSibling;
+        }
+      }
+
+      return element;
+    };
+
+    function isSimpleClick(event) {
+      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey,
+          secondaryClick = event.which > 1; // IE9 may return undefined
+
+      return !modifier && !secondaryClick;
+    }
+
+    __exports__.setInnerHTML = setInnerHTML;
+    __exports__.isSimpleClick = isSimpleClick;
+  });
+define("ember-views/views/collection_view",
+  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/view","ember-metal/mixin","ember-runtime/mixins/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var create = __dependency2__.create;
+    var isGlobalPath = __dependency3__.isGlobalPath;
+    var merge = __dependency4__["default"];
+    var get = __dependency5__.get;
+    var set = __dependency6__.set;
+    var fmt = __dependency7__.fmt;
+    var ContainerView = __dependency8__["default"];
+    var CoreView = __dependency9__.CoreView;
+    var View = __dependency9__.View;
+    var observer = __dependency10__.observer;
+    var beforeObserver = __dependency10__.beforeObserver;
+    var EmberArray = __dependency11__["default"];
+
+    /**
+      `Ember.CollectionView` is an `Ember.View` descendent responsible for managing
+      a collection (an array or array-like object) by maintaining a child view object
+      and associated DOM representation for each item in the array and ensuring
+      that child views and their associated rendered HTML are updated when items in
+      the array are added, removed, or replaced.
+
+      ## Setting content
+
+      The managed collection of objects is referenced as the `Ember.CollectionView`
+      instance's `content` property.
+
+      ```javascript
+      someItemsView = Ember.CollectionView.create({
+        content: ['A', 'B','C']
+      })
+      ```
+
+      The view for each item in the collection will have its `content` property set
+      to the item.
+
+      ## Specifying itemViewClass
+
+      By default the view class for each item in the managed collection will be an
+      instance of `Ember.View`. You can supply a different class by setting the
+      `CollectionView`'s `itemViewClass` property.
+
+      Given an empty `<body>` and the following code:
+
+      ```javascript
+      someItemsView = Ember.CollectionView.create({
+        classNames: ['a-collection'],
+        content: ['A','B','C'],
+        itemViewClass: Ember.View.extend({
+          template: Ember.Handlebars.compile("the letter: {{view.content}}")
+        })
+      });
+
+      someItemsView.appendTo('body');
+      ```
+
+      Will result in the following HTML structure
+
+      ```html
+      <div class="ember-view a-collection">
+        <div class="ember-view">the letter: A</div>
+        <div class="ember-view">the letter: B</div>
+        <div class="ember-view">the letter: C</div>
+      </div>
+      ```
+
+      ## Automatic matching of parent/child tagNames
+
+      Setting the `tagName` property of a `CollectionView` to any of
+      "ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
+      in the item views receiving an appropriately matched `tagName` property.
+
+      Given an empty `<body>` and the following code:
+
+      ```javascript
+      anUnorderedListView = Ember.CollectionView.create({
+        tagName: 'ul',
+        content: ['A','B','C'],
+        itemViewClass: Ember.View.extend({
+          template: Ember.Handlebars.compile("the letter: {{view.content}}")
+        })
+      });
+
+      anUnorderedListView.appendTo('body');
+      ```
+
+      Will result in the following HTML structure
+
+      ```html
+      <ul class="ember-view a-collection">
+        <li class="ember-view">the letter: A</li>
+        <li class="ember-view">the letter: B</li>
+        <li class="ember-view">the letter: C</li>
+      </ul>
+      ```
+
+      Additional `tagName` pairs can be provided by adding to
+      `Ember.CollectionView.CONTAINER_MAP `
+
+      ```javascript
+      Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
+      ```
+
+      ## Programmatic creation of child views
+
+      For cases where additional customization beyond the use of a single
+      `itemViewClass` or `tagName` matching is required CollectionView's
+      `createChildView` method can be overidden:
+
+      ```javascript
+      CustomCollectionView = Ember.CollectionView.extend({
+        createChildView: function(viewClass, attrs) {
+          if (attrs.content.kind == 'album') {
+            viewClass = App.AlbumView;
+          } else {
+            viewClass = App.SongView;
+          }
+          return this._super(viewClass, attrs);
+        }
+      });
+      ```
+
+      ## Empty View
+
+      You can provide an `Ember.View` subclass to the `Ember.CollectionView`
+      instance as its `emptyView` property. If the `content` property of a
+      `CollectionView` is set to `null` or an empty array, an instance of this view
+      will be the `CollectionView`s only child.
+
+      ```javascript
+      aListWithNothing = Ember.CollectionView.create({
+        classNames: ['nothing']
+        content: null,
+        emptyView: Ember.View.extend({
+          template: Ember.Handlebars.compile("The collection is empty")
+        })
+      });
+
+      aListWithNothing.appendTo('body');
+      ```
+
+      Will result in the following HTML structure
+
+      ```html
+      <div class="ember-view nothing">
+        <div class="ember-view">
+          The collection is empty
+        </div>
+      </div>
+      ```
+
+      ## Adding and Removing items
+
+      The `childViews` property of a `CollectionView` should not be directly
+      manipulated. Instead, add, remove, replace items from its `content` property.
+      This will trigger appropriate changes to its rendered HTML.
+
+
+      @class CollectionView
+      @namespace Ember
+      @extends Ember.ContainerView
+      @since Ember 0.9
+    */
+    var CollectionView = ContainerView.extend({
+
+      /**
+        A list of items to be displayed by the `Ember.CollectionView`.
+
+        @property content
+        @type Ember.Array
+        @default null
+      */
+      content: null,
+
+      /**
+        This provides metadata about what kind of empty view class this
+        collection would like if it is being instantiated from another
+        system (like Handlebars)
+
+        @private
+        @property emptyViewClass
+      */
+      emptyViewClass: View,
+
+      /**
+        An optional view to display if content is set to an empty array.
+
+        @property emptyView
+        @type Ember.View
+        @default null
+      */
+      emptyView: null,
+
+      /**
+        @property itemViewClass
+        @type Ember.View
+        @default Ember.View
+      */
+      itemViewClass: View,
+
+      /**
+        Setup a CollectionView
+
+        @method init
+      */
+      init: function() {
+        var ret = this._super();
+        this._contentDidChange();
+        return ret;
+      },
+
+      /**
+        Invoked when the content property is about to change. Notifies observers that the
+        entire array content will change.
+
+        @private
+        @method _contentWillChange
+      */
+      _contentWillChange: beforeObserver('content', function() {
+        var content = this.get('content');
+
+        if (content) { content.removeArrayObserver(this); }
+        var len = content ? get(content, 'length') : 0;
+        this.arrayWillChange(content, 0, len);
+      }),
+
+      /**
+        Check to make sure that the content has changed, and if so,
+        update the children directly. This is always scheduled
+        asynchronously, to allow the element to be created before
+        bindings have synchronized and vice versa.
+
+        @private
+        @method _contentDidChange
+      */
+      _contentDidChange: observer('content', function() {
+        var content = get(this, 'content');
+
+        if (content) {
+          this._assertArrayLike(content);
+          content.addArrayObserver(this);
+        }
+
+        var len = content ? get(content, 'length') : 0;
+        this.arrayDidChange(content, 0, null, len);
+      }),
+
+      /**
+        Ensure that the content implements Ember.Array
+
+        @private
+        @method _assertArrayLike
+      */
+      _assertArrayLike: function(content) {
+        Ember.assert(fmt("an Ember.CollectionView's content must implement Ember.Array. You passed %@", [content]), EmberArray.detect(content));
+      },
+
+      /**
+        Removes the content and content observers.
+
+        @method destroy
+      */
+      destroy: function() {
+        if (!this._super()) { return; }
+
+        var content = get(this, 'content');
+        if (content) { content.removeArrayObserver(this); }
+
+        if (this._createdEmptyView) {
+          this._createdEmptyView.destroy();
+        }
+
+        return this;
+      },
+
+      /**
+        Called when a mutation to the underlying content array will occur.
+
+        This method will remove any views that are no longer in the underlying
+        content array.
+
+        Invokes whenever the content array itself will change.
+
+        @method arrayWillChange
+        @param {Array} content the managed collection of objects
+        @param {Number} start the index at which the changes will occurr
+        @param {Number} removed number of object to be removed from content
+      */
+      arrayWillChange: function(content, start, removedCount) {
+        // If the contents were empty before and this template collection has an
+        // empty view remove it now.
+        var emptyView = get(this, 'emptyView');
+        if (emptyView && emptyView instanceof View) {
+          emptyView.removeFromParent();
+        }
+
+        // Loop through child views that correspond with the removed items.
+        // Note that we loop from the end of the array to the beginning because
+        // we are mutating it as we go.
+        var childViews = this._childViews, childView, idx, len;
+
+        len = this._childViews.length;
+
+        var removingAll = removedCount === len;
+
+        if (removingAll) {
+          this.currentState.empty(this);
+          this.invokeRecursively(function(view) {
+            view.removedFromDOM = true;
+          }, false);
+        }
+
+        for (idx = start + removedCount - 1; idx >= start; idx--) {
+          childView = childViews[idx];
+          childView.destroy();
+        }
+      },
+
+      /**
+        Called when a mutation to the underlying content array occurs.
+
+        This method will replay that mutation against the views that compose the
+        `Ember.CollectionView`, ensuring that the view reflects the model.
+
+        This array observer is added in `contentDidChange`.
+
+        @method arrayDidChange
+        @param {Array} content the managed collection of objects
+        @param {Number} start the index at which the changes occurred
+        @param {Number} removed number of object removed from content
+        @param {Number} added number of object added to content
+      */
+      arrayDidChange: function(content, start, removed, added) {
+        var addedViews = [], view, item, idx, len, itemViewClass,
+          emptyView;
+
+        len = content ? get(content, 'length') : 0;
+
+        if (len) {
+          itemViewClass = get(this, 'itemViewClass');
+
+          if ('string' === typeof itemViewClass && isGlobalPath(itemViewClass)) {
+            itemViewClass = get(itemViewClass) || itemViewClass;
+          }
+
+          Ember.assert(fmt("itemViewClass must be a subclass of Ember.View, not %@",
+                           [itemViewClass]),
+                           'string' === typeof itemViewClass || View.detect(itemViewClass));
+
+          for (idx = start; idx < start+added; idx++) {
+            item = content.objectAt(idx);
+
+            view = this.createChildView(itemViewClass, {
+              content: item,
+              contentIndex: idx
+            });
+
+            addedViews.push(view);
+          }
+        } else {
+          emptyView = get(this, 'emptyView');
+
+          if (!emptyView) { return; }
+
+          if ('string' === typeof emptyView && isGlobalPath(emptyView)) {
+            emptyView = get(emptyView) || emptyView;
+          }
+
+          emptyView = this.createChildView(emptyView);
+          addedViews.push(emptyView);
+          set(this, 'emptyView', emptyView);
+
+          if (CoreView.detect(emptyView)) {
+            this._createdEmptyView = emptyView;
+          }
+        }
+
+        this.replace(start, 0, addedViews);
+      },
+
+      /**
+        Instantiates a view to be added to the childViews array during view
+        initialization. You generally will not call this method directly unless
+        you are overriding `createChildViews()`. Note that this method will
+        automatically configure the correct settings on the new view instance to
+        act as a child of the parent.
+
+        The tag name for the view will be set to the tagName of the viewClass
+        passed in.
+
+        @method createChildView
+        @param {Class} viewClass
+        @param {Hash} [attrs] Attributes to add
+        @return {Ember.View} new instance
+      */
+      createChildView: function(view, attrs) {
+        view = this._super(view, attrs);
+
+        var itemTagName = get(view, 'tagName');
+
+        if (itemTagName === null || itemTagName === undefined) {
+          itemTagName = CollectionView.CONTAINER_MAP[get(this, 'tagName')];
+          set(view, 'tagName', itemTagName);
+        }
+
+        return view;
+      }
+    });
+
+    /**
+      A map of parent tags to their default child tags. You can add
+      additional parent tags if you want collection views that use
+      a particular parent tag to default to a child tag.
+
+      @property CONTAINER_MAP
+      @type Hash
+      @static
+      @final
+    */
+    CollectionView.CONTAINER_MAP = {
+      ul: 'li',
+      ol: 'li',
+      table: 'tr',
+      thead: 'tr',
+      tbody: 'tr',
+      tfoot: 'tr',
+      tr: 'td',
+      select: 'option'
+    };
+
+    __exports__["default"] = CollectionView;
+  });
+define("ember-views/views/component",
+  ["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.Handlebars
+
+    var ComponentTemplateDeprecation = __dependency2__["default"];
+    var TargetActionSupport = __dependency3__["default"];
+    var View = __dependency4__.View;var get = __dependency5__.get;
+    var set = __dependency6__.set;
+    var isNone = __dependency7__.isNone;
+
+    var computed = __dependency8__.computed;
+
+    var a_slice = Array.prototype.slice;
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    /**
+      An `Ember.Component` is a view that is completely
+      isolated. Property access in its templates go
+      to the view object and actions are targeted at
+      the view object. There is no access to the
+      surrounding context or outer controller; all
+      contextual information must be passed in.
+
+      The easiest way to create an `Ember.Component` is via
+      a template. If you name a template
+      `components/my-foo`, you will be able to use
+      `{{my-foo}}` in other templates, which will make
+      an instance of the isolated component.
+
+      ```handlebars
+      {{app-profile person=currentUser}}
+      ```
+
+      ```handlebars
+      <!-- app-profile template -->
+      <h1>{{person.title}}</h1>
+      <img {{bind-attr src=person.avatar}}>
+      <p class='signature'>{{person.signature}}</p>
+      ```
+
+      You can use `yield` inside a template to
+      include the **contents** of any block attached to
+      the component. The block will be executed in the
+      context of the surrounding context or outer controller:
+
+      ```handlebars
+      {{#app-profile person=currentUser}}
+        <p>Admin mode</p>
+        {{! Executed in the controller's context. }}
+      {{/app-profile}}
+      ```
+
+      ```handlebars
+      <!-- app-profile template -->
+      <h1>{{person.title}}</h1>
+      {{! Executed in the components context. }}
+      {{yield}} {{! block contents }}
+      ```
+
+      If you want to customize the component, in order to
+      handle events or actions, you implement a subclass
+      of `Ember.Component` named after the name of the
+      component. Note that `Component` needs to be appended to the name of
+      your subclass like `AppProfileComponent`.
+
+      For example, you could implement the action
+      `hello` for the `app-profile` component:
+
+      ```javascript
+      App.AppProfileComponent = Ember.Component.extend({
+        actions: {
+          hello: function(name) {
+            console.log("Hello", name);
+          }
+        }
+      });
+      ```
+
+      And then use it in the component's template:
+
+      ```handlebars
+      <!-- app-profile template -->
+
+      <h1>{{person.title}}</h1>
+      {{yield}} <!-- block contents -->
+
+      <button {{action 'hello' person.name}}>
+        Say Hello to {{person.name}}
+      </button>
+      ```
+
+      Components must have a `-` in their name to avoid
+      conflicts with built-in controls that wrap HTML
+      elements. This is consistent with the same
+      requirement in web components.
+
+      @class Component
+      @namespace Ember
+      @extends Ember.View
+    */
+    var Component = View.extend(TargetActionSupport, ComponentTemplateDeprecation, {
+      instrumentName: 'component',
+      instrumentDisplay: computed(function() {
+        if (this._debugContainerKey) {
+          return '{{' + this._debugContainerKey.split(':')[1] + '}}';
+        }
+      }),
+
+      init: function() {
+        this._super();
+        set(this, 'context', this);
+        set(this, 'controller', this);
+      },
+
+      defaultLayout: function(context, options){
+        Ember.Handlebars.helpers['yield'].call(context, options);
+      },
+
+      /**
+      A components template property is set by passing a block
+      during its invocation. It is executed within the parent context.
+
+      Example:
+
+      ```handlebars
+      {{#my-component}}
+        // something that is run in the context
+        // of the parent context
+      {{/my-component}}
+      ```
+
+      Specifying a template directly to a component is deprecated without
+      also specifying the layout property.
+
+      @deprecated
+      @property template
+      */
+      template: computed(function(key, value) {
+        if (value !== undefined) { return value; }
+
+        var templateName = get(this, 'templateName'),
+            template = this.templateForName(templateName, 'template');
+
+        Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
+
+        return template || get(this, 'defaultTemplate');
+      }).property('templateName'),
+
+      /**
+      Specifying a components `templateName` is deprecated without also
+      providing the `layout` or `layoutName` properties.
+
+      @deprecated
+      @property templateName
+      */
+      templateName: null,
+
+      // during render, isolate keywords
+      cloneKeywords: function() {
+        return {
+          view: this,
+          controller: this
+        };
+      },
+
+      _yield: function(context, options) {
+        var view = options.data.view,
+            parentView = this._parentView,
+            template = get(this, 'template');
+
+        if (template) {
+          Ember.assert("A Component must have a parent view in order to yield.", parentView);
+
+          view.appendChild(View, {
+            isVirtual: true,
+            tagName: '',
+            _contextView: parentView,
+            template: template,
+            context: get(parentView, 'context'),
+            controller: get(parentView, 'controller'),
+            templateData: { keywords: parentView.cloneKeywords() }
+          });
+        }
+      },
+
+      /**
+        If the component is currently inserted into the DOM of a parent view, this
+        property will point to the controller of the parent view.
+
+        @property targetObject
+        @type Ember.Controller
+        @default null
+      */
+      targetObject: computed(function(key) {
+        var parentView = get(this, '_parentView');
+        return parentView ? get(parentView, 'controller') : null;
+      }).property('_parentView'),
+
+      /**
+        Triggers a named action on the controller context where the component is used if
+        this controller has registered for notifications of the action.
+
+        For example a component for playing or pausing music may translate click events
+        into action notifications of "play" or "stop" depending on some internal state
+        of the component:
+
+
+        ```javascript
+        App.PlayButtonComponent = Ember.Component.extend({
+          click: function(){
+            if (this.get('isPlaying')) {
+              this.sendAction('play');
+            } else {
+              this.sendAction('stop');
+            }
+          }
+        });
+        ```
+
+        When used inside a template these component actions are configured to
+        trigger actions in the outer application context:
+
+        ```handlebars
+        {{! application.hbs }}
+        {{play-button play="musicStarted" stop="musicStopped"}}
+        ```
+
+        When the component receives a browser `click` event it translate this
+        interaction into application-specific semantics ("play" or "stop") and
+        triggers the specified action name on the controller for the template
+        where the component is used:
+
+
+        ```javascript
+        App.ApplicationController = Ember.Controller.extend({
+          actions: {
+            musicStarted: function(){
+              // called when the play button is clicked
+              // and the music started playing
+            },
+            musicStopped: function(){
+              // called when the play button is clicked
+              // and the music stopped playing
+            }
+          }
+        });
+        ```
+
+        If no action name is passed to `sendAction` a default name of "action"
+        is assumed.
+
+        ```javascript
+        App.NextButtonComponent = Ember.Component.extend({
+          click: function(){
+            this.sendAction();
+          }
+        });
+        ```
+
+        ```handlebars
+        {{! application.hbs }}
+        {{next-button action="playNextSongInAlbum"}}
+        ```
+
+        ```javascript
+        App.ApplicationController = Ember.Controller.extend({
+          actions: {
+            playNextSongInAlbum: function(){
+              ...
+            }
+          }
+        });
+        ```
+
+        @method sendAction
+        @param [action] {String} the action to trigger
+        @param [context] {*} a context to send with the action
+      */
+      sendAction: function(action) {
+        var actionName,
+            contexts = a_slice.call(arguments, 1);
+
+        // Send the default action
+        if (action === undefined) {
+          actionName = get(this, 'action');
+          Ember.assert("The default action was triggered on the component " + this.toString() +
+                       ", but the action name (" + actionName + ") was not a string.",
+                       isNone(actionName) || typeof actionName === 'string');
+        } else {
+          actionName = get(this, action);
+          Ember.assert("The " + action + " action was triggered on the component " +
+                       this.toString() + ", but the action name (" + actionName +
+                       ") was not a string.",
+                       isNone(actionName) || typeof actionName === 'string');
+        }
+
+        // If no action name for that action could be found, just abort.
+        if (actionName === undefined) { return; }
+
+        this.triggerAction({
+          action: actionName,
+          actionContext: contexts
+        });
+      }
+    });
+
+    __exports__["default"] = Component;
+  });
+define("ember-views/views/container_view",
+  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.K
+
+    var merge = __dependency2__["default"];
+    var MutableArray = __dependency3__["default"];
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+
+    var View = __dependency6__.View;
+    var ViewCollection = __dependency6__.ViewCollection;
+    var cloneStates = __dependency7__.cloneStates;
+    var EmberViewStates = __dependency7__.states;
+
+    var EmberError = __dependency8__["default"];
+
+    // ES6TODO: functions on EnumerableUtils should get their own export
+    var EnumerableUtils = __dependency9__["default"];
+    var forEach = EnumerableUtils.forEach;
+
+    var computed = __dependency10__.computed;
+    var run = __dependency11__["default"];
+    var defineProperty = __dependency12__.defineProperty;
+    var RenderBuffer = __dependency13__["default"];
+    var observer = __dependency14__.observer;
+    var beforeObserver = __dependency14__.beforeObserver;
+    var A = __dependency15__.A;
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var states = cloneStates(EmberViewStates);
+
+    /**
+      A `ContainerView` is an `Ember.View` subclass that implements `Ember.MutableArray`
+      allowing programmatic management of its child views.
+
+      ## Setting Initial Child Views
+
+      The initial array of child views can be set in one of two ways. You can
+      provide a `childViews` property at creation time that contains instance of
+      `Ember.View`:
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        childViews: [Ember.View.create(), Ember.View.create()]
+      });
+      ```
+
+      You can also provide a list of property names whose values are instances of
+      `Ember.View`:
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        childViews: ['aView', 'bView', 'cView'],
+        aView: Ember.View.create(),
+        bView: Ember.View.create(),
+        cView: Ember.View.create()
+      });
+      ```
+
+      The two strategies can be combined:
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        childViews: ['aView', Ember.View.create()],
+        aView: Ember.View.create()
+      });
+      ```
+
+      Each child view's rendering will be inserted into the container's rendered
+      HTML in the same order as its position in the `childViews` property.
+
+      ## Adding and Removing Child Views
+
+      The container view implements `Ember.MutableArray` allowing programmatic management of its child views.
+
+      To remove a view, pass that view into a `removeObject` call on the container view.
+
+      Given an empty `<body>` the following code
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        classNames: ['the-container'],
+        childViews: ['aView', 'bView'],
+        aView: Ember.View.create({
+          template: Ember.Handlebars.compile("A")
+        }),
+        bView: Ember.View.create({
+          template: Ember.Handlebars.compile("B")
+        })
+      });
+
+      aContainer.appendTo('body');
+      ```
+
+      Results in the HTML
+
+      ```html
+      <div class="ember-view the-container">
+        <div class="ember-view">A</div>
+        <div class="ember-view">B</div>
+      </div>
+      ```
+
+      Removing a view
+
+      ```javascript
+      aContainer.toArray();  // [aContainer.aView, aContainer.bView]
+      aContainer.removeObject(aContainer.get('bView'));
+      aContainer.toArray();  // [aContainer.aView]
+      ```
+
+      Will result in the following HTML
+
+      ```html
+      <div class="ember-view the-container">
+        <div class="ember-view">A</div>
+      </div>
+      ```
+
+      Similarly, adding a child view is accomplished by adding `Ember.View` instances to the
+      container view.
+
+      Given an empty `<body>` the following code
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        classNames: ['the-container'],
+        childViews: ['aView', 'bView'],
+        aView: Ember.View.create({
+          template: Ember.Handlebars.compile("A")
+        }),
+        bView: Ember.View.create({
+          template: Ember.Handlebars.compile("B")
+        })
+      });
+
+      aContainer.appendTo('body');
+      ```
+
+      Results in the HTML
+
+      ```html
+      <div class="ember-view the-container">
+        <div class="ember-view">A</div>
+        <div class="ember-view">B</div>
+      </div>
+      ```
+
+      Adding a view
+
+      ```javascript
+      AnotherViewClass = Ember.View.extend({
+        template: Ember.Handlebars.compile("Another view")
+      });
+
+      aContainer.toArray();  // [aContainer.aView, aContainer.bView]
+      aContainer.pushObject(AnotherViewClass.create());
+      aContainer.toArray(); // [aContainer.aView, aContainer.bView, <AnotherViewClass instance>]
+      ```
+
+      Will result in the following HTML
+
+      ```html
+      <div class="ember-view the-container">
+        <div class="ember-view">A</div>
+        <div class="ember-view">B</div>
+        <div class="ember-view">Another view</div>
+      </div>
+      ```
+
+      ## Templates and Layout
+
+      A `template`, `templateName`, `defaultTemplate`, `layout`, `layoutName` or
+      `defaultLayout` property on a container view will not result in the template
+      or layout being rendered. The HTML contents of a `Ember.ContainerView`'s DOM
+      representation will only be the rendered HTML of its child views.
+
+      @class ContainerView
+      @namespace Ember
+      @extends Ember.View
+    */
+    var ContainerView = View.extend(MutableArray, {
+      states: states,
+
+      init: function() {
+        this._super();
+
+        var childViews = get(this, 'childViews');
+
+        // redefine view's childViews property that was obliterated
+        defineProperty(this, 'childViews', View.childViewsProperty);
+
+        var _childViews = this._childViews;
+
+        forEach(childViews, function(viewName, idx) {
+          var view;
+
+          if ('string' === typeof viewName) {
+            view = get(this, viewName);
+            view = this.createChildView(view);
+            set(this, viewName, view);
+          } else {
+            view = this.createChildView(viewName);
+          }
+
+          _childViews[idx] = view;
+        }, this);
+
+        var currentView = get(this, 'currentView');
+        if (currentView) {
+          if (!_childViews.length) { _childViews = this._childViews = this._childViews.slice(); }
+          _childViews.push(this.createChildView(currentView));
+        }
+      },
+
+      replace: function(idx, removedCount, addedViews) {
+        var addedCount = addedViews ? get(addedViews, 'length') : 0;
+        var self = this;
+        Ember.assert("You can't add a child to a container - the child is already a child of another view", A(addedViews).every(function(item) { return !get(item, '_parentView') || get(item, '_parentView') === self; }));
+
+        this.arrayContentWillChange(idx, removedCount, addedCount);
+        this.childViewsWillChange(this._childViews, idx, removedCount);
+
+        if (addedCount === 0) {
+          this._childViews.splice(idx, removedCount) ;
+        } else {
+          var args = [idx, removedCount].concat(addedViews);
+          if (addedViews.length && !this._childViews.length) { this._childViews = this._childViews.slice(); }
+          this._childViews.splice.apply(this._childViews, args);
+        }
+
+        this.arrayContentDidChange(idx, removedCount, addedCount);
+        this.childViewsDidChange(this._childViews, idx, removedCount, addedCount);
+
+        return this;
+      },
+
+      objectAt: function(idx) {
+        return this._childViews[idx];
+      },
+
+      length: computed(function () {
+        return this._childViews.length;
+      }).volatile(),
+
+      /**
+        Instructs each child view to render to the passed render buffer.
+
+        @private
+        @method render
+        @param {Ember.RenderBuffer} buffer the buffer to render to
+      */
+      render: function(buffer) {
+        this.forEachChildView(function(view) {
+          view.renderToBuffer(buffer);
+        });
+      },
+
+      instrumentName: 'container',
+
+      /**
+        When a child view is removed, destroy its element so that
+        it is removed from the DOM.
+
+        The array observer that triggers this action is set up in the
+        `renderToBuffer` method.
+
+        @private
+        @method childViewsWillChange
+        @param {Ember.Array} views the child views array before mutation
+        @param {Number} start the start position of the mutation
+        @param {Number} removed the number of child views removed
+      **/
+      childViewsWillChange: function(views, start, removed) {
+        this.propertyWillChange('childViews');
+
+        if (removed > 0) {
+          var changedViews = views.slice(start, start+removed);
+          // transition to preRender before clearing parentView
+          this.currentState.childViewsWillChange(this, views, start, removed);
+          this.initializeViews(changedViews, null, null);
+        }
+      },
+
+      removeChild: function(child) {
+        this.removeObject(child);
+        return this;
+      },
+
+      /**
+        When a child view is added, make sure the DOM gets updated appropriately.
+
+        If the view has already rendered an element, we tell the child view to
+        create an element and insert it into the DOM. If the enclosing container
+        view has already written to a buffer, but not yet converted that buffer
+        into an element, we insert the string representation of the child into the
+        appropriate place in the buffer.
+
+        @private
+        @method childViewsDidChange
+        @param {Ember.Array} views the array of child views after the mutation has occurred
+        @param {Number} start the start position of the mutation
+        @param {Number} removed the number of child views removed
+        @param {Number} added the number of child views added
+      */
+      childViewsDidChange: function(views, start, removed, added) {
+        if (added > 0) {
+          var changedViews = views.slice(start, start+added);
+          this.initializeViews(changedViews, this, get(this, 'templateData'));
+          this.currentState.childViewsDidChange(this, views, start, added);
+        }
+        this.propertyDidChange('childViews');
+      },
+
+      initializeViews: function(views, parentView, templateData) {
+        forEach(views, function(view) {
+          set(view, '_parentView', parentView);
+
+          if (!view.container && parentView) {
+            set(view, 'container', parentView.container);
+          }
+
+          if (!get(view, 'templateData')) {
+            set(view, 'templateData', templateData);
+          }
+        });
+      },
+
+      currentView: null,
+
+      _currentViewWillChange: beforeObserver('currentView', function() {
+        var currentView = get(this, 'currentView');
+        if (currentView) {
+          currentView.destroy();
+        }
+      }),
+
+      _currentViewDidChange: observer('currentView', function() {
+        var currentView = get(this, 'currentView');
+        if (currentView) {
+          Ember.assert("You tried to set a current view that already has a parent. Make sure you don't have multiple outlets in the same view.", !get(currentView, '_parentView'));
+          this.pushObject(currentView);
+        }
+      }),
+
+      _ensureChildrenAreInDOM: function () {
+        this.currentState.ensureChildrenAreInDOM(this);
+      }
+    });
+
+    merge(states._default, {
+      childViewsWillChange: Ember.K,
+      childViewsDidChange: Ember.K,
+      ensureChildrenAreInDOM: Ember.K
+    });
+
+    merge(states.inBuffer, {
+      childViewsDidChange: function(parentView, views, start, added) {
+        throw new EmberError('You cannot modify child views while in the inBuffer state');
+      }
+    });
+
+    merge(states.hasElement, {
+      childViewsWillChange: function(view, views, start, removed) {
+        for (var i=start; i<start+removed; i++) {
+          views[i].remove();
+        }
+      },
+
+      childViewsDidChange: function(view, views, start, added) {
+        run.scheduleOnce('render', view, '_ensureChildrenAreInDOM');
+      },
+
+      ensureChildrenAreInDOM: function(view) {
+        var childViews = view._childViews, i, len, childView, previous, buffer, viewCollection = new ViewCollection();
+
+        for (i = 0, len = childViews.length; i < len; i++) {
+          childView = childViews[i];
+
+          if (!buffer) { buffer = RenderBuffer(); buffer._hasElement = false; }
+
+          if (childView.renderToBufferIfNeeded(buffer)) {
+            viewCollection.push(childView);
+          } else if (viewCollection.length) {
+            insertViewCollection(view, viewCollection, previous, buffer);
+            buffer = null;
+            previous = childView;
+            viewCollection.clear();
+          } else {
+            previous = childView;
+          }
+        }
+
+        if (viewCollection.length) {
+          insertViewCollection(view, viewCollection, previous, buffer);
+        }
+      }
+    });
+
+    function insertViewCollection(view, viewCollection, previous, buffer) {
+      viewCollection.triggerRecursively('willInsertElement');
+
+      if (previous) {
+        previous.domManager.after(previous, buffer.string());
+      } else {
+        view.domManager.prepend(view, buffer.string());
+      }
+
+      viewCollection.forEach(function(v) {
+        v.transitionTo('inDOM');
+        v.propertyDidChange('element');
+        v.triggerRecursively('didInsertElement');
+      });
+    }
+
+
+    __exports__["default"] = ContainerView;
+  });
+define("ember-views/views/states",
+  ["ember-metal/platform","ember-metal/merge","ember-views/views/states/default","ember-views/views/states/pre_render","ember-views/views/states/in_buffer","ember-views/views/states/has_element","ember-views/views/states/in_dom","ember-views/views/states/destroying","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+    var merge = __dependency2__["default"];
+    var _default = __dependency3__["default"];
+    var preRender = __dependency4__["default"];
+    var inBuffer = __dependency5__["default"];
+    var hasElement = __dependency6__["default"];
+    var inDOM = __dependency7__["default"];
+    var destroying = __dependency8__["default"];
+
+    function cloneStates(from) {
+      var into = {};
+
+      into._default = {};
+      into.preRender = create(into._default);
+      into.destroying = create(into._default);
+      into.inBuffer = create(into._default);
+      into.hasElement = create(into._default);
+      into.inDOM = create(into.hasElement);
+
+      for (var stateName in from) {
+        if (!from.hasOwnProperty(stateName)) { continue; }
+        merge(into[stateName], from[stateName]);
+      }
+
+      return into;
+    };
+
+    var states = {
+      _default: _default,
+      preRender: preRender,
+      inDOM: inDOM,
+      inBuffer: inBuffer,
+      hasElement: hasElement,
+      destroying: destroying
+    };
+
+    __exports__.cloneStates = cloneStates;
+    __exports__.states = states;
+  });
+define("ember-views/views/states/default",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.K
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var run = __dependency4__["default"];
+    var EmberError = __dependency5__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+    var _default = {
+      // appendChild is only legal while rendering the buffer.
+      appendChild: function() {
+        throw new EmberError("You can't use appendChild outside of the rendering process");
+      },
+
+      $: function() {
+        return undefined;
+      },
+
+      getElement: function() {
+        return null;
+      },
+
+      // Handle events from `Ember.EventDispatcher`
+      handleEvent: function() {
+        return true; // continue event propagation
+      },
+
+      destroyElement: function(view) {
+        set(view, 'element', null);
+        if (view._scheduledInsert) {
+          run.cancel(view._scheduledInsert);
+          view._scheduledInsert = null;
+        }
+        return view;
+      },
+
+      renderToBufferIfNeeded: function () {
+        return false;
+      },
+
+      rerender: Ember.K,
+      invokeObserver: Ember.K
+    };
+
+    __exports__["default"] = _default;
+  });
+define("ember-views/views/states/destroying",
+  ["ember-metal/merge","ember-metal/platform","ember-runtime/system/string","ember-views/views/states/default","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var merge = __dependency1__["default"];
+    var create = __dependency2__.create;
+    var fmt = __dependency3__.fmt;
+    var _default = __dependency4__["default"];
+    var EmberError = __dependency5__["default"];
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var destroyingError = "You can't call %@ on a view being destroyed";
+
+    var destroying = create(_default);
+
+    merge(destroying, {
+      appendChild: function() {
+        throw new EmberError(fmt(destroyingError, ['appendChild']));
+      },
+      rerender: function() {
+        throw new EmberError(fmt(destroyingError, ['rerender']));
+      },
+      destroyElement: function() {
+        throw new EmberError(fmt(destroyingError, ['destroyElement']));
+      },
+      empty: function() {
+        throw new EmberError(fmt(destroyingError, ['empty']));
+      },
+
+      setElement: function() {
+        throw new EmberError(fmt(destroyingError, ["set('element', ...)"]));
+      },
+
+      renderToBufferIfNeeded: function() {
+        return false;
+      },
+
+      // Since element insertion is scheduled, don't do anything if
+      // the view has been destroyed between scheduling and execution
+      insertElement: Ember.K
+    });
+
+    __exports__["default"] = destroying;
+  });
+define("ember-views/views/states/has_element",
+  ["ember-views/views/states/default","ember-metal/run_loop","ember-metal/merge","ember-metal/platform","ember-views/system/jquery","ember-metal/error","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var _default = __dependency1__["default"];
+    var run = __dependency2__["default"];
+    var merge = __dependency3__["default"];
+    var create = __dependency4__.create;
+    var jQuery = __dependency5__["default"];
+    var EmberError = __dependency6__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var get = __dependency7__.get;
+    var set = __dependency8__.set;
+
+    var hasElement = create(_default);
+
+    merge(hasElement, {
+      $: function(view, sel) {
+        var elem = get(view, 'element');
+        return sel ? jQuery(sel, elem) : jQuery(elem);
+      },
+
+      getElement: function(view) {
+        var parent = get(view, 'parentView');
+        if (parent) { parent = get(parent, 'element'); }
+        if (parent) { return view.findElementInParentElement(parent); }
+        return jQuery("#" + get(view, 'elementId'))[0];
+      },
+
+      setElement: function(view, value) {
+        if (value === null) {
+          view.transitionTo('preRender');
+        } else {
+          throw new EmberError("You cannot set an element to a non-null value when the element is already in the DOM.");
+        }
+
+        return value;
+      },
+
+      // once the view has been inserted into the DOM, rerendering is
+      // deferred to allow bindings to synchronize.
+      rerender: function(view) {
+        view.triggerRecursively('willClearRender');
+
+        view.clearRenderedChildren();
+
+        view.domManager.replace(view);
+        return view;
+      },
+
+      // once the view is already in the DOM, destroying it removes it
+      // from the DOM, nukes its element, and puts it back into the
+      // preRender state if inDOM.
+
+      destroyElement: function(view) {
+        view._notifyWillDestroyElement();
+        view.domManager.remove(view);
+        set(view, 'element', null);
+        if (view._scheduledInsert) {
+          run.cancel(view._scheduledInsert);
+          view._scheduledInsert = null;
+        }
+        return view;
+      },
+
+      empty: function(view) {
+        var _childViews = view._childViews, len, idx;
+        if (_childViews) {
+          len = _childViews.length;
+          for (idx = 0; idx < len; idx++) {
+            _childViews[idx]._notifyWillDestroyElement();
+          }
+        }
+        view.domManager.empty(view);
+      },
+
+      // Handle events from `Ember.EventDispatcher`
+      handleEvent: function(view, eventName, evt) {
+        if (view.has(eventName)) {
+          // Handler should be able to re-dispatch events, so we don't
+          // preventDefault or stopPropagation.
+          return view.trigger(eventName, evt);
+        } else {
+          return true; // continue event propagation
+        }
+      },
+
+      invokeObserver: function(target, observer) {
+        observer.call(target);
+      }
+    });
+
+    __exports__["default"] = hasElement;
+  });
+define("ember-views/views/states/in_buffer",
+  ["ember-views/views/states/default","ember-metal/error","ember-metal/core","ember-metal/platform","ember-metal/merge","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var _default = __dependency1__["default"];
+    var EmberError = __dependency2__["default"];
+
+    var Ember = __dependency3__["default"];
+    // Ember.assert
+    var create = __dependency4__.create;
+    var merge = __dependency5__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var inBuffer = create(_default);
+
+    merge(inBuffer, {
+      $: function(view, sel) {
+        // if we don't have an element yet, someone calling this.$() is
+        // trying to update an element that isn't in the DOM. Instead,
+        // rerender the view to allow the render method to reflect the
+        // changes.
+        view.rerender();
+        return Ember.$();
+      },
+
+      // when a view is rendered in a buffer, rerendering it simply
+      // replaces the existing buffer with a new one
+      rerender: function(view) {
+        throw new EmberError("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
+      },
+
+      // when a view is rendered in a buffer, appending a child
+      // view will render that view and append the resulting
+      // buffer into its buffer.
+      appendChild: function(view, childView, options) {
+        var buffer = view.buffer, _childViews = view._childViews;
+
+        childView = view.createChildView(childView, options);
+        if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
+        _childViews.push(childView);
+
+        childView.renderToBuffer(buffer);
+
+        view.propertyDidChange('childViews');
+
+        return childView;
+      },
+
+      // when a view is rendered in a buffer, destroying the
+      // element will simply destroy the buffer and put the
+      // state back into the preRender state.
+      destroyElement: function(view) {
+        view.clearBuffer();
+        var viewCollection = view._notifyWillDestroyElement();
+        viewCollection.transitionTo('preRender', false);
+
+        return view;
+      },
+
+      empty: function() {
+        Ember.assert("Emptying a view in the inBuffer state is not allowed and " +
+                     "should not happen under normal circumstances. Most likely " +
+                     "there is a bug in your application. This may be due to " +
+                     "excessive property change notifications.");
+      },
+
+      renderToBufferIfNeeded: function (view, buffer) {
+        return false;
+      },
+
+      // It should be impossible for a rendered view to be scheduled for
+      // insertion.
+      insertElement: function() {
+        throw new EmberError("You can't insert an element that has already been rendered");
+      },
+
+      setElement: function(view, value) {
+        if (value === null) {
+          view.transitionTo('preRender');
+        } else {
+          view.clearBuffer();
+          view.transitionTo('hasElement');
+        }
+
+        return value;
+      },
+
+      invokeObserver: function(target, observer) {
+        observer.call(target);
+      }
+    });
+
+    __exports__["default"] = inBuffer;
+  });
+define("ember-views/views/states/in_dom",
+  ["ember-metal/core","ember-metal/platform","ember-metal/merge","ember-metal/error","ember-views/views/states/has_element","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var create = __dependency2__.create;
+    var merge = __dependency3__["default"];
+    var EmberError = __dependency4__["default"];
+
+    var hasElement = __dependency5__["default"];
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var inDOM = create(hasElement);
+
+    var View;
+
+    merge(inDOM, {
+      enter: function(view) {
+        if (!View) { View = requireModule('ember-views/views/view')["View"]; } // ES6TODO: this sucks. Have to avoid cycles...
+
+        // Register the view for event handling. This hash is used by
+        // Ember.EventDispatcher to dispatch incoming events.
+        if (!view.isVirtual) {
+          Ember.assert("Attempted to register a view with an id already in use: "+view.elementId, !View.views[view.elementId]);
+          View.views[view.elementId] = view;
+        }
+
+        view.addBeforeObserver('elementId', function() {
+          throw new EmberError("Changing a view's elementId after creation is not allowed");
+        });
+      },
+
+      exit: function(view) {
+        if (!View) { View = requireModule('ember-views/views/view')["View"]; } // ES6TODO: this sucks. Have to avoid cycles...
+
+        if (!this.isVirtual) delete View.views[view.elementId];
+      },
+
+      insertElement: function(view, fn) {
+        throw new EmberError("You can't insert an element into the DOM that has already been inserted");
+      }
+    });
+
+    __exports__["default"] = inDOM;
+  });
+define("ember-views/views/states/pre_render",
+  ["ember-views/views/states/default","ember-metal/platform","ember-metal/merge","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var _default = __dependency1__["default"];
+    var create = __dependency2__.create;
+    var merge = __dependency3__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+    var preRender = create(_default);
+
+    merge(preRender, {
+      // a view leaves the preRender state once its element has been
+      // created (createElement).
+      insertElement: function(view, fn) {
+        view.createElement();
+        var viewCollection = view.viewHierarchyCollection();
+
+        viewCollection.trigger('willInsertElement');
+
+        fn.call(view);
+
+        // We transition to `inDOM` if the element exists in the DOM
+        var element = view.get('element');
+        if (document.body.contains(element)) {
+          viewCollection.transitionTo('inDOM', false);
+          viewCollection.trigger('didInsertElement');
+        }
+      },
+
+      renderToBufferIfNeeded: function(view, buffer) {
+        view.renderToBuffer(buffer);
+        return true;
+      },
+
+      empty: Ember.K,
+
+      setElement: function(view, value) {
+        if (value !== null) {
+          view.transitionTo('hasElement');
+        }
+        return value;
+      }
+    });
+
+    __exports__["default"] = preRender;
+  });
+define("ember-views/views/view",
+  ["ember-metal/core","ember-metal/error","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-views/system/render_buffer","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","container/container","ember-runtime/system/native_array","ember-metal/instrumentation","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/views/states","ember-views/system/jquery","ember-views/system/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __exports__) {
+    "use strict";
+    // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
+    // Ember.K, jQuery, Ember.lookup,
+    // Ember.ContainerView circular dependency
+    // Ember.ENV
+    var Ember = __dependency1__["default"];
+
+    var EmberError = __dependency2__["default"];
+    var EmberObject = __dependency3__["default"];
+    var Evented = __dependency4__["default"];
+    var ActionHandler = __dependency5__["default"];
+    var RenderBuffer = __dependency6__["default"];
+    var get = __dependency7__.get;
+    var set = __dependency8__.set;
+    var setProperties = __dependency9__["default"];
+    var run = __dependency10__["default"];
+    var addObserver = __dependency11__.addObserver;
+    var removeObserver = __dependency11__.removeObserver;
+
+    var defineProperty = __dependency12__.defineProperty;
+    var guidFor = __dependency13__.guidFor;
+    var meta = __dependency13__.meta;
+    var computed = __dependency14__.computed;
+    var observer = __dependency15__.observer;
+
+    var typeOf = __dependency13__.typeOf;
+    var isArray = __dependency13__.isArray;
+    var isNone = __dependency16__.isNone;
+    var Mixin = __dependency15__.Mixin;
+    var Container = __dependency17__["default"];
+    var A = __dependency18__.A;
+
+    var instrument = __dependency19__.instrument;
+
+    var dasherize = __dependency20__.dasherize;
+
+    // ES6TODO: functions on EnumerableUtils should get their own export
+    var EnumerableUtils = __dependency21__["default"];
+    var a_forEach = EnumerableUtils.forEach,
+        a_addObject = EnumerableUtils.addObject,
+        a_removeObject = EnumerableUtils.removeObject;
+
+    var beforeObserver = __dependency15__.beforeObserver;
+    var copy = __dependency22__["default"];
+    var isGlobalPath = __dependency23__.isGlobalPath;
+
+    var propertyWillChange = __dependency24__.propertyWillChange;
+    var propertyDidChange = __dependency24__.propertyDidChange;
+
+    var cloneStates = __dependency25__.cloneStates;
+    var states = __dependency25__.states;
+    var jQuery = __dependency26__["default"];
+     // for the side effect of extending Ember.run.queues
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var ContainerView;
+
+    function nullViewsBuffer(view) {
+      view.buffer = null;
+
+    }
+
+    function clearCachedElement(view) {
+      meta(view).cache.element = undefined;
+    }
+
+    var childViewsProperty = computed(function() {
+      var childViews = this._childViews, ret = A(), view = this;
+
+      a_forEach(childViews, function(view) {
+        var currentChildViews;
+        if (view.isVirtual) {
+          if (currentChildViews = get(view, 'childViews')) {
+            ret.pushObjects(currentChildViews);
+          }
+        } else {
+          ret.push(view);
+        }
+      });
+
+      ret.replace = function (idx, removedCount, addedViews) {
+        if (!ContainerView) { ContainerView = requireModule('ember-views/views/container_view')['default']; } // ES6TODO: stupid circular dep
+
+        if (view instanceof ContainerView) {
+          Ember.deprecate("Manipulating an Ember.ContainerView through its childViews property is deprecated. Please use the ContainerView instance itself as an Ember.MutableArray.");
+          return view.replace(idx, removedCount, addedViews);
+        }
+        throw new EmberError("childViews is immutable");
+      };
+
+      return ret;
+    });
+
+    Ember.warn("The VIEW_PRESERVES_CONTEXT flag has been removed and the functionality can no longer be disabled.", Ember.ENV.VIEW_PRESERVES_CONTEXT !== false);
+
+    /**
+      Global hash of shared templates. This will automatically be populated
+      by the build tools so that you can store your Handlebars templates in
+      separate files that get loaded into JavaScript at buildtime.
+
+      @property TEMPLATES
+      @for Ember
+      @type Hash
+    */
+    Ember.TEMPLATES = {};
+
+    /**
+      `Ember.CoreView` is an abstract class that exists to give view-like behavior
+      to both Ember's main view class `Ember.View` and other classes like
+      `Ember._SimpleMetamorphView` that don't need the fully functionaltiy of
+      `Ember.View`.
+
+      Unless you have specific needs for `CoreView`, you will use `Ember.View`
+      in your applications.
+
+      @class CoreView
+      @namespace Ember
+      @extends Ember.Object
+      @uses Ember.Evented
+      @uses Ember.ActionHandler
+    */
+
+    var CoreView = EmberObject.extend(Evented, ActionHandler, {
+      isView: true,
+
+      states: cloneStates(states),
+
+      init: function() {
+        this._super();
+        this.transitionTo('preRender');
+        this._isVisible = get(this, 'isVisible');
+      },
+
+      /**
+        If the view is currently inserted into the DOM of a parent view, this
+        property will point to the parent of the view.
+
+        @property parentView
+        @type Ember.View
+        @default null
+      */
+      parentView: computed('_parentView', function() {
+        var parent = this._parentView;
+
+        if (parent && parent.isVirtual) {
+          return get(parent, 'parentView');
+        } else {
+          return parent;
+        }
+      }),
+
+      state: null,
+
+      _parentView: null,
+
+      // return the current view, not including virtual views
+      concreteView: computed('parentView', function() {
+        if (!this.isVirtual) { return this; }
+        else { return get(this, 'parentView.concreteView'); }
+      }),
+
+      instrumentName: 'core_view',
+
+      instrumentDetails: function(hash) {
+        hash.object = this.toString();
+        hash.containerKey = this._debugContainerKey;
+        hash.view = this;
+      },
+
+      /**
+        Invoked by the view system when this view needs to produce an HTML
+        representation. This method will create a new render buffer, if needed,
+        then apply any default attributes, such as class names and visibility.
+        Finally, the `render()` method is invoked, which is responsible for
+        doing the bulk of the rendering.
+
+        You should not need to override this method; instead, implement the
+        `template` property, or if you need more control, override the `render`
+        method.
+
+        @method renderToBuffer
+        @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
+          passed, a default buffer, using the current view's `tagName`, will
+          be used.
+        @private
+      */
+      renderToBuffer: function(parentBuffer, bufferOperation) {
+        var name = 'render.' + this.instrumentName,
+            details = {};
+
+        this.instrumentDetails(details);
+
+        return instrument(name, details, function instrumentRenderToBuffer() {
+          return this._renderToBuffer(parentBuffer, bufferOperation);
+        }, this);
+      },
+
+      _renderToBuffer: function(parentBuffer, bufferOperation) {
+        // If this is the top-most view, start a new buffer. Otherwise,
+        // create a new buffer relative to the original using the
+        // provided buffer operation (for example, `insertAfter` will
+        // insert a new buffer after the "parent buffer").
+        var tagName = this.tagName;
+
+        if (tagName === null || tagName === undefined) {
+          tagName = 'div';
+        }
+
+        var buffer = this.buffer = parentBuffer && parentBuffer.begin(tagName) || RenderBuffer(tagName);
+        this.transitionTo('inBuffer', false);
+
+        this.beforeRender(buffer);
+        this.render(buffer);
+        this.afterRender(buffer);
+
+        return buffer;
+      },
+
+      /**
+        Override the default event firing from `Ember.Evented` to
+        also call methods with the given name.
+
+        @method trigger
+        @param name {String}
+        @private
+      */
+      trigger: function(name) {
+        this._super.apply(this, arguments);
+        var method = this[name];
+        if (method) {
+          var args = [], i, l;
+          for (i = 1, l = arguments.length; i < l; i++) {
+            args.push(arguments[i]);
+          }
+          return method.apply(this, args);
+        }
+      },
+
+      deprecatedSendHandles: function(actionName) {
+        return !!this[actionName];
+      },
+
+      deprecatedSend: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+        Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
+        Ember.deprecate('Action handlers implemented directly on views are deprecated in favor of action handlers on an `actions` object ( action: `' + actionName + '` on ' + this + ')', false);
+        this[actionName].apply(this, args);
+        return;
+      },
+
+      has: function(name) {
+        return typeOf(this[name]) === 'function' || this._super(name);
+      },
+
+      destroy: function() {
+        var parent = this._parentView;
+
+        if (!this._super()) { return; }
+
+        // destroy the element -- this will avoid each child view destroying
+        // the element over and over again...
+        if (!this.removedFromDOM) { this.destroyElement(); }
+
+        // remove from parent if found. Don't call removeFromParent,
+        // as removeFromParent will try to remove the element from
+        // the DOM again.
+        if (parent) { parent.removeChild(this); }
+
+        this.transitionTo('destroying', false);
+
+        return this;
+      },
+
+      clearRenderedChildren: Ember.K,
+      triggerRecursively: Ember.K,
+      invokeRecursively: Ember.K,
+      transitionTo: Ember.K,
+      destroyElement: Ember.K
+    });
+
+    var ViewCollection = function(initialViews) {
+      var views = this.views = initialViews || [];
+      this.length = views.length;
+    };
+
+    ViewCollection.prototype = {
+      length: 0,
+
+      trigger: function(eventName) {
+        var views = this.views, view;
+        for (var i = 0, l = views.length; i < l; i++) {
+          view = views[i];
+          if (view.trigger) { view.trigger(eventName); }
+        }
+      },
+
+      triggerRecursively: function(eventName) {
+        var views = this.views;
+        for (var i = 0, l = views.length; i < l; i++) {
+          views[i].triggerRecursively(eventName);
+        }
+      },
+
+      invokeRecursively: function(fn) {
+        var views = this.views, view;
+
+        for (var i = 0, l = views.length; i < l; i++) {
+          view = views[i];
+          fn(view);
+        }
+      },
+
+      transitionTo: function(state, children) {
+        var views = this.views;
+        for (var i = 0, l = views.length; i < l; i++) {
+          views[i].transitionTo(state, children);
+        }
+      },
+
+      push: function() {
+        this.length += arguments.length;
+        var views = this.views;
+        return views.push.apply(views, arguments);
+      },
+
+      objectAt: function(idx) {
+        return this.views[idx];
+      },
+
+      forEach: function(callback) {
+        var views = this.views;
+        return a_forEach(views, callback);
+      },
+
+      clear: function() {
+        this.length = 0;
+        this.views.length = 0;
+      }
+    };
+
+    var EMPTY_ARRAY = [];
+
+    /**
+      `Ember.View` is the class in Ember responsible for encapsulating templates of
+      HTML content, combining templates with data to render as sections of a page's
+      DOM, and registering and responding to user-initiated events.
+
+      ## HTML Tag
+
+      The default HTML tag name used for a view's DOM representation is `div`. This
+      can be customized by setting the `tagName` property. The following view
+      class:
+
+      ```javascript
+      ParagraphView = Ember.View.extend({
+        tagName: 'em'
+      });
+      ```
+
+      Would result in instances with the following HTML:
+
+      ```html
+      <em id="ember1" class="ember-view"></em>
+      ```
+
+      ## HTML `class` Attribute
+
+      The HTML `class` attribute of a view's tag can be set by providing a
+      `classNames` property that is set to an array of strings:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNames: ['my-class', 'my-other-class']
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view my-class my-other-class"></div>
+      ```
+
+      `class` attribute values can also be set by providing a `classNameBindings`
+      property set to an array of properties names for the view. The return value
+      of these properties will be added as part of the value for the view's `class`
+      attribute. These properties can be computed properties:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['propertyA', 'propertyB'],
+        propertyA: 'from-a',
+        propertyB: function() {
+          if (someLogic) { return 'from-b'; }
+        }.property()
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view from-a from-b"></div>
+      ```
+
+      If the value of a class name binding returns a boolean the property name
+      itself will be used as the class name if the property is true. The class name
+      will not be added if the value is `false` or `undefined`.
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['hovered'],
+        hovered: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view hovered"></div>
+      ```
+
+      When using boolean class name bindings you can supply a string value other
+      than the property name for use as the `class` HTML attribute by appending the
+      preferred value after a ":" character when defining the binding:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['awesome:so-very-cool'],
+        awesome: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view so-very-cool"></div>
+      ```
+
+      Boolean value class name bindings whose property names are in a
+      camelCase-style format will be converted to a dasherized format:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['isUrgent'],
+        isUrgent: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view is-urgent"></div>
+      ```
+
+      Class name bindings can also refer to object values that are found by
+      traversing a path relative to the view itself:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['messages.empty']
+        messages: Ember.Object.create({
+          empty: true
+        })
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view empty"></div>
+      ```
+
+      If you want to add a class name for a property which evaluates to true and
+      and a different class name if it evaluates to false, you can pass a binding
+      like this:
+
+      ```javascript
+      // Applies 'enabled' class when isEnabled is true and 'disabled' when isEnabled is false
+      Ember.View.extend({
+        classNameBindings: ['isEnabled:enabled:disabled']
+        isEnabled: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view enabled"></div>
+      ```
+
+      When isEnabled is `false`, the resulting HTML reprensentation looks like
+      this:
+
+      ```html
+      <div id="ember1" class="ember-view disabled"></div>
+      ```
+
+      This syntax offers the convenience to add a class if a property is `false`:
+
+      ```javascript
+      // Applies no class when isEnabled is true and class 'disabled' when isEnabled is false
+      Ember.View.extend({
+        classNameBindings: ['isEnabled::disabled']
+        isEnabled: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view"></div>
+      ```
+
+      When the `isEnabled` property on the view is set to `false`, it will result
+      in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view disabled"></div>
+      ```
+
+      Updates to the the value of a class name binding will result in automatic
+      update of the  HTML `class` attribute in the view's rendered HTML
+      representation. If the value becomes `false` or `undefined` the class name
+      will be removed.
+
+      Both `classNames` and `classNameBindings` are concatenated properties. See
+      [Ember.Object](/api/classes/Ember.Object.html) documentation for more
+      information about concatenated properties.
+
+      ## HTML Attributes
+
+      The HTML attribute section of a view's tag can be set by providing an
+      `attributeBindings` property set to an array of property names on the view.
+      The return value of these properties will be used as the value of the view's
+      HTML associated attribute:
+
+      ```javascript
+      AnchorView = Ember.View.extend({
+        tagName: 'a',
+        attributeBindings: ['href'],
+        href: 'http://google.com'
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <a id="ember1" class="ember-view" href="http://google.com"></a>
+      ```
+      
+      One property can be mapped on to another by placing a ":" between 
+      the source property and the destination property:
+      
+      ```javascript
+      AnchorView = Ember.View.extend({
+        tagName: 'a',
+        attributeBindings: ['url:href'],
+        url: 'http://google.com'
+      });
+      ```
+      
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <a id="ember1" class="ember-view" href="http://google.com"></a>
+      ```
+      
+      If the return value of an `attributeBindings` monitored property is a boolean
+      the property will follow HTML's pattern of repeating the attribute's name as
+      its value:
+
+      ```javascript
+      MyTextInput = Ember.View.extend({
+        tagName: 'input',
+        attributeBindings: ['disabled'],
+        disabled: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <input id="ember1" class="ember-view" disabled="disabled" />
+      ```
+
+      `attributeBindings` can refer to computed properties:
+
+      ```javascript
+      MyTextInput = Ember.View.extend({
+        tagName: 'input',
+        attributeBindings: ['disabled'],
+        disabled: function() {
+          if (someLogic) {
+            return true;
+          } else {
+            return false;
+          }
+        }.property()
+      });
+      ```
+
+      Updates to the the property of an attribute binding will result in automatic
+      update of the  HTML attribute in the view's rendered HTML representation.
+
+      `attributeBindings` is a concatenated property. See [Ember.Object](/api/classes/Ember.Object.html)
+      documentation for more information about concatenated properties.
+
+      ## Templates
+
+      The HTML contents of a view's rendered representation are determined by its
+      template. Templates can be any function that accepts an optional context
+      parameter and returns a string of HTML that will be inserted within the
+      view's tag. Most typically in Ember this function will be a compiled
+      `Ember.Handlebars` template.
+
+      ```javascript
+      AView = Ember.View.extend({
+        template: Ember.Handlebars.compile('I am the template')
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view">I am the template</div>
+      ```
+
+      Within an Ember application is more common to define a Handlebars templates as
+      part of a page:
+
+      ```html
+      <script type='text/x-handlebars' data-template-name='some-template'>
+        Hello
+      </script>
+      ```
+
+      And associate it by name using a view's `templateName` property:
+
+      ```javascript
+      AView = Ember.View.extend({
+        templateName: 'some-template'
+      });
+      ```
+
+      If you have nested resources, your Handlebars template will look like this:
+
+      ```html
+      <script type='text/x-handlebars' data-template-name='posts/new'>
+        <h1>New Post</h1>
+      </script>
+      ```
+
+      And `templateName` property:
+
+      ```javascript
+      AView = Ember.View.extend({
+        templateName: 'posts/new'
+      });
+      ```
+
+      Using a value for `templateName` that does not have a Handlebars template
+      with a matching `data-template-name` attribute will throw an error.
+
+      For views classes that may have a template later defined (e.g. as the block
+      portion of a `{{view}}` Handlebars helper call in another template or in
+      a subclass), you can provide a `defaultTemplate` property set to compiled
+      template function. If a template is not later provided for the view instance
+      the `defaultTemplate` value will be used:
+
+      ```javascript
+      AView = Ember.View.extend({
+        defaultTemplate: Ember.Handlebars.compile('I was the default'),
+        template: null,
+        templateName: null
+      });
+      ```
+
+      Will result in instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view">I was the default</div>
+      ```
+
+      If a `template` or `templateName` is provided it will take precedence over
+      `defaultTemplate`:
+
+      ```javascript
+      AView = Ember.View.extend({
+        defaultTemplate: Ember.Handlebars.compile('I was the default')
+      });
+
+      aView = AView.create({
+        template: Ember.Handlebars.compile('I was the template, not default')
+      });
+      ```
+
+      Will result in the following HTML representation when rendered:
+
+      ```html
+      <div id="ember1" class="ember-view">I was the template, not default</div>
+      ```
+
+      ## View Context
+
+      The default context of the compiled template is the view's controller:
+
+      ```javascript
+      AView = Ember.View.extend({
+        template: Ember.Handlebars.compile('Hello {{excitedGreeting}}')
+      });
+
+      aController = Ember.Object.create({
+        firstName: 'Barry',
+        excitedGreeting: function() {
+          return this.get("content.firstName") + "!!!"
+        }.property()
+      });
+
+      aView = AView.create({
+        controller: aController,
+      });
+      ```
+
+      Will result in an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view">Hello Barry!!!</div>
+      ```
+
+      A context can also be explicitly supplied through the view's `context`
+      property. If the view has neither `context` nor `controller` properties, the
+      `parentView`'s context will be used.
+
+      ## Layouts
+
+      Views can have a secondary template that wraps their main template. Like
+      primary templates, layouts can be any function that  accepts an optional
+      context parameter and returns a string of HTML that will be inserted inside
+      view's tag. Views whose HTML element is self closing (e.g. `<input />`)
+      cannot have a layout and this property will be ignored.
+
+      Most typically in Ember a layout will be a compiled `Ember.Handlebars`
+      template.
+
+      A view's layout can be set directly with the `layout` property or reference
+      an existing Handlebars template by name with the `layoutName` property.
+
+      A template used as a layout must contain a single use of the Handlebars
+      `{{yield}}` helper. The HTML contents of a view's rendered `template` will be
+      inserted at this location:
+
+      ```javascript
+      AViewWithLayout = Ember.View.extend({
+        layout: Ember.Handlebars.compile("<div class='my-decorative-class'>{{yield}}</div>")
+        template: Ember.Handlebars.compile("I got wrapped"),
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view">
+        <div class="my-decorative-class">
+          I got wrapped
+        </div>
+      </div>
+      ```
+
+      See [Ember.Handlebars.helpers.yield](/api/classes/Ember.Handlebars.helpers.html#method_yield)
+      for more information.
+
+      ## Responding to Browser Events
+
+      Views can respond to user-initiated events in one of three ways: method
+      implementation, through an event manager, and through `{{action}}` helper use
+      in their template or layout.
+
+      ### Method Implementation
+
+      Views can respond to user-initiated events by implementing a method that
+      matches the event name. A `jQuery.Event` object will be passed as the
+      argument to this method.
+
+      ```javascript
+      AView = Ember.View.extend({
+        click: function(event) {
+          // will be called when when an instance's
+          // rendered element is clicked
+        }
+      });
+      ```
+
+      ### Event Managers
+
+      Views can define an object as their `eventManager` property. This object can
+      then implement methods that match the desired event names. Matching events
+      that occur on the view's rendered HTML or the rendered HTML of any of its DOM
+      descendants will trigger this method. A `jQuery.Event` object will be passed
+      as the first argument to the method and an  `Ember.View` object as the
+      second. The `Ember.View` will be the view whose rendered HTML was interacted
+      with. This may be the view with the `eventManager` property or one of its
+      descendent views.
+
+      ```javascript
+      AView = Ember.View.extend({
+        eventManager: Ember.Object.create({
+          doubleClick: function(event, view) {
+            // will be called when when an instance's
+            // rendered element or any rendering
+            // of this views's descendent
+            // elements is clicked
+          }
+        })
+      });
+      ```
+
+      An event defined for an event manager takes precedence over events of the
+      same name handled through methods on the view.
+
+      ```javascript
+      AView = Ember.View.extend({
+        mouseEnter: function(event) {
+          // will never trigger.
+        },
+        eventManager: Ember.Object.create({
+          mouseEnter: function(event, view) {
+            // takes precedence over AView#mouseEnter
+          }
+        })
+      });
+      ```
+
+      Similarly a view's event manager will take precedence for events of any views
+      rendered as a descendent. A method name that matches an event name will not
+      be called if the view instance was rendered inside the HTML representation of
+      a view that has an `eventManager` property defined that handles events of the
+      name. Events not handled by the event manager will still trigger method calls
+      on the descendent.
+
+      ```javascript
+      OuterView = Ember.View.extend({
+        template: Ember.Handlebars.compile("outer {{#view InnerView}}inner{{/view}} outer"),
+        eventManager: Ember.Object.create({
+          mouseEnter: function(event, view) {
+            // view might be instance of either
+            // OuterView or InnerView depending on
+            // where on the page the user interaction occured
+          }
+        })
+      });
+
+      InnerView = Ember.View.extend({
+        click: function(event) {
+          // will be called if rendered inside
+          // an OuterView because OuterView's
+          // eventManager doesn't handle click events
+        },
+        mouseEnter: function(event) {
+          // will never be called if rendered inside
+          // an OuterView.
+        }
+      });
+      ```
+
+      ### Handlebars `{{action}}` Helper
+
+      See [Handlebars.helpers.action](/api/classes/Ember.Handlebars.helpers.html#method_action).
+
+      ### Event Names
+
+      All of the event handling approaches described above respond to the same set
+      of events. The names of the built-in events are listed below. (The hash of
+      built-in events exists in `Ember.EventDispatcher`.) Additional, custom events
+      can be registered by using `Ember.Application.customEvents`.
+
+      Touch events:
+
+      * `touchStart`
+      * `touchMove`
+      * `touchEnd`
+      * `touchCancel`
+
+      Keyboard events
+
+      * `keyDown`
+      * `keyUp`
+      * `keyPress`
+
+      Mouse events
+
+      * `mouseDown`
+      * `mouseUp`
+      * `contextMenu`
+      * `click`
+      * `doubleClick`
+      * `mouseMove`
+      * `focusIn`
+      * `focusOut`
+      * `mouseEnter`
+      * `mouseLeave`
+
+      Form events:
+
+      * `submit`
+      * `change`
+      * `focusIn`
+      * `focusOut`
+      * `input`
+
+      HTML5 drag and drop events:
+
+      * `dragStart`
+      * `drag`
+      * `dragEnter`
+      * `dragLeave`
+      * `dragOver`
+      * `dragEnd`
+      * `drop`
+
+      ## Handlebars `{{view}}` Helper
+
+      Other `Ember.View` instances can be included as part of a view's template by
+      using the `{{view}}` Handlebars helper. See [Ember.Handlebars.helpers.view](/api/classes/Ember.Handlebars.helpers.html#method_view)
+      for additional information.
+
+      @class View
+      @namespace Ember
+      @extends Ember.CoreView
+    */
+    var View = CoreView.extend({
+
+      concatenatedProperties: ['classNames', 'classNameBindings', 'attributeBindings'],
+
+      /**
+        @property isView
+        @type Boolean
+        @default true
+        @static
+      */
+      isView: true,
+
+      // ..........................................................
+      // TEMPLATE SUPPORT
+      //
+
+      /**
+        The name of the template to lookup if no template is provided.
+
+        By default `Ember.View` will lookup a template with this name in
+        `Ember.TEMPLATES` (a shared global object).
+
+        @property templateName
+        @type String
+        @default null
+      */
+      templateName: null,
+
+      /**
+        The name of the layout to lookup if no layout is provided.
+
+        By default `Ember.View` will lookup a template with this name in
+        `Ember.TEMPLATES` (a shared global object).
+
+        @property layoutName
+        @type String
+        @default null
+      */
+      layoutName: null,
+
+      /**
+        Used to identify this view during debugging
+
+        @property instrumentDisplay
+        @type String
+      */
+      instrumentDisplay: computed(function() {
+        if (this.helperName) {
+          return '{{' + this.helperName + '}}';
+        }
+      }),
+
+      /**
+        The template used to render the view. This should be a function that
+        accepts an optional context parameter and returns a string of HTML that
+        will be inserted into the DOM relative to its parent view.
+
+        In general, you should set the `templateName` property instead of setting
+        the template yourself.
+
+        @property template
+        @type Function
+      */
+      template: computed('templateName', function(key, value) {
+        if (value !== undefined) { return value; }
+
+        var templateName = get(this, 'templateName'),
+            template = this.templateForName(templateName, 'template');
+
+        Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
+
+        return template || get(this, 'defaultTemplate');
+      }),
+
+      /**
+        The controller managing this view. If this property is set, it will be
+        made available for use by the template.
+
+        @property controller
+        @type Object
+      */
+      controller: computed('_parentView', function(key) {
+        var parentView = get(this, '_parentView');
+        return parentView ? get(parentView, 'controller') : null;
+      }),
+
+      /**
+        A view may contain a layout. A layout is a regular template but
+        supersedes the `template` property during rendering. It is the
+        responsibility of the layout template to retrieve the `template`
+        property from the view (or alternatively, call `Handlebars.helpers.yield`,
+        `{{yield}}`) to render it in the correct location.
+
+        This is useful for a view that has a shared wrapper, but which delegates
+        the rendering of the contents of the wrapper to the `template` property
+        on a subclass.
+
+        @property layout
+        @type Function
+      */
+      layout: computed(function(key) {
+        var layoutName = get(this, 'layoutName'),
+            layout = this.templateForName(layoutName, 'layout');
+
+        Ember.assert("You specified the layoutName " + layoutName + " for " + this + ", but it did not exist.", !layoutName || layout);
+
+        return layout || get(this, 'defaultLayout');
+      }).property('layoutName'),
+
+      _yield: function(context, options) {
+        var template = get(this, 'template');
+        if (template) { template(context, options); }
+      },
+
+      templateForName: function(name, type) {
+        if (!name) { return; }
+        Ember.assert("templateNames are not allowed to contain periods: "+name, name.indexOf('.') === -1);
+
+        // the defaultContainer is deprecated
+        var container = this.container || (Container && Container.defaultContainer);
+        return container && container.lookup('template:' + name);
+      },
+
+      /**
+        The object from which templates should access properties.
+
+        This object will be passed to the template function each time the render
+        method is called, but it is up to the individual function to decide what
+        to do with it.
+
+        By default, this will be the view's controller.
+
+        @property context
+        @type Object
+      */
+      context: computed(function(key, value) {
+        if (arguments.length === 2) {
+          set(this, '_context', value);
+          return value;
+        } else {
+          return get(this, '_context');
+        }
+      }).volatile(),
+
+      /**
+        Private copy of the view's template context. This can be set directly
+        by Handlebars without triggering the observer that causes the view
+        to be re-rendered.
+
+        The context of a view is looked up as follows:
+
+        1. Supplied context (usually by Handlebars)
+        2. Specified controller
+        3. `parentView`'s context (for a child of a ContainerView)
+
+        The code in Handlebars that overrides the `_context` property first
+        checks to see whether the view has a specified controller. This is
+        something of a hack and should be revisited.
+
+        @property _context
+        @private
+      */
+      _context: computed(function(key) {
+        var parentView, controller;
+
+        if (controller = get(this, 'controller')) {
+          return controller;
+        }
+
+        parentView = this._parentView;
+        if (parentView) {
+          return get(parentView, '_context');
+        }
+
+        return null;
+      }),
+
+      /**
+        If a value that affects template rendering changes, the view should be
+        re-rendered to reflect the new value.
+
+        @method _contextDidChange
+        @private
+      */
+      _contextDidChange: observer('context', function() {
+        this.rerender();
+      }),
+
+      /**
+        If `false`, the view will appear hidden in DOM.
+
+        @property isVisible
+        @type Boolean
+        @default null
+      */
+      isVisible: true,
+
+      /**
+        Array of child views. You should never edit this array directly.
+        Instead, use `appendChild` and `removeFromParent`.
+
+        @property childViews
+        @type Array
+        @default []
+        @private
+      */
+      childViews: childViewsProperty,
+
+      _childViews: EMPTY_ARRAY,
+
+      // When it's a virtual view, we need to notify the parent that their
+      // childViews will change.
+      _childViewsWillChange: beforeObserver('childViews', function() {
+        if (this.isVirtual) {
+          var parentView = get(this, 'parentView');
+          if (parentView) { propertyWillChange(parentView, 'childViews'); }
+        }
+      }),
+
+      // When it's a virtual view, we need to notify the parent that their
+      // childViews did change.
+      _childViewsDidChange: observer('childViews', function() {
+        if (this.isVirtual) {
+          var parentView = get(this, 'parentView');
+          if (parentView) { propertyDidChange(parentView, 'childViews'); }
+        }
+      }),
+
+      /**
+        Return the nearest ancestor that is an instance of the provided
+        class.
+
+        @method nearestInstanceOf
+        @param {Class} klass Subclass of Ember.View (or Ember.View itself)
+        @return Ember.View
+        @deprecated
+      */
+      nearestInstanceOf: function(klass) {
+        Ember.deprecate("nearestInstanceOf is deprecated and will be removed from future releases. Use nearestOfType.");
+        var view = get(this, 'parentView');
+
+        while (view) {
+          if (view instanceof klass) { return view; }
+          view = get(view, 'parentView');
+        }
+      },
+
+      /**
+        Return the nearest ancestor that is an instance of the provided
+        class or mixin.
+
+        @method nearestOfType
+        @param {Class,Mixin} klass Subclass of Ember.View (or Ember.View itself),
+               or an instance of Ember.Mixin.
+        @return Ember.View
+      */
+      nearestOfType: function(klass) {
+        var view = get(this, 'parentView'),
+            isOfType = klass instanceof Mixin ?
+                       function(view) { return klass.detect(view); } :
+                       function(view) { return klass.detect(view.constructor); };
+
+        while (view) {
+          if (isOfType(view)) { return view; }
+          view = get(view, 'parentView');
+        }
+      },
+
+      /**
+        Return the nearest ancestor that has a given property.
+
+        @method nearestWithProperty
+        @param {String} property A property name
+        @return Ember.View
+      */
+      nearestWithProperty: function(property) {
+        var view = get(this, 'parentView');
+
+        while (view) {
+          if (property in view) { return view; }
+          view = get(view, 'parentView');
+        }
+      },
+
+      /**
+        Return the nearest ancestor whose parent is an instance of
+        `klass`.
+
+        @method nearestChildOf
+        @param {Class} klass Subclass of Ember.View (or Ember.View itself)
+        @return Ember.View
+      */
+      nearestChildOf: function(klass) {
+        var view = get(this, 'parentView');
+
+        while (view) {
+          if (get(view, 'parentView') instanceof klass) { return view; }
+          view = get(view, 'parentView');
+        }
+      },
+
+      /**
+        When the parent view changes, recursively invalidate `controller`
+
+        @method _parentViewDidChange
+        @private
+      */
+      _parentViewDidChange: observer('_parentView', function() {
+        if (this.isDestroying) { return; }
+
+        this.trigger('parentViewDidChange');
+
+        if (get(this, 'parentView.controller') && !get(this, 'controller')) {
+          this.notifyPropertyChange('controller');
+        }
+      }),
+
+      _controllerDidChange: observer('controller', function() {
+        if (this.isDestroying) { return; }
+
+        this.rerender();
+
+        this.forEachChildView(function(view) {
+          view.propertyDidChange('controller');
+        });
+      }),
+
+      cloneKeywords: function() {
+        var templateData = get(this, 'templateData');
+
+        var keywords = templateData ? copy(templateData.keywords) : {};
+        set(keywords, 'view', get(this, 'concreteView'));
+        set(keywords, '_view', this);
+        set(keywords, 'controller', get(this, 'controller'));
+
+        return keywords;
+      },
+
+      /**
+        Called on your view when it should push strings of HTML into a
+        `Ember.RenderBuffer`. Most users will want to override the `template`
+        or `templateName` properties instead of this method.
+
+        By default, `Ember.View` will look for a function in the `template`
+        property and invoke it with the value of `context`. The value of
+        `context` will be the view's controller unless you override it.
+
+        @method render
+        @param {Ember.RenderBuffer} buffer The render buffer
+      */
+      render: function(buffer) {
+        // If this view has a layout, it is the responsibility of the
+        // the layout to render the view's template. Otherwise, render the template
+        // directly.
+        var template = get(this, 'layout') || get(this, 'template');
+
+        if (template) {
+          var context = get(this, 'context');
+          var keywords = this.cloneKeywords();
+          var output;
+
+          var data = {
+            view: this,
+            buffer: buffer,
+            isRenderData: true,
+            keywords: keywords,
+            insideGroup: get(this, 'templateData.insideGroup')
+          };
+
+          // Invoke the template with the provided template context, which
+          // is the view's controller by default. A hash of data is also passed that provides
+          // the template with access to the view and render buffer.
+
+          Ember.assert('template must be a function. Did you mean to call Ember.Handlebars.compile("...") or specify templateName instead?', typeof template === 'function');
+          // The template should write directly to the render buffer instead
+          // of returning a string.
+          output = template(context, { data: data });
+
+          // If the template returned a string instead of writing to the buffer,
+          // push the string onto the buffer.
+          if (output !== undefined) { buffer.push(output); }
+        }
+      },
+
+      /**
+        Renders the view again. This will work regardless of whether the
+        view is already in the DOM or not. If the view is in the DOM, the
+        rendering process will be deferred to give bindings a chance
+        to synchronize.
+
+        If children were added during the rendering process using `appendChild`,
+        `rerender` will remove them, because they will be added again
+        if needed by the next `render`.
+
+        In general, if the display of your view changes, you should modify
+        the DOM element directly instead of manually calling `rerender`, which can
+        be slow.
+
+        @method rerender
+      */
+      rerender: function() {
+        return this.currentState.rerender(this);
+      },
+
+      clearRenderedChildren: function() {
+        var lengthBefore = this.lengthBeforeRender,
+            lengthAfter  = this.lengthAfterRender;
+
+        // If there were child views created during the last call to render(),
+        // remove them under the assumption that they will be re-created when
+        // we re-render.
+
+        // VIEW-TODO: Unit test this path.
+        var childViews = this._childViews;
+        for (var i=lengthAfter-1; i>=lengthBefore; i--) {
+          if (childViews[i]) { childViews[i].destroy(); }
+        }
+      },
+
+      /**
+        Iterates over the view's `classNameBindings` array, inserts the value
+        of the specified property into the `classNames` array, then creates an
+        observer to update the view's element if the bound property ever changes
+        in the future.
+
+        @method _applyClassNameBindings
+        @private
+      */
+      _applyClassNameBindings: function(classBindings) {
+        var classNames = this.classNames,
+        elem, newClass, dasherizedClass;
+
+        // Loop through all of the configured bindings. These will be either
+        // property names ('isUrgent') or property paths relative to the view
+        // ('content.isUrgent')
+        a_forEach(classBindings, function(binding) {
+
+          Ember.assert("classNameBindings must not have spaces in them. Multiple class name bindings can be provided as elements of an array, e.g. ['foo', ':bar']", binding.indexOf(' ') === -1);
+
+          // Variable in which the old class value is saved. The observer function
+          // closes over this variable, so it knows which string to remove when
+          // the property changes.
+          var oldClass;
+          // Extract just the property name from bindings like 'foo:bar'
+          var parsedPath = View._parsePropertyPath(binding);
+
+          // Set up an observer on the context. If the property changes, toggle the
+          // class name.
+          var observer = function() {
+            // Get the current value of the property
+            newClass = this._classStringForProperty(binding);
+            elem = this.$();
+
+            // If we had previously added a class to the element, remove it.
+            if (oldClass) {
+              elem.removeClass(oldClass);
+              // Also remove from classNames so that if the view gets rerendered,
+              // the class doesn't get added back to the DOM.
+              classNames.removeObject(oldClass);
+            }
+
+            // If necessary, add a new class. Make sure we keep track of it so
+            // it can be removed in the future.
+            if (newClass) {
+              elem.addClass(newClass);
+              oldClass = newClass;
+            } else {
+              oldClass = null;
+            }
+          };
+
+          // Get the class name for the property at its current value
+          dasherizedClass = this._classStringForProperty(binding);
+
+          if (dasherizedClass) {
+            // Ensure that it gets into the classNames array
+            // so it is displayed when we render.
+            a_addObject(classNames, dasherizedClass);
+
+            // Save a reference to the class name so we can remove it
+            // if the observer fires. Remember that this variable has
+            // been closed over by the observer.
+            oldClass = dasherizedClass;
+          }
+
+          this.registerObserver(this, parsedPath.path, observer);
+          // Remove className so when the view is rerendered,
+          // the className is added based on binding reevaluation
+          this.one('willClearRender', function() {
+            if (oldClass) {
+              classNames.removeObject(oldClass);
+              oldClass = null;
+            }
+          });
+
+        }, this);
+      },
+
+      _unspecifiedAttributeBindings: null,
+
+      /**
+        Iterates through the view's attribute bindings, sets up observers for each,
+        then applies the current value of the attributes to the passed render buffer.
+
+        @method _applyAttributeBindings
+        @param {Ember.RenderBuffer} buffer
+        @private
+      */
+      _applyAttributeBindings: function(buffer, attributeBindings) {
+        var attributeValue,
+            unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+
+        a_forEach(attributeBindings, function(binding) {
+          var split = binding.split(':'),
+              property = split[0],
+              attributeName = split[1] || property;
+
+          if (property in this) {
+            this._setupAttributeBindingObservation(property, attributeName);
+
+            // Determine the current value and add it to the render buffer
+            // if necessary.
+            attributeValue = get(this, property);
+            View.applyAttributeBindings(buffer, attributeName, attributeValue);
+          } else {
+            unspecifiedAttributeBindings[property] = attributeName;
+          }
+        }, this);
+
+        // Lazily setup setUnknownProperty after attributeBindings are initially applied
+        this.setUnknownProperty = this._setUnknownProperty;
+      },
+
+      _setupAttributeBindingObservation: function(property, attributeName) {
+        var attributeValue, elem;
+
+        // Create an observer to add/remove/change the attribute if the
+        // JavaScript property changes.
+        var observer = function() {
+          elem = this.$();
+
+          attributeValue = get(this, property);
+
+          View.applyAttributeBindings(elem, attributeName, attributeValue);
+        };
+
+        this.registerObserver(this, property, observer);
+      },
+
+      /**
+        We're using setUnknownProperty as a hook to setup attributeBinding observers for
+        properties that aren't defined on a view at initialization time.
+
+        Note: setUnknownProperty will only be called once for each property.
+
+        @method setUnknownProperty
+        @param key
+        @param value
+        @private
+      */
+      setUnknownProperty: null, // Gets defined after initialization by _applyAttributeBindings
+
+      _setUnknownProperty: function(key, value) {
+        var attributeName = this._unspecifiedAttributeBindings && this._unspecifiedAttributeBindings[key];
+        if (attributeName) {
+          this._setupAttributeBindingObservation(key, attributeName);
+        }
+
+        defineProperty(this, key);
+        return set(this, key, value);
+      },
+
+      /**
+        Given a property name, returns a dasherized version of that
+        property name if the property evaluates to a non-falsy value.
+
+        For example, if the view has property `isUrgent` that evaluates to true,
+        passing `isUrgent` to this method will return `"is-urgent"`.
+
+        @method _classStringForProperty
+        @param property
+        @private
+      */
+      _classStringForProperty: function(property) {
+        var parsedPath = View._parsePropertyPath(property);
+        var path = parsedPath.path;
+
+        var val = get(this, path);
+        if (val === undefined && isGlobalPath(path)) {
+          val = get(Ember.lookup, path);
+        }
+
+        return View._classStringForValue(path, val, parsedPath.className, parsedPath.falsyClassName);
+      },
+
+      // ..........................................................
+      // ELEMENT SUPPORT
+      //
+
+      /**
+        Returns the current DOM element for the view.
+
+        @property element
+        @type DOMElement
+      */
+      element: computed('_parentView', function(key, value) {
+        if (value !== undefined) {
+          return this.currentState.setElement(this, value);
+        } else {
+          return this.currentState.getElement(this);
+        }
+      }),
+
+      /**
+        Returns a jQuery object for this view's element. If you pass in a selector
+        string, this method will return a jQuery object, using the current element
+        as its buffer.
+
+        For example, calling `view.$('li')` will return a jQuery object containing
+        all of the `li` elements inside the DOM element of this view.
+
+        @method $
+        @param {String} [selector] a jQuery-compatible selector string
+        @return {jQuery} the jQuery object for the DOM node
+      */
+      $: function(sel) {
+        return this.currentState.$(this, sel);
+      },
+
+      mutateChildViews: function(callback) {
+        var childViews = this._childViews,
+            idx = childViews.length,
+            view;
+
+        while(--idx >= 0) {
+          view = childViews[idx];
+          callback(this, view, idx);
+        }
+
+        return this;
+      },
+
+      forEachChildView: function(callback) {
+        var childViews = this._childViews;
+
+        if (!childViews) { return this; }
+
+        var len = childViews.length,
+            view, idx;
+
+        for (idx = 0; idx < len; idx++) {
+          view = childViews[idx];
+          callback(view);
+        }
+
+        return this;
+      },
+
+      /**
+        Appends the view's element to the specified parent element.
+
+        If the view does not have an HTML representation yet, `createElement()`
+        will be called automatically.
+
+        Note that this method just schedules the view to be appended; the DOM
+        element will not be appended to the given element until all bindings have
+        finished synchronizing.
+
+        This is not typically a function that you will need to call directly when
+        building your application. You might consider using `Ember.ContainerView`
+        instead. If you do need to use `appendTo`, be sure that the target element
+        you are providing is associated with an `Ember.Application` and does not
+        have an ancestor element that is associated with an Ember view.
+
+        @method appendTo
+        @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
+        @return {Ember.View} receiver
+      */
+      appendTo: function(target) {
+        // Schedule the DOM element to be created and appended to the given
+        // element after bindings have synchronized.
+        this._insertElementLater(function() {
+          Ember.assert("You tried to append to (" + target + ") but that isn't in the DOM", jQuery(target).length > 0);
+          Ember.assert("You cannot append to an existing Ember.View. Consider using Ember.ContainerView instead.", !jQuery(target).is('.ember-view') && !jQuery(target).parents().is('.ember-view'));
+          this.$().appendTo(target);
+        });
+
+        return this;
+      },
+
+      /**
+        Replaces the content of the specified parent element with this view's
+        element. If the view does not have an HTML representation yet,
+        `createElement()` will be called automatically.
+
+        Note that this method just schedules the view to be appended; the DOM
+        element will not be appended to the given element until all bindings have
+        finished synchronizing
+
+        @method replaceIn
+        @param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object
+        @return {Ember.View} received
+      */
+      replaceIn: function(target) {
+        Ember.assert("You tried to replace in (" + target + ") but that isn't in the DOM", jQuery(target).length > 0);
+        Ember.assert("You cannot replace an existing Ember.View. Consider using Ember.ContainerView instead.", !jQuery(target).is('.ember-view') && !jQuery(target).parents().is('.ember-view'));
+
+        this._insertElementLater(function() {
+          jQuery(target).empty();
+          this.$().appendTo(target);
+        });
+
+        return this;
+      },
+
+      /**
+        Schedules a DOM operation to occur during the next render phase. This
+        ensures that all bindings have finished synchronizing before the view is
+        rendered.
+
+        To use, pass a function that performs a DOM operation.
+
+        Before your function is called, this view and all child views will receive
+        the `willInsertElement` event. After your function is invoked, this view
+        and all of its child views will receive the `didInsertElement` event.
+
+        ```javascript
+        view._insertElementLater(function() {
+          this.createElement();
+          this.$().appendTo('body');
+        });
+        ```
+
+        @method _insertElementLater
+        @param {Function} fn the function that inserts the element into the DOM
+        @private
+      */
+      _insertElementLater: function(fn) {
+        this._scheduledInsert = run.scheduleOnce('render', this, '_insertElement', fn);
+      },
+
+      _insertElement: function (fn) {
+        this._scheduledInsert = null;
+        this.currentState.insertElement(this, fn);
+      },
+
+      /**
+        Appends the view's element to the document body. If the view does
+        not have an HTML representation yet, `createElement()` will be called
+        automatically.
+
+        If your application uses the `rootElement` property, you must append
+        the view within that element. Rendering views outside of the `rootElement`
+        is not supported.
+
+        Note that this method just schedules the view to be appended; the DOM
+        element will not be appended to the document body until all bindings have
+        finished synchronizing.
+
+        @method append
+        @return {Ember.View} receiver
+      */
+      append: function() {
+        return this.appendTo(document.body);
+      },
+
+      /**
+        Removes the view's element from the element to which it is attached.
+
+        @method remove
+        @return {Ember.View} receiver
+      */
+      remove: function() {
+        // What we should really do here is wait until the end of the run loop
+        // to determine if the element has been re-appended to a different
+        // element.
+        // In the interim, we will just re-render if that happens. It is more
+        // important than elements get garbage collected.
+        if (!this.removedFromDOM) { this.destroyElement(); }
+        this.invokeRecursively(function(view) {
+          if (view.clearRenderedChildren) { view.clearRenderedChildren(); }
+        });
+      },
+
+      elementId: null,
+
+      /**
+        Attempts to discover the element in the parent element. The default
+        implementation looks for an element with an ID of `elementId` (or the
+        view's guid if `elementId` is null). You can override this method to
+        provide your own form of lookup. For example, if you want to discover your
+        element using a CSS class name instead of an ID.
+
+        @method findElementInParentElement
+        @param {DOMElement} parentElement The parent's DOM element
+        @return {DOMElement} The discovered element
+      */
+      findElementInParentElement: function(parentElem) {
+        var id = "#" + this.elementId;
+        return jQuery(id)[0] || jQuery(id, parentElem)[0];
+      },
+
+      /**
+        Creates a DOM representation of the view and all of its
+        child views by recursively calling the `render()` method.
+
+        After the element has been created, `didInsertElement` will
+        be called on this view and all of its child views.
+
+        @method createElement
+        @return {Ember.View} receiver
+      */
+      createElement: function() {
+        if (get(this, 'element')) { return this; }
+
+        var buffer = this.renderToBuffer();
+        set(this, 'element', buffer.element());
+
+        return this;
+      },
+
+      /**
+        Called when a view is going to insert an element into the DOM.
+
+        @event willInsertElement
+      */
+      willInsertElement: Ember.K,
+
+      /**
+        Called when the element of the view has been inserted into the DOM
+        or after the view was re-rendered. Override this function to do any
+        set up that requires an element in the document body.
+
+        @event didInsertElement
+      */
+      didInsertElement: Ember.K,
+
+      /**
+        Called when the view is about to rerender, but before anything has
+        been torn down. This is a good opportunity to tear down any manual
+        observers you have installed based on the DOM state
+
+        @event willClearRender
+      */
+      willClearRender: Ember.K,
+
+      /**
+        Run this callback on the current view (unless includeSelf is false) and recursively on child views.
+
+        @method invokeRecursively
+        @param fn {Function}
+        @param includeSelf {Boolean} Includes itself if true.
+        @private
+      */
+      invokeRecursively: function(fn, includeSelf) {
+        var childViews = (includeSelf === false) ? this._childViews : [this];
+        var currentViews, view, currentChildViews;
+
+        while (childViews.length) {
+          currentViews = childViews.slice();
+          childViews = [];
+
+          for (var i=0, l=currentViews.length; i<l; i++) {
+            view = currentViews[i];
+            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
+            fn(view);
+            if (currentChildViews) {
+              childViews.push.apply(childViews, currentChildViews);
+            }
+          }
+        }
+      },
+
+      triggerRecursively: function(eventName) {
+        var childViews = [this], currentViews, view, currentChildViews;
+
+        while (childViews.length) {
+          currentViews = childViews.slice();
+          childViews = [];
+
+          for (var i=0, l=currentViews.length; i<l; i++) {
+            view = currentViews[i];
+            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
+            if (view.trigger) { view.trigger(eventName); }
+            if (currentChildViews) {
+              childViews.push.apply(childViews, currentChildViews);
+            }
+
+          }
+        }
+      },
+
+      viewHierarchyCollection: function() {
+        var currentView, viewCollection = new ViewCollection([this]);
+
+        for (var i = 0; i < viewCollection.length; i++) {
+          currentView = viewCollection.objectAt(i);
+          if (currentView._childViews) {
+            viewCollection.push.apply(viewCollection, currentView._childViews);
+          }
+        }
+
+        return viewCollection;
+      },
+
+      /**
+        Destroys any existing element along with the element for any child views
+        as well. If the view does not currently have a element, then this method
+        will do nothing.
+
+        If you implement `willDestroyElement()` on your view, then this method will
+        be invoked on your view before your element is destroyed to give you a
+        chance to clean up any event handlers, etc.
+
+        If you write a `willDestroyElement()` handler, you can assume that your
+        `didInsertElement()` handler was called earlier for the same element.
+
+        You should not call or override this method yourself, but you may
+        want to implement the above callbacks.
+
+        @method destroyElement
+        @return {Ember.View} receiver
+      */
+      destroyElement: function() {
+        return this.currentState.destroyElement(this);
+      },
+
+      /**
+        Called when the element of the view is going to be destroyed. Override
+        this function to do any teardown that requires an element, like removing
+        event listeners.
+
+        @event willDestroyElement
+      */
+      willDestroyElement: Ember.K,
+
+      /**
+        Triggers the `willDestroyElement` event (which invokes the
+        `willDestroyElement()` method if it exists) on this view and all child
+        views.
+
+        Before triggering `willDestroyElement`, it first triggers the
+        `willClearRender` event recursively.
+
+        @method _notifyWillDestroyElement
+        @private
+      */
+      _notifyWillDestroyElement: function() {
+        var viewCollection = this.viewHierarchyCollection();
+        viewCollection.trigger('willClearRender');
+        viewCollection.trigger('willDestroyElement');
+        return viewCollection;
+      },
+
+      /**
+        If this view's element changes, we need to invalidate the caches of our
+        child views so that we do not retain references to DOM elements that are
+        no longer needed.
+
+        @method _elementDidChange
+        @private
+      */
+      _elementDidChange: observer('element', function() {
+        this.forEachChildView(clearCachedElement);
+      }),
+
+      /**
+        Called when the parentView property has changed.
+
+        @event parentViewDidChange
+      */
+      parentViewDidChange: Ember.K,
+
+      instrumentName: 'view',
+
+      instrumentDetails: function(hash) {
+        hash.template = get(this, 'templateName');
+        this._super(hash);
+      },
+
+      _renderToBuffer: function(parentBuffer, bufferOperation) {
+        this.lengthBeforeRender = this._childViews.length;
+        var buffer = this._super(parentBuffer, bufferOperation);
+        this.lengthAfterRender = this._childViews.length;
+
+        return buffer;
+      },
+
+      renderToBufferIfNeeded: function (buffer) {
+        return this.currentState.renderToBufferIfNeeded(this, buffer);
+      },
+
+      beforeRender: function(buffer) {
+        this.applyAttributesToBuffer(buffer);
+        buffer.pushOpeningTag();
+      },
+
+      afterRender: function(buffer) {
+        buffer.pushClosingTag();
+      },
+
+      applyAttributesToBuffer: function(buffer) {
+        // Creates observers for all registered class name and attribute bindings,
+        // then adds them to the element.
+        var classNameBindings = get(this, 'classNameBindings');
+        if (classNameBindings.length) {
+          this._applyClassNameBindings(classNameBindings);
+        }
+
+        // Pass the render buffer so the method can apply attributes directly.
+        // This isn't needed for class name bindings because they use the
+        // existing classNames infrastructure.
+        var attributeBindings = get(this, 'attributeBindings');
+        if (attributeBindings.length) {
+          this._applyAttributeBindings(buffer, attributeBindings);
+        }
+
+        buffer.setClasses(this.classNames);
+        buffer.id(this.elementId);
+
+        var role = get(this, 'ariaRole');
+        if (role) {
+          buffer.attr('role', role);
+        }
+
+        if (get(this, 'isVisible') === false) {
+          buffer.style('display', 'none');
+        }
+      },
+
+      // ..........................................................
+      // STANDARD RENDER PROPERTIES
+      //
+
+      /**
+        Tag name for the view's outer element. The tag name is only used when an
+        element is first created. If you change the `tagName` for an element, you
+        must destroy and recreate the view element.
+
+        By default, the render buffer will use a `<div>` tag for views.
+
+        @property tagName
+        @type String
+        @default null
+      */
+
+      // We leave this null by default so we can tell the difference between
+      // the default case and a user-specified tag.
+      tagName: null,
+
+      /**
+        The WAI-ARIA role of the control represented by this view. For example, a
+        button may have a role of type 'button', or a pane may have a role of
+        type 'alertdialog'. This property is used by assistive software to help
+        visually challenged users navigate rich web applications.
+
+        The full list of valid WAI-ARIA roles is available at:
+        [http://www.w3.org/TR/wai-aria/roles#roles_categorization](http://www.w3.org/TR/wai-aria/roles#roles_categorization)
+
+        @property ariaRole
+        @type String
+        @default null
+      */
+      ariaRole: null,
+
+      /**
+        Standard CSS class names to apply to the view's outer element. This
+        property automatically inherits any class names defined by the view's
+        superclasses as well.
+
+        @property classNames
+        @type Array
+        @default ['ember-view']
+      */
+      classNames: ['ember-view'],
+
+      /**
+        A list of properties of the view to apply as class names. If the property
+        is a string value, the value of that string will be applied as a class
+        name.
+
+        ```javascript
+        // Applies the 'high' class to the view element
+        Ember.View.extend({
+          classNameBindings: ['priority']
+          priority: 'high'
+        });
+        ```
+
+        If the value of the property is a Boolean, the name of that property is
+        added as a dasherized class name.
+
+        ```javascript
+        // Applies the 'is-urgent' class to the view element
+        Ember.View.extend({
+          classNameBindings: ['isUrgent']
+          isUrgent: true
+        });
+        ```
+
+        If you would prefer to use a custom value instead of the dasherized
+        property name, you can pass a binding like this:
+
+        ```javascript
+        // Applies the 'urgent' class to the view element
+        Ember.View.extend({
+          classNameBindings: ['isUrgent:urgent']
+          isUrgent: true
+        });
+        ```
+
+        This list of properties is inherited from the view's superclasses as well.
+
+        @property classNameBindings
+        @type Array
+        @default []
+      */
+      classNameBindings: EMPTY_ARRAY,
+
+      /**
+        A list of properties of the view to apply as attributes. If the property is
+        a string value, the value of that string will be applied as the attribute.
+
+        ```javascript
+        // Applies the type attribute to the element
+        // with the value "button", like <div type="button">
+        Ember.View.extend({
+          attributeBindings: ['type'],
+          type: 'button'
+        });
+        ```
+
+        If the value of the property is a Boolean, the name of that property is
+        added as an attribute.
+
+        ```javascript
+        // Renders something like <div enabled="enabled">
+        Ember.View.extend({
+          attributeBindings: ['enabled'],
+          enabled: true
+        });
+        ```
+
+        @property attributeBindings
+      */
+      attributeBindings: EMPTY_ARRAY,
+
+      // .......................................................
+      // CORE DISPLAY METHODS
+      //
+
+      /**
+        Setup a view, but do not finish waking it up.
+
+        * configure `childViews`
+        * register the view with the global views hash, which is used for event
+          dispatch
+
+        @method init
+        @private
+      */
+      init: function() {
+        this.elementId = this.elementId || guidFor(this);
+
+        this._super();
+
+        // setup child views. be sure to clone the child views array first
+        this._childViews = this._childViews.slice();
+
+        Ember.assert("Only arrays are allowed for 'classNameBindings'", typeOf(this.classNameBindings) === 'array');
+        this.classNameBindings = A(this.classNameBindings.slice());
+
+        Ember.assert("Only arrays are allowed for 'classNames'", typeOf(this.classNames) === 'array');
+        this.classNames = A(this.classNames.slice());
+      },
+
+      appendChild: function(view, options) {
+        return this.currentState.appendChild(this, view, options);
+      },
+
+      /**
+        Removes the child view from the parent view.
+
+        @method removeChild
+        @param {Ember.View} view
+        @return {Ember.View} receiver
+      */
+      removeChild: function(view) {
+        // If we're destroying, the entire subtree will be
+        // freed, and the DOM will be handled separately,
+        // so no need to mess with childViews.
+        if (this.isDestroying) { return; }
+
+        // update parent node
+        set(view, '_parentView', null);
+
+        // remove view from childViews array.
+        var childViews = this._childViews;
+
+        a_removeObject(childViews, view);
+
+        this.propertyDidChange('childViews'); // HUH?! what happened to will change?
+
+        return this;
+      },
+
+      /**
+        Removes all children from the `parentView`.
+
+        @method removeAllChildren
+        @return {Ember.View} receiver
+      */
+      removeAllChildren: function() {
+        return this.mutateChildViews(function(parentView, view) {
+          parentView.removeChild(view);
+        });
+      },
+
+      destroyAllChildren: function() {
+        return this.mutateChildViews(function(parentView, view) {
+          view.destroy();
+        });
+      },
+
+      /**
+        Removes the view from its `parentView`, if one is found. Otherwise
+        does nothing.
+
+        @method removeFromParent
+        @return {Ember.View} receiver
+      */
+      removeFromParent: function() {
+        var parent = this._parentView;
+
+        // Remove DOM element from parent
+        this.remove();
+
+        if (parent) { parent.removeChild(this); }
+        return this;
+      },
+
+      /**
+        You must call `destroy` on a view to destroy the view (and all of its
+        child views). This will remove the view from any parent node, then make
+        sure that the DOM element managed by the view can be released by the
+        memory manager.
+
+        @method destroy
+      */
+      destroy: function() {
+        var childViews = this._childViews,
+            // get parentView before calling super because it'll be destroyed
+            nonVirtualParentView = get(this, 'parentView'),
+            viewName = this.viewName,
+            childLen, i;
+
+        if (!this._super()) { return; }
+
+        childLen = childViews.length;
+        for (i=childLen-1; i>=0; i--) {
+          childViews[i].removedFromDOM = true;
+        }
+
+        // remove from non-virtual parent view if viewName was specified
+        if (viewName && nonVirtualParentView) {
+          nonVirtualParentView.set(viewName, null);
+        }
+
+        childLen = childViews.length;
+        for (i=childLen-1; i>=0; i--) {
+          childViews[i].destroy();
+        }
+
+        return this;
+      },
+
+      /**
+        Instantiates a view to be added to the childViews array during view
+        initialization. You generally will not call this method directly unless
+        you are overriding `createChildViews()`. Note that this method will
+        automatically configure the correct settings on the new view instance to
+        act as a child of the parent.
+
+        @method createChildView
+        @param {Class|String} viewClass
+        @param {Hash} [attrs] Attributes to add
+        @return {Ember.View} new instance
+      */
+      createChildView: function(view, attrs) {
+        if (!view) {
+          throw new TypeError("createChildViews first argument must exist");
+        }
+
+        if (view.isView && view._parentView === this && view.container === this.container) {
+          return view;
+        }
+
+        attrs = attrs || {};
+        attrs._parentView = this;
+
+        if (CoreView.detect(view)) {
+          attrs.templateData = attrs.templateData || get(this, 'templateData');
+
+          attrs.container = this.container;
+          view = view.create(attrs);
+
+          // don't set the property on a virtual view, as they are invisible to
+          // consumers of the view API
+          if (view.viewName) {
+            set(get(this, 'concreteView'), view.viewName, view);
+          }
+        } else if ('string' === typeof view) {
+          var fullName = 'view:' + view;
+          var ViewKlass = this.container.lookupFactory(fullName);
+
+          Ember.assert("Could not find view: '" + fullName + "'", !!ViewKlass);
+
+          attrs.templateData = get(this, 'templateData');
+          view = ViewKlass.create(attrs);
+        } else {
+          Ember.assert('You must pass instance or subclass of View', view.isView);
+          attrs.container = this.container;
+
+          if (!get(view, 'templateData')) {
+            attrs.templateData = get(this, 'templateData');
+          }
+
+          setProperties(view, attrs);
+
+        }
+
+        return view;
+      },
+
+      becameVisible: Ember.K,
+      becameHidden: Ember.K,
+
+      /**
+        When the view's `isVisible` property changes, toggle the visibility
+        element of the actual DOM element.
+
+        @method _isVisibleDidChange
+        @private
+      */
+      _isVisibleDidChange: observer('isVisible', function() {
+        if (this._isVisible === get(this, 'isVisible')) { return ; }
+        run.scheduleOnce('render', this, this._toggleVisibility);
+      }),
+
+      _toggleVisibility: function() {
+        var $el = this.$();
+        if (!$el) { return; }
+
+        var isVisible = get(this, 'isVisible');
+
+        if (this._isVisible === isVisible) { return ; }
+
+        $el.toggle(isVisible);
+
+        this._isVisible = isVisible;
+
+        if (this._isAncestorHidden()) { return; }
+
+        if (isVisible) {
+          this._notifyBecameVisible();
+        } else {
+          this._notifyBecameHidden();
+        }
+      },
+
+      _notifyBecameVisible: function() {
+        this.trigger('becameVisible');
+
+        this.forEachChildView(function(view) {
+          var isVisible = get(view, 'isVisible');
+
+          if (isVisible || isVisible === null) {
+            view._notifyBecameVisible();
+          }
+        });
+      },
+
+      _notifyBecameHidden: function() {
+        this.trigger('becameHidden');
+        this.forEachChildView(function(view) {
+          var isVisible = get(view, 'isVisible');
+
+          if (isVisible || isVisible === null) {
+            view._notifyBecameHidden();
+          }
+        });
+      },
+
+      _isAncestorHidden: function() {
+        var parent = get(this, 'parentView');
+
+        while (parent) {
+          if (get(parent, 'isVisible') === false) { return true; }
+
+          parent = get(parent, 'parentView');
+        }
+
+        return false;
+      },
+
+      clearBuffer: function() {
+        this.invokeRecursively(nullViewsBuffer);
+      },
+
+      transitionTo: function(state, children) {
+        var priorState = this.currentState,
+            currentState = this.currentState = this.states[state];
+        this.state = state;
+
+        if (priorState && priorState.exit) { priorState.exit(this); }
+        if (currentState.enter) { currentState.enter(this); }
+        if (state === 'inDOM') { meta(this).cache.element = undefined; }
+
+        if (children !== false) {
+          this.forEachChildView(function(view) {
+            view.transitionTo(state);
+          });
+        }
+      },
+
+      // .......................................................
+      // EVENT HANDLING
+      //
+
+      /**
+        Handle events from `Ember.EventDispatcher`
+
+        @method handleEvent
+        @param eventName {String}
+        @param evt {Event}
+        @private
+      */
+      handleEvent: function(eventName, evt) {
+        return this.currentState.handleEvent(this, eventName, evt);
+      },
+
+      registerObserver: function(root, path, target, observer) {
+        if (!observer && 'function' === typeof target) {
+          observer = target;
+          target = null;
+        }
+
+        if (!root || typeof root !== 'object') {
+          return;
+        }
+
+        var view = this,
+            stateCheckedObserver = function() {
+              view.currentState.invokeObserver(this, observer);
+            },
+            scheduledObserver = function() {
+              run.scheduleOnce('render', this, stateCheckedObserver);
+            };
+
+        addObserver(root, path, target, scheduledObserver);
+
+        this.one('willClearRender', function() {
+          removeObserver(root, path, target, scheduledObserver);
+        });
+      }
+
+    });
+
+    /*
+      Describe how the specified actions should behave in the various
+      states that a view can exist in. Possible states:
+
+      * preRender: when a view is first instantiated, and after its
+        element was destroyed, it is in the preRender state
+      * inBuffer: once a view has been rendered, but before it has
+        been inserted into the DOM, it is in the inBuffer state
+      * hasElement: the DOM representation of the view is created,
+        and is ready to be inserted
+      * inDOM: once a view has been inserted into the DOM it is in
+        the inDOM state. A view spends the vast majority of its
+        existence in this state.
+      * destroyed: once a view has been destroyed (using the destroy
+        method), it is in this state. No further actions can be invoked
+        on a destroyed view.
+    */
+
+      // in the destroyed state, everything is illegal
+
+      // before rendering has begun, all legal manipulations are noops.
+
+      // inside the buffer, legal manipulations are done on the buffer
+
+      // once the view has been inserted into the DOM, legal manipulations
+      // are done on the DOM element.
+
+    function notifyMutationListeners() {
+      run.once(View, 'notifyMutationListeners');
+    }
+
+    var DOMManager = {
+      prepend: function(view, html) {
+        view.$().prepend(html);
+        notifyMutationListeners();
+      },
+
+      after: function(view, html) {
+        view.$().after(html);
+        notifyMutationListeners();
+      },
+
+      html: function(view, html) {
+        view.$().html(html);
+        notifyMutationListeners();
+      },
+
+      replace: function(view) {
+        var element = get(view, 'element');
+
+        set(view, 'element', null);
+
+        view._insertElementLater(function() {
+          jQuery(element).replaceWith(get(view, 'element'));
+          notifyMutationListeners();
+        });
+      },
+
+      remove: function(view) {
+        view.$().remove();
+        notifyMutationListeners();
+      },
+
+      empty: function(view) {
+        view.$().empty();
+        notifyMutationListeners();
+      }
+    };
+
+    View.reopen({
+      domManager: DOMManager
+    });
+
+    View.reopenClass({
+
+      /**
+        Parse a path and return an object which holds the parsed properties.
+
+        For example a path like "content.isEnabled:enabled:disabled" will return the
+        following object:
+
+        ```javascript
+        {
+          path: "content.isEnabled",
+          className: "enabled",
+          falsyClassName: "disabled",
+          classNames: ":enabled:disabled"
+        }
+        ```
+
+        @method _parsePropertyPath
+        @static
+        @private
+      */
+      _parsePropertyPath: function(path) {
+        var split = path.split(':'),
+            propertyPath = split[0],
+            classNames = "",
+            className,
+            falsyClassName;
+
+        // check if the property is defined as prop:class or prop:trueClass:falseClass
+        if (split.length > 1) {
+          className = split[1];
+          if (split.length === 3) { falsyClassName = split[2]; }
+
+          classNames = ':' + className;
+          if (falsyClassName) { classNames += ":" + falsyClassName; }
+        }
+
+        return {
+          path: propertyPath,
+          classNames: classNames,
+          className: (className === '') ? undefined : className,
+          falsyClassName: falsyClassName
+        };
+      },
+
+      /**
+        Get the class name for a given value, based on the path, optional
+        `className` and optional `falsyClassName`.
+
+        - if a `className` or `falsyClassName` has been specified:
+          - if the value is truthy and `className` has been specified,
+            `className` is returned
+          - if the value is falsy and `falsyClassName` has been specified,
+            `falsyClassName` is returned
+          - otherwise `null` is returned
+        - if the value is `true`, the dasherized last part of the supplied path
+          is returned
+        - if the value is not `false`, `undefined` or `null`, the `value`
+          is returned
+        - if none of the above rules apply, `null` is returned
+
+        @method _classStringForValue
+        @param path
+        @param val
+        @param className
+        @param falsyClassName
+        @static
+        @private
+      */
+      _classStringForValue: function(path, val, className, falsyClassName) {
+        if(isArray(val)) {
+          val = get(val, 'length') !== 0;  
+        }
+        
+        // When using the colon syntax, evaluate the truthiness or falsiness
+        // of the value to determine which className to return
+        if (className || falsyClassName) {
+          if (className && !!val) {
+            return className;
+
+          } else if (falsyClassName && !val) {
+            return falsyClassName;
+
+          } else {
+            return null;
+          }
+
+        // If value is a Boolean and true, return the dasherized property
+        // name.
+        } else if (val === true) {
+          // Normalize property path to be suitable for use
+          // as a class name. For exaple, content.foo.barBaz
+          // becomes bar-baz.
+          var parts = path.split('.');
+          return dasherize(parts[parts.length-1]);
+
+        // If the value is not false, undefined, or null, return the current
+        // value of the property.
+        } else if (val !== false && val != null) {
+          return val;
+
+        // Nothing to display. Return null so that the old class is removed
+        // but no new class is added.
+        } else {
+          return null;
+        }
+      }
+    });
+
+    var mutation = EmberObject.extend(Evented).create();
+
+    View.addMutationListener = function(callback) {
+      mutation.on('change', callback);
+    };
+
+    View.removeMutationListener = function(callback) {
+      mutation.off('change', callback);
+    };
+
+    View.notifyMutationListeners = function() {
+      mutation.trigger('change');
+    };
+
+    /**
+      Global views hash
+
+      @property views
+      @static
+      @type Hash
+    */
+    View.views = {};
+
+    // If someone overrides the child views computed property when
+    // defining their class, we want to be able to process the user's
+    // supplied childViews and then restore the original computed property
+    // at view initialization time. This happens in Ember.ContainerView's init
+    // method.
+    View.childViewsProperty = childViewsProperty;
+
+    View.applyAttributeBindings = function(elem, name, value) {
+      var type = typeOf(value);
+
+      // if this changes, also change the logic in ember-handlebars/lib/helpers/binding.js
+      if (name !== 'value' && (type === 'string' || (type === 'number' && !isNaN(value)))) {
+        if (value !== elem.attr(name)) {
+          elem.attr(name, value);
+        }
+      } else if (name === 'value' || type === 'boolean') {
+        if (isNone(value) || value === false) {
+          // `null`, `undefined` or `false` should remove attribute
+          elem.removeAttr(name);
+          elem.prop(name, '');
+        } else if (value !== elem.prop(name)) {
+          // value should always be properties
+          elem.prop(name, value);
+        }
+      } else if (!value) {
+        elem.removeAttr(name);
+      }
+    };
+
+    __exports__.CoreView = CoreView;
+    __exports__.View = View;
+    __exports__.ViewCollection = ViewCollection;
+  });
+})();
+
+(function() {
+define("metamorph",
+  [],
+  function() {
+    "use strict";
+    // ==========================================================================
+    // Project:   metamorph
+    // Copyright: ©2014 Tilde, Inc. All rights reserved.
+    // ==========================================================================
+
+    var K = function() {},
+        guid = 0,
+        disableRange = (function(){
+          if ('undefined' !== typeof MetamorphENV) {
+            return MetamorphENV.DISABLE_RANGE_API;
+          } else if ('undefined' !== ENV) {
+            return ENV.DISABLE_RANGE_API;
+          } else {
+            return false;
+          }
+        })(),
+
+        // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
+        supportsRange = (!disableRange) && typeof document !== 'undefined' && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+
+        // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+        // is a "zero-scope" element. This problem can be worked around by making
+        // the first node an invisible text node. We, like Modernizr, use &shy;
+        needsShy = typeof document !== 'undefined' && (function() {
+          var testEl = document.createElement('div');
+          testEl.innerHTML = "<div></div>";
+          testEl.firstChild.innerHTML = "<script></script>";
+          return testEl.firstChild.innerHTML === '';
+        })(),
+
+
+        // IE 8 (and likely earlier) likes to move whitespace preceeding
+        // a script tag to appear after it. This means that we can
+        // accidentally remove whitespace when updating a morph.
+        movesWhitespace = document && (function() {
+          var testEl = document.createElement('div');
+          testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
+          return testEl.childNodes[0].nodeValue === 'Test:' &&
+                  testEl.childNodes[2].nodeValue === ' Value';
+        })();
+
+    // Constructor that supports either Metamorph('foo') or new
+    // Metamorph('foo');
+    //
+    // Takes a string of HTML as the argument.
+
+    var Metamorph = function(html) {
+      var self;
+
+      if (this instanceof Metamorph) {
+        self = this;
+      } else {
+        self = new K();
+      }
+
+      self.innerHTML = html;
+      var myGuid = 'metamorph-'+(guid++);
+      self.start = myGuid + '-start';
+      self.end = myGuid + '-end';
+
+      return self;
+    };
+
+    K.prototype = Metamorph.prototype;
+
+    var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
+
+    outerHTMLFunc = function() {
+      return this.startTag() + this.innerHTML + this.endTag();
+    };
+
+    startTagFunc = function() {
+      /*
+       * We replace chevron by its hex code in order to prevent escaping problems.
+       * Check this thread for more explaination:
+       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
+       */
+      return "<script id='" + this.start + "' type='text/x-placeholder'>\x3C/script>";
+    };
+
+    endTagFunc = function() {
+      /*
+       * We replace chevron by its hex code in order to prevent escaping problems.
+       * Check this thread for more explaination:
+       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
+       */
+      return "<script id='" + this.end + "' type='text/x-placeholder'>\x3C/script>";
+    };
+
+    // If we have the W3C range API, this process is relatively straight forward.
+    if (supportsRange) {
+
+      // Get a range for the current morph. Optionally include the starting and
+      // ending placeholders.
+      rangeFor = function(morph, outerToo) {
+        var range = document.createRange();
+        var before = document.getElementById(morph.start);
+        var after = document.getElementById(morph.end);
+
+        if (outerToo) {
+          range.setStartBefore(before);
+          range.setEndAfter(after);
+        } else {
+          range.setStartAfter(before);
+          range.setEndBefore(after);
+        }
+
+        return range;
+      };
+
+      htmlFunc = function(html, outerToo) {
+        // get a range for the current metamorph object
+        var range = rangeFor(this, outerToo);
+
+        // delete the contents of the range, which will be the
+        // nodes between the starting and ending placeholder.
+        range.deleteContents();
+
+        // create a new document fragment for the HTML
+        var fragment = range.createContextualFragment(html);
+
+        // insert the fragment into the range
+        range.insertNode(fragment);
+      };
+
+      /**
+      * @public
+      *
+      * Remove this object (including starting and ending
+      * placeholders).
+      *
+      * @method remove
+      */
+      removeFunc = function() {
+        // get a range for the current metamorph object including
+        // the starting and ending placeholders.
+        var range = rangeFor(this, true);
+
+        // delete the entire range.
+        range.deleteContents();
+      };
+
+      appendToFunc = function(node) {
+        var range = document.createRange();
+        range.setStart(node);
+        range.collapse(false);
+        var frag = range.createContextualFragment(this.outerHTML());
+        node.appendChild(frag);
+      };
+
+      afterFunc = function(html) {
+        var range = document.createRange();
+        var after = document.getElementById(this.end);
+
+        range.setStartAfter(after);
+        range.setEndAfter(after);
+
+        var fragment = range.createContextualFragment(html);
+        range.insertNode(fragment);
+      };
+
+      prependFunc = function(html) {
+        var range = document.createRange();
+        var start = document.getElementById(this.start);
+
+        range.setStartAfter(start);
+        range.setEndAfter(start);
+
+        var fragment = range.createContextualFragment(html);
+        range.insertNode(fragment);
+      };
+
+    } else {
+      /*
+       * This code is mostly taken from jQuery, with one exception. In jQuery's case, we
+       * have some HTML and we need to figure out how to convert it into some nodes.
+       *
+       * In this case, jQuery needs to scan the HTML looking for an opening tag and use
+       * that as the key for the wrap map. In our case, we know the parent node, and
+       * can use its type as the key for the wrap map.
+       **/
+      var wrapMap = {
+        select: [ 1, "<select multiple='multiple'>", "</select>" ],
+        fieldset: [ 1, "<fieldset>", "</fieldset>" ],
+        table: [ 1, "<table>", "</table>" ],
+        tbody: [ 2, "<table><tbody>", "</tbody></table>" ],
+        tr: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+        colgroup: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+        map: [ 1, "<map>", "</map>" ],
+        _default: [ 0, "", "" ]
+      };
+
+      var findChildById = function(element, id) {
+        if (element.getAttribute('id') === id) { return element; }
+
+        var len = element.childNodes.length, idx, node, found;
+        for (idx=0; idx<len; idx++) {
+          node = element.childNodes[idx];
+          found = node.nodeType === 1 && findChildById(node, id);
+          if (found) { return found; }
+        }
+      };
+
+      var setInnerHTML = function(element, html) {
+        var matches = [];
+        if (movesWhitespace) {
+          // Right now we only check for script tags with ids with the
+          // goal of targeting morphs.
+          html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
+            matches.push([id, spaces]);
+            return tag;
+          });
+        }
+
+        element.innerHTML = html;
+
+        // If we have to do any whitespace adjustments do them now
+        if (matches.length > 0) {
+          var len = matches.length, idx;
+          for (idx=0; idx<len; idx++) {
+            var script = findChildById(element, matches[idx][0]),
+                node = document.createTextNode(matches[idx][1]);
+            script.parentNode.insertBefore(node, script);
+          }
+        }
+      };
+
+      /*
+       * Given a parent node and some HTML, generate a set of nodes. Return the first
+       * node, which will allow us to traverse the rest using nextSibling.
+       *
+       * We need to do this because innerHTML in IE does not really parse the nodes.
+       */
+      var firstNodeFor = function(parentNode, html) {
+        var arr = wrapMap[parentNode.tagName.toLowerCase()] || wrapMap._default;
+        var depth = arr[0], start = arr[1], end = arr[2];
+
+        if (needsShy) { html = '&shy;'+html; }
+
+        var element = document.createElement('div');
+
+        setInnerHTML(element, start + html + end);
+
+        for (var i=0; i<=depth; i++) {
+          element = element.firstChild;
+        }
+
+        // Look for &shy; to remove it.
+        if (needsShy) {
+          var shyElement = element;
+
+          // Sometimes we get nameless elements with the shy inside
+          while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+            shyElement = shyElement.firstChild;
+          }
+
+          // At this point it's the actual unicode character.
+          if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+            shyElement.nodeValue = shyElement.nodeValue.slice(1);
+          }
+        }
+
+        return element;
+      };
+
+      /*
+       * In some cases, Internet Explorer can create an anonymous node in
+       * the hierarchy with no tagName. You can create this scenario via:
+       *
+       *     div = document.createElement("div");
+       *     div.innerHTML = "<table>&shy<script></script><tr><td>hi</td></tr></table>";
+       *     div.firstChild.firstChild.tagName //=> ""
+       *
+       * If our script markers are inside such a node, we need to find that
+       * node and use *it* as the marker.
+       */
+      var realNode = function(start) {
+        while (start.parentNode.tagName === "") {
+          start = start.parentNode;
+        }
+
+        return start;
+      };
+
+      /*
+       * When automatically adding a tbody, Internet Explorer inserts the
+       * tbody immediately before the first <tr>. Other browsers create it
+       * before the first node, no matter what.
+       *
+       * This means the the following code:
+       *
+       *     div = document.createElement("div");
+       *     div.innerHTML = "<table><script id='first'></script><tr><td>hi</td></tr><script id='last'></script></table>
+       *
+       * Generates the following DOM in IE:
+       *
+       *     + div
+       *       + table
+       *         - script id='first'
+       *         + tbody
+       *           + tr
+       *             + td
+       *               - "hi"
+       *           - script id='last'
+       *
+       * Which means that the two script tags, even though they were
+       * inserted at the same point in the hierarchy in the original
+       * HTML, now have different parents.
+       *
+       * This code reparents the first script tag by making it the tbody's
+       * first child.
+       *
+       */
+      var fixParentage = function(start, end) {
+        if (start.parentNode !== end.parentNode) {
+          end.parentNode.insertBefore(start, end.parentNode.firstChild);
+        }
+      };
+
+      htmlFunc = function(html, outerToo) {
+        // get the real starting node. see realNode for details.
+        var start = realNode(document.getElementById(this.start));
+        var end = document.getElementById(this.end);
+        var parentNode = end.parentNode;
+        var node, nextSibling, last;
+
+        // make sure that the start and end nodes share the same
+        // parent. If not, fix it.
+        fixParentage(start, end);
+
+        // remove all of the nodes after the starting placeholder and
+        // before the ending placeholder.
+        node = start.nextSibling;
+        while (node) {
+          nextSibling = node.nextSibling;
+          last = node === end;
+
+          // if this is the last node, and we want to remove it as well,
+          // set the `end` node to the next sibling. This is because
+          // for the rest of the function, we insert the new nodes
+          // before the end (note that insertBefore(node, null) is
+          // the same as appendChild(node)).
+          //
+          // if we do not want to remove it, just break.
+          if (last) {
+            if (outerToo) { end = node.nextSibling; } else { break; }
+          }
+
+          node.parentNode.removeChild(node);
+
+          // if this is the last node and we didn't break before
+          // (because we wanted to remove the outer nodes), break
+          // now.
+          if (last) { break; }
+
+          node = nextSibling;
+        }
+
+        // get the first node for the HTML string, even in cases like
+        // tables and lists where a simple innerHTML on a div would
+        // swallow some of the content.
+        node = firstNodeFor(start.parentNode, html);
+
+        if (outerToo) {
+          start.parentNode.removeChild(start);
+        }
+
+        // copy the nodes for the HTML between the starting and ending
+        // placeholder.
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, end);
+          node = nextSibling;
+        }
+      };
+
+      // remove the nodes in the DOM representing this metamorph.
+      //
+      // this includes the starting and ending placeholders.
+      removeFunc = function() {
+        var start = realNode(document.getElementById(this.start));
+        var end = document.getElementById(this.end);
+
+        this.html('');
+        start.parentNode.removeChild(start);
+        end.parentNode.removeChild(end);
+      };
+
+      appendToFunc = function(parentNode) {
+        var node = firstNodeFor(parentNode, this.outerHTML());
+        var nextSibling;
+
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.appendChild(node);
+          node = nextSibling;
+        }
+      };
+
+      afterFunc = function(html) {
+        // get the real starting node. see realNode for details.
+        var end = document.getElementById(this.end);
+        var insertBefore = end.nextSibling;
+        var parentNode = end.parentNode;
+        var nextSibling;
+        var node;
+
+        // get the first node for the HTML string, even in cases like
+        // tables and lists where a simple innerHTML on a div would
+        // swallow some of the content.
+        node = firstNodeFor(parentNode, html);
+
+        // copy the nodes for the HTML between the starting and ending
+        // placeholder.
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, insertBefore);
+          node = nextSibling;
+        }
+      };
+
+      prependFunc = function(html) {
+        var start = document.getElementById(this.start);
+        var parentNode = start.parentNode;
+        var nextSibling;
+        var node;
+
+        node = firstNodeFor(parentNode, html);
+        var insertBefore = start.nextSibling;
+
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, insertBefore);
+          node = nextSibling;
+        }
+      };
+    }
+
+    Metamorph.prototype.html = function(html) {
+      this.checkRemoved();
+      if (html === undefined) { return this.innerHTML; }
+
+      htmlFunc.call(this, html);
+
+      this.innerHTML = html;
+    };
+
+    Metamorph.prototype.replaceWith = function(html) {
+      this.checkRemoved();
+      htmlFunc.call(this, html, true);
+    };
+
+    Metamorph.prototype.remove = removeFunc;
+    Metamorph.prototype.outerHTML = outerHTMLFunc;
+    Metamorph.prototype.appendTo = appendToFunc;
+    Metamorph.prototype.after = afterFunc;
+    Metamorph.prototype.prepend = prependFunc;
+    Metamorph.prototype.startTag = startTagFunc;
+    Metamorph.prototype.endTag = endTagFunc;
+
+    Metamorph.prototype.isRemoved = function() {
+      var before = document.getElementById(this.start);
+      var after = document.getElementById(this.end);
+
+      return !before || !after;
+    };
+
+    Metamorph.prototype.checkRemoved = function() {
+      if (this.isRemoved()) {
+        throw new Error("Cannot perform operations on a Metamorph that is not in the DOM.");
+      }
+    };
+
+    return Metamorph;
+  });
+
+})();
+
+(function() {
+define("ember-handlebars-compiler",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars-compiler
+    */
+
+    var Ember = __dependency1__["default"];
+
+    // ES6Todo: you'll need to import debugger once debugger is es6'd.
+    if (typeof Ember.assert === 'undefined')   { Ember.assert = function(){}; };
+    if (typeof Ember.FEATURES === 'undefined') { Ember.FEATURES = { isEnabled: function(){} }; };
+
+    var objectCreate = Object.create || function(parent) {
+      function F() {}
+      F.prototype = parent;
+      return new F();
+    };
+
+    // set up for circular references later
+    var View, Component;
+
+    // ES6Todo: when ember-debug is es6'ed import this.
+    // var emberAssert = Ember.assert;
+    var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
+    if (!Handlebars && typeof require === 'function') {
+      Handlebars = require('handlebars');
+    }
+
+    Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include " +
+                 "a SCRIPT tag in the HTML HEAD linking to the Handlebars file " +
+                 "before you link to Ember.", Handlebars);
+
+    Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1, " +
+                 "COMPILER_REVISION expected: 4, got: " +  Handlebars.COMPILER_REVISION +
+                 " - Please note: Builds of master may have other COMPILER_REVISION values.",
+                 Handlebars.COMPILER_REVISION === 4);
+
+    /**
+      Prepares the Handlebars templating library for use inside Ember's view
+      system.
+
+      The `Ember.Handlebars` object is the standard Handlebars library, extended to
+      use Ember's `get()` method instead of direct property access, which allows
+      computed properties to be used inside templates.
+
+      To create an `Ember.Handlebars` template, call `Ember.Handlebars.compile()`.
+      This will return a function that can be used by `Ember.View` for rendering.
+
+      @class Handlebars
+      @namespace Ember
+    */
+    var EmberHandlebars = Ember.Handlebars = objectCreate(Handlebars);
+
+    /**
+      Register a bound helper or custom view helper.
+
+      ## Simple bound helper example
+
+      ```javascript
+      Ember.Handlebars.helper('capitalize', function(value) {
+        return value.toUpperCase();
+      });
+      ```
+
+      The above bound helper can be used inside of templates as follows:
+
+      ```handlebars
+      {{capitalize name}}
+      ```
+
+      In this case, when the `name` property of the template's context changes,
+      the rendered value of the helper will update to reflect this change.
+
+      For more examples of bound helpers, see documentation for
+      `Ember.Handlebars.registerBoundHelper`.
+
+      ## Custom view helper example
+
+      Assuming a view subclass named `App.CalendarView` were defined, a helper
+      for rendering instances of this view could be registered as follows:
+
+      ```javascript
+      Ember.Handlebars.helper('calendar', App.CalendarView):
+      ```
+
+      The above bound helper can be used inside of templates as follows:
+
+      ```handlebars
+      {{calendar}}
+      ```
+
+      Which is functionally equivalent to:
+
+      ```handlebars
+      {{view App.CalendarView}}
+      ```
+
+      Options in the helper will be passed to the view in exactly the same
+      manner as with the `view` helper.
+
+      @method helper
+      @for Ember.Handlebars
+      @param {String} name
+      @param {Function|Ember.View} function or view class constructor
+      @param {String} dependentKeys*
+    */
+    EmberHandlebars.helper = function(name, value) {
+      if (!View) { View = requireModule('ember-views/views/view')['View']; } // ES6TODO: stupid circular dep
+      if (!Component) { Component = requireModule('ember-views/views/component')['default']; } // ES6TODO: stupid circular dep
+
+      Ember.assert("You tried to register a component named '" + name + "', but component names must include a '-'", !Component.detect(value) || name.match(/-/));
+
+      if (View.detect(value)) {
+        EmberHandlebars.registerHelper(name, EmberHandlebars.makeViewHelper(value));
+      } else {
+        EmberHandlebars.registerBoundHelper.apply(null, arguments);
+      }
+    };
+
+    /**
+      Returns a helper function that renders the provided ViewClass.
+
+      Used internally by Ember.Handlebars.helper and other methods
+      involving helper/component registration.
+
+      @private
+      @method makeViewHelper
+      @for Ember.Handlebars
+      @param {Function} ViewClass view class constructor
+      @since 1.2.0
+    */
+    EmberHandlebars.makeViewHelper = function(ViewClass) {
+      return function(options) {
+        Ember.assert("You can only pass attributes (such as name=value) not bare values to a helper for a View found in '" + ViewClass.toString() + "'", arguments.length < 2);
+        return EmberHandlebars.helpers.view.call(this, ViewClass, options);
+      };
+    };
+
+    /**
+    @class helpers
+    @namespace Ember.Handlebars
+    */
+    EmberHandlebars.helpers = objectCreate(Handlebars.helpers);
+
+    /**
+      Override the the opcode compiler and JavaScript compiler for Handlebars.
+
+      @class Compiler
+      @namespace Ember.Handlebars
+      @private
+      @constructor
+    */
+    EmberHandlebars.Compiler = function() {};
+
+    // Handlebars.Compiler doesn't exist in runtime-only
+    if (Handlebars.Compiler) {
+      EmberHandlebars.Compiler.prototype = objectCreate(Handlebars.Compiler.prototype);
+    }
+
+    EmberHandlebars.Compiler.prototype.compiler = EmberHandlebars.Compiler;
+
+    /**
+      @class JavaScriptCompiler
+      @namespace Ember.Handlebars
+      @private
+      @constructor
+    */
+    EmberHandlebars.JavaScriptCompiler = function() {};
+
+    // Handlebars.JavaScriptCompiler doesn't exist in runtime-only
+    if (Handlebars.JavaScriptCompiler) {
+      EmberHandlebars.JavaScriptCompiler.prototype = objectCreate(Handlebars.JavaScriptCompiler.prototype);
+      EmberHandlebars.JavaScriptCompiler.prototype.compiler = EmberHandlebars.JavaScriptCompiler;
+    }
+
+
+    EmberHandlebars.JavaScriptCompiler.prototype.namespace = "Ember.Handlebars";
+
+    EmberHandlebars.JavaScriptCompiler.prototype.initializeBuffer = function() {
+      return "''";
+    };
+
+    /**
+      Override the default buffer for Ember Handlebars. By default, Handlebars
+      creates an empty String at the beginning of each invocation and appends to
+      it. Ember's Handlebars overrides this to append to a single shared buffer.
+
+      @private
+      @method appendToBuffer
+      @param string {String}
+    */
+    EmberHandlebars.JavaScriptCompiler.prototype.appendToBuffer = function(string) {
+      return "data.buffer.push("+string+");";
+    };
+
+    // Hacks ahead:
+    // Handlebars presently has a bug where the `blockHelperMissing` hook
+    // doesn't get passed the name of the missing helper name, but rather
+    // gets passed the value of that missing helper evaluated on the current
+    // context, which is most likely `undefined` and totally useless.
+    //
+    // So we alter the compiled template function to pass the name of the helper
+    // instead, as expected.
+    //
+    // This can go away once the following is closed:
+    // https://github.com/wycats/handlebars.js/issues/634
+
+    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
+        BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
+        INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+
+    EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
+      var helperInvocation = source[source.length - 1],
+          helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
+          matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+
+      source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
+    };
+
+    var stringifyBlockHelperMissing = EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation;
+
+    var originalBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.blockValue;
+    EmberHandlebars.JavaScriptCompiler.prototype.blockValue = function() {
+      originalBlockValue.apply(this, arguments);
+      stringifyBlockHelperMissing(this.source);
+    };
+
+    var originalAmbiguousBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue;
+    EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue = function() {
+      originalAmbiguousBlockValue.apply(this, arguments);
+      stringifyBlockHelperMissing(this.source);
+    };
+
+    /**
+      Rewrite simple mustaches from `{{foo}}` to `{{bind "foo"}}`. This means that
+      all simple mustaches in Ember's Handlebars will also set up an observer to
+      keep the DOM up to date when the underlying property changes.
+
+      @private
+      @method mustache
+      @for Ember.Handlebars.Compiler
+      @param mustache
+    */
+    EmberHandlebars.Compiler.prototype.mustache = function(mustache) {
+      if (!(mustache.params.length || mustache.hash)) {
+        var id = new Handlebars.AST.IdNode([{ part: '_triageMustache' }]);
+
+        // Update the mustache node to include a hash value indicating whether the original node
+        // was escaped. This will allow us to properly escape values when the underlying value
+        // changes and we need to re-render the value.
+        if (!mustache.escaped) {
+          mustache.hash = mustache.hash || new Handlebars.AST.HashNode([]);
+          mustache.hash.pairs.push(["unescaped", new Handlebars.AST.StringNode("true")]);
+        }
+        mustache = new Handlebars.AST.MustacheNode([id].concat([mustache.id]), mustache.hash, !mustache.escaped);
+      }
+
+      return Handlebars.Compiler.prototype.mustache.call(this, mustache);
+    };
+
+    /**
+      Used for precompilation of Ember Handlebars templates. This will not be used
+      during normal app execution.
+
+      @method precompile
+      @for Ember.Handlebars
+      @static
+      @param {String} string The template to precompile
+      @param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
+                                compiled template should be returned as an Object or a String
+    */
+    EmberHandlebars.precompile = function(string, asObject) {
+      var ast = Handlebars.parse(string);
+
+      var options = {
+        knownHelpers: {
+          action: true,
+          unbound: true,
+          'bind-attr': true,
+          template: true,
+          view: true,
+          _triageMustache: true
+        },
+        data: true,
+        stringParams: true
+      };
+
+      asObject = asObject === undefined ? true : asObject;
+
+      var environment = new EmberHandlebars.Compiler().compile(ast, options);
+      return new EmberHandlebars.JavaScriptCompiler().compile(environment, options, undefined, asObject);
+    };
+
+    // We don't support this for Handlebars runtime-only
+    if (Handlebars.compile) {
+      /**
+        The entry point for Ember Handlebars. This replaces the default
+        `Handlebars.compile` and turns on template-local data and String
+        parameters.
+
+        @method compile
+        @for Ember.Handlebars
+        @static
+        @param {String} string The template to compile
+        @return {Function}
+      */
+      EmberHandlebars.compile = function(string) {
+        var ast = Handlebars.parse(string);
+        var options = { data: true, stringParams: true };
+        var environment = new EmberHandlebars.Compiler().compile(ast, options);
+        var templateSpec = new EmberHandlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
+
+        var template = EmberHandlebars.template(templateSpec);
+        template.isMethod = false; //Make sure we don't wrap templates with ._super
+
+        return template;
+      };
+    }
+
+    __exports__["default"] = EmberHandlebars;
+  });
+})();
+
+(function() {
+define("ember-handlebars/component_lookup",
+  ["ember-runtime/system/object","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var EmberObject = __dependency1__["default"];
+
+    var ComponentLookup = EmberObject.extend({
+      lookupFactory: function(name, container) {
+
+        container = container || this.container;
+
+        var fullName = 'component:' + name,
+            templateFullName = 'template:components/' + name,
+            templateRegistered = container && container.has(templateFullName);
+
+        if (templateRegistered) {
+          container.injection(fullName, 'layout', templateFullName);
+        }
+
+        var Component = container.lookupFactory(fullName);
+
+        // Only treat as a component if either the component
+        // or a template has been registered.
+        if (templateRegistered || Component) {
+          if (!Component) {
+            container.register(fullName, Ember.Component);
+            Component = container.lookupFactory(fullName);
+          }
+          return Component;
+        }
+      }
+    });
+
+    __exports__["default"] = ComponentLookup;
+  });
+define("ember-handlebars/controls",
+  ["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Checkbox = __dependency1__["default"];
+    var TextField = __dependency2__["default"];
+    var TextArea = __dependency3__["default"];
+
+    var Ember = __dependency4__["default"];
+    // Ember.assert
+    // var emberAssert = Ember.assert;
+
+    var EmberHandlebars = __dependency5__["default"];
+    var helpers = EmberHandlebars.helpers;
+    /**
+    @module ember
+    @submodule ember-handlebars-compiler
+    */
+
+    /**
+
+      The `{{input}}` helper inserts an HTML `<input>` tag into the template,
+      with a `type` value of either `text` or `checkbox`. If no `type` is provided,
+      `text` will be the default value applied. The attributes of `{{input}}`
+      match those of the native HTML tag as closely as possible for these two types.
+
+      ## Use as text field
+      An `{{input}}` with no `type` or a `type` of `text` will render an HTML text input.
+      The following HTML attributes can be set via the helper:
+
+     <table>
+      <tr><td>`readonly`</td><td>`required`</td><td>`autofocus`</td></tr>
+      <tr><td>`value`</td><td>`placeholder`</td><td>`disabled`</td></tr>
+      <tr><td>`size`</td><td>`tabindex`</td><td>`maxlength`</td></tr>
+      <tr><td>`name`</td><td>`min`</td><td>`max`</td></tr>
+      <tr><td>`pattern`</td><td>`accept`</td><td>`autocomplete`</td></tr>
+      <tr><td>`autosave`</td><td>`formaction`</td><td>`formenctype`</td></tr>
+      <tr><td>`formmethod`</td><td>`formnovalidate`</td><td>`formtarget`</td></tr>
+      <tr><td>`height`</td><td>`inputmode`</td><td>`multiple`</td></tr>
+      <tr><td>`step`</td><td>`width`</td><td>`form`</td></tr>
+      <tr><td>`selectionDirection`</td><td>`spellcheck`</td><td>&nbsp;</td></tr>
+     </table>
+
+
+      When set to a quoted string, these values will be directly applied to the HTML
+      element. When left unquoted, these values will be bound to a property on the
+      template's current rendering context (most typically a controller instance).
+
+      ## Unbound:
+
+      ```handlebars
+      {{input value="http://www.facebook.com"}}
+      ```
+
+
+      ```html
+      <input type="text" value="http://www.facebook.com"/>
+      ```
+
+      ## Bound:
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        firstName: "Stanley",
+        entryNotAllowed: true
+      });
+      ```
+
+
+      ```handlebars
+      {{input type="text" value=firstName disabled=entryNotAllowed size="50"}}
+      ```
+
+
+      ```html
+      <input type="text" value="Stanley" disabled="disabled" size="50"/>
+      ```
+
+      ## Extension
+
+      Internally, `{{input type="text"}}` creates an instance of `Ember.TextField`, passing
+      arguments from the helper to `Ember.TextField`'s `create` method. You can extend the
+      capabilities of text inputs in your applications by reopening this class. For example,
+      if you are building a Bootstrap project where `data-*` attributes are used, you
+      can add one to the `TextField`'s `attributeBindings` property:
+
+
+      ```javascript
+      Ember.TextField.reopen({
+        attributeBindings: ['data-error']
+      });
+      ```
+
+      Keep in mind when writing `Ember.TextField` subclasses that `Ember.TextField`
+      itself extends `Ember.Component`, meaning that it does NOT inherit
+      the `controller` of the parent view.
+
+      See more about [Ember components](api/classes/Ember.Component.html)
+
+
+      ## Use as checkbox
+
+      An `{{input}}` with a `type` of `checkbox` will render an HTML checkbox input.
+      The following HTML attributes can be set via the helper:
+
+    * `checked`
+    * `disabled`
+    * `tabindex`
+    * `indeterminate`
+    * `name`
+    * `autofocus`
+    * `form`
+
+
+      When set to a quoted string, these values will be directly applied to the HTML
+      element. When left unquoted, these values will be bound to a property on the
+      template's current rendering context (most typically a controller instance).
+
+      ## Unbound:
+
+      ```handlebars
+      {{input type="checkbox" name="isAdmin"}}
+      ```
+
+      ```html
+      <input type="checkbox" name="isAdmin" />
+      ```
+
+      ## Bound:
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        isAdmin: true
+      });
+      ```
+
+
+      ```handlebars
+      {{input type="checkbox" checked=isAdmin }}
+      ```
+
+
+      ```html
+      <input type="checkbox" checked="checked" />
+      ```
+
+      ## Extension
+
+      Internally, `{{input type="checkbox"}}` creates an instance of `Ember.Checkbox`, passing
+      arguments from the helper to `Ember.Checkbox`'s `create` method. You can extend the
+      capablilties of checkbox inputs in your applications by reopening this class. For example,
+      if you wanted to add a css class to all checkboxes in your application:
+
+
+      ```javascript
+      Ember.Checkbox.reopen({
+        classNames: ['my-app-checkbox']
+      });
+      ```
+
+
+      @method input
+      @for Ember.Handlebars.helpers
+      @param {Hash} options
+    */
+    function inputHelper(options) {
+      Ember.assert('You can only pass attributes to the `input` helper, not arguments', arguments.length < 2);
+
+      var hash = options.hash,
+          types = options.hashTypes,
+          inputType = hash.type,
+          onEvent = hash.on;
+
+      delete hash.type;
+      delete hash.on;
+
+      if (inputType === 'checkbox') {
+        Ember.assert("{{input type='checkbox'}} does not support setting `value=someBooleanValue`; you must use `checked=someBooleanValue` instead.", options.hashTypes.value !== 'ID');
+        return helpers.view.call(this, Checkbox, options);
+      } else {
+        if (inputType) { hash.type = inputType; }
+        hash.onEvent = onEvent || 'enter';
+        return helpers.view.call(this, TextField, options);
+      }
+    }
+
+    /**
+      `{{textarea}}` inserts a new instance of `<textarea>` tag into the template.
+      The attributes of `{{textarea}}` match those of the native HTML tags as
+      closely as possible.
+
+      The following HTML attributes can be set:
+
+        * `value`
+        * `name`
+        * `rows`
+        * `cols`
+        * `placeholder`
+        * `disabled`
+        * `maxlength`
+        * `tabindex`
+        * `selectionEnd`
+        * `selectionStart`
+        * `selectionDirection`
+        * `wrap`
+        * `readonly`
+        * `autofocus`
+        * `form`
+        * `spellcheck`
+        * `required`
+
+      When set to a quoted string, these value will be directly applied to the HTML
+      element. When left unquoted, these values will be bound to a property on the
+      template's current rendering context (most typically a controller instance).
+
+      Unbound:
+
+      ```handlebars
+      {{textarea value="Lots of static text that ISN'T bound"}}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <textarea class="ember-text-area">
+        Lots of static text that ISN'T bound
+      </textarea>
+      ```
+
+      Bound:
+
+      In the following example, the `writtenWords` property on `App.ApplicationController`
+      will be updated live as the user types 'Lots of text that IS bound' into
+      the text area of their browser's window.
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        writtenWords: "Lots of text that IS bound"
+      });
+      ```
+
+      ```handlebars
+      {{textarea value=writtenWords}}
+      ```
+
+       Would result in the following HTML:
+
+      ```html
+      <textarea class="ember-text-area">
+        Lots of text that IS bound
+      </textarea>
+      ```
+
+      If you wanted a one way binding between the text area and a div tag
+      somewhere else on your screen, you could use `Ember.computed.oneWay`:
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        writtenWords: "Lots of text that IS bound",
+        outputWrittenWords: Ember.computed.oneWay("writtenWords")
+      });
+      ```
+
+      ```handlebars
+      {{textarea value=writtenWords}}
+
+      <div>
+        {{outputWrittenWords}}
+      </div>
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <textarea class="ember-text-area">
+        Lots of text that IS bound
+      </textarea>
+
+      <-- the following div will be updated in real time as you type -->
+
+      <div>
+        Lots of text that IS bound
+      </div>
+      ```
+
+      Finally, this example really shows the power and ease of Ember when two
+      properties are bound to eachother via `Ember.computed.alias`. Type into
+      either text area box and they'll both stay in sync. Note that
+      `Ember.computed.alias` costs more in terms of performance, so only use it when
+      your really binding in both directions:
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        writtenWords: "Lots of text that IS bound",
+        twoWayWrittenWords: Ember.computed.alias("writtenWords")
+      });
+      ```
+
+      ```handlebars
+      {{textarea value=writtenWords}}
+      {{textarea value=twoWayWrittenWords}}
+      ```
+
+      ```html
+      <textarea id="ember1" class="ember-text-area">
+        Lots of text that IS bound
+      </textarea>
+
+      <-- both updated in real time -->
+
+      <textarea id="ember2" class="ember-text-area">
+        Lots of text that IS bound
+      </textarea>
+      ```
+
+      ## Extension
+
+      Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
+      arguments from the helper to `Ember.TextArea`'s `create` method. You can
+      extend the capabilities of text areas in your application by reopening this
+      class. For example, if you are building a Bootstrap project where `data-*` 
+      attributes are used, you can globally add support for a `data-*` attribute
+      on all `{{textarea}}`s' in your app by reopening `Ember.TextArea` or
+      `Ember.TextSupport` and adding it to the `attributeBindings` concatenated
+      property:
+
+      ```javascript
+      Ember.TextArea.reopen({
+        attributeBindings: ['data-error']
+      });
+      ```
+
+      Keep in mind when writing `Ember.TextArea` subclasses that `Ember.TextArea`
+      itself extends `Ember.Component`, meaning that it does NOT inherit
+      the `controller` of the parent view.
+
+      See more about [Ember components](api/classes/Ember.Component.html)
+
+      @method textarea
+      @for Ember.Handlebars.helpers
+      @param {Hash} options
+    */
+    function textareaHelper(options) {
+      Ember.assert('You can only pass attributes to the `textarea` helper, not arguments', arguments.length < 2);
+
+      var hash = options.hash,
+          types = options.hashTypes;
+
+      return helpers.view.call(this, TextArea, options);
+    }
+
+    __exports__.inputHelper = inputHelper;
+    __exports__.textareaHelper = textareaHelper;
+  });
+define("ember-handlebars/controls/checkbox",
+  ["ember-metal/property_get","ember-metal/property_set","ember-views/views/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var View = __dependency3__.View;
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    /**
+      The internal class used to create text inputs when the `{{input}}`
+      helper is used with `type` of `checkbox`.
+
+      See [handlebars.helpers.input](/api/classes/Ember.Handlebars.helpers.html#method_input)  for usage details.
+
+      ## Direct manipulation of `checked`
+
+      The `checked` attribute of an `Ember.Checkbox` object should always be set
+      through the Ember object or by interacting with its rendered element
+      representation via the mouse, keyboard, or touch. Updating the value of the
+      checkbox via jQuery will result in the checked value of the object and its
+      element losing synchronization.
+
+      ## Layout and LayoutName properties
+
+      Because HTML `input` elements are self closing `layout` and `layoutName`
+      properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+      layout section for more information.
+
+      @class Checkbox
+      @namespace Ember
+      @extends Ember.View
+    */
+    var Checkbox = View.extend({
+      instrumentDisplay: '{{input type="checkbox"}}',
+
+      classNames: ['ember-checkbox'],
+
+      tagName: 'input',
+
+      attributeBindings: ['type', 'checked', 'indeterminate', 'disabled', 'tabindex', 'name',
+                          'autofocus', 'required', 'form'],
+
+      type: "checkbox",
+      checked: false,
+      disabled: false,
+      indeterminate: false,
+
+      init: function() {
+        this._super();
+        this.on("change", this, this._updateElementValue);
+      },
+
+      didInsertElement: function() {
+        this._super();
+        get(this, 'element').indeterminate = !!get(this, 'indeterminate');
+      },
+
+      _updateElementValue: function() {
+        set(this, 'checked', this.$().prop('checked'));
+      }
+    });
+
+    __exports__["default"] = Checkbox;
+  });
+define("ember-handlebars/controls/select",
+  ["ember-handlebars-compiler","ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    /*jshint eqeqeq:false newcap:false */
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var EmberHandlebars = __dependency1__["default"];
+    var EnumerableUtils = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var View = __dependency5__.View;
+    var CollectionView = __dependency6__["default"];
+    var isArray = __dependency7__.isArray;
+    var isNone = __dependency8__["default"];
+    var computed = __dependency9__.computed;
+    var A = __dependency10__.A;
+    var observer = __dependency11__.observer;
+    var defineProperty = __dependency12__.defineProperty;
+
+    var indexOf = EnumerableUtils.indexOf,
+        indexesOf = EnumerableUtils.indexesOf,
+        forEach = EnumerableUtils.forEach,
+        replace = EnumerableUtils.replace,
+        precompileTemplate = EmberHandlebars.compile;
+
+    var SelectOption = View.extend({
+      instrumentDisplay: 'Ember.SelectOption',
+
+      tagName: 'option',
+      attributeBindings: ['value', 'selected'],
+
+      defaultTemplate: function(context, options) {
+        options = { data: options.data, hash: {} };
+        EmberHandlebars.helpers.bind.call(context, "view.label", options);
+      },
+
+      init: function() {
+        this.labelPathDidChange();
+        this.valuePathDidChange();
+
+        this._super();
+      },
+
+      selected: computed(function() {
+        var content = get(this, 'content'),
+            selection = get(this, 'parentView.selection');
+        if (get(this, 'parentView.multiple')) {
+          return selection && indexOf(selection, content.valueOf()) > -1;
+        } else {
+          // Primitives get passed through bindings as objects... since
+          // `new Number(4) !== 4`, we use `==` below
+          return content == selection;
+        }
+      }).property('content', 'parentView.selection'),
+
+      labelPathDidChange: observer('parentView.optionLabelPath', function() {
+        var labelPath = get(this, 'parentView.optionLabelPath');
+
+        if (!labelPath) { return; }
+
+        defineProperty(this, 'label', computed(function() {
+          return get(this, labelPath);
+        }).property(labelPath));
+      }),
+
+      valuePathDidChange: observer('parentView.optionValuePath', function() {
+        var valuePath = get(this, 'parentView.optionValuePath');
+
+        if (!valuePath) { return; }
+
+        defineProperty(this, 'value', computed(function() {
+          return get(this, valuePath);
+        }).property(valuePath));
+      })
+    });
+
+    var SelectOptgroup = CollectionView.extend({
+      instrumentDisplay: 'Ember.SelectOptgroup',
+
+      tagName: 'optgroup',
+      attributeBindings: ['label'],
+
+      selectionBinding: 'parentView.selection',
+      multipleBinding: 'parentView.multiple',
+      optionLabelPathBinding: 'parentView.optionLabelPath',
+      optionValuePathBinding: 'parentView.optionValuePath',
+
+      itemViewClassBinding: 'parentView.optionView'
+    });
+
+    /**
+      The `Ember.Select` view class renders a
+      [select](https://developer.mozilla.org/en/HTML/Element/select) HTML element,
+      allowing the user to choose from a list of options.
+
+      The text and `value` property of each `<option>` element within the
+      `<select>` element are populated from the objects in the `Element.Select`'s
+      `content` property. The underlying data object of the selected `<option>` is
+      stored in the `Element.Select`'s `value` property.
+
+      ## The Content Property (array of strings)
+
+      The simplest version of an `Ember.Select` takes an array of strings as its
+      `content` property. The string will be used as both the `value` property and
+      the inner text of each `<option>` element inside the rendered `<select>`.
+
+      Example:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        names: ["Yehuda", "Tom"]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select content=names}}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <select class="ember-select">
+        <option value="Yehuda">Yehuda</option>
+        <option value="Tom">Tom</option>
+      </select>
+      ```
+
+      You can control which `<option>` is selected through the `Ember.Select`'s
+      `value` property:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        selectedName: 'Tom',
+        names: ["Yehuda", "Tom"]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=names
+             value=selectedName
+      }}
+      ```
+
+      Would result in the following HTML with the `<option>` for 'Tom' selected:
+
+      ```html
+      <select class="ember-select">
+        <option value="Yehuda">Yehuda</option>
+        <option value="Tom" selected="selected">Tom</option>
+      </select>
+      ```
+
+      A user interacting with the rendered `<select>` to choose "Yehuda" would
+      update the value of `selectedName` to "Yehuda".
+
+      ## The Content Property (array of Objects)
+
+      An `Ember.Select` can also take an array of JavaScript or Ember objects as
+      its `content` property.
+
+      When using objects you need to tell the `Ember.Select` which property should
+      be accessed on each object to supply the `value` attribute of the `<option>`
+      and which property should be used to supply the element text.
+
+      The `optionValuePath` option is used to specify the path on each object to
+      the desired property for the `value` attribute. The `optionLabelPath`
+      specifies the path on each object to the desired property for the
+      element's text. Both paths must reference each object itself as `content`:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        programmers: [
+          {firstName: "Yehuda", id: 1},
+          {firstName: "Tom",    id: 2}
+        ]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=programmers
+             optionValuePath="content.id"
+             optionLabelPath="content.firstName"}}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <select class="ember-select">
+        <option value="1">Yehuda</option>
+        <option value="2">Tom</option>
+      </select>
+      ```
+
+      The `value` attribute of the selected `<option>` within an `Ember.Select`
+      can be bound to a property on another object:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        programmers: [
+          {firstName: "Yehuda", id: 1},
+          {firstName: "Tom",    id: 2}
+        ],
+        currentProgrammer: {
+          id: 2
+        }
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=programmers
+             optionValuePath="content.id"
+             optionLabelPath="content.firstName"
+             value=currentProgrammer.id}}
+      ```
+
+      Would result in the following HTML with a selected option:
+
+      ```html
+      <select class="ember-select">
+        <option value="1">Yehuda</option>
+        <option value="2" selected="selected">Tom</option>
+      </select>
+      ```
+
+      Interacting with the rendered element by selecting the first option
+      ('Yehuda') will update the `id` of `currentProgrammer`
+      to match the `value` property of the newly selected `<option>`.
+
+      Alternatively, you can control selection through the underlying objects
+      used to render each object by binding the `selection` option. When the selected
+      `<option>` is changed, the property path provided to `selection`
+      will be updated to match the content object of the rendered `<option>`
+      element:
+
+      ```javascript
+
+      var yehuda = {firstName: "Yehuda", id: 1, bff4eva: 'tom'}
+      var tom = {firstName: "Tom", id: 2, bff4eva: 'yehuda'};
+
+      App.ApplicationController = Ember.ObjectController.extend({
+        selectedPerson: tom,
+        programmers: [
+          yehuda,
+          tom
+        ]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=programmers
+             optionValuePath="content.id"
+             optionLabelPath="content.firstName"
+             selection=selectedPerson}}
+      ```
+
+      Would result in the following HTML with a selected option:
+
+      ```html
+      <select class="ember-select">
+        <option value="1">Yehuda</option>
+        <option value="2" selected="selected">Tom</option>
+      </select>
+      ```
+
+      Interacting with the rendered element by selecting the first option
+      ('Yehuda') will update the `selectedPerson` to match the object of
+      the newly selected `<option>`. In this case it is the first object
+      in the `programmers`
+
+      ## Supplying a Prompt
+
+      A `null` value for the `Ember.Select`'s `value` or `selection` property
+      results in there being no `<option>` with a `selected` attribute:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        selectedProgrammer: null,
+        programmers: [
+          "Yehuda",
+          "Tom"
+        ]
+      });
+      ```
+
+      ``` handlebars
+      {{view Ember.Select
+             content=programmers
+             value=selectedProgrammer
+      }}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <select class="ember-select">
+        <option value="Yehuda">Yehuda</option>
+        <option value="Tom">Tom</option>
+      </select>
+      ```
+
+      Although `selectedProgrammer` is `null` and no `<option>`
+      has a `selected` attribute the rendered HTML will display the
+      first item as though it were selected. You can supply a string
+      value for the `Ember.Select` to display when there is no selection
+      with the `prompt` option:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        selectedProgrammer: null,
+        programmers: [
+          "Yehuda",
+          "Tom"
+        ]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=programmers
+             value=selectedProgrammer
+             prompt="Please select a name"
+      }}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <select class="ember-select">
+        <option>Please select a name</option>
+        <option value="Yehuda">Yehuda</option>
+        <option value="Tom">Tom</option>
+      </select>
+      ```
+
+      @class Select
+      @namespace Ember
+      @extends Ember.View
+    */
+    var Select = View.extend({
+      instrumentDisplay: 'Ember.Select',
+
+      tagName: 'select',
+      classNames: ['ember-select'],
+      defaultTemplate: Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) {
+this.compilerInfo = [4,'>= 1.0.0'];
+helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {};
+  var buffer = '', stack1, escapeExpression=this.escapeExpression, self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = '', stack1;
+  data.buffer.push("<option value=\"\">");
+  stack1 = helpers._triageMustache.call(depth0, "view.prompt", {hash:{},hashTypes:{},hashContexts:{},contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  data.buffer.push("</option>");
+  return buffer;
+  }
+
+function program3(depth0,data) {
+  
+  var stack1;
+  stack1 = helpers.each.call(depth0, "view.groupedContent", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(4, program4, data),contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  else { data.buffer.push(''); }
+  }
+function program4(depth0,data) {
+  
+  
+  data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.groupView", {hash:{
+    'content': ("content"),
+    'label': ("label")
+  },hashTypes:{'content': "ID",'label': "ID"},hashContexts:{'content': depth0,'label': depth0},contexts:[depth0],types:["ID"],data:data})));
+  }
+
+function program6(depth0,data) {
+  
+  var stack1;
+  stack1 = helpers.each.call(depth0, "view.content", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(7, program7, data),contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  else { data.buffer.push(''); }
+  }
+function program7(depth0,data) {
+  
+  
+  data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.optionView", {hash:{
+    'content': ("")
+  },hashTypes:{'content': "ID"},hashContexts:{'content': depth0},contexts:[depth0],types:["ID"],data:data})));
+  }
+
+  stack1 = helpers['if'].call(depth0, "view.prompt", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(1, program1, data),contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  stack1 = helpers['if'].call(depth0, "view.optionGroupPath", {hash:{},hashTypes:{},hashContexts:{},inverse:self.program(6, program6, data),fn:self.program(3, program3, data),contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  return buffer;
+  
+}),
+      attributeBindings: ['multiple', 'disabled', 'tabindex', 'name', 'required', 'autofocus',
+                          'form', 'size'],
+
+      /**
+        The `multiple` attribute of the select element. Indicates whether multiple
+        options can be selected.
+
+        @property multiple
+        @type Boolean
+        @default false
+      */
+      multiple: false,
+
+      /**
+        The `disabled` attribute of the select element. Indicates whether
+        the element is disabled from interactions.
+
+        @property disabled
+        @type Boolean
+        @default false
+      */
+      disabled: false,
+
+      /**
+        The `required` attribute of the select element. Indicates whether
+        a selected option is required for form validation.
+
+        @property required
+        @type Boolean
+        @default false
+        @since 1.5.0
+      */
+      required: false,
+
+      /**
+        The list of options.
+
+        If `optionLabelPath` and `optionValuePath` are not overridden, this should
+        be a list of strings, which will serve simultaneously as labels and values.
+
+        Otherwise, this should be a list of objects. For instance:
+
+        ```javascript
+        Ember.Select.create({
+          content: A([
+              { id: 1, firstName: 'Yehuda' },
+              { id: 2, firstName: 'Tom' }
+            ]),
+          optionLabelPath: 'content.firstName',
+          optionValuePath: 'content.id'
+        });
+        ```
+
+        @property content
+        @type Array
+        @default null
+      */
+      content: null,
+
+      /**
+        When `multiple` is `false`, the element of `content` that is currently
+        selected, if any.
+
+        When `multiple` is `true`, an array of such elements.
+
+        @property selection
+        @type Object or Array
+        @default null
+      */
+      selection: null,
+
+      /**
+        In single selection mode (when `multiple` is `false`), value can be used to
+        get the current selection's value or set the selection by it's value.
+
+        It is not currently supported in multiple selection mode.
+
+        @property value
+        @type String
+        @default null
+      */
+      value: computed(function(key, value) {
+        if (arguments.length === 2) { return value; }
+        var valuePath = get(this, 'optionValuePath').replace(/^content\.?/, '');
+        return valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection');
+      }).property('selection'),
+
+      /**
+        If given, a top-most dummy option will be rendered to serve as a user
+        prompt.
+
+        @property prompt
+        @type String
+        @default null
+      */
+      prompt: null,
+
+      /**
+        The path of the option labels. See [content](/api/classes/Ember.Select.html#property_content).
+
+        @property optionLabelPath
+        @type String
+        @default 'content'
+      */
+      optionLabelPath: 'content',
+
+      /**
+        The path of the option values. See [content](/api/classes/Ember.Select.html#property_content).
+
+        @property optionValuePath
+        @type String
+        @default 'content'
+      */
+      optionValuePath: 'content',
+
+      /**
+        The path of the option group.
+        When this property is used, `content` should be sorted by `optionGroupPath`.
+
+        @property optionGroupPath
+        @type String
+        @default null
+      */
+      optionGroupPath: null,
+
+      /**
+        The view class for optgroup.
+
+        @property groupView
+        @type Ember.View
+        @default Ember.SelectOptgroup
+      */
+      groupView: SelectOptgroup,
+
+      groupedContent: computed(function() {
+        var groupPath = get(this, 'optionGroupPath');
+        var groupedContent = A();
+        var content = get(this, 'content') || [];
+
+        forEach(content, function(item) {
+          var label = get(item, groupPath);
+
+          if (get(groupedContent, 'lastObject.label') !== label) {
+            groupedContent.pushObject({
+              label: label,
+              content: A()
+            });
+          }
+
+          get(groupedContent, 'lastObject.content').push(item);
+        });
+
+        return groupedContent;
+      }).property('optionGroupPath', 'content.@each'),
+
+      /**
+        The view class for option.
+
+        @property optionView
+        @type Ember.View
+        @default Ember.SelectOption
+      */
+      optionView: SelectOption,
+
+      _change: function() {
+        if (get(this, 'multiple')) {
+          this._changeMultiple();
+        } else {
+          this._changeSingle();
+        }
+      },
+
+      selectionDidChange: observer('selection.@each', function() {
+        var selection = get(this, 'selection');
+        if (get(this, 'multiple')) {
+          if (!isArray(selection)) {
+            set(this, 'selection', A([selection]));
+            return;
+          }
+          this._selectionDidChangeMultiple();
+        } else {
+          this._selectionDidChangeSingle();
+        }
+      }),
+
+      valueDidChange: observer('value', function() {
+        var content = get(this, 'content'),
+            value = get(this, 'value'),
+            valuePath = get(this, 'optionValuePath').replace(/^content\.?/, ''),
+            selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection')),
+            selection;
+
+        if (value !== selectedValue) {
+          selection = content ? content.find(function(obj) {
+            return value === (valuePath ? get(obj, valuePath) : obj);
+          }) : null;
+
+          this.set('selection', selection);
+        }
+      }),
+
+
+      _triggerChange: function() {
+        var selection = get(this, 'selection');
+        var value = get(this, 'value');
+
+        if (!isNone(selection)) { this.selectionDidChange(); }
+        if (!isNone(value)) { this.valueDidChange(); }
+
+        this._change();
+      },
+
+      _changeSingle: function() {
+        var selectedIndex = this.$()[0].selectedIndex,
+            content = get(this, 'content'),
+            prompt = get(this, 'prompt');
+
+        if (!content || !get(content, 'length')) { return; }
+        if (prompt && selectedIndex === 0) { set(this, 'selection', null); return; }
+
+        if (prompt) { selectedIndex -= 1; }
+        set(this, 'selection', content.objectAt(selectedIndex));
+      },
+
+
+      _changeMultiple: function() {
+        var options = this.$('option:selected'),
+            prompt = get(this, 'prompt'),
+            offset = prompt ? 1 : 0,
+            content = get(this, 'content'),
+            selection = get(this, 'selection');
+
+        if (!content) { return; }
+        if (options) {
+          var selectedIndexes = options.map(function() {
+            return this.index - offset;
+          }).toArray();
+          var newSelection = content.objectsAt(selectedIndexes);
+
+          if (isArray(selection)) {
+            replace(selection, 0, get(selection, 'length'), newSelection);
+          } else {
+            set(this, 'selection', newSelection);
+          }
+        }
+      },
+
+      _selectionDidChangeSingle: function() {
+        var el = this.get('element');
+        if (!el) { return; }
+
+        var content = get(this, 'content'),
+            selection = get(this, 'selection'),
+            selectionIndex = content ? indexOf(content, selection) : -1,
+            prompt = get(this, 'prompt');
+
+        if (prompt) { selectionIndex += 1; }
+        if (el) { el.selectedIndex = selectionIndex; }
+      },
+
+      _selectionDidChangeMultiple: function() {
+        var content = get(this, 'content'),
+            selection = get(this, 'selection'),
+            selectedIndexes = content ? indexesOf(content, selection) : [-1],
+            prompt = get(this, 'prompt'),
+            offset = prompt ? 1 : 0,
+            options = this.$('option'),
+            adjusted;
+
+        if (options) {
+          options.each(function() {
+            adjusted = this.index > -1 ? this.index - offset : -1;
+            this.selected = indexOf(selectedIndexes, adjusted) > -1;
+          });
+        }
+      },
+
+      init: function() {
+        this._super();
+        this.on("didInsertElement", this, this._triggerChange);
+        this.on("change", this, this._change);
+      }
+    });
+
+    __exports__["default"] = Select
+    __exports__.Select = Select;
+    __exports__.SelectOption = SelectOption;
+    __exports__.SelectOptgroup = SelectOptgroup;
+  });
+define("ember-handlebars/controls/text_area",
+  ["ember-metal/property_get","ember-views/views/component","ember-handlebars/controls/text_support","ember-metal/mixin","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+    var get = __dependency1__.get;
+    var Component = __dependency2__["default"];
+    var TextSupport = __dependency3__["default"];
+    var observer = __dependency4__.observer;
+
+    /**
+      The internal class used to create textarea element when the `{{textarea}}`
+      helper is used.
+
+      See [handlebars.helpers.textarea](/api/classes/Ember.Handlebars.helpers.html#method_textarea)  for usage details.
+
+      ## Layout and LayoutName properties
+
+      Because HTML `textarea` elements do not contain inner HTML the `layout` and
+      `layoutName` properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+      layout section for more information.
+
+      @class TextArea
+      @namespace Ember
+      @extends Ember.Component
+      @uses Ember.TextSupport
+    */
+    var TextArea = Component.extend(TextSupport, {
+      instrumentDisplay: '{{textarea}}',
+
+      classNames: ['ember-text-area'],
+
+      tagName: "textarea",
+      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap'],
+      rows: null,
+      cols: null,
+
+      _updateElementValue: observer('value', function() {
+        // We do this check so cursor position doesn't get affected in IE
+        var value = get(this, 'value'),
+            $el = this.$();
+        if ($el && value !== $el.val()) {
+          $el.val(value);
+        }
+      }),
+
+      init: function() {
+        this._super();
+        this.on("didInsertElement", this, this._updateElementValue);
+      }
+
+    });
+
+    __exports__["default"] = TextArea;
+  });
+define("ember-handlebars/controls/text_field",
+  ["ember-metal/property_get","ember-metal/property_set","ember-views/views/component","ember-handlebars/controls/text_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var Component = __dependency3__["default"];
+    var TextSupport = __dependency4__["default"];
+
+    /**
+
+      The internal class used to create text inputs when the `{{input}}`
+      helper is used with `type` of `text`.
+
+      See [Handlebars.helpers.input](/api/classes/Ember.Handlebars.helpers.html#method_input)  for usage details.
+
+      ## Layout and LayoutName properties
+
+      Because HTML `input` elements are self closing `layout` and `layoutName`
+      properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+      layout section for more information.
+
+      @class TextField
+      @namespace Ember
+      @extends Ember.Component
+      @uses Ember.TextSupport
+    */
+    var TextField = Component.extend(TextSupport, {
+      instrumentDisplay: '{{input type="text"}}',
+
+      classNames: ['ember-text-field'],
+      tagName: "input",
+      attributeBindings: ['type', 'value', 'size', 'pattern', 'name', 'min', 'max',
+                          'accept', 'autocomplete', 'autosave', 'formaction',
+                          'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
+                          'height', 'inputmode', 'list', 'multiple', 'pattern', 'step',
+                          'width'],
+
+      /**
+        The `value` attribute of the input element. As the user inputs text, this
+        property is updated live.
+
+        @property value
+        @type String
+        @default ""
+      */
+      value: "",
+
+      /**
+        The `type` attribute of the input element.
+
+        @property type
+        @type String
+        @default "text"
+      */
+      type: "text",
+
+      /**
+        The `size` of the text field in characters.
+
+        @property size
+        @type String
+        @default null
+      */
+      size: null,
+
+      /**
+        The `pattern` attribute of input element.
+
+        @property pattern
+        @type String
+        @default null
+      */
+      pattern: null,
+
+      /**
+        The `min` attribute of input element used with `type="number"` or `type="range"`.
+
+        @property min
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      min: null,
+
+      /**
+        The `max` attribute of input element used with `type="number"` or `type="range"`.
+
+        @property max
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      max: null
+    });
+
+    __exports__["default"] = TextField;
+  });
+define("ember-handlebars/controls/text_support",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/target_action_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var Mixin = __dependency3__.Mixin;
+    var TargetActionSupport = __dependency4__["default"];
+
+    /**
+      Shared mixin used by `Ember.TextField` and `Ember.TextArea`.
+
+      @class TextSupport
+      @namespace Ember
+      @uses Ember.TargetActionSupport
+      @extends Ember.Mixin
+      @private
+    */
+    var TextSupport = Mixin.create(TargetActionSupport, {
+      value: "",
+
+      attributeBindings: ['placeholder', 'disabled', 'maxlength', 'tabindex', 'readonly',
+                          'autofocus', 'form', 'selectionDirection', 'spellcheck', 'required',
+                          'title', 'autocapitalize', 'autocorrect'],
+      placeholder: null,
+      disabled: false,
+      maxlength: null,
+
+      init: function() {
+        this._super();
+        this.on("focusOut", this, this._elementValueDidChange);
+        this.on("change", this, this._elementValueDidChange);
+        this.on("paste", this, this._elementValueDidChange);
+        this.on("cut", this, this._elementValueDidChange);
+        this.on("input", this, this._elementValueDidChange);
+        this.on("keyUp", this, this.interpretKeyEvents);
+      },
+
+      /**
+        The action to be sent when the user presses the return key.
+
+        This is similar to the `{{action}}` helper, but is fired when
+        the user presses the return key when editing a text field, and sends
+        the value of the field as the context.
+
+        @property action
+        @type String
+        @default null
+      */
+      action: null,
+
+      /**
+        The event that should send the action.
+
+        Options are:
+
+        * `enter`: the user pressed enter
+        * `keyPress`: the user pressed a key
+
+        @property onEvent
+        @type String
+        @default enter
+      */
+      onEvent: 'enter',
+
+      /**
+        Whether they `keyUp` event that triggers an `action` to be sent continues
+        propagating to other views.
+
+        By default, when the user presses the return key on their keyboard and
+        the text field has an `action` set, the action will be sent to the view's
+        controller and the key event will stop propagating.
+
+        If you would like parent views to receive the `keyUp` event even after an
+        action has been dispatched, set `bubbles` to true.
+
+        @property bubbles
+        @type Boolean
+        @default false
+      */
+      bubbles: false,
+
+      interpretKeyEvents: function(event) {
+        var map = TextSupport.KEY_EVENTS;
+        var method = map[event.keyCode];
+
+        this._elementValueDidChange();
+        if (method) { return this[method](event); }
+      },
+
+      _elementValueDidChange: function() {
+        set(this, 'value', this.$().val());
+      },
+
+      /**
+        The action to be sent when the user inserts a new line.
+
+        Called by the `Ember.TextSupport` mixin on keyUp if keycode matches 13.
+        Uses sendAction to send the `enter` action to the controller.
+
+        @method insertNewline
+        @param {Event} event
+      */
+      insertNewline: function(event) {
+        sendAction('enter', this, event);
+        sendAction('insert-newline', this, event);
+      },
+
+      /**
+        Called when the user hits escape.
+
+        Called by the `Ember.TextSupport` mixin on keyUp if keycode matches 27.
+        Uses sendAction to send the `escape-press` action to the controller.
+
+        @method cancel
+        @param {Event} event
+      */
+      cancel: function(event) {
+        sendAction('escape-press', this, event);
+      },
+
+      /**
+        Called when the text area is focused.
+
+        @method focusIn
+        @param {Event} event
+      */
+      focusIn: function(event) {
+        sendAction('focus-in', this, event);
+      },
+
+      /**
+        Called when the text area is blurred.
+
+        @method focusOut
+        @param {Event} event
+      */
+      focusOut: function(event) {
+        sendAction('focus-out', this, event);
+      },
+
+      /**
+        The action to be sent when the user presses a key. Enabled by setting
+        the `onEvent` property to `keyPress`.
+
+        Uses sendAction to send the `keyPress` action to the controller.
+
+        @method keyPress
+        @param {Event} event
+      */
+      keyPress: function(event) {
+        sendAction('key-press', this, event);
+      }
+
+    });
+
+    TextSupport.KEY_EVENTS = {
+      13: 'insertNewline',
+      27: 'cancel'
+    };
+
+    // In principle, this shouldn't be necessary, but the legacy
+    // sendAction semantics for TextField are different from
+    // the component semantics so this method normalizes them.
+    function sendAction(eventName, view, event) {
+      var action = get(view, eventName),
+          on = get(view, 'onEvent'),
+          value = get(view, 'value');
+
+      // back-compat support for keyPress as an event name even though
+      // it's also a method name that consumes the event (and therefore
+      // incompatible with sendAction semantics).
+      if (on === eventName || (on === 'keyPress' && eventName === 'key-press')) {
+        view.sendAction('action', value);
+      }
+
+      view.sendAction(eventName, value);
+
+      if (action || on === eventName) {
+        if(!get(view, 'bubbles')) {
+          event.stopPropagation();
+        }
+      }
+    }
+
+    __exports__["default"] = TextSupport;
+  });
+define("ember-handlebars/ext",
+  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/binding","ember-metal/error","ember-metal/mixin","ember-metal/is_empty","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
+    // var emberAssert = Ember.assert;
+
+    var fmt = __dependency2__.fmt;
+
+    var EmberHandlebars = __dependency3__["default"];
+    var helpers = EmberHandlebars.helpers;
+
+    var get = __dependency4__.get;
+    var isGlobalPath = __dependency5__.isGlobalPath;
+    var EmberError = __dependency6__["default"];
+    var IS_BINDING = __dependency7__.IS_BINDING;
+
+    // late bound via requireModule because of circular dependencies.
+    var resolveHelper,
+        SimpleHandlebarsView;
+
+    var isEmpty = __dependency8__["default"];
+
+    var slice = [].slice, originalTemplate = EmberHandlebars.template;
+
+    /**
+      If a path starts with a reserved keyword, returns the root
+      that should be used.
+
+      @private
+      @method normalizePath
+      @for Ember
+      @param root {Object}
+      @param path {String}
+      @param data {Hash}
+    */
+    function normalizePath(root, path, data) {
+      var keywords = (data && data.keywords) || {},
+          keyword, isKeyword;
+
+      // Get the first segment of the path. For example, if the
+      // path is "foo.bar.baz", returns "foo".
+      keyword = path.split('.', 1)[0];
+
+      // Test to see if the first path is a keyword that has been
+      // passed along in the view's data hash. If so, we will treat
+      // that object as the new root.
+      if (keywords.hasOwnProperty(keyword)) {
+        // Look up the value in the template's data hash.
+        root = keywords[keyword];
+        isKeyword = true;
+
+        // Handle cases where the entire path is the reserved
+        // word. In that case, return the object itself.
+        if (path === keyword) {
+          path = '';
+        } else {
+          // Strip the keyword from the path and look up
+          // the remainder from the newly found root.
+          path = path.substr(keyword.length+1);
+        }
+      }
+
+      return { root: root, path: path, isKeyword: isKeyword };
+    };
+
+
+    /**
+      Lookup both on root and on window. If the path starts with
+      a keyword, the corresponding object will be looked up in the
+      template's data hash and used to resolve the path.
+
+      @method get
+      @for Ember.Handlebars
+      @param {Object} root The object to look up the property on
+      @param {String} path The path to be lookedup
+      @param {Object} options The template's option hash
+    */
+    function handlebarsGet(root, path, options) {
+      var data = options && options.data,
+          normalizedPath = normalizePath(root, path, data),
+          value;
+
+      
+        root = normalizedPath.root;
+        path = normalizedPath.path;
+
+        value = get(root, path);
+
+        if (value === undefined && root !== Ember.lookup && isGlobalPath(path)) {
+          value = get(Ember.lookup, path);
+        }
+      
+
+      return value;
+    }
+
+    /**
+      This method uses `Ember.Handlebars.get` to lookup a value, then ensures
+      that the value is escaped properly.
+
+      If `unescaped` is a truthy value then the escaping will not be performed.
+
+      @method getEscaped
+      @for Ember.Handlebars
+      @param {Object} root The object to look up the property on
+      @param {String} path The path to be lookedup
+      @param {Object} options The template's option hash
+      @since 1.4.0
+    */
+    function getEscaped(root, path, options) {
+      var result = handlebarsGet(root, path, options);
+
+      if (result === null || result === undefined) {
+        result = "";
+      } else if (!(result instanceof Handlebars.SafeString)) {
+        result = String(result);
+      }
+      if (!options.hash.unescaped){
+        result = Handlebars.Utils.escapeExpression(result);
+      }
+
+      return result;
+    };
+
+    function resolveParams(context, params, options) {
+      var resolvedParams = [], types = options.types, param, type;
+
+      for (var i=0, l=params.length; i<l; i++) {
+        param = params[i];
+        type = types[i];
+
+        if (type === 'ID') {
+          resolvedParams.push(handlebarsGet(context, param, options));
+        } else {
+          resolvedParams.push(param);
+        }
+      }
+
+      return resolvedParams;
+    };
+
+    function resolveHash(context, hash, options) {
+      var resolvedHash = {}, types = options.hashTypes, type;
+
+      for (var key in hash) {
+        if (!hash.hasOwnProperty(key)) { continue; }
+
+        type = types[key];
+
+        if (type === 'ID') {
+          resolvedHash[key] = handlebarsGet(context, hash[key], options);
+        } else {
+          resolvedHash[key] = hash[key];
+        }
+      }
+
+      return resolvedHash;
+    };
+
+    /**
+      Registers a helper in Handlebars that will be called if no property with the
+      given name can be found on the current context object, and no helper with
+      that name is registered.
+
+      This throws an exception with a more helpful error message so the user can
+      track down where the problem is happening.
+
+      @private
+      @method helperMissing
+      @for Ember.Handlebars.helpers
+      @param {String} path
+      @param {Hash} options
+    */
+    function helperMissingHelper(path) {
+      if (!resolveHelper) { resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper']; } // ES6TODO: stupid circular dep
+
+      var error, view = "";
+
+      var options = arguments[arguments.length - 1];
+
+      var helper = resolveHelper(options.data.view.container, path);
+
+      if (helper) {
+        return helper.apply(this, slice.call(arguments, 1));
+      }
+
+      error = "%@ Handlebars error: Could not find property '%@' on object %@.";
+      if (options.data) {
+        view = options.data.view;
+      }
+      throw new EmberError(fmt(error, [view, path, this]));
+    }
+
+    /**
+      Registers a helper in Handlebars that will be called if no property with the
+      given name can be found on the current context object, and no helper with
+      that name is registered.
+
+      This throws an exception with a more helpful error message so the user can
+      track down where the problem is happening.
+
+      @private
+      @method helperMissing
+      @for Ember.Handlebars.helpers
+      @param {String} path
+      @param {Hash} options
+    */
+    function blockHelperMissingHelper(path) {
+      if (!resolveHelper) { resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper']; } // ES6TODO: stupid circular dep
+
+      var options = arguments[arguments.length - 1];
+
+      Ember.assert("`blockHelperMissing` was invoked without a helper name, which " +
+                   "is most likely due to a mismatch between the version of " +
+                   "Ember.js you're running now and the one used to precompile your " +
+                   "templates. Please make sure the version of " +
+                   "`ember-handlebars-compiler` you're using is up to date.", path);
+
+      var helper = resolveHelper(options.data.view.container, path);
+
+      if (helper) {
+        return helper.apply(this, slice.call(arguments, 1));
+      } else {
+        return helpers.helperMissing.call(this, path);
+      }
+    }
+
+    /**
+      Register a bound handlebars helper. Bound helpers behave similarly to regular
+      handlebars helpers, with the added ability to re-render when the underlying data
+      changes.
+
+      ## Simple example
+
+      ```javascript
+      Ember.Handlebars.registerBoundHelper('capitalize', function(value) {
+        return Ember.String.capitalize(value);
+      });
+      ```
+
+      The above bound helper can be used inside of templates as follows:
+
+      ```handlebars
+      {{capitalize name}}
+      ```
+
+      In this case, when the `name` property of the template's context changes,
+      the rendered value of the helper will update to reflect this change.
+
+      ## Example with options
+
+      Like normal handlebars helpers, bound helpers have access to the options
+      passed into the helper call.
+
+      ```javascript
+      Ember.Handlebars.registerBoundHelper('repeat', function(value, options) {
+        var count = options.hash.count;
+        var a = [];
+        while(a.length < count) {
+            a.push(value);
+        }
+        return a.join('');
+      });
+      ```
+
+      This helper could be used in a template as follows:
+
+      ```handlebars
+      {{repeat text count=3}}
+      ```
+
+      ## Example with bound options
+
+      Bound hash options are also supported. Example:
+
+      ```handlebars
+      {{repeat text count=numRepeats}}
+      ```
+
+      In this example, count will be bound to the value of
+      the `numRepeats` property on the context. If that property
+      changes, the helper will be re-rendered.
+
+      ## Example with extra dependencies
+
+      The `Ember.Handlebars.registerBoundHelper` method takes a variable length
+      third parameter which indicates extra dependencies on the passed in value.
+      This allows the handlebars helper to update when these dependencies change.
+
+      ```javascript
+      Ember.Handlebars.registerBoundHelper('capitalizeName', function(value) {
+        return value.get('name').toUpperCase();
+      }, 'name');
+      ```
+
+      ## Example with multiple bound properties
+
+      `Ember.Handlebars.registerBoundHelper` supports binding to
+      multiple properties, e.g.:
+
+      ```javascript
+      Ember.Handlebars.registerBoundHelper('concatenate', function() {
+        var values = Array.prototype.slice.call(arguments, 0, -1);
+        return values.join('||');
+      });
+      ```
+
+      Which allows for template syntax such as `{{concatenate prop1 prop2}}` or
+      `{{concatenate prop1 prop2 prop3}}`. If any of the properties change,
+      the helper will re-render.  Note that dependency keys cannot be
+      using in conjunction with multi-property helpers, since it is ambiguous
+      which property the dependent keys would belong to.
+
+      ## Use with unbound helper
+
+      The `{{unbound}}` helper can be used with bound helper invocations
+      to render them in their unbound form, e.g.
+
+      ```handlebars
+      {{unbound capitalize name}}
+      ```
+
+      In this example, if the name property changes, the helper
+      will not re-render.
+
+      ## Use with blocks not supported
+
+      Bound helpers do not support use with Handlebars blocks or
+      the addition of child views of any kind.
+
+      @method registerBoundHelper
+      @for Ember.Handlebars
+      @param {String} name
+      @param {Function} function
+      @param {String} dependentKeys*
+    */
+    function registerBoundHelper(name, fn) {
+      var boundHelperArgs = slice.call(arguments, 1),
+          boundFn = makeBoundHelper.apply(this, boundHelperArgs);
+      EmberHandlebars.registerHelper(name, boundFn);
+    };
+
+    /**
+      A helper function used by `registerBoundHelper`. Takes the
+      provided Handlebars helper function fn and returns it in wrapped
+      bound helper form.
+
+      The main use case for using this outside of `registerBoundHelper`
+      is for registering helpers on the container:
+
+      ```js
+      var boundHelperFn = Ember.Handlebars.makeBoundHelper(function(word) {
+        return word.toUpperCase();
+      });
+
+      container.register('helper:my-bound-helper', boundHelperFn);
+      ```
+
+      In the above example, if the helper function hadn't been wrapped in
+      `makeBoundHelper`, the registered helper would be unbound.
+
+      @method makeBoundHelper
+      @for Ember.Handlebars
+      @param {Function} function
+      @param {String} dependentKeys*
+      @since 1.2.0
+    */
+    function makeBoundHelper(fn) {
+      if (!SimpleHandlebarsView) { SimpleHandlebarsView = requireModule('ember-handlebars/views/handlebars_bound_view')['SimpleHandlebarsView']; } // ES6TODO: stupid circular dep
+
+      var dependentKeys = slice.call(arguments, 1);
+
+      function helper() {
+        var properties = slice.call(arguments, 0, -1),
+          numProperties = properties.length,
+          options = arguments[arguments.length - 1],
+          normalizedProperties = [],
+          data = options.data,
+          types = data.isUnbound ? slice.call(options.types, 1) : options.types,
+          hash = options.hash,
+          view = data.view,
+          contexts = options.contexts,
+          currentContext = (contexts && contexts.length) ? contexts[0] : this,
+          prefixPathForDependentKeys = '',
+          loc, len, hashOption,
+          boundOption, property,
+          normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
+
+        Ember.assert("registerBoundHelper-generated helpers do not support use with Handlebars blocks.", !options.fn);
+
+        // Detect bound options (e.g. countBinding="otherCount")
+        var boundOptions = hash.boundOptions = {};
+        for (hashOption in hash) {
+          if (IS_BINDING.test(hashOption)) {
+            // Lop off 'Binding' suffix.
+            boundOptions[hashOption.slice(0, -7)] = hash[hashOption];
+          }
+        }
+
+        // Expose property names on data.properties object.
+        var watchedProperties = [];
+        data.properties = [];
+        for (loc = 0; loc < numProperties; ++loc) {
+          data.properties.push(properties[loc]);
+          if (types[loc] === 'ID') {
+            var normalizedProp = normalizePath(currentContext, properties[loc], data);
+            normalizedProperties.push(normalizedProp);
+            watchedProperties.push(normalizedProp);
+          } else {
+            if(data.isUnbound) {
+              normalizedProperties.push({path: properties[loc]});
+            }else {
+              normalizedProperties.push(null);
+            }
+          }
+        }
+
+        // Handle case when helper invocation is preceded by `unbound`, e.g.
+        // {{unbound myHelper foo}}
+        if (data.isUnbound) {
+          return evaluateUnboundHelper(this, fn, normalizedProperties, options);
+        }
+
+        var bindView = new SimpleHandlebarsView(null, null, !options.hash.unescaped, options.data);
+
+        // Override SimpleHandlebarsView's method for generating the view's content.
+        bindView.normalizedValue = function() {
+          var args = [], boundOption;
+
+          // Copy over bound hash options.
+          for (boundOption in boundOptions) {
+            if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
+            property = normalizePath(currentContext, boundOptions[boundOption], data);
+            bindView.path = property.path;
+            bindView.pathRoot = property.root;
+            hash[boundOption] = normalizedValue.call(bindView);
+          }
+
+          for (loc = 0; loc < numProperties; ++loc) {
+            property = normalizedProperties[loc];
+            if (property) {
+              bindView.path = property.path;
+              bindView.pathRoot = property.root;
+              args.push(normalizedValue.call(bindView));
+            } else {
+              args.push(properties[loc]);
+            }
+          }
+          args.push(options);
+
+          // Run the supplied helper function.
+          return fn.apply(currentContext, args);
+        };
+
+        view.appendChild(bindView);
+
+        // Assemble list of watched properties that'll re-render this helper.
+        for (boundOption in boundOptions) {
+          if (boundOptions.hasOwnProperty(boundOption)) {
+            watchedProperties.push(normalizePath(currentContext, boundOptions[boundOption], data));
+          }
+        }
+
+        // Observe each property.
+        for (loc = 0, len = watchedProperties.length; loc < len; ++loc) {
+          property = watchedProperties[loc];
+          view.registerObserver(property.root, property.path, bindView, bindView.rerender);
+        }
+
+        if (types[0] !== 'ID' || normalizedProperties.length === 0) {
+          return;
+        }
+
+        // Add dependent key observers to the first param
+        var normalized = normalizedProperties[0],
+            pathRoot = normalized.root,
+            path = normalized.path;
+
+        if(!isEmpty(path)) {
+          prefixPathForDependentKeys = path + '.';
+        }
+        for (var i=0, l=dependentKeys.length; i<l; i++) {
+          view.registerObserver(pathRoot, prefixPathForDependentKeys + dependentKeys[i], bindView, bindView.rerender);
+        }
+      }
+
+      helper._rawFunction = fn;
+      return helper;
+    };
+
+    /**
+      Renders the unbound form of an otherwise bound helper function.
+
+      @private
+      @method evaluateUnboundHelper
+      @param {Function} fn
+      @param {Object} context
+      @param {Array} normalizedProperties
+      @param {String} options
+    */
+    function evaluateUnboundHelper(context, fn, normalizedProperties, options) {
+      var args = [],
+       hash = options.hash,
+       boundOptions = hash.boundOptions,
+       types = slice.call(options.types, 1),
+       loc,
+       len,
+       property,
+       propertyType,
+       boundOption;
+
+      for (boundOption in boundOptions) {
+        if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
+        hash[boundOption] = handlebarsGet(context, boundOptions[boundOption], options);
+      }
+
+      for(loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
+        property = normalizedProperties[loc];
+        propertyType = types[loc];
+        if(propertyType === "ID") {
+          args.push(handlebarsGet(property.root, property.path, options));
+        } else {
+          args.push(property.path);
+        }
+      }
+      args.push(options);
+      return fn.apply(context, args);
+    }
+
+    /**
+      Overrides Handlebars.template so that we can distinguish
+      user-created, top-level templates from inner contexts.
+
+      @private
+      @method template
+      @for Ember.Handlebars
+      @param {String} spec
+    */
+    function template(spec) {
+      var t = originalTemplate(spec);
+      t.isTop = true;
+      return t;
+    };
+
+    __exports__.normalizePath = normalizePath;
+    __exports__.template = template;
+    __exports__.makeBoundHelper = makeBoundHelper;
+    __exports__.registerBoundHelper = registerBoundHelper;
+    __exports__.resolveHash = resolveHash;
+    __exports__.resolveParams = resolveParams;
+    __exports__.handlebarsGet = handlebarsGet;
+    __exports__.getEscaped = getEscaped;
+    __exports__.evaluateUnboundHelper = evaluateUnboundHelper;
+    __exports__.helperMissingHelper = helperMissingHelper;
+    __exports__.blockHelperMissingHelper = blockHelperMissingHelper;
+  });
+define("ember-handlebars/helpers/binding",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-metal/utils","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-handlebars/views/handlebars_bound_view","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-runtime/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.warn, uuid
+    // var emberAssert = Ember.assert, Ember.warn = Ember.warn;
+
+    var EmberHandlebars = __dependency2__["default"];
+    var helpers = EmberHandlebars.helpers;
+    var SafeString = EmberHandlebars.SafeString;
+
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var fmt = __dependency5__.fmt;
+    var apply = __dependency6__.apply;
+    var o_create = __dependency7__.create;
+    var isNone = __dependency8__["default"];
+    var EnumerableUtils = __dependency9__["default"];
+    var forEach = __dependency10__.forEach;
+    var View = __dependency11__.View;
+    var run = __dependency12__["default"];
+    var _HandlebarsBoundView = __dependency13__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency13__.SimpleHandlebarsView;
+    var removeObserver = __dependency14__.removeObserver;
+    var isGlobalPath = __dependency15__.isGlobalPath;
+    var emberBind = __dependency15__.bind;
+    var guidFor = __dependency6__.guidFor;
+    var typeOf = __dependency6__.typeOf;
+    var jQuery = __dependency16__["default"];
+    var isArray = __dependency6__.isArray;
+    var normalizePath = __dependency17__.normalizePath;
+    var handlebarsGet = __dependency17__.handlebarsGet;
+    var getEscaped = __dependency17__.getEscaped;
+    var handlebarsGetEscaped = __dependency17__.getEscaped;
+    var keys = __dependency18__["default"];
+
+    function exists(value) {
+      return !isNone(value);
+    }
+
+    var WithView = _HandlebarsBoundView.extend({
+      init: function() {
+        var controller;
+
+        apply(this, this._super, arguments);
+
+        var keywords        = this.templateData.keywords;
+        var keywordName     = this.templateHash.keywordName;
+        var keywordPath     = this.templateHash.keywordPath;
+        var controllerName  = this.templateHash.controller;
+        var preserveContext = this.preserveContext;
+
+        if (controllerName) {
+          var previousContext = this.previousContext;
+          controller = this.container.lookupFactory('controller:'+controllerName).create({
+            parentController: previousContext,
+            target: previousContext
+          });
+
+          this._generatedController = controller;
+
+          if (!preserveContext) {
+            this.set('controller', controller);
+
+            this.valueNormalizerFunc = function(result) {
+                controller.set('model', result);
+                return controller;
+            };
+          } else {
+            var controllerPath = jQuery.expando + guidFor(controller);
+            keywords[controllerPath] = controller;
+            emberBind(keywords, controllerPath + '.model', keywordPath);
+            keywordPath = controllerPath;
+          }
+        }
+
+        if (preserveContext) {
+          emberBind(keywords, keywordName, keywordPath);
+        }
+
+      },
+      willDestroy: function() {
+        this._super();
+
+        if (this._generatedController) {
+          this._generatedController.destroy();
+        }
+      }
+    });
+
+    // Binds a property into the DOM. This will create a hook in DOM that the
+    // KVO system will look for and update if the property changes.
+    function bind(property, options, preserveContext, shouldDisplay, valueNormalizer, childProperties) {
+      var data = options.data,
+          fn = options.fn,
+          inverse = options.inverse,
+          view = data.view,
+          normalized, observer, i;
+
+      // we relied on the behavior of calling without
+      // context to mean this === window, but when running
+      // "use strict", it's possible for this to === undefined;
+      var currentContext = this || window;
+
+      normalized = normalizePath(currentContext, property, data);
+
+      // Set up observers for observable objects
+      if ('object' === typeof this) {
+        if (data.insideGroup) {
+          observer = function() {
+            run.once(view, 'rerender');
+          };
+
+          var template, context, result = handlebarsGet(currentContext, property, options);
+
+          result = valueNormalizer ? valueNormalizer(result) : result;
+
+          context = preserveContext ? currentContext : result;
+          if (shouldDisplay(result)) {
+            template = fn;
+          } else if (inverse) {
+            template = inverse;
+          }
+
+          template(context, { data: options.data });
+        } else {
+          var viewClass = _HandlebarsBoundView;
+          var viewOptions = {
+            preserveContext: preserveContext,
+            shouldDisplayFunc: shouldDisplay,
+            valueNormalizerFunc: valueNormalizer,
+            displayTemplate: fn,
+            inverseTemplate: inverse,
+            path: property,
+            pathRoot: currentContext,
+            previousContext: currentContext,
+            isEscaped: !options.hash.unescaped,
+            templateData: options.data,
+            templateHash: options.hash,
+            helperName: options.helperName
+          };
+
+          if (options.isWithHelper) {
+            viewClass = WithView;
+          }
+
+          // Create the view that will wrap the output of this template/property
+          // and add it to the nearest view's childViews array.
+          // See the documentation of Ember._HandlebarsBoundView for more.
+          var bindView = view.createChildView(viewClass, viewOptions);
+
+          view.appendChild(bindView);
+
+          observer = function() {
+            run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
+          };
+        }
+
+        // Observes the given property on the context and
+        // tells the Ember._HandlebarsBoundView to re-render. If property
+        // is an empty string, we are printing the current context
+        // object ({{this}}) so updating it is not our responsibility.
+        if (normalized.path !== '') {
+          view.registerObserver(normalized.root, normalized.path, observer);
+          if (childProperties) {
+            for (i=0; i<childProperties.length; i++) {
+              view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
+            }
+          }
+        }
+      } else {
+        // The object is not observable, so just render it out and
+        // be done with it.
+        data.buffer.push(handlebarsGetEscaped(currentContext, property, options));
+      }
+    }
+
+    function simpleBind(currentContext, property, options) {
+      var data = options.data,
+          view = data.view,
+          normalized, observer, pathRoot, output;
+
+      normalized = normalizePath(currentContext, property, data);
+      pathRoot = normalized.root;
+
+      // Set up observers for observable objects
+      if (pathRoot && ('object' === typeof pathRoot)) {
+        if (data.insideGroup) {
+          observer = function() {
+            run.once(view, 'rerender');
+          };
+
+          output = handlebarsGetEscaped(currentContext, property, options);
+
+          data.buffer.push(output);
+        } else {
+          var bindView = new SimpleHandlebarsView(
+            property, currentContext, !options.hash.unescaped, options.data
+          );
+
+          bindView._parentView = view;
+          view.appendChild(bindView);
+
+          observer = function() {
+            run.scheduleOnce('render', bindView, 'rerender');
+          };
+        }
+
+        // Observes the given property on the context and
+        // tells the Ember._HandlebarsBoundView to re-render. If property
+        // is an empty string, we are printing the current context
+        // object ({{this}}) so updating it is not our responsibility.
+        if (normalized.path !== '') {
+          view.registerObserver(normalized.root, normalized.path, observer);
+        }
+      } else {
+        // The object is not observable, so just render it out and
+        // be done with it.
+        output = handlebarsGetEscaped(currentContext, property, options);
+        data.buffer.push(output);
+      }
+    }
+
+    function shouldDisplayIfHelperContent(result) {
+      var truthy = result && get(result, 'isTruthy');
+      if (typeof truthy === 'boolean') { return truthy; }
+
+      if (isArray(result)) {
+        return get(result, 'length') !== 0;
+      } else {
+        return !!result;
+      }
+    }
+
+    /**
+      '_triageMustache' is used internally select between a binding, helper, or component for
+      the given context. Until this point, it would be hard to determine if the
+      mustache is a property reference or a regular helper reference. This triage
+      helper resolves that.
+
+      This would not be typically invoked by directly.
+
+      @private
+      @method _triageMustache
+      @for Ember.Handlebars.helpers
+      @param {String} property Property/helperID to triage
+      @param {Object} options hash of template/rendering options
+      @return {String} HTML string
+    */
+    function _triageMustacheHelper(property, options) {
+      Ember.assert("You cannot pass more than one argument to the _triageMustache helper", arguments.length <= 2);
+
+      var helper = EmberHandlebars.resolveHelper(options.data.view.container, property);
+      if (helper) {
+        return helper.call(this, options);
+      }
+
+      return helpers.bind.call(this, property, options);
+    }
+
+    /**
+      Used to lookup/resolve handlebars helpers. The lookup order is:
+
+      * Look for a registered helper
+      * If a dash exists in the name:
+        * Look for a helper registed in the container
+        * Use Ember.ComponentLookup to find an Ember.Component that resolves
+          to the given name
+
+      @private
+      @method resolveHelper
+      @param {Container} container
+      @param {String} name the name of the helper to lookup
+      @return {Handlebars Helper}
+    */
+    function resolveHelper(container, name) {
+      if (helpers[name]) {
+        return helpers[name];
+      }
+
+      if (!container || name.indexOf('-') === -1) {
+        return;
+      }
+
+      var helper = container.lookup('helper:' + name);
+      if (!helper) {
+        var componentLookup = container.lookup('component-lookup:main');
+        Ember.assert("Could not find 'component-lookup:main' on the provided container, which is necessary for performing component lookups", componentLookup);
+
+        var Component = componentLookup.lookupFactory(name, container);
+        if (Component) {
+          helper = EmberHandlebars.makeViewHelper(Component);
+          container.register('helper:' + name, helper);
+        }
+      }
+      return helper;
+    }
+
+
+    /**
+      `bind` can be used to display a value, then update that value if it
+      changes. For example, if you wanted to print the `title` property of
+      `content`:
+
+      ```handlebars
+      {{bind "content.title"}}
+      ```
+
+      This will return the `title` property as a string, then create a new observer
+      at the specified path. If it changes, it will update the value in DOM. Note
+      that if you need to support IE7 and IE8 you must modify the model objects
+      properties using `Ember.get()` and `Ember.set()` for this to work as it
+      relies on Ember's KVO system. For all other browsers this will be handled for
+      you automatically.
+
+      @private
+      @method bind
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+    */
+    function bindHelper(property, options) {
+      Ember.assert("You cannot pass more than one argument to the bind helper", arguments.length <= 2);
+
+      var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
+
+      if (!options.fn) {
+        return simpleBind(context, property, options);
+      }
+
+      options.helperName = 'bind';
+
+      return bind.call(context, property, options, false, exists);
+    }
+
+    /**
+      Use the `boundIf` helper to create a conditional that re-evaluates
+      whenever the truthiness of the bound value changes.
+
+      ```handlebars
+      {{#boundIf "content.shouldDisplayTitle"}}
+        {{content.title}}
+      {{/boundIf}}
+      ```
+
+      @private
+      @method boundIf
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+    */
+    function boundIfHelper(property, fn) {
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
+
+      fn.helperName = fn.helperName || 'boundIf';
+
+      return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, ['isTruthy', 'length']);
+    }
+
+
+    /**
+      @private
+
+      Use the `unboundIf` helper to create a conditional that evaluates once.
+
+      ```handlebars
+      {{#unboundIf "content.shouldDisplayTitle"}}
+        {{content.title}}
+      {{/unboundIf}}
+      ```
+
+      @method unboundIf
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+      @since 1.4.0
+    */
+    function unboundIfHelper(property, fn) {
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this,
+          data = fn.data,
+          template = fn.fn,
+          inverse = fn.inverse,
+          normalized, propertyValue, result;
+
+      normalized = normalizePath(context, property, data);
+      propertyValue = handlebarsGet(context, property, fn);
+
+      if (!shouldDisplayIfHelperContent(propertyValue)) {
+        template = inverse;
+      }
+
+      template(context, { data: data });
+    }
+
+    /**
+      Use the `{{with}}` helper when you want to scope context. Take the following code as an example:
+
+      ```handlebars
+      <h5>{{user.name}}</h5>
+
+      <div class="role">
+        <h6>{{user.role.label}}</h6>
+        <span class="role-id">{{user.role.id}}</span>
+
+        <p class="role-desc">{{user.role.description}}</p>
+      </div>
+      ```
+
+      `{{with}}` can be our best friend in these cases,
+      instead of writing `user.role.*` over and over, we use `{{#with user.role}}`.
+      Now the context within the `{{#with}} .. {{/with}}` block is `user.role` so you can do the following:
+
+      ```handlebars
+      <h5>{{user.name}}</h5>
+
+      <div class="role">
+        {{#with user.role}}
+          <h6>{{label}}</h6>
+          <span class="role-id">{{id}}</span>
+
+          <p class="role-desc">{{description}}</p>
+        {{/with}}
+      </div>
+      ```
+
+      ### `as` operator
+
+      This operator aliases the scope to a new name. It's helpful for semantic clarity and to retain
+      default scope or to reference from another `{{with}}` block.
+
+      ```handlebars
+      // posts might not be
+      {{#with user.posts as blogPosts}}
+        <div class="notice">
+          There are {{blogPosts.length}} blog posts written by {{user.name}}.
+        </div>
+
+        {{#each post in blogPosts}}
+          <li>{{post.title}}</li>
+        {{/each}}
+      {{/with}}
+      ```
+
+      Without the `as` operator, it would be impossible to reference `user.name` in the example above.
+
+      NOTE: The alias should not reuse a name from the bound property path.
+      For example: `{{#with foo.bar as foo}}` is not supported because it attempts to alias using
+      the first part of the property path, `foo`. Instead, use `{{#with foo.bar as baz}}`.
+
+      ### `controller` option
+
+      Adding `controller='something'` instructs the `{{with}}` helper to create and use an instance of
+      the specified controller with the new context as its content.
+
+      This is very similar to using an `itemController` option with the `{{each}}` helper.
+
+      ```handlebars
+      {{#with users.posts controller='userBlogPosts'}}
+        {{!- The current context is wrapped in our controller instance }}
+      {{/with}}
+      ```
+
+      In the above example, the template provided to the `{{with}}` block is now wrapped in the
+      `userBlogPost` controller, which provides a very elegant way to decorate the context with custom
+      functions/properties.
+
+      @method with
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function withHelper(context, options) {
+      var bindContext, preserveContext, controller, helperName = 'with';
+
+      if (arguments.length === 4) {
+        var keywordName, path, rootPath, normalized, contextPath;
+
+        Ember.assert("If you pass more than one argument to the with helper, it must be in the form #with foo as bar", arguments[1] === "as");
+        options = arguments[3];
+        keywordName = arguments[2];
+        path = arguments[0];
+
+        if (path) {
+          helperName += ' ' + path + ' as ' + keywordName;
+        }
+
+        Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop);
+
+        var localizedOptions = o_create(options);
+        localizedOptions.data = o_create(options.data);
+        localizedOptions.data.keywords = o_create(options.data.keywords || {});
+
+        if (isGlobalPath(path)) {
+          contextPath = path;
+        } else {
+          normalized = normalizePath(this, path, options.data);
+          path = normalized.path;
+          rootPath = normalized.root;
+
+          // This is a workaround for the fact that you cannot bind separate objects
+          // together. When we implement that functionality, we should use it here.
+          var contextKey = jQuery.expando + guidFor(rootPath);
+          localizedOptions.data.keywords[contextKey] = rootPath;
+          // if the path is '' ("this"), just bind directly to the current context
+          contextPath = path ? contextKey + '.' + path : contextKey;
+        }
+
+        localizedOptions.hash.keywordName = keywordName;
+        localizedOptions.hash.keywordPath = contextPath;
+
+        bindContext = this;
+        context = path;
+        options = localizedOptions;
+        preserveContext = true;
+      } else {
+        Ember.assert("You must pass exactly one argument to the with helper", arguments.length === 2);
+        Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop);
+
+        helperName += ' ' + context;
+        bindContext = options.contexts[0];
+        preserveContext = false;
+      }
+
+      options.helperName = helperName;
+      options.isWithHelper = true;
+
+      return bind.call(bindContext, context, options, preserveContext, exists);
+    }
+    /**
+      See [boundIf](/api/classes/Ember.Handlebars.helpers.html#method_boundIf)
+      and [unboundIf](/api/classes/Ember.Handlebars.helpers.html#method_unboundIf)
+
+      @method if
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function ifHelper(context, options) {
+      Ember.assert("You must pass exactly one argument to the if helper", arguments.length === 2);
+      Ember.assert("You must pass a block to the if helper", options.fn && options.fn !== Handlebars.VM.noop);
+
+      options.helperName = options.helperName || ('if ' + context);
+
+      if (options.data.isUnbound) {
+        return helpers.unboundIf.call(options.contexts[0], context, options);
+      } else {
+        return helpers.boundIf.call(options.contexts[0], context, options);
+      }
+    }
+
+    /**
+      @method unless
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function unlessHelper(context, options) {
+      Ember.assert("You must pass exactly one argument to the unless helper", arguments.length === 2);
+      Ember.assert("You must pass a block to the unless helper", options.fn && options.fn !== Handlebars.VM.noop);
+
+      var fn = options.fn, inverse = options.inverse, helperName = 'unless';
+
+      if (context) {
+        helperName += ' ' + context;
+      }
+
+      options.fn = inverse;
+      options.inverse = fn;
+
+      options.helperName = options.helperName || helperName;
+
+      if (options.data.isUnbound) {
+        return helpers.unboundIf.call(options.contexts[0], context, options);
+      } else {
+        return helpers.boundIf.call(options.contexts[0], context, options);
+      }
+    }
+
+    /**
+      `bind-attr` allows you to create a binding between DOM element attributes and
+      Ember objects. For example:
+
+      ```handlebars
+      <img {{bind-attr src="imageUrl" alt="imageTitle"}}>
+      ```
+
+      The above handlebars template will fill the `<img>`'s `src` attribute will
+      the value of the property referenced with `"imageUrl"` and its `alt`
+      attribute with the value of the property referenced with `"imageTitle"`.
+
+      If the rendering context of this template is the following object:
+
+      ```javascript
+      {
+        imageUrl: 'http://lolcats.info/haz-a-funny',
+        imageTitle: 'A humorous image of a cat'
+      }
+      ```
+
+      The resulting HTML output will be:
+
+      ```html
+      <img src="http://lolcats.info/haz-a-funny" alt="A humorous image of a cat">
+      ```
+
+      `bind-attr` cannot redeclare existing DOM element attributes. The use of `src`
+      in the following `bind-attr` example will be ignored and the hard coded value
+      of `src="/failwhale.gif"` will take precedence:
+
+      ```handlebars
+      <img src="/failwhale.gif" {{bind-attr src="imageUrl" alt="imageTitle"}}>
+      ```
+
+      ### `bind-attr` and the `class` attribute
+
+      `bind-attr` supports a special syntax for handling a number of cases unique
+      to the `class` DOM element attribute. The `class` attribute combines
+      multiple discrete values into a single attribute as a space-delimited
+      list of strings. Each string can be:
+
+      * a string return value of an object's property.
+      * a boolean return value of an object's property
+      * a hard-coded value
+
+      A string return value works identically to other uses of `bind-attr`. The
+      return value of the property will become the value of the attribute. For
+      example, the following view and template:
+
+      ```javascript
+        AView = View.extend({
+          someProperty: function() {
+            return "aValue";
+          }.property()
+        })
+      ```
+
+      ```handlebars
+      <img {{bind-attr class="view.someProperty}}>
+      ```
+
+      Result in the following rendered output:
+
+      ```html
+      <img class="aValue">
+      ```
+
+      A boolean return value will insert a specified class name if the property
+      returns `true` and remove the class name if the property returns `false`.
+
+      A class name is provided via the syntax
+      `somePropertyName:class-name-if-true`.
+
+      ```javascript
+      AView = View.extend({
+        someBool: true
+      })
+      ```
+
+      ```handlebars
+      <img {{bind-attr class="view.someBool:class-name-if-true"}}>
+      ```
+
+      Result in the following rendered output:
+
+      ```html
+      <img class="class-name-if-true">
+      ```
+
+      An additional section of the binding can be provided if you want to
+      replace the existing class instead of removing it when the boolean
+      value changes:
+
+      ```handlebars
+      <img {{bind-attr class="view.someBool:class-name-if-true:class-name-if-false"}}>
+      ```
+
+      A hard-coded value can be used by prepending `:` to the desired
+      class name: `:class-name-to-always-apply`.
+
+      ```handlebars
+      <img {{bind-attr class=":class-name-to-always-apply"}}>
+      ```
+
+      Results in the following rendered output:
+
+      ```html
+      <img class="class-name-to-always-apply">
+      ```
+
+      All three strategies - string return value, boolean return value, and
+      hard-coded value – can be combined in a single declaration:
+
+      ```handlebars
+      <img {{bind-attr class=":class-name-to-always-apply view.someBool:class-name-if-true view.someProperty"}}>
+      ```
+
+      @method bind-attr
+      @for Ember.Handlebars.helpers
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function bindAttrHelper(options) {
+      var attrs = options.hash;
+
+      Ember.assert("You must specify at least one hash argument to bind-attr", !!keys(attrs).length);
+
+      var view = options.data.view;
+      var ret = [];
+
+      // we relied on the behavior of calling without
+      // context to mean this === window, but when running
+      // "use strict", it's possible for this to === undefined;
+      var ctx = this || window;
+
+      // Generate a unique id for this element. This will be added as a
+      // data attribute to the element so it can be looked up when
+      // the bound property changes.
+      var dataId = ++Ember.uuid;
+
+      // Handle classes differently, as we can bind multiple classes
+      var classBindings = attrs['class'];
+      if (classBindings != null) {
+        var classResults = bindClasses(ctx, classBindings, view, dataId, options);
+
+        ret.push('class="' + Handlebars.Utils.escapeExpression(classResults.join(' ')) + '"');
+        delete attrs['class'];
+      }
+
+      var attrKeys = keys(attrs);
+
+      // For each attribute passed, create an observer and emit the
+      // current value of the property as an attribute.
+      forEach.call(attrKeys, function(attr) {
+        var path = attrs[attr],
+            normalized;
+
+        Ember.assert(fmt("You must provide an expression as the value of bound attribute. You specified: %@=%@", [attr, path]), typeof path === 'string');
+
+        normalized = normalizePath(ctx, path, options.data);
+
+        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options),
+            type = typeOf(value);
+
+        Ember.assert(fmt("Attributes must be numbers, strings or booleans, not %@", [value]), value === null || value === undefined || type === 'number' || type === 'string' || type === 'boolean');
+
+        var observer, invoker;
+
+        observer = function observer() {
+          var result = handlebarsGet(ctx, path, options);
+
+          Ember.assert(fmt("Attributes must be numbers, strings or booleans, not %@", [result]),
+                       result === null || result === undefined || typeof result === 'number' ||
+                         typeof result === 'string' || typeof result === 'boolean');
+
+          var elem = view.$("[data-bindattr-" + dataId + "='" + dataId + "']");
+
+          // If we aren't able to find the element, it means the element
+          // to which we were bound has been removed from the view.
+          // In that case, we can assume the template has been re-rendered
+          // and we need to clean up the observer.
+          if (!elem || elem.length === 0) {
+            removeObserver(normalized.root, normalized.path, invoker);
+            return;
+          }
+
+          View.applyAttributeBindings(elem, attr, result);
+        };
+
+        // Add an observer to the view for when the property changes.
+        // When the observer fires, find the element using the
+        // unique data id and update the attribute to the new value.
+        // Note: don't add observer when path is 'this' or path
+        // is whole keyword e.g. {{#each x in list}} ... {{bind-attr attr="x"}}
+        if (path !== 'this' && !(normalized.isKeyword && normalized.path === '' )) {
+          view.registerObserver(normalized.root, normalized.path, observer);
+        }
+
+        // if this changes, also change the logic in ember-views/lib/views/view.js
+        if ((type === 'string' || (type === 'number' && !isNaN(value)))) {
+          ret.push(attr + '="' + Handlebars.Utils.escapeExpression(value) + '"');
+        } else if (value && type === 'boolean') {
+          // The developer controls the attr name, so it should always be safe
+          ret.push(attr + '="' + attr + '"');
+        }
+      }, this);
+
+      // Add the unique identifier
+      // NOTE: We use all lower-case since Firefox has problems with mixed case in SVG
+      ret.push('data-bindattr-' + dataId + '="' + dataId + '"');
+      return new SafeString(ret.join(' '));
+    }
+
+    /**
+      See `bind-attr`
+
+      @method bindAttr
+      @for Ember.Handlebars.helpers
+      @deprecated
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function bindAttrHelperDeprecated() {
+      Ember.warn("The 'bindAttr' view helper is deprecated in favor of 'bind-attr'");
+      return helpers['bind-attr'].apply(this, arguments);
+    }
+
+    /**
+      Helper that, given a space-separated string of property paths and a context,
+      returns an array of class names. Calling this method also has the side
+      effect of setting up observers at those property paths, such that if they
+      change, the correct class name will be reapplied to the DOM element.
+
+      For example, if you pass the string "fooBar", it will first look up the
+      "fooBar" value of the context. If that value is true, it will add the
+      "foo-bar" class to the current element (i.e., the dasherized form of
+      "fooBar"). If the value is a string, it will add that string as the class.
+      Otherwise, it will not add any new class name.
+
+      @private
+      @method bindClasses
+      @for Ember.Handlebars
+      @param {Ember.Object} context The context from which to lookup properties
+      @param {String} classBindings A string, space-separated, of class bindings
+        to use
+      @param {View} view The view in which observers should look for the
+        element to update
+      @param {Srting} bindAttrId Optional bindAttr id used to lookup elements
+      @return {Array} An array of class names to add
+    */
+    function bindClasses(context, classBindings, view, bindAttrId, options) {
+      var ret = [], newClass, value, elem;
+
+      // Helper method to retrieve the property from the context and
+      // determine which class string to return, based on whether it is
+      // a Boolean or not.
+      var classStringForPath = function(root, parsedPath, options) {
+        var val,
+            path = parsedPath.path;
+
+        if (path === 'this') {
+          val = root;
+        } else if (path === '') {
+          val = true;
+        } else {
+          val = handlebarsGet(root, path, options);
+        }
+
+        return View._classStringForValue(path, val, parsedPath.className, parsedPath.falsyClassName);
+      };
+
+      // For each property passed, loop through and setup
+      // an observer.
+      forEach.call(classBindings.split(' '), function(binding) {
+
+        // Variable in which the old class value is saved. The observer function
+        // closes over this variable, so it knows which string to remove when
+        // the property changes.
+        var oldClass;
+
+        var observer, invoker;
+
+        var parsedPath = View._parsePropertyPath(binding),
+            path = parsedPath.path,
+            pathRoot = context,
+            normalized;
+
+        if (path !== '' && path !== 'this') {
+          normalized = normalizePath(context, path, options.data);
+
+          pathRoot = normalized.root;
+          path = normalized.path;
+        }
+
+        // Set up an observer on the context. If the property changes, toggle the
+        // class name.
+        observer = function() {
+          // Get the current value of the property
+          newClass = classStringForPath(context, parsedPath, options);
+          elem = bindAttrId ? view.$("[data-bindattr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
+
+          // If we can't find the element anymore, a parent template has been
+          // re-rendered and we've been nuked. Remove the observer.
+          if (!elem || elem.length === 0) {
+            removeObserver(pathRoot, path, invoker);
+          } else {
+            // If we had previously added a class to the element, remove it.
+            if (oldClass) {
+              elem.removeClass(oldClass);
+            }
+
+            // If necessary, add a new class. Make sure we keep track of it so
+            // it can be removed in the future.
+            if (newClass) {
+              elem.addClass(newClass);
+              oldClass = newClass;
+            } else {
+              oldClass = null;
+            }
+          }
+        };
+
+        if (path !== '' && path !== 'this') {
+          view.registerObserver(pathRoot, path, observer);
+        }
+
+        // We've already setup the observer; now we just need to figure out the
+        // correct behavior right now on the first pass through.
+        value = classStringForPath(context, parsedPath, options);
+
+        if (value) {
+          ret.push(value);
+
+          // Make sure we save the current value so that it can be removed if the
+          // observer fires.
+          oldClass = value;
+        }
+      });
+
+      return ret;
+    };
+
+    __exports__.bind = bind;
+    __exports__._triageMustacheHelper = _triageMustacheHelper;
+    __exports__.resolveHelper = resolveHelper;
+    __exports__.bindHelper = bindHelper;
+    __exports__.boundIfHelper = boundIfHelper;
+    __exports__.unboundIfHelper = unboundIfHelper;
+    __exports__.withHelper = withHelper;
+    __exports__.ifHelper = ifHelper;
+    __exports__.unlessHelper = unlessHelper;
+    __exports__.bindAttrHelper = bindAttrHelper;
+    __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
+    __exports__.bindClasses = bindClasses;
+  });
+define("ember-handlebars/helpers/collection",
+  ["ember-metal/core","ember-metal/utils","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-handlebars/ext","ember-handlebars/helpers/view","ember-metal/computed","ember-views/views/collection_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.deprecate
+    var inspect = __dependency2__.inspect;
+
+    // var emberAssert = Ember.assert;
+        // emberDeprecate = Ember.deprecate;
+
+    var EmberHandlebars = __dependency3__["default"];
+    var helpers = EmberHandlebars.helpers;
+
+    var fmt = __dependency4__.fmt;
+    var get = __dependency5__.get;
+    var handlebarsGet = __dependency6__.handlebarsGet;
+    var ViewHelper = __dependency7__.ViewHelper;
+    var computed = __dependency8__.computed;
+    var CollectionView = __dependency9__["default"];
+
+    var alias = computed.alias;
+    /**
+      `{{collection}}` is a `Ember.Handlebars` helper for adding instances of
+      `Ember.CollectionView` to a template. See [Ember.CollectionView](/api/classes/Ember.CollectionView.html)
+       for additional information on how a `CollectionView` functions.
+
+      `{{collection}}`'s primary use is as a block helper with a `contentBinding`
+      option pointing towards an `Ember.Array`-compatible object. An `Ember.View`
+      instance will be created for each item in its `content` property. Each view
+      will have its own `content` property set to the appropriate item in the
+      collection.
+
+      The provided block will be applied as the template for each item's view.
+
+      Given an empty `<body>` the following template:
+
+      ```handlebars
+      {{#collection contentBinding="App.items"}}
+        Hi {{view.content.name}}
+      {{/collection}}
+      ```
+
+      And the following application code
+
+      ```javascript
+      App = Ember.Application.create()
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ]
+      ```
+
+      Will result in the HTML structure below
+
+      ```html
+      <div class="ember-view">
+        <div class="ember-view">Hi Dave</div>
+        <div class="ember-view">Hi Mary</div>
+        <div class="ember-view">Hi Sara</div>
+      </div>
+      ```
+
+      ### Blockless use in a collection
+
+      If you provide an `itemViewClass` option that has its own `template` you can
+      omit the block.
+
+      The following template:
+
+      ```handlebars
+      {{collection contentBinding="App.items" itemViewClass="App.AnItemView"}}
+      ```
+
+      And application code
+
+      ```javascript
+      App = Ember.Application.create();
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ];
+
+      App.AnItemView = Ember.View.extend({
+        template: Ember.Handlebars.compile("Greetings {{view.content.name}}")
+      });
+      ```
+
+      Will result in the HTML structure below
+
+      ```html
+      <div class="ember-view">
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
+      </div>
+      ```
+
+      ### Specifying a CollectionView subclass
+
+      By default the `{{collection}}` helper will create an instance of
+      `Ember.CollectionView`. You can supply a `Ember.CollectionView` subclass to
+      the helper by passing it as the first argument:
+
+      ```handlebars
+      {{#collection App.MyCustomCollectionClass contentBinding="App.items"}}
+        Hi {{view.content.name}}
+      {{/collection}}
+      ```
+
+      ### Forwarded `item.*`-named Options
+
+      As with the `{{view}}`, helper options passed to the `{{collection}}` will be
+      set on the resulting `Ember.CollectionView` as properties. Additionally,
+      options prefixed with `item` will be applied to the views rendered for each
+      item (note the camelcasing):
+
+      ```handlebars
+      {{#collection contentBinding="App.items"
+                    itemTagName="p"
+                    itemClassNames="greeting"}}
+        Howdy {{view.content.name}}
+      {{/collection}}
+      ```
+
+      Will result in the following HTML structure:
+
+      ```html
+      <div class="ember-view">
+        <p class="ember-view greeting">Howdy Dave</p>
+        <p class="ember-view greeting">Howdy Mary</p>
+        <p class="ember-view greeting">Howdy Sara</p>
+      </div>
+      ```
+
+      @method collection
+      @for Ember.Handlebars.helpers
+      @param {String} path
+      @param {Hash} options
+      @return {String} HTML string
+      @deprecated Use `{{each}}` helper instead.
+    */
+    function collectionHelper(path, options) {
+      Ember.deprecate("Using the {{collection}} helper without specifying a class has been deprecated as the {{each}} helper now supports the same functionality.", path !== 'collection');
+
+      // If no path is provided, treat path param as options.
+      if (path && path.data && path.data.isRenderData) {
+        options = path;
+        path = undefined;
+        Ember.assert("You cannot pass more than one argument to the collection helper", arguments.length === 1);
+      } else {
+        Ember.assert("You cannot pass more than one argument to the collection helper", arguments.length === 2);
+      }
+
+      var fn = options.fn;
+      var data = options.data;
+      var inverse = options.inverse;
+      var view = options.data.view;
+
+
+      var controller, container;
+      // If passed a path string, convert that into an object.
+      // Otherwise, just default to the standard class.
+      var collectionClass;
+      if (path) {
+        controller = data.keywords.controller;
+        container = controller && controller.container;
+        collectionClass = handlebarsGet(this, path, options) || container.lookupFactory('view:' + path);
+        Ember.assert(fmt("%@ #collection: Could not find collection class %@", [data.view, path]), !!collectionClass);
+      }
+      else {
+        collectionClass = CollectionView;
+      }
+
+      var hash = options.hash, itemHash = {}, match;
+
+      // Extract item view class if provided else default to the standard class
+      var collectionPrototype = collectionClass.proto(), itemViewClass;
+
+      if (hash.itemView) {
+        controller = data.keywords.controller;
+        Ember.assert('You specified an itemView, but the current context has no ' +
+                     'container to look the itemView up in. This probably means ' +
+                     'that you created a view manually, instead of through the ' +
+                     'container. Instead, use container.lookup("view:viewName"), ' +
+                     'which will properly instantiate your view.',
+                     controller && controller.container);
+        container = controller.container;
+        itemViewClass = container.lookupFactory('view:' + hash.itemView);
+        Ember.assert('You specified the itemView ' + hash.itemView + ", but it was " +
+                     "not found at " + container.describe("view:" + hash.itemView) +
+                     " (and it was not registered in the container)", !!itemViewClass);
+      } else if (hash.itemViewClass) {
+        itemViewClass = handlebarsGet(collectionPrototype, hash.itemViewClass, options);
+      } else {
+        itemViewClass = collectionPrototype.itemViewClass;
+      }
+
+      Ember.assert(fmt("%@ #collection: Could not find itemViewClass %@", [data.view, itemViewClass]), !!itemViewClass);
+
+      delete hash.itemViewClass;
+      delete hash.itemView;
+
+      // Go through options passed to the {{collection}} helper and extract options
+      // that configure item views instead of the collection itself.
+      for (var prop in hash) {
+        if (hash.hasOwnProperty(prop)) {
+          match = prop.match(/^item(.)(.*)$/);
+
+          if (match && prop !== 'itemController') {
+            // Convert itemShouldFoo -> shouldFoo
+            itemHash[match[1].toLowerCase() + match[2]] = hash[prop];
+            // Delete from hash as this will end up getting passed to the
+            // {{view}} helper method.
+            delete hash[prop];
+          }
+        }
+      }
+
+      if (fn) {
+        itemHash.template = fn;
+        delete options.fn;
+      }
+
+      var emptyViewClass;
+      if (inverse && inverse !== EmberHandlebars.VM.noop) {
+        emptyViewClass = get(collectionPrototype, 'emptyViewClass');
+        emptyViewClass = emptyViewClass.extend({
+              template: inverse,
+              tagName: itemHash.tagName
+        });
+      } else if (hash.emptyViewClass) {
+        emptyViewClass = handlebarsGet(this, hash.emptyViewClass, options);
+      }
+      if (emptyViewClass) { hash.emptyView = emptyViewClass; }
+
+      if (hash.keyword) {
+        itemHash._context = this;
+      } else {
+        itemHash._context = alias('content');
+      }
+
+      var viewOptions = ViewHelper.propertiesFromHTMLOptions({ data: data, hash: itemHash }, this);
+      hash.itemViewClass = itemViewClass.extend(viewOptions);
+
+      options.helperName = options.helperName || 'collection';
+
+      return helpers.view.call(this, collectionClass, options);
+    }
+
+    __exports__["default"] = collectionHelper;
+  });
+define("ember-handlebars/helpers/debug",
+  ["ember-metal/core","ember-metal/utils","ember-metal/logger","ember-metal/property_get","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /*jshint debug:true*/
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.FEATURES,
+    var inspect = __dependency2__.inspect;
+    var Logger = __dependency3__["default"];
+
+    var get = __dependency4__.get;
+    var normalizePath = __dependency5__.normalizePath;
+    var handlebarsGet = __dependency5__.handlebarsGet;
+
+    var a_slice = [].slice;
+
+    /**
+      `log` allows you to output the value of variables in the current rendering
+      context. `log` also accepts primitive types such as strings or numbers.
+
+      ```handlebars
+      {{log "myVariable:" myVariable }}
+      ```
+
+      @method log
+      @for Ember.Handlebars.helpers
+      @param {String} property
+    */
+    function logHelper() {
+      var params = a_slice.call(arguments, 0, -1),
+          options = arguments[arguments.length - 1],
+          logger = Logger.log,
+          values = [],
+          allowPrimitives = true;
+
+      for (var i = 0; i < params.length; i++) {
+        var type = options.types[i];
+
+        if (type === 'ID' || !allowPrimitives) {
+          var context = (options.contexts && options.contexts[i]) || this,
+              normalized = normalizePath(context, params[i], options.data);
+
+          if (normalized.path === 'this') {
+            values.push(normalized.root);
+          } else {
+            values.push(handlebarsGet(normalized.root, normalized.path, options));
+          }
+        } else {
+          values.push(params[i]);
+        }
+      }
+
+      logger.apply(logger, values);
+    };
+
+    /**
+      Execute the `debugger` statement in the current context.
+
+      ```handlebars
+      {{debugger}}
+      ```
+
+      Before invoking the `debugger` statement, there
+      are a few helpful variables defined in the
+      body of this helper that you can inspect while
+      debugging that describe how and where this
+      helper was invoked:
+
+      - templateContext: this is most likely a controller
+        from which this template looks up / displays properties
+      - typeOfTemplateContext: a string description of
+        what the templateContext is
+
+      For example, if you're wondering why a value `{{foo}}`
+      isn't rendering as expected within a template, you
+      could place a `{{debugger}}` statement, and when
+      the `debugger;` breakpoint is hit, you can inspect
+      `templateContext`, determine if it's the object you
+      expect, and/or evaluate expressions in the console
+      to perform property lookups on the `templateContext`:
+
+      ```
+        > templateContext.get('foo') // -> "<value of {{foo}}>"
+      ```
+
+      @method debugger
+      @for Ember.Handlebars.helpers
+      @param {String} property
+    */
+    function debuggerHelper(options) {
+
+      // These are helpful values you can inspect while debugging.
+      var templateContext = this;
+      var typeOfTemplateContext = inspect(templateContext);
+
+      debugger;
+    }
+
+    __exports__.logHelper = logHelper;
+    __exports__.debuggerHelper = debuggerHelper;
+  });
+define("ember-handlebars/helpers/each",
+  ["ember-metal/core","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-metal/property_set","ember-handlebars/views/metamorph_view","ember-views/views/collection_view","ember-metal/binding","ember-runtime/controllers/controller","ember-runtime/controllers/array_controller","ember-runtime/mixins/array","ember-runtime/copy","ember-metal/run_loop","ember-metal/observer","ember-metal/events","ember-handlebars/ext","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+    "use strict";
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert;, Ember.K
+    // var emberAssert = Ember.assert,
+    var K = Ember.K;
+
+    var EmberHandlebars = __dependency2__["default"];
+    var helpers = EmberHandlebars.helpers;
+
+    var fmt = __dependency3__.fmt;
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+    var _Metamorph = __dependency6__._Metamorph;
+    var _MetamorphView = __dependency6__._MetamorphView;
+    var CollectionView = __dependency7__["default"];
+    var Binding = __dependency8__.Binding;
+    var ControllerMixin = __dependency9__.ControllerMixin;
+    var ArrayController = __dependency10__["default"];
+    var EmberArray = __dependency11__["default"];
+    var copy = __dependency12__["default"];
+    var run = __dependency13__["default"];
+    var addObserver = __dependency14__.addObserver;
+    var removeObserver = __dependency14__.removeObserver;
+    var addBeforeObserver = __dependency14__.addBeforeObserver;
+    var removeBeforeObserver = __dependency14__.removeBeforeObserver;
+    var on = __dependency15__.on;
+    var handlebarsGet = __dependency16__.handlebarsGet;
+    var computed = __dependency17__.computed;
+
+    var handlebarsGet = __dependency16__.handlebarsGet;
+
+    var EachView = CollectionView.extend(_Metamorph, {
+
+      init: function() {
+        var itemController = get(this, 'itemController');
+        var binding;
+
+        if (itemController) {
+          var controller = get(this, 'controller.container').lookupFactory('controller:array').create({
+            _isVirtual: true,
+            parentController: get(this, 'controller'),
+            itemController: itemController,
+            target: get(this, 'controller'),
+            _eachView: this
+          });
+
+          this.disableContentObservers(function() {
+            set(this, 'content', controller);
+            binding = new Binding('content', '_eachView.dataSource').oneWay();
+            binding.connect(controller);
+          });
+
+          set(this, '_arrayController', controller);
+        } else {
+          this.disableContentObservers(function() {
+            binding = new Binding('content', 'dataSource').oneWay();
+            binding.connect(this);
+          });
+        }
+
+        return this._super();
+      },
+
+      _assertArrayLike: function(content) {
+        Ember.assert(fmt("The value that #each loops over must be an Array. You " +
+                         "passed %@, but it should have been an ArrayController",
+                         [content.constructor]),
+                         !ControllerMixin.detect(content) ||
+                           (content && content.isGenerated) ||
+                           content instanceof ArrayController);
+        Ember.assert(fmt("The value that #each loops over must be an Array. You passed %@", [(ControllerMixin.detect(content) && content.get('model') !== undefined) ? fmt("'%@' (wrapped in %@)", [content.get('model'), content]) : content]), EmberArray.detect(content));
+      },
+
+      disableContentObservers: function(callback) {
+        removeBeforeObserver(this, 'content', null, '_contentWillChange');
+        removeObserver(this, 'content', null, '_contentDidChange');
+
+        callback.call(this);
+
+        addBeforeObserver(this, 'content', null, '_contentWillChange');
+        addObserver(this, 'content', null, '_contentDidChange');
+      },
+
+      itemViewClass: _MetamorphView,
+      emptyViewClass: _MetamorphView,
+
+      createChildView: function(view, attrs) {
+        view = this._super(view, attrs);
+
+        // At the moment, if a container view subclass wants
+        // to insert keywords, it is responsible for cloning
+        // the keywords hash. This will be fixed momentarily.
+        var keyword = get(this, 'keyword');
+        var content = get(view, 'content');
+
+        if (keyword) {
+          var data = get(view, 'templateData');
+
+          data = copy(data);
+          data.keywords = view.cloneKeywords();
+          set(view, 'templateData', data);
+
+          // In this case, we do not bind, because the `content` of
+          // a #each item cannot change.
+          data.keywords[keyword] = content;
+        }
+
+        // If {{#each}} is looping over an array of controllers,
+        // point each child view at their respective controller.
+        if (content && content.isController) {
+          set(view, 'controller', content);
+        }
+
+        return view;
+      },
+
+      destroy: function() {
+        if (!this._super()) { return; }
+
+        var arrayController = get(this, '_arrayController');
+
+        if (arrayController) {
+          arrayController.destroy();
+        }
+
+        return this;
+      }
+    });
+
+    // Defeatureify doesn't seem to like nested functions that need to be removed
+    function _addMetamorphCheck() {
+      EachView.reopen({
+        _checkMetamorph: on('didInsertElement', function() {
+          Ember.assert("The metamorph tags, " +
+                       this.morph.start + " and " + this.morph.end +
+                       ", have different parents.\nThe browser has fixed your template to output valid HTML (for example, check that you have properly closed all tags and have used a TBODY tag when creating a table with '{{#each}}')",
+            document.getElementById( this.morph.start ).parentNode ===
+            document.getElementById( this.morph.end ).parentNode
+          );
+        })
+      });
+    }
+
+    // until ember-debug is es6ed
+    var runInDebug = function(f){f()};
+    runInDebug( function() {
+      _addMetamorphCheck();
+    });
+
+    var GroupedEach = EmberHandlebars.GroupedEach = function(context, path, options) {
+      var self = this,
+          normalized = EmberHandlebars.normalizePath(context, path, options.data);
+
+      this.context = context;
+      this.path = path;
+      this.options = options;
+      this.template = options.fn;
+      this.containingView = options.data.view;
+      this.normalizedRoot = normalized.root;
+      this.normalizedPath = normalized.path;
+      this.content = this.lookupContent();
+
+      this.addContentObservers();
+      this.addArrayObservers();
+
+      this.containingView.on('willClearRender', function() {
+        self.destroy();
+      });
+    };
+
+    GroupedEach.prototype = {
+      contentWillChange: function() {
+        this.removeArrayObservers();
+      },
+
+      contentDidChange: function() {
+        this.content = this.lookupContent();
+        this.addArrayObservers();
+        this.rerenderContainingView();
+      },
+
+      contentArrayWillChange: K,
+
+      contentArrayDidChange: function() {
+        this.rerenderContainingView();
+      },
+
+      lookupContent: function() {
+        return handlebarsGet(this.normalizedRoot, this.normalizedPath, this.options);
+      },
+
+      addArrayObservers: function() {
+        if (!this.content) { return; }
+
+        this.content.addArrayObserver(this, {
+          willChange: 'contentArrayWillChange',
+          didChange: 'contentArrayDidChange'
+        });
+      },
+
+      removeArrayObservers: function() {
+        if (!this.content) { return; }
+
+        this.content.removeArrayObserver(this, {
+          willChange: 'contentArrayWillChange',
+          didChange: 'contentArrayDidChange'
+        });
+      },
+
+      addContentObservers: function() {
+        addBeforeObserver(this.normalizedRoot, this.normalizedPath, this, this.contentWillChange);
+        addObserver(this.normalizedRoot, this.normalizedPath, this, this.contentDidChange);
+      },
+
+      removeContentObservers: function() {
+        removeBeforeObserver(this.normalizedRoot, this.normalizedPath, this.contentWillChange);
+        removeObserver(this.normalizedRoot, this.normalizedPath, this.contentDidChange);
+      },
+
+      render: function() {
+        if (!this.content) { return; }
+
+        var content = this.content,
+            contentLength = get(content, 'length'),
+            data = this.options.data,
+            template = this.template;
+
+        data.insideEach = true;
+        for (var i = 0; i < contentLength; i++) {
+          template(content.objectAt(i), { data: data });
+        }
+      },
+
+      rerenderContainingView: function() {
+        var self = this;
+        run.scheduleOnce('render', this, function() {
+          // It's possible it's been destroyed after we enqueued a re-render call.
+          if (!self.destroyed) {
+            self.containingView.rerender();
+          }
+        });
+      },
+
+      destroy: function() {
+        this.removeContentObservers();
+        if (this.content) {
+          this.removeArrayObservers();
+        }
+        this.destroyed = true;
+      }
+    };
+
+    /**
+      The `{{#each}}` helper loops over elements in a collection, rendering its
+      block once for each item. It is an extension of the base Handlebars `{{#each}}`
+      helper:
+
+      ```javascript
+      Developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
+      ```
+
+      ```handlebars
+      {{#each Developers}}
+        {{name}}
+      {{/each}}
+      ```
+
+      `{{each}}` supports an alternative syntax with element naming:
+
+      ```handlebars
+      {{#each person in Developers}}
+        {{person.name}}
+      {{/each}}
+      ```
+
+      When looping over objects that do not have properties, `{{this}}` can be used
+      to render the object:
+
+      ```javascript
+      DeveloperNames = ['Yehuda', 'Tom', 'Paul']
+      ```
+
+      ```handlebars
+      {{#each DeveloperNames}}
+        {{this}}
+      {{/each}}
+      ```
+      ### {{else}} condition
+      `{{#each}}` can have a matching `{{else}}`. The contents of this block will render
+      if the collection is empty.
+
+      ```
+      {{#each person in Developers}}
+        {{person.name}}
+      {{else}}
+        <p>Sorry, nobody is available for this task.</p>
+      {{/each}}
+      ```
+      ### Specifying a View class for items
+      If you provide an `itemViewClass` option that references a view class
+      with its own `template` you can omit the block.
+
+      The following template:
+
+      ```handlebars
+      {{#view App.MyView }}
+        {{each view.items itemViewClass="App.AnItemView"}}
+      {{/view}}
+      ```
+
+      And application code
+
+      ```javascript
+      App = Ember.Application.create({
+        MyView: Ember.View.extend({
+          items: [
+            Ember.Object.create({name: 'Dave'}),
+            Ember.Object.create({name: 'Mary'}),
+            Ember.Object.create({name: 'Sara'})
+          ]
+        })
+      });
+
+      App.AnItemView = Ember.View.extend({
+        template: Ember.Handlebars.compile("Greetings {{name}}")
+      });
+      ```
+
+      Will result in the HTML structure below
+
+      ```html
+      <div class="ember-view">
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
+      </div>
+      ```
+
+      If an `itemViewClass` is defined on the helper, and therefore the helper is not
+      being used as a block, an `emptyViewClass` can also be provided optionally.
+      The `emptyViewClass` will match the behavior of the `{{else}}` condition
+      described above. That is, the `emptyViewClass` will render if the collection
+      is empty.
+
+      ### Representing each item with a Controller.
+      By default the controller lookup within an `{{#each}}` block will be
+      the controller of the template where the `{{#each}}` was used. If each
+      item needs to be presented by a custom controller you can provide a
+      `itemController` option which references a controller by lookup name.
+      Each item in the loop will be wrapped in an instance of this controller
+      and the item itself will be set to the `content` property of that controller.
+
+      This is useful in cases where properties of model objects need transformation
+      or synthesis for display:
+
+      ```javascript
+      App.DeveloperController = Ember.ObjectController.extend({
+        isAvailableForHire: function() {
+          return !this.get('content.isEmployed') && this.get('content.isSeekingWork');
+        }.property('isEmployed', 'isSeekingWork')
+      })
+      ```
+
+      ```handlebars
+      {{#each person in developers itemController="developer"}}
+        {{person.name}} {{#if person.isAvailableForHire}}Hire me!{{/if}}
+      {{/each}}
+      ```
+
+      Each itemController will receive a reference to the current controller as
+      a `parentController` property.
+
+      ### (Experimental) Grouped Each
+
+      When used in conjunction with the experimental [group helper](https://github.com/emberjs/group-helper),
+      you can inform Handlebars to re-render an entire group of items instead of
+      re-rendering them one at a time (in the event that they are changed en masse
+      or an item is added/removed).
+
+      ```handlebars
+      {{#group}}
+        {{#each people}}
+          {{firstName}} {{lastName}}
+        {{/each}}
+      {{/group}}
+      ```
+
+      This can be faster than the normal way that Handlebars re-renders items
+      in some cases.
+
+      If for some reason you have a group with more than one `#each`, you can make
+      one of the collections be updated in normal (non-grouped) fashion by setting
+      the option `groupedRows=true` (counter-intuitive, I know).
+
+      For example,
+
+      ```handlebars
+      {{dealershipName}}
+
+      {{#group}}
+        {{#each dealers}}
+          {{firstName}} {{lastName}}
+        {{/each}}
+
+        {{#each car in cars groupedRows=true}}
+          {{car.make}} {{car.model}} {{car.color}}
+        {{/each}}
+      {{/group}}
+      ```
+      Any change to `dealershipName` or the `dealers` collection will cause the
+      entire group to be re-rendered. However, changes to the `cars` collection
+      will be re-rendered individually (as normal).
+
+      Note that `group` behavior is also disabled by specifying an `itemViewClass`.
+
+      @method each
+      @for Ember.Handlebars.helpers
+      @param [name] {String} name for item (used with `in`)
+      @param [path] {String} path
+      @param [options] {Object} Handlebars key/value pairs of options
+      @param [options.itemViewClass] {String} a path to a view class used for each item
+      @param [options.itemController] {String} name of a controller to be created for each item
+      @param [options.groupedRows] {boolean} enable normal item-by-item rendering when inside a `#group` helper
+    */
+    function eachHelper(path, options) {
+      var ctx, helperName = 'each';
+
+      if (arguments.length === 4) {
+        Ember.assert("If you pass more than one argument to the each helper, it must be in the form #each foo in bar", arguments[1] === "in");
+
+        var keywordName = arguments[0];
+
+
+        options = arguments[3];
+        path = arguments[2];
+
+        helperName += ' ' + keywordName + ' in ' + path;
+
+        if (path === '') { path = "this"; }
+
+        options.hash.keyword = keywordName;
+
+      } else if (arguments.length === 1) {
+        options = path;
+        path = 'this';
+      } else {
+        helperName += ' ' + path;
+      }
+
+      options.hash.dataSourceBinding = path;
+      // Set up emptyView as a metamorph with no tag
+      //options.hash.emptyViewClass = Ember._MetamorphView;
+
+      // can't rely on this default behavior when use strict
+      ctx = this || window;
+
+      options.helperName = options.helperName || helperName;
+
+      if (options.data.insideGroup && !options.hash.groupedRows && !options.hash.itemViewClass) {
+        new GroupedEach(ctx, path, options).render();
+      } else {
+        // ES6TODO: figure out how to do this without global lookup.
+        return helpers.collection.call(ctx, 'Ember.Handlebars.EachView', options);
+      }
+    }
+
+    __exports__.EachView = EachView;
+    __exports__.GroupedEach = GroupedEach;
+    __exports__.eachHelper = eachHelper;
+  });
+define("ember-handlebars/helpers/loc",
+  ["ember-runtime/system/string","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var loc = __dependency1__.loc;
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    // ES6TODO:
+    // Pretty sure this can be expressed as
+    // var locHelper EmberStringUtils.loc ?
+
+    /**
+      Calls [Ember.String.loc](/api/classes/Ember.String.html#method_loc) with the
+      provided string.
+
+      This is a convenient way to localize text. For example:
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="home">
+        {{loc "welcome"}}
+      </script>
+      ```
+
+      Take note that `"welcome"` is a string and not an object
+      reference.
+
+      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to 
+      set up localized string references.
+
+      @method loc
+      @for Ember.Handlebars.helpers
+      @param {String} str The string to format
+      @see {Ember.String#loc}
+    */
+    function locHelper(str) {
+      return loc(str);
+    }
+
+    __exports__["default"] = locHelper;
+  });
+define("ember-handlebars/helpers/partial",
+  ["ember-metal/core","ember-metal/is_none","ember-handlebars/ext","ember-handlebars/helpers/binding","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    // var emberAssert = Ember.assert;
+
+    var isNone = __dependency2__.isNone;
+    var handlebarsGet = __dependency3__.handlebarsGet;
+    var bind = __dependency4__.bind;
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    /**
+      The `partial` helper renders another template without
+      changing the template context:
+
+      ```handlebars
+      {{foo}}
+      {{partial "nav"}}
+      ```
+
+      The above example template will render a template named
+      "_nav", which has the same context as the parent template
+      it's rendered into, so if the "_nav" template also referenced
+      `{{foo}}`, it would print the same thing as the `{{foo}}`
+      in the above example.
+
+      If a "_nav" template isn't found, the `partial` helper will
+      fall back to a template named "nav".
+
+      ## Bound template names
+
+      The parameter supplied to `partial` can also be a path
+      to a property containing a template name, e.g.:
+
+      ```handlebars
+      {{partial someTemplateName}}
+      ```
+
+      The above example will look up the value of `someTemplateName`
+      on the template context (e.g. a controller) and use that
+      value as the name of the template to render. If the resolved
+      value is falsy, nothing will be rendered. If `someTemplateName`
+      changes, the partial will be re-rendered using the new template
+      name.
+
+      ## Setting the partial's context with `with`
+
+      The `partial` helper can be used in conjunction with the `with`
+      helper to set a context that will be used by the partial:
+
+      ```handlebars
+      {{#with currentUser}}
+        {{partial "user_info"}}
+      {{/with}}
+      ```
+
+      @method partial
+      @for Ember.Handlebars.helpers
+      @param {String} partialName the name of the template to render minus the leading underscore
+    */
+
+    function partialHelper(name, options) {
+
+      var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
+
+      options.helperName = options.helperName || 'partial';
+
+      if (options.types[0] === "ID") {
+        // Helper was passed a property path; we need to
+        // create a binding that will re-render whenever
+        // this property changes.
+        options.fn = function(context, fnOptions) {
+          var partialName = handlebarsGet(context, name, fnOptions);
+          renderPartial(context, partialName, fnOptions);
+        };
+
+        return bind.call(context, name, options, true, exists);
+      } else {
+        // Render the partial right into parent template.
+        renderPartial(context, name, options);
+      }
+    }
+
+    function exists(value) {
+      return !isNone(value);
+    }
+
+    function renderPartial(context, name, options) {
+      var nameParts = name.split("/");
+      var lastPart = nameParts[nameParts.length - 1];
+
+      nameParts[nameParts.length - 1] = "_" + lastPart;
+
+      var view = options.data.view;
+      var underscoredName = nameParts.join("/");
+      var template = view.templateForName(underscoredName);
+      var deprecatedTemplate = !template && view.templateForName(name);
+
+      Ember.assert("Unable to find partial with name '"+name+"'.", template || deprecatedTemplate);
+
+      template = template || deprecatedTemplate;
+
+      template(context, { data: options.data });
+    }
+
+    __exports__["default"] = partialHelper;
+  });
+define("ember-handlebars/helpers/shared",
+  ["ember-handlebars/ext","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var handlebarsGet = __dependency1__.handlebarsGet;
+
+    function resolvePaths(options) {
+      var ret = [],
+          contexts = options.contexts,
+          roots = options.roots,
+          data = options.data;
+
+      for (var i=0, l=contexts.length; i<l; i++) {
+        ret.push( handlebarsGet(roots[i], contexts[i], { data: data }) );
+      }
+
+      return ret;
+    }
+
+    __exports__["default"] = resolvePaths;
+  });
+define("ember-handlebars/helpers/template",
+  ["ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // var emberDeprecate = Ember.deprecate;
+
+    var EmberHandlebars = __dependency2__["default"];
+    var helpers = EmberHandlebars.helpers;
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    /**
+      `template` allows you to render a template from inside another template.
+      This allows you to re-use the same template in multiple places. For example:
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="logged_in_user">
+        {{#with loggedInUser}}
+          Last Login: {{lastLogin}}
+          User Info: {{template "user_info"}}
+        {{/with}}
+      </script>
+      ```
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="user_info">
+        Name: <em>{{name}}</em>
+        Karma: <em>{{karma}}</em>
+      </script>
+      ```
+
+      ```handlebars
+      {{#if isUser}}
+        {{template "user_info"}}
+      {{else}}
+        {{template "unlogged_user_info"}}
+      {{/if}}
+      ```
+
+      This helper looks for templates in the global `Ember.TEMPLATES` hash. If you
+      add `<script>` tags to your page with the `data-template-name` attribute set,
+      they will be compiled and placed in this hash automatically.
+
+      You can also manually register templates by adding them to the hash:
+
+      ```javascript
+      Ember.TEMPLATES["my_cool_template"] = Ember.Handlebars.compile('<b>{{user}}</b>');
+      ```
+
+      @deprecated
+      @method template
+      @for Ember.Handlebars.helpers
+      @param {String} templateName the template to render
+    */
+    function templateHelper(name, options) {
+      Ember.deprecate("The `template` helper has been deprecated in favor of the `partial` helper. Please use `partial` instead, which will work the same way.");
+
+      options.helperName = options.helperName || 'template';
+
+      return helpers.partial.apply(this, arguments);
+    }
+
+    __exports__["default"] = templateHelper;
+  });
+define("ember-handlebars/helpers/unbound",
+  ["ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /*globals Handlebars */
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var EmberHandlebars = __dependency1__["default"];
+    var helpers = EmberHandlebars.helpers;
+
+    var resolveHelper = __dependency2__.resolveHelper;
+    var handlebarsGet = __dependency3__.handlebarsGet;
+
+    var slice = [].slice;
+
+    /**
+      `unbound` allows you to output a property without binding. *Important:* The
+      output will not be updated if the property changes. Use with caution.
+
+      ```handlebars
+      <div>{{unbound somePropertyThatDoesntChange}}</div>
+      ```
+
+      `unbound` can also be used in conjunction with a bound helper to
+      render it in its unbound form:
+
+      ```handlebars
+      <div>{{unbound helperName somePropertyThatDoesntChange}}</div>
+      ```
+
+      @method unbound
+      @for Ember.Handlebars.helpers
+      @param {String} property
+      @return {String} HTML string
+    */
+    function unboundHelper(property, fn) {
+      var options = arguments[arguments.length - 1],
+          container = options.data.view.container,
+          helper, context, out, ctx;
+
+      ctx = this;
+      if (arguments.length > 2) {
+        // Unbound helper call.
+        options.data.isUnbound = true;
+        helper = resolveHelper(container, property) || helpers.helperMissing;
+        out = helper.apply(ctx, slice.call(arguments, 1));
+        delete options.data.isUnbound;
+        return out;
+      }
+
+      context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : ctx;
+      return handlebarsGet(context, property, fn);
+    }
+
+    __exports__["default"] = unboundHelper;
+  });
+define("ember-handlebars/helpers/view",
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-handlebars/ext","ember-runtime/system/string","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+    "use strict";
+    /*globals Handlebars */
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.warn, Ember.assert
+    // var emberWarn = Ember.warn, emberAssert = Ember.assert;
+
+    var EmberObject = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var IS_BINDING = __dependency5__.IS_BINDING;
+    var jQuery = __dependency6__["default"];
+    var View = __dependency7__.View;
+    var isGlobalPath = __dependency8__.isGlobalPath;
+    var normalizePath = __dependency9__.normalizePath;
+    var handlebarsGet = __dependency9__.handlebarsGet;
+    var EmberString = __dependency10__["default"];
+
+
+    var LOWERCASE_A_Z = /^[a-z]/,
+        VIEW_PREFIX = /^view\./;
+
+    function makeBindings(thisContext, options) {
+      var hash = options.hash,
+          hashType = options.hashTypes;
+
+      for (var prop in hash) {
+        if (hashType[prop] === 'ID') {
+
+          var value = hash[prop];
+
+          if (IS_BINDING.test(prop)) {
+            Ember.warn("You're attempting to render a view by passing " + prop + "=" + value + " to a view helper, but this syntax is ambiguous. You should either surround " + value + " in quotes or remove `Binding` from " + prop + ".");
+          } else {
+            hash[prop + 'Binding'] = value;
+            hashType[prop + 'Binding'] = 'STRING';
+            delete hash[prop];
+            delete hashType[prop];
+          }
+        }
+      }
+
+      if (hash.hasOwnProperty('idBinding')) {
+        // id can't be bound, so just perform one-time lookup.
+        hash.id = handlebarsGet(thisContext, hash.idBinding, options);
+        hashType.id = 'STRING';
+        delete hash.idBinding;
+        delete hashType.idBinding;
+      }
+    }
+
+    var ViewHelper = EmberObject.create({
+
+      propertiesFromHTMLOptions: function(options) {
+        var hash = options.hash, data = options.data;
+        var extensions = {},
+            classes = hash['class'],
+            dup = false;
+
+        if (hash.id) {
+          extensions.elementId = hash.id;
+          dup = true;
+        }
+
+        if (hash.tag) {
+          extensions.tagName = hash.tag;
+          dup = true;
+        }
+
+        if (classes) {
+          classes = classes.split(' ');
+          extensions.classNames = classes;
+          dup = true;
+        }
+
+        if (hash.classBinding) {
+          extensions.classNameBindings = hash.classBinding.split(' ');
+          dup = true;
+        }
+
+        if (hash.classNameBindings) {
+          if (extensions.classNameBindings === undefined) extensions.classNameBindings = [];
+          extensions.classNameBindings = extensions.classNameBindings.concat(hash.classNameBindings.split(' '));
+          dup = true;
+        }
+
+        if (hash.attributeBindings) {
+          Ember.assert("Setting 'attributeBindings' via Handlebars is not allowed. Please subclass Ember.View and set it there instead.");
+          extensions.attributeBindings = null;
+          dup = true;
+        }
+
+        if (dup) {
+          hash = jQuery.extend({}, hash);
+          delete hash.id;
+          delete hash.tag;
+          delete hash['class'];
+          delete hash.classBinding;
+        }
+
+        // Set the proper context for all bindings passed to the helper. This applies to regular attribute bindings
+        // as well as class name bindings. If the bindings are local, make them relative to the current context
+        // instead of the view.
+        var path;
+
+        // Evaluate the context of regular attribute bindings:
+        for (var prop in hash) {
+          if (!hash.hasOwnProperty(prop)) { continue; }
+
+          // Test if the property ends in "Binding"
+          if (IS_BINDING.test(prop) && typeof hash[prop] === 'string') {
+            path = this.contextualizeBindingPath(hash[prop], data);
+            if (path) { hash[prop] = path; }
+          }
+        }
+
+        // Evaluate the context of class name bindings:
+        if (extensions.classNameBindings) {
+          for (var b in extensions.classNameBindings) {
+            var full = extensions.classNameBindings[b];
+            if (typeof full === 'string') {
+              // Contextualize the path of classNameBinding so this:
+              //
+              //     classNameBinding="isGreen:green"
+              //
+              // is converted to this:
+              //
+              //     classNameBinding="_parentView.context.isGreen:green"
+              var parsedPath = View._parsePropertyPath(full);
+              path = this.contextualizeBindingPath(parsedPath.path, data);
+              if (path) { extensions.classNameBindings[b] = path + parsedPath.classNames; }
+            }
+          }
+        }
+
+        return jQuery.extend(hash, extensions);
+      },
+
+      // Transform bindings from the current context to a context that can be evaluated within the view.
+      // Returns null if the path shouldn't be changed.
+      //
+      // TODO: consider the addition of a prefix that would allow this method to return `path`.
+      contextualizeBindingPath: function(path, data) {
+        var normalized = normalizePath(null, path, data);
+        if (normalized.isKeyword) {
+          return 'templateData.keywords.' + path;
+        } else if (isGlobalPath(path)) {
+          return null;
+        } else if (path === 'this' || path === '') {
+          return '_parentView.context';
+        } else {
+          return '_parentView.context.' + path;
+        }
+      },
+
+      helper: function(thisContext, path, options) {
+        var data = options.data,
+            fn = options.fn,
+            newView;
+
+        makeBindings(thisContext, options);
+
+        if ('string' === typeof path) {
+
+          // TODO: this is a lame conditional, this should likely change
+          // but something along these lines will likely need to be added
+          // as deprecation warnings
+          //
+          if (options.types[0] === 'STRING' && LOWERCASE_A_Z.test(path) && !VIEW_PREFIX.test(path)) {
+            Ember.assert("View requires a container", !!data.view.container);
+            newView = data.view.container.lookupFactory('view:' + path);
+          } else {
+            newView = handlebarsGet(thisContext, path, options);
+          }
+
+          Ember.assert("Unable to find view at path '" + path + "'", !!newView);
+        } else {
+          newView = path;
+        }
+
+        Ember.assert(EmberString.fmt('You must pass a view to the #view helper, not %@ (%@)', [path, newView]), View.detect(newView) || View.detectInstance(newView));
+
+        var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
+        var currentView = data.view;
+        viewOptions.templateData = data;
+        var newViewProto = newView.proto ? newView.proto() : newView;
+
+        if (fn) {
+          Ember.assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !get(newViewProto, 'templateName'));
+          viewOptions.template = fn;
+        }
+
+        // We only want to override the `_context` computed property if there is
+        // no specified controller. See View#_context for more information.
+        if (!newViewProto.controller && !newViewProto.controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
+          viewOptions._context = thisContext;
+        }
+
+        // for instrumentation
+        if (options.helperName) {
+          viewOptions.helperName = options.helperName;
+        }
+
+        currentView.appendChild(newView, viewOptions);
+      }
+    });
+
+    /**
+      `{{view}}` inserts a new instance of `Ember.View` into a template passing its
+      options to the `Ember.View`'s `create` method and using the supplied block as
+      the view's own template.
+
+      An empty `<body>` and the following template:
+
+      ```handlebars
+      A span:
+      {{#view tagName="span"}}
+        hello.
+      {{/view}}
+      ```
+
+      Will result in HTML structure:
+
+      ```html
+      <body>
+        <!-- Note: the handlebars template script
+             also results in a rendered Ember.View
+             which is the outer <div> here -->
+
+        <div class="ember-view">
+          A span:
+          <span id="ember1" class="ember-view">
+            Hello.
+          </span>
+        </div>
+      </body>
+      ```
+
+      ### `parentView` setting
+
+      The `parentView` property of the new `Ember.View` instance created through
+      `{{view}}` will be set to the `Ember.View` instance of the template where
+      `{{view}}` was called.
+
+      ```javascript
+      aView = Ember.View.create({
+        template: Ember.Handlebars.compile("{{#view}} my parent: {{parentView.elementId}} {{/view}}")
+      });
+
+      aView.appendTo('body');
+      ```
+
+      Will result in HTML structure:
+
+      ```html
+      <div id="ember1" class="ember-view">
+        <div id="ember2" class="ember-view">
+          my parent: ember1
+        </div>
+      </div>
+      ```
+
+      ### Setting CSS id and class attributes
+
+      The HTML `id` attribute can be set on the `{{view}}`'s resulting element with
+      the `id` option. This option will _not_ be passed to `Ember.View.create`.
+
+      ```handlebars
+      {{#view tagName="span" id="a-custom-id"}}
+        hello.
+      {{/view}}
+      ```
+
+      Results in the following HTML structure:
+
+      ```html
+      <div class="ember-view">
+        <span id="a-custom-id" class="ember-view">
+          hello.
+        </span>
+      </div>
+      ```
+
+      The HTML `class` attribute can be set on the `{{view}}`'s resulting element
+      with the `class` or `classNameBindings` options. The `class` option will
+      directly set the CSS `class` attribute and will not be passed to
+      `Ember.View.create`. `classNameBindings` will be passed to `create` and use
+      `Ember.View`'s class name binding functionality:
+
+      ```handlebars
+      {{#view tagName="span" class="a-custom-class"}}
+        hello.
+      {{/view}}
+      ```
+
+      Results in the following HTML structure:
+
+      ```html
+      <div class="ember-view">
+        <span id="ember2" class="ember-view a-custom-class">
+          hello.
+        </span>
+      </div>
+      ```
+
+      ### Supplying a different view class
+
+      `{{view}}` can take an optional first argument before its supplied options to
+      specify a path to a custom view class.
+
+      ```handlebars
+      {{#view "MyApp.CustomView"}}
+        hello.
+      {{/view}}
+      ```
+
+      The first argument can also be a relative path accessible from the current
+      context.
+
+      ```javascript
+      MyApp = Ember.Application.create({});
+      MyApp.OuterView = Ember.View.extend({
+        innerViewClass: Ember.View.extend({
+          classNames: ['a-custom-view-class-as-property']
+        }),
+        template: Ember.Handlebars.compile('{{#view "view.innerViewClass"}} hi {{/view}}')
+      });
+
+      MyApp.OuterView.create().appendTo('body');
+      ```
+
+      Will result in the following HTML:
+
+      ```html
+      <div id="ember1" class="ember-view">
+        <div id="ember2" class="ember-view a-custom-view-class-as-property">
+          hi
+        </div>
+      </div>
+      ```
+
+      ### Blockless use
+
+      If you supply a custom `Ember.View` subclass that specifies its own template
+      or provide a `templateName` option to `{{view}}` it can be used without
+      supplying a block. Attempts to use both a `templateName` option and supply a
+      block will throw an error.
+
+      ```handlebars
+      {{view "MyApp.ViewWithATemplateDefined"}}
+      ```
+
+      ### `viewName` property
+
+      You can supply a `viewName` option to `{{view}}`. The `Ember.View` instance
+      will be referenced as a property of its parent view by this name.
+
+      ```javascript
+      aView = Ember.View.create({
+        template: Ember.Handlebars.compile('{{#view viewName="aChildByName"}} hi {{/view}}')
+      });
+
+      aView.appendTo('body');
+      aView.get('aChildByName') // the instance of Ember.View created by {{view}} helper
+      ```
+
+      @method view
+      @for Ember.Handlebars.helpers
+      @param {String} path
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function viewHelper(path, options) {
+      Ember.assert("The view helper only takes a single argument", arguments.length <= 2);
+
+      // If no path is provided, treat path param as options.
+      // ES6TODO: find a way to do this without global lookup
+      if (path && path.data && path.data.isRenderData) {
+        options = path;
+        path = "Ember.View";
+      }
+
+      options.helperName = options.helperName || 'view';
+
+      return ViewHelper.helper(this, path, options);
+    }
+
+    __exports__.ViewHelper = ViewHelper;
+    __exports__.viewHelper = viewHelper;
+  });
+define("ember-handlebars/helpers/yield",
+  ["ember-metal/core","ember-metal/property_get","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // var emberAssert = Ember.assert;
+
+    var get = __dependency2__.get;
+
+    /**
+      `{{yield}}` denotes an area of a template that will be rendered inside
+      of another template. It has two main uses:
+
+      ### Use with `layout`
+      When used in a Handlebars template that is assigned to an `Ember.View`
+      instance's `layout` property Ember will render the layout template first,
+      inserting the view's own rendered output at the `{{yield}}` location.
+
+      An empty `<body>` and the following application code:
+
+      ```javascript
+      AView = Ember.View.extend({
+        classNames: ['a-view-with-layout'],
+        layout: Ember.Handlebars.compile('<div class="wrapper">{{yield}}</div>'),
+        template: Ember.Handlebars.compile('<span>I am wrapped</span>')
+      });
+
+      aView = AView.create();
+      aView.appendTo('body');
+      ```
+
+      Will result in the following HTML output:
+
+      ```html
+      <body>
+        <div class='ember-view a-view-with-layout'>
+          <div class="wrapper">
+            <span>I am wrapped</span>
+          </div>
+        </div>
+      </body>
+      ```
+
+      The `yield` helper cannot be used outside of a template assigned to an
+      `Ember.View`'s `layout` property and will throw an error if attempted.
+
+      ```javascript
+      BView = Ember.View.extend({
+        classNames: ['a-view-with-layout'],
+        template: Ember.Handlebars.compile('{{yield}}')
+      });
+
+      bView = BView.create();
+      bView.appendTo('body');
+
+      // throws
+      // Uncaught Error: assertion failed:
+      // You called yield in a template that was not a layout
+      ```
+
+      ### Use with Ember.Component
+      When designing components `{{yield}}` is used to denote where, inside the component's
+      template, an optional block passed to the component should render:
+
+      ```handlebars
+      <!-- application.hbs -->
+      {{#labeled-textfield value=someProperty}}
+        First name:
+      {{/labeled-textfield}}
+      ```
+
+      ```handlebars
+      <!-- components/labeled-textfield.hbs -->
+      <label>
+        {{yield}} {{input value=value}}
+      </label>
+      ```
+
+      Result:
+
+      ```html
+      <label>
+        First name: <input type="text" />
+      </label>
+      ```
+
+      @method yield
+      @for Ember.Handlebars.helpers
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function yieldHelper(options) {
+      var view = options.data.view;
+
+      while (view && !get(view, 'layout')) {
+        if (view._contextView) {
+          view = view._contextView;
+        } else {
+          view = get(view, '_parentView');
+        }
+      }
+
+      Ember.assert("You called yield in a template that was not a layout", !!view);
+
+      view._yield(this, options);
+    }
+
+    __exports__["default"] = yieldHelper;
+  });
+define("ember-handlebars/loader",
+  ["ember-handlebars/component_lookup","ember-views/system/jquery","ember-metal/error","ember-runtime/system/lazy_load","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /*globals Handlebars */
+
+    var ComponentLookup = __dependency1__["default"];
+    var jQuery = __dependency2__["default"];
+    var EmberError = __dependency3__["default"];
+    var onLoad = __dependency4__.onLoad;
+
+    var EmberHandlebars = __dependency5__["default"];
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    /**
+      Find templates stored in the head tag as script tags and make them available
+      to `Ember.CoreView` in the global `Ember.TEMPLATES` object. This will be run
+      as as jQuery DOM-ready callback.
+
+      Script tags with `text/x-handlebars` will be compiled
+      with Ember's Handlebars and are suitable for use as a view's template.
+      Those with type `text/x-raw-handlebars` will be compiled with regular
+      Handlebars and are suitable for use in views' computed properties.
+
+      @private
+      @method bootstrap
+      @for Ember.Handlebars
+      @static
+      @param ctx
+    */
+    function bootstrap(ctx) {
+      var selectors = 'script[type="text/x-handlebars"], script[type="text/x-raw-handlebars"]';
+
+      jQuery(selectors, ctx)
+        .each(function() {
+        // Get a reference to the script tag
+        var script = jQuery(this);
+
+        var compile = (script.attr('type') === 'text/x-raw-handlebars') ?
+                      jQuery.proxy(Handlebars.compile, Handlebars) :
+                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars),
+          // Get the name of the script, used by Ember.View's templateName property.
+          // First look for data-template-name attribute, then fall back to its
+          // id if no name is found.
+          templateName = script.attr('data-template-name') || script.attr('id') || 'application',
+          template = compile(script.html());
+
+        // Check if template of same name already exists
+        if (Ember.TEMPLATES[templateName] !== undefined) {
+          throw new EmberError('Template named "' + templateName  + '" already exists.');
+        }
+
+        // For templates which have a name, we save them and then remove them from the DOM
+        Ember.TEMPLATES[templateName] = template;
+
+        // Remove script tag from DOM
+        script.remove();
+      });
+    };
+
+    function _bootstrap() {
+      bootstrap( jQuery(document) );
+    }
+
+    function registerComponentLookup(container) {
+      container.register('component-lookup:main', ComponentLookup);
+    }
+
+    /*
+      We tie this to application.load to ensure that we've at least
+      attempted to bootstrap at the point that the application is loaded.
+
+      We also tie this to document ready since we're guaranteed that all
+      the inline templates are present at this point.
+
+      There's no harm to running this twice, since we remove the templates
+      from the DOM after processing.
+    */
+
+    onLoad('Ember.Application', function(Application) {
+      Application.initializer({
+        name: 'domTemplates',
+        initialize: _bootstrap
+      });
+
+      Application.initializer({
+        name: 'registerComponentLookup',
+        after: 'domTemplates',
+        initialize: registerComponentLookup
+      });
+    });
+
+    __exports__["default"] = bootstrap;
+  });
+define("ember-handlebars",
+  ["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/shared","ember-handlebars/helpers/binding","ember-handlebars/helpers/collection","ember-handlebars/helpers/view","ember-handlebars/helpers/unbound","ember-handlebars/helpers/debug","ember-handlebars/helpers/each","ember-handlebars/helpers/template","ember-handlebars/helpers/partial","ember-handlebars/helpers/yield","ember-handlebars/helpers/loc","ember-handlebars/controls/checkbox","ember-handlebars/controls/select","ember-handlebars/controls/text_area","ember-handlebars/controls/text_field","ember-handlebars/controls/text_support","ember-handlebars/controls","ember-handlebars/component_lookup","ember-handlebars/views/handlebars_bound_view","ember-handlebars/views/metamorph_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
+    "use strict";
+    var EmberHandlebars = __dependency1__["default"];
+    var Ember = __dependency2__["default"];
+    // to add to globals
+
+    var runLoadHooks = __dependency3__.runLoadHooks;
+    var bootstrap = __dependency4__["default"];
+
+    var normalizePath = __dependency5__.normalizePath;
+    var template = __dependency5__.template;
+    var makeBoundHelper = __dependency5__.makeBoundHelper;
+    var registerBoundHelper = __dependency5__.registerBoundHelper;
+    var resolveHash = __dependency5__.resolveHash;
+    var resolveParams = __dependency5__.resolveParams;
+    var getEscaped = __dependency5__.getEscaped;
+    var handlebarsGet = __dependency5__.handlebarsGet;
+    var evaluateUnboundHelper = __dependency5__.evaluateUnboundHelper;
+    var helperMissingHelper = __dependency5__.helperMissingHelper;
+    var blockHelperMissingHelper = __dependency5__.blockHelperMissingHelper;
+
+
+    // side effect of extending StringUtils of htmlSafe
+
+    var resolvePaths = __dependency7__["default"];
+    var bind = __dependency8__.bind;
+    var _triageMustacheHelper = __dependency8__._triageMustacheHelper;
+    var resolveHelper = __dependency8__.resolveHelper;
+    var bindHelper = __dependency8__.bindHelper;
+    var boundIfHelper = __dependency8__.boundIfHelper;
+    var unboundIfHelper = __dependency8__.unboundIfHelper;
+    var withHelper = __dependency8__.withHelper;
+    var ifHelper = __dependency8__.ifHelper;
+    var unlessHelper = __dependency8__.unlessHelper;
+    var bindAttrHelper = __dependency8__.bindAttrHelper;
+    var bindAttrHelperDeprecated = __dependency8__.bindAttrHelperDeprecated;
+    var bindClasses = __dependency8__.bindClasses;
+
+    var collectionHelper = __dependency9__["default"];
+    var ViewHelper = __dependency10__.ViewHelper;
+    var viewHelper = __dependency10__.viewHelper;
+    var unboundHelper = __dependency11__["default"];
+    var logHelper = __dependency12__.logHelper;
+    var debuggerHelper = __dependency12__.debuggerHelper;
+    var EachView = __dependency13__.EachView;
+    var GroupedEach = __dependency13__.GroupedEach;
+    var eachHelper = __dependency13__.eachHelper;
+
+    var templateHelper = __dependency14__["default"];
+    var partialHelper = __dependency15__["default"];
+    var yieldHelper = __dependency16__["default"];
+    var locHelper = __dependency17__["default"];
+
+
+    var Checkbox = __dependency18__["default"];
+    var Select = __dependency19__.Select;
+    var SelectOption = __dependency19__.SelectOption;
+    var SelectOptgroup = __dependency19__.SelectOptgroup;
+    var TextArea = __dependency20__["default"];
+    var TextField = __dependency21__["default"];
+    var TextSupport = __dependency22__["default"];
+    var TextSupport = __dependency22__["default"];
+    var inputHelper = __dependency23__.inputHelper;
+    var textareaHelper = __dependency23__.textareaHelper;var ComponentLookup = __dependency24__["default"];
+    var _HandlebarsBoundView = __dependency25__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency25__.SimpleHandlebarsView;
+    var _SimpleMetamorphView = __dependency26__._SimpleMetamorphView;
+    var _MetamorphView = __dependency26__._MetamorphView;
+    var _Metamorph = __dependency26__._Metamorph;
+
+    /**
+    Ember Handlebars
+
+    @module ember
+    @submodule ember-handlebars
+    @requires ember-views
+    */
+
+    // Ember.Handlebars.Globals
+    EmberHandlebars.bootstrap = bootstrap;
+    EmberHandlebars.template = template;
+    EmberHandlebars.makeBoundHelper = makeBoundHelper;
+    EmberHandlebars.registerBoundHelper = registerBoundHelper;
+    EmberHandlebars.resolveHash = resolveHash;
+    EmberHandlebars.resolveParams = resolveParams;
+    EmberHandlebars.resolveHelper = resolveHelper;
+    EmberHandlebars.get = handlebarsGet;
+    EmberHandlebars.getEscaped = getEscaped;
+    EmberHandlebars.evaluateUnboundHelper = evaluateUnboundHelper;
+    EmberHandlebars.bind = bind;
+    EmberHandlebars.bindClasses = bindClasses;
+    EmberHandlebars.EachView = EachView;
+    EmberHandlebars.GroupedEach = GroupedEach;
+    EmberHandlebars.resolvePaths = resolvePaths;
+    EmberHandlebars.ViewHelper = ViewHelper;
+    EmberHandlebars.normalizePath = normalizePath;
+
+
+    // Ember Globals
+    Ember.Handlebars = EmberHandlebars;
+    Ember.ComponentLookup = ComponentLookup;
+    Ember._SimpleHandlebarsView = SimpleHandlebarsView;
+    Ember._HandlebarsBoundView = _HandlebarsBoundView;
+    Ember._SimpleMetamorphView = _SimpleMetamorphView;
+    Ember._MetamorphView = _MetamorphView;
+    Ember._Metamorph = _Metamorph;
+    Ember.TextSupport = TextSupport;
+    Ember.Checkbox = Checkbox;
+    Ember.Select = Select;
+    Ember.SelectOption = SelectOption;
+    Ember.SelectOptgroup = SelectOptgroup;
+    Ember.TextArea = TextArea;
+    Ember.TextField = TextField;
+    Ember.TextSupport = TextSupport;
+
+    // register helpers
+    EmberHandlebars.registerHelper('helperMissing', helperMissingHelper);
+    EmberHandlebars.registerHelper('blockHelperMissing', blockHelperMissingHelper);
+    EmberHandlebars.registerHelper('bind', bindHelper);
+    EmberHandlebars.registerHelper('boundIf', boundIfHelper);
+    EmberHandlebars.registerHelper('_triageMustache', _triageMustacheHelper);
+    EmberHandlebars.registerHelper('unboundIf', unboundIfHelper);
+    EmberHandlebars.registerHelper('with', withHelper);
+    EmberHandlebars.registerHelper('if', ifHelper);
+    EmberHandlebars.registerHelper('unless', unlessHelper);
+    EmberHandlebars.registerHelper('bind-attr', bindAttrHelper);
+    EmberHandlebars.registerHelper('bindAttr', bindAttrHelperDeprecated);
+    EmberHandlebars.registerHelper('collection', collectionHelper);
+    EmberHandlebars.registerHelper("log", logHelper);
+    EmberHandlebars.registerHelper("debugger", debuggerHelper);
+    EmberHandlebars.registerHelper("each", eachHelper);
+    EmberHandlebars.registerHelper("loc", locHelper);
+    EmberHandlebars.registerHelper("partial", partialHelper);
+    EmberHandlebars.registerHelper("template", templateHelper);
+    EmberHandlebars.registerHelper("yield", yieldHelper);
+    EmberHandlebars.registerHelper("view", viewHelper);
+    EmberHandlebars.registerHelper("unbound", unboundHelper);
+    EmberHandlebars.registerHelper("input", inputHelper);
+    EmberHandlebars.registerHelper("textarea", textareaHelper);
+
+    // run load hooks
+    runLoadHooks('Ember.Handlebars', EmberHandlebars);
+
+    __exports__["default"] = EmberHandlebars;
+  });
+define("ember-handlebars/string",
+  ["ember-runtime/system/string","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    // required so we can extend this object.
+    var EmberStringUtils = __dependency1__["default"];
+
+    /**
+      Mark a string as safe for unescaped output with Handlebars. If you
+      return HTML from a Handlebars helper, use this function to
+      ensure Handlebars does not escape the HTML.
+
+      ```javascript
+      Ember.String.htmlSafe('<div>someString</div>')
+      ```
+
+      @method htmlSafe
+      @for Ember.String
+      @static
+      @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
+    */
+    function htmlSafe(str) {
+      return new Handlebars.SafeString(str);
+    };
+
+    EmberStringUtils.htmlSafe = htmlSafe;
+    if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
+
+      /**
+        Mark a string as being safe for unescaped output with Handlebars.
+
+        ```javascript
+        '<div>someString</div>'.htmlSafe()
+        ```
+
+        See [Ember.String.htmlSafe](/api/classes/Ember.String.html#method_htmlSafe).
+
+        @method htmlSafe
+        @for String
+        @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
+      */
+      String.prototype.htmlSafe = function() {
+        return htmlSafe(this);
+      };
+    }
+
+    __exports__["default"] = htmlSafe;
+  });
+define("ember-handlebars/views/handlebars_bound_view",
+  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-views/views/view","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    /*globals Handlebars */
+    /*jshint newcap:false*/
+
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var EmberHandlebars = __dependency1__["default"];
+    // EmberHandlebars.SafeString;
+    var SafeString = EmberHandlebars.SafeString;
+
+    var Ember = __dependency2__["default"];
+    // Ember.K
+    var K = Ember.K
+
+    var Metamorph = requireModule('metamorph');
+
+    var EmberError = __dependency3__["default"];
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+    var merge = __dependency6__["default"];
+    var run = __dependency7__["default"];
+    var computed = __dependency8__.computed;
+    var View = __dependency9__.View;
+    var cloneStates = __dependency10__.cloneStates;
+    var states = __dependency10__.states;
+    var viewStates = states;
+
+    var _MetamorphView = __dependency11__._MetamorphView;
+    var handlebarsGet = __dependency12__.handlebarsGet;
+
+    function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
+      this.path = path;
+      this.pathRoot = pathRoot;
+      this.isEscaped = isEscaped;
+      this.templateData = templateData;
+
+      this.morph = Metamorph();
+      this.state = 'preRender';
+      this.updateId = null;
+      this._parentView = null;
+      this.buffer = null;
+    }
+
+    SimpleHandlebarsView.prototype = {
+      isVirtual: true,
+      isView: true,
+
+      destroy: function () {
+        if (this.updateId) {
+          run.cancel(this.updateId);
+          this.updateId = null;
+        }
+        if (this._parentView) {
+          this._parentView.removeChild(this);
+        }
+        this.morph = null;
+        this.state = 'destroyed';
+      },
+
+      propertyWillChange: K,
+
+      propertyDidChange: K,
+
+      normalizedValue: function() {
+        var path = this.path,
+            pathRoot = this.pathRoot,
+            result, templateData;
+
+        // Use the pathRoot as the result if no path is provided. This
+        // happens if the path is `this`, which gets normalized into
+        // a `pathRoot` of the current Handlebars context and a path
+        // of `''`.
+        if (path === '') {
+          result = pathRoot;
+        } else {
+          templateData = this.templateData;
+          result = handlebarsGet(pathRoot, path, { data: templateData });
+        }
+
+        return result;
+      },
+
+      renderToBuffer: function(buffer) {
+        var string = '';
+
+        string += this.morph.startTag();
+        string += this.render();
+        string += this.morph.endTag();
+
+        buffer.push(string);
+      },
+
+      render: function() {
+        // If not invoked via a triple-mustache ({{{foo}}}), escape
+        // the content of the template.
+        var escape = this.isEscaped;
+        var result = this.normalizedValue();
+
+        if (result === null || result === undefined) {
+          result = "";
+        } else if (!(result instanceof SafeString)) {
+          result = String(result);
+        }
+
+        if (escape) { result = Handlebars.Utils.escapeExpression(result); }
+        return result;
+      },
+
+      rerender: function() {
+        switch(this.state) {
+          case 'preRender':
+          case 'destroyed':
+            break;
+          case 'inBuffer':
+            throw new EmberError("Something you did tried to replace an {{expression}} before it was inserted into the DOM.");
+          case 'hasElement':
+          case 'inDOM':
+            this.updateId = run.scheduleOnce('render', this, 'update');
+            break;
+        }
+
+        return this;
+      },
+
+      update: function () {
+        this.updateId = null;
+        this.morph.html(this.render());
+      },
+
+      transitionTo: function(state) {
+        this.state = state;
+      }
+    };
+
+    var states = cloneStates(viewStates);
+
+    merge(states._default, {
+      rerenderIfNeeded: K
+    });
+
+    merge(states.inDOM, {
+      rerenderIfNeeded: function(view) {
+        if (view.normalizedValue() !== view._lastNormalizedValue) {
+          view.rerender();
+        }
+      }
+    });
+
+    /**
+      `Ember._HandlebarsBoundView` is a private view created by the Handlebars
+      `{{bind}}` helpers that is used to keep track of bound properties.
+
+      Every time a property is bound using a `{{mustache}}`, an anonymous subclass
+      of `Ember._HandlebarsBoundView` is created with the appropriate sub-template
+      and context set up. When the associated property changes, just the template
+      for this view will re-render.
+
+      @class _HandlebarsBoundView
+      @namespace Ember
+      @extends Ember._MetamorphView
+      @private
+    */
+    var _HandlebarsBoundView = _MetamorphView.extend({
+      states: states,
+      instrumentName: 'boundHandlebars',
+
+      /**
+        The function used to determine if the `displayTemplate` or
+        `inverseTemplate` should be rendered. This should be a function that takes
+        a value and returns a Boolean.
+
+        @property shouldDisplayFunc
+        @type Function
+        @default null
+      */
+      shouldDisplayFunc: null,
+
+      /**
+        Whether the template rendered by this view gets passed the context object
+        of its parent template, or gets passed the value of retrieving `path`
+        from the `pathRoot`.
+
+        For example, this is true when using the `{{#if}}` helper, because the
+        template inside the helper should look up properties relative to the same
+        object as outside the block. This would be `false` when used with `{{#with
+        foo}}` because the template should receive the object found by evaluating
+        `foo`.
+
+        @property preserveContext
+        @type Boolean
+        @default false
+      */
+      preserveContext: false,
+
+      /**
+        If `preserveContext` is true, this is the object that will be used
+        to render the template.
+
+        @property previousContext
+        @type Object
+      */
+      previousContext: null,
+
+      /**
+        The template to render when `shouldDisplayFunc` evaluates to `true`.
+
+        @property displayTemplate
+        @type Function
+        @default null
+      */
+      displayTemplate: null,
+
+      /**
+        The template to render when `shouldDisplayFunc` evaluates to `false`.
+
+        @property inverseTemplate
+        @type Function
+        @default null
+      */
+      inverseTemplate: null,
+
+
+      /**
+        The path to look up on `pathRoot` that is passed to
+        `shouldDisplayFunc` to determine which template to render.
+
+        In addition, if `preserveContext` is `false,` the object at this path will
+        be passed to the template when rendering.
+
+        @property path
+        @type String
+        @default null
+      */
+      path: null,
+
+      /**
+        The object from which the `path` will be looked up. Sometimes this is the
+        same as the `previousContext`, but in cases where this view has been
+        generated for paths that start with a keyword such as `view` or
+        `controller`, the path root will be that resolved object.
+
+        @property pathRoot
+        @type Object
+      */
+      pathRoot: null,
+
+      normalizedValue: function() {
+        var path = get(this, 'path'),
+            pathRoot  = get(this, 'pathRoot'),
+            valueNormalizer = get(this, 'valueNormalizerFunc'),
+            result, templateData;
+
+        // Use the pathRoot as the result if no path is provided. This
+        // happens if the path is `this`, which gets normalized into
+        // a `pathRoot` of the current Handlebars context and a path
+        // of `''`.
+        if (path === '') {
+          result = pathRoot;
+        } else {
+          templateData = get(this, 'templateData');
+          result = handlebarsGet(pathRoot, path, { data: templateData });
+        }
+
+        return valueNormalizer ? valueNormalizer(result) : result;
+      },
+
+      rerenderIfNeeded: function() {
+        this.currentState.rerenderIfNeeded(this);
+      },
+
+      /**
+        Determines which template to invoke, sets up the correct state based on
+        that logic, then invokes the default `Ember.View` `render` implementation.
+
+        This method will first look up the `path` key on `pathRoot`,
+        then pass that value to the `shouldDisplayFunc` function. If that returns
+        `true,` the `displayTemplate` function will be rendered to DOM. Otherwise,
+        `inverseTemplate`, if specified, will be rendered.
+
+        For example, if this `Ember._HandlebarsBoundView` represented the `{{#with
+        foo}}` helper, it would look up the `foo` property of its context, and
+        `shouldDisplayFunc` would always return true. The object found by looking
+        up `foo` would be passed to `displayTemplate`.
+
+        @method render
+        @param {Ember.RenderBuffer} buffer
+      */
+      render: function(buffer) {
+        // If not invoked via a triple-mustache ({{{foo}}}), escape
+        // the content of the template.
+        var escape = get(this, 'isEscaped');
+
+        var shouldDisplay = get(this, 'shouldDisplayFunc'),
+            preserveContext = get(this, 'preserveContext'),
+            context = get(this, 'previousContext');
+
+        var inverseTemplate = get(this, 'inverseTemplate'),
+            displayTemplate = get(this, 'displayTemplate');
+
+        var result = this.normalizedValue();
+        this._lastNormalizedValue = result;
+
+        // First, test the conditional to see if we should
+        // render the template or not.
+        if (shouldDisplay(result)) {
+          set(this, 'template', displayTemplate);
+
+          // If we are preserving the context (for example, if this
+          // is an #if block, call the template with the same object.
+          if (preserveContext) {
+            set(this, '_context', context);
+          } else {
+          // Otherwise, determine if this is a block bind or not.
+          // If so, pass the specified object to the template
+            if (displayTemplate) {
+              set(this, '_context', result);
+            } else {
+            // This is not a bind block, just push the result of the
+            // expression to the render context and return.
+              if (result === null || result === undefined) {
+                result = "";
+              } else if (!(result instanceof SafeString)) {
+                result = String(result);
+              }
+
+              if (escape) { result = Handlebars.Utils.escapeExpression(result); }
+              buffer.push(result);
+              return;
+            }
+          }
+        } else if (inverseTemplate) {
+          set(this, 'template', inverseTemplate);
+
+          if (preserveContext) {
+            set(this, '_context', context);
+          } else {
+            set(this, '_context', result);
+          }
+        } else {
+          set(this, 'template', function() { return ''; });
+        }
+
+        return this._super(buffer);
+      }
+    });
+
+    __exports__._HandlebarsBoundView = _HandlebarsBoundView;
+    __exports__.SimpleHandlebarsView = SimpleHandlebarsView;
+  });
+define("ember-handlebars/views/metamorph_view",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    /*jshint newcap:false*/
+    var Ember = __dependency1__["default"];
+    // Ember.deprecate
+    // var emberDeprecate = Ember.deprecate;
+
+    var get = __dependency2__.get;
+    var set = __dependency3__["default"];
+
+    var CoreView = __dependency4__.CoreView;
+    var View = __dependency4__.View;
+    var Mixin = __dependency5__.Mixin;
+    var run = __dependency6__["default"];
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Metamorph = requireModule('metamorph');
+
+    function notifyMutationListeners() {
+      run.once(View, 'notifyMutationListeners');
+    }
+
+    // DOMManager should just abstract dom manipulation between jquery and metamorph
+    var DOMManager = {
+      remove: function(view) {
+        view.morph.remove();
+        notifyMutationListeners();
+      },
+
+      prepend: function(view, html) {
+        view.morph.prepend(html);
+        notifyMutationListeners();
+      },
+
+      after: function(view, html) {
+        view.morph.after(html);
+        notifyMutationListeners();
+      },
+
+      html: function(view, html) {
+        view.morph.html(html);
+        notifyMutationListeners();
+      },
+
+      // This is messed up.
+      replace: function(view) {
+        var morph = view.morph;
+
+        view.transitionTo('preRender');
+
+        run.schedule('render', this, function renderMetamorphView() {
+          if (view.isDestroying) { return; }
+
+          view.clearRenderedChildren();
+          var buffer = view.renderToBuffer();
+
+          view.invokeRecursively(function(view) {
+            view.propertyWillChange('element');
+          });
+          view.triggerRecursively('willInsertElement');
+
+          morph.replaceWith(buffer.string());
+          view.transitionTo('inDOM');
+
+          view.invokeRecursively(function(view) {
+            view.propertyDidChange('element');
+          });
+          view.triggerRecursively('didInsertElement');
+
+          notifyMutationListeners();
+        });
+      },
+
+      empty: function(view) {
+        view.morph.html("");
+        notifyMutationListeners();
+      }
+    };
+
+    // The `morph` and `outerHTML` properties are internal only
+    // and not observable.
+
+    /**
+      @class _Metamorph
+      @namespace Ember
+      @private
+    */
+    var _Metamorph = Mixin.create({
+      isVirtual: true,
+      tagName: '',
+
+      instrumentName: 'metamorph',
+
+      init: function() {
+        this._super();
+        this.morph = Metamorph();
+        Ember.deprecate('Supplying a tagName to Metamorph views is unreliable and is deprecated. You may be setting the tagName on a Handlebars helper that creates a Metamorph.', !this.tagName);
+      },
+
+      beforeRender: function(buffer) {
+        buffer.push(this.morph.startTag());
+        buffer.pushOpeningTag();
+      },
+
+      afterRender: function(buffer) {
+        buffer.pushClosingTag();
+        buffer.push(this.morph.endTag());
+      },
+
+      createElement: function() {
+        var buffer = this.renderToBuffer();
+        this.outerHTML = buffer.string();
+        this.clearBuffer();
+      },
+
+      domManager: DOMManager
+    });
+
+    /**
+      @class _MetamorphView
+      @namespace Ember
+      @extends Ember.View
+      @uses Ember._Metamorph
+      @private
+    */
+    var _MetamorphView = View.extend(_Metamorph);
+
+    /**
+      @class _SimpleMetamorphView
+      @namespace Ember
+      @extends Ember.CoreView
+      @uses Ember._Metamorph
+      @private
+    */
+    var _SimpleMetamorphView = CoreView.extend(_Metamorph);
+
+    __exports__._SimpleMetamorphView = _SimpleMetamorphView;
+    __exports__._MetamorphView = _MetamorphView;
+    __exports__._Metamorph = _Metamorph;
+  });
+})();
+
+(function() {
+define("ember-routing/ext/controller",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-runtime/controllers/controller","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, deprecate
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EnumerableUtils = __dependency4__["default"];
+    var map = EnumerableUtils.map;
+
+    var ControllerMixin = __dependency5__.ControllerMixin;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+
+    ControllerMixin.reopen({
+      /**
+        Transition the application into another route. The route may
+        be either a single route or route path:
+
+        ```javascript
+        aController.transitionToRoute('blogPosts');
+        aController.transitionToRoute('blogPosts.recentEntries');
+        ```
+
+        Optionally supply a model for the route in question. The model
+        will be serialized into the URL using the `serialize` hook of
+        the route:
+
+        ```javascript
+        aController.transitionToRoute('blogPost', aPost);
+        ```
+
+        If a literal is passed (such as a number or a string), it will
+        be treated as an identifier instead. In this case, the `model`
+        hook of the route will be triggered:
+
+        ```javascript
+        aController.transitionToRoute('blogPost', 1);
+        ```
+
+        Multiple models will be applied last to first recursively up the
+        resource tree.
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('blogPost', {path:':blogPostId'}, function(){
+            this.resource('blogComment', {path: ':blogCommentId'});
+          });
+        });
+
+        aController.transitionToRoute('blogComment', aPost, aComment);
+        aController.transitionToRoute('blogComment', 1, 13);
+        ```
+
+        It is also possible to pass a URL (a string that starts with a
+        `/`). This is intended for testing and debugging purposes and
+        should rarely be used in production code.
+
+        ```javascript
+        aController.transitionToRoute('/');
+        aController.transitionToRoute('/blog/post/1/comment/13');
+        ```
+
+        See also [replaceRoute](/api/classes/Ember.ControllerMixin.html#method_replaceRoute).
+
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used
+        while transitioning to the route.
+        @for Ember.ControllerMixin
+        @method transitionToRoute
+      */
+      transitionToRoute: function() {
+        // target may be either another controller or a router
+        var target = get(this, 'target'),
+            method = target.transitionToRoute || target.transitionTo;
+        return method.apply(target, arguments);
+      },
+
+      /**
+        @deprecated
+        @for Ember.ControllerMixin
+        @method transitionTo
+      */
+      transitionTo: function() {
+        Ember.deprecate("transitionTo is deprecated. Please use transitionToRoute.");
+        return this.transitionToRoute.apply(this, arguments);
+      },
+
+      /**
+        Transition into another route while replacing the current URL, if possible.
+        This will replace the current history entry instead of adding a new one.
+        Beside that, it is identical to `transitionToRoute` in all other respects.
+
+        ```javascript
+        aController.replaceRoute('blogPosts');
+        aController.replaceRoute('blogPosts.recentEntries');
+        ```
+
+        Optionally supply a model for the route in question. The model
+        will be serialized into the URL using the `serialize` hook of
+        the route:
+
+        ```javascript
+        aController.replaceRoute('blogPost', aPost);
+        ```
+
+        If a literal is passed (such as a number or a string), it will
+        be treated as an identifier instead. In this case, the `model`
+        hook of the route will be triggered:
+
+        ```javascript
+        aController.replaceRoute('blogPost', 1);
+        ```
+
+        Multiple models will be applied last to first recursively up the
+        resource tree.
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('blogPost', {path:':blogPostId'}, function(){
+            this.resource('blogComment', {path: ':blogCommentId'});
+          });
+        });
+
+        aController.replaceRoute('blogComment', aPost, aComment);
+        aController.replaceRoute('blogComment', 1, 13);
+        ```
+
+        It is also possible to pass a URL (a string that starts with a
+        `/`). This is intended for testing and debugging purposes and
+        should rarely be used in production code.
+
+        ```javascript
+        aController.replaceRoute('/');
+        aController.replaceRoute('/blog/post/1/comment/13');
+        ```
+
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used
+        while transitioning to the route.
+        @for Ember.ControllerMixin
+        @method replaceRoute
+      */
+      replaceRoute: function() {
+        // target may be either another controller or a router
+        var target = get(this, 'target'),
+            method = target.replaceRoute || target.replaceWith;
+        return method.apply(target, arguments);
+      },
+
+      /**
+        @deprecated
+        @for Ember.ControllerMixin
+        @method replaceWith
+      */
+      replaceWith: function() {
+        Ember.deprecate("replaceWith is deprecated. Please use replaceRoute.");
+        return this.replaceRoute.apply(this, arguments);
+      }
+    });
+
+    
+    __exports__["default"] = ControllerMixin;
+  });
+define("ember-routing/ext/run_loop",
+  ["ember-metal/run_loop"],
+  function(__dependency1__) {
+    "use strict";
+    var run = __dependency1__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    // Add a new named queue after the 'actions' queue (where RSVP promises
+    // resolve), which is used in router transitions to prevent unnecessary
+    // loading state entry if all context promises resolve on the
+    // 'actions' queue first.
+
+    var queues = run.queues;
+    run._addQueue('routerTransitions', 'actions');
+  });
+define("ember-routing/ext/view",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-views/views/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var run = __dependency3__["default"];
+    var EmberView = __dependency4__.View;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    EmberView.reopen({
+
+      /**
+        Sets the private `_outlets` object on the view.
+
+        @method init
+       */
+      init: function() {
+        set(this, '_outlets', {});
+        this._super();
+      },
+
+      /**
+        Manually fill any of a view's `{{outlet}}` areas with the
+        supplied view.
+
+        Example
+
+        ```javascript
+        var MyView = Ember.View.extend({
+          template: Ember.Handlebars.compile('Child view: {{outlet "main"}} ')
+        });
+        var myView = MyView.create();
+        myView.appendTo('body');
+        // The html for myView now looks like:
+        // <div id="ember228" class="ember-view">Child view: </div>
+
+        var FooView = Ember.View.extend({
+          template: Ember.Handlebars.compile('<h1>Foo</h1> ')
+        });
+        var fooView = FooView.create();
+        myView.connectOutlet('main', fooView);
+        // The html for myView now looks like:
+        // <div id="ember228" class="ember-view">Child view:
+        //   <div id="ember234" class="ember-view"><h1>Foo</h1> </div>
+        // </div>
+        ```
+        @method connectOutlet
+        @param  {String} outletName A unique name for the outlet
+        @param  {Object} view       An Ember.View
+       */
+      connectOutlet: function(outletName, view) {
+        if (this._pendingDisconnections) {
+          delete this._pendingDisconnections[outletName];
+        }
+
+        if (this._hasEquivalentView(outletName, view)) {
+          view.destroy();
+          return;
+        }
+
+        var outlets = get(this, '_outlets'),
+            container = get(this, 'container'),
+            router = container && container.lookup('router:main'),
+            renderedName = get(view, 'renderedName');
+
+        set(outlets, outletName, view);
+
+        if (router && renderedName) {
+          router._connectActiveView(renderedName, view);
+        }
+      },
+
+      /**
+        Determines if the view has already been created by checking if
+        the view has the same constructor, template, and context as the
+        view in the `_outlets` object.
+
+        @private
+        @method _hasEquivalentView
+        @param  {String} outletName The name of the outlet we are checking
+        @param  {Object} view       An Ember.View
+        @return {Boolean}
+       */
+      _hasEquivalentView: function(outletName, view) {
+        var existingView = get(this, '_outlets.'+outletName);
+        return existingView &&
+          existingView.constructor === view.constructor &&
+          existingView.get('template') === view.get('template') &&
+          existingView.get('context') === view.get('context');
+      },
+
+      /**
+        Removes an outlet from the view.
+
+        Example
+
+        ```javascript
+        var MyView = Ember.View.extend({
+          template: Ember.Handlebars.compile('Child view: {{outlet "main"}} ')
+        });
+        var myView = MyView.create();
+        myView.appendTo('body');
+        // myView's html:
+        // <div id="ember228" class="ember-view">Child view: </div>
+
+        var FooView = Ember.View.extend({
+          template: Ember.Handlebars.compile('<h1>Foo</h1> ')
+        });
+        var fooView = FooView.create();
+        myView.connectOutlet('main', fooView);
+        // myView's html:
+        // <div id="ember228" class="ember-view">Child view:
+        //   <div id="ember234" class="ember-view"><h1>Foo</h1> </div>
+        // </div>
+
+        myView.disconnectOutlet('main');
+        // myView's html:
+        // <div id="ember228" class="ember-view">Child view: </div>
+        ```
+
+        @method disconnectOutlet
+        @param  {String} outletName The name of the outlet to be removed
+       */
+      disconnectOutlet: function(outletName) {
+        if (!this._pendingDisconnections) {
+          this._pendingDisconnections = {};
+        }
+        this._pendingDisconnections[outletName] = true;
+        run.once(this, '_finishDisconnections');
+      },
+
+      /**
+        Gets an outlet that is pending disconnection and then
+        nullifys the object on the `_outlet` object.
+
+        @private
+        @method _finishDisconnections
+       */
+      _finishDisconnections: function() {
+        if (this.isDestroyed) return; // _outlets will be gone anyway
+        var outlets = get(this, '_outlets');
+        var pendingDisconnections = this._pendingDisconnections;
+        this._pendingDisconnections = null;
+
+        for (var outletName in pendingDisconnections) {
+          set(outlets, outletName, null);
+        }
+      }
+    });
+
+    __exports__["default"] = EmberView;
+  });
+define("ember-routing/helpers/action",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/run_loop","ember-views/system/utils","ember-handlebars","ember-routing/system/router","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Handlebars, uuid, FEATURES, assert, deprecate
+    var get = __dependency2__.get;
+    var forEach = __dependency3__.forEach;
+    var run = __dependency4__["default"];
+
+    var isSimpleClick = __dependency5__.isSimpleClick;
+    var EmberHandlebars = __dependency6__["default"];
+    var EmberRouter = __dependency7__["default"];
+
+
+    var EmberHandlebars = __dependency6__["default"];
+    var handlebarsGet = __dependency8__.handlebarsGet;
+    var viewHelper = __dependency9__.viewHelper;
+    var resolveParams = __dependency10__.resolveParams;
+    var resolvePath = __dependency10__.resolvePath;
+
+    // requireModule('ember-handlebars');
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    var SafeString = EmberHandlebars.SafeString,
+        a_slice = Array.prototype.slice;
+
+    function args(options, actionName) {
+      var ret = [];
+      if (actionName) { ret.push(actionName); }
+
+      var types = options.options.types.slice(1),
+          data = options.options.data;
+
+      return ret.concat(resolveParams(options.context, options.params, { types: types, data: data }));
+    }
+
+    var ActionHelper = {
+      registeredActions: {}
+    };
+
+    var keys = ["alt", "shift", "meta", "ctrl"];
+
+    var POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
+
+    var isAllowedEvent = function(event, allowedKeys) {
+      if (typeof allowedKeys === "undefined") {
+        if (POINTER_EVENT_TYPE_REGEX.test(event.type)) {
+          return isSimpleClick(event);
+        } else {
+          allowedKeys = '';
+        }
+      }
+
+      if (allowedKeys.indexOf("any") >= 0) {
+        return true;
+      }
+
+      var allowed = true;
+
+      forEach.call(keys, function(key) {
+        if (event[key + "Key"] && allowedKeys.indexOf(key) === -1) {
+          allowed = false;
+        }
+      });
+
+      return allowed;
+    };
+
+    ActionHelper.registerAction = function(actionNameOrPath, options, allowedKeys) {
+      var actionId = ++Ember.uuid;
+
+      ActionHelper.registeredActions[actionId] = {
+        eventName: options.eventName,
+        handler: function handleRegisteredAction(event) {
+          if (!isAllowedEvent(event, allowedKeys)) { return true; }
+
+          if (options.preventDefault !== false) {
+            event.preventDefault();
+          }
+
+          if (options.bubbles === false) {
+            event.stopPropagation();
+          }
+
+          var target = options.target,
+              parameters = options.parameters,
+              actionName;
+
+          if (target.target) {
+            target = handlebarsGet(target.root, target.target, target.options);
+          } else {
+            target = target.root;
+          }
+
+          if (options.boundProperty) {
+            actionName = resolveParams(parameters.context, [actionNameOrPath], { types: ['ID'], data: parameters.options.data })[0];
+
+            if(typeof actionName === 'undefined' || typeof actionName === 'function') {
+              Ember.assert("You specified a quoteless path to the {{action}} helper '" + actionNameOrPath + "' which did not resolve to an actionName. Perhaps you meant to use a quoted actionName? (e.g. {{action '" + actionNameOrPath + "'}}).", true);
+              actionName = actionNameOrPath;
+            }
+          }
+
+          if (!actionName) {
+            actionName = actionNameOrPath;
+          }
+
+          run(function runRegisteredAction() {
+            if (target.send) {
+              target.send.apply(target, args(parameters, actionName));
+            } else {
+              Ember.assert("The action '" + actionName + "' did not exist on " + target, typeof target[actionName] === 'function');
+              target[actionName].apply(target, args(parameters));
+            }
+          });
+        }
+      };
+
+      options.view.on('willClearRender', function() {
+        delete ActionHelper.registeredActions[actionId];
+      });
+
+      return actionId;
+    };
+
+    /**
+      The `{{action}}` helper registers an HTML element within a template for DOM
+      event handling and forwards that interaction to the templates's controller
+      or supplied `target` option (see 'Specifying a Target').
+
+      If the controller does not implement the event, the event is sent
+      to the current route, and it bubbles up the route hierarchy from there.
+
+      User interaction with that element will invoke the supplied action name on
+      the appropriate target. Specifying a non-quoted action name will result in
+      a bound property lookup at the time the event will be triggered.
+
+      Given the following application Handlebars template on the page
+
+      ```handlebars
+      <div {{action 'anActionName'}}>
+        click me
+      </div>
+      ```
+
+      And application code
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        actions: {
+          anActionName: function() {
+          }
+        }
+      });
+      ```
+
+      Will result in the following rendered HTML
+
+      ```html
+      <div class="ember-view">
+        <div data-ember-action="1">
+          click me
+        </div>
+      </div>
+      ```
+
+      Clicking "click me" will trigger the `anActionName` action of the
+      `App.ApplicationController`. In this case, no additional parameters will be passed.
+
+      If you provide additional parameters to the helper:
+
+      ```handlebars
+      <button {{action 'edit' post}}>Edit</button>
+      ```
+
+      Those parameters will be passed along as arguments to the JavaScript
+      function implementing the action.
+
+      ### Event Propagation
+
+      Events triggered through the action helper will automatically have
+      `.preventDefault()` called on them. You do not need to do so in your event
+      handlers. If you need to allow event propagation (to handle file inputs for
+      example) you can supply the `preventDefault=false` option to the `{{action}}` helper:
+
+      ```handlebars
+      <div {{action "sayHello" preventDefault=false}}>
+        <input type="file" />
+        <input type="checkbox" />
+      </div>
+      ```
+
+      To disable bubbling, pass `bubbles=false` to the helper:
+
+      ```handlebars
+      <button {{action 'edit' post bubbles=false}}>Edit</button>
+      ```
+
+      If you need the default handler to trigger you should either register your
+      own event handler, or use event methods on your view class. See [Ember.View](/api/classes/Ember.View.html)
+      'Responding to Browser Events' for more information.
+
+      ### Specifying DOM event type
+
+      By default the `{{action}}` helper registers for DOM `click` events. You can
+      supply an `on` option to the helper to specify a different DOM event name:
+
+      ```handlebars
+      <div {{action "anActionName" on="doubleClick"}}>
+        click me
+      </div>
+      ```
+
+      See `Ember.View` 'Responding to Browser Events' for a list of
+      acceptable DOM event names.
+
+      NOTE: Because `{{action}}` depends on Ember's event dispatch system it will
+      only function if an `Ember.EventDispatcher` instance is available. An
+      `Ember.EventDispatcher` instance will be created when a new `Ember.Application`
+      is created. Having an instance of `Ember.Application` will satisfy this
+      requirement.
+
+      ### Specifying whitelisted modifier keys
+
+      By default the `{{action}}` helper will ignore click event with pressed modifier
+      keys. You can supply an `allowedKeys` option to specify which keys should not be ignored.
+
+      ```handlebars
+      <div {{action "anActionName" allowedKeys="alt"}}>
+        click me
+      </div>
+      ```
+
+      This way the `{{action}}` will fire when clicking with the alt key pressed down.
+
+      Alternatively, supply "any" to the `allowedKeys` option to accept any combination of modifier keys.
+
+      ```handlebars
+      <div {{action "anActionName" allowedKeys="any"}}>
+        click me with any key pressed
+      </div>
+      ```
+
+      ### Specifying a Target
+
+      There are several possible target objects for `{{action}}` helpers:
+
+      In a typical Ember application, where views are managed through use of the
+      `{{outlet}}` helper, actions will bubble to the current controller, then
+      to the current route, and then up the route hierarchy.
+
+      Alternatively, a `target` option can be provided to the helper to change
+      which object will receive the method call. This option must be a path
+      to an object, accessible in the current context:
+
+      ```handlebars
+      {{! the application template }}
+      <div {{action "anActionName" target=view}}>
+        click me
+      </div>
+      ```
+
+      ```javascript
+      App.ApplicationView = Ember.View.extend({
+        actions: {
+          anActionName: function(){}
+        }
+      });
+
+      ```
+
+      ### Additional Parameters
+
+      You may specify additional parameters to the `{{action}}` helper. These
+      parameters are passed along as the arguments to the JavaScript function
+      implementing the action.
+
+      ```handlebars
+      {{#each person in people}}
+        <div {{action "edit" person}}>
+          click me
+        </div>
+      {{/each}}
+      ```
+
+      Clicking "click me" will trigger the `edit` method on the current controller
+      with the value of `person` as a parameter.
+
+      @method action
+      @for Ember.Handlebars.helpers
+      @param {String} actionName
+      @param {Object} [context]*
+      @param {Hash} options
+    */
+    function actionHelper(actionName) {
+      var options = arguments[arguments.length - 1],
+          contexts = a_slice.call(arguments, 1, -1);
+
+      var hash = options.hash,
+          controller = options.data.keywords.controller;
+
+      // create a hash to pass along to registerAction
+      var action = {
+        eventName: hash.on || "click",
+        parameters: {
+          context: this,
+          options: options,
+          params: contexts
+        },
+        view: options.data.view,
+        bubbles: hash.bubbles,
+        preventDefault: hash.preventDefault,
+        target: { options: options },
+        boundProperty: options.types[0] === "ID"
+      };
+
+      if (hash.target) {
+        action.target.root = this;
+        action.target.target = hash.target;
+      } else if (controller) {
+        action.target.root = controller;
+      }
+
+      var actionId = ActionHelper.registerAction(actionName, action, hash.allowedKeys);
+      return new SafeString('data-ember-action="' + actionId + '"');
+    };
+
+    __exports__.ActionHelper = ActionHelper;
+    __exports__.actionHelper = actionHelper;
+  });
+define("ember-routing/helpers/link_to",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/keys","ember-views/system/utils","ember-views/views/view","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, Logger, Handlebars, warn, assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var merge = __dependency4__["default"];
+    var run = __dependency5__["default"];
+    var computed = __dependency6__.computed;
+
+    var onLoad = __dependency7__.onLoad;
+    var fmt = __dependency8__.fmt;
+    var EmberObject = __dependency9__["default"];
+    var keys = __dependency10__["default"];
+    var isSimpleClick = __dependency11__.isSimpleClick;
+    var EmberView = __dependency12__.View;
+    var EmberHandlebars = __dependency13__["default"];
+    var viewHelper = __dependency14__.viewHelper;
+    var EmberRouter = __dependency15__["default"];
+    var resolveParams = __dependency16__.resolveParams;
+    var resolvePaths = __dependency16__.resolvePaths;
+
+    // requireModule('ember-handlebars');
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    var slice = [].slice;
+
+    requireModule('ember-handlebars');
+
+    var numberOfContextsAcceptedByHandler = function(handler, handlerInfos) {
+      var req = 0;
+      for (var i = 0, l = handlerInfos.length; i < l; i++) {
+        req = req + handlerInfos[i].names.length;
+        if (handlerInfos[i].handler === handler)
+          break;
+      }
+
+      // query params adds an additional context
+            return req;
+    };
+
+    var QueryParams = EmberObject.extend({
+      values: null
+    });
+
+    function computeQueryParams(linkView, stripDefaultValues) {
+      var helperParameters = linkView.parameters,
+          queryParamsObject = get(linkView, 'queryParamsObject'),
+          suppliedParams = {};
+
+      if (queryParamsObject) {
+        merge(suppliedParams, queryParamsObject.values);
+      }
+
+      var resolvedParams = get(linkView, 'resolvedParams'),
+          router = get(linkView, 'router'),
+          routeName = resolvedParams[0],
+          paramsForRoute = router._queryParamsFor(routeName),
+          qps = paramsForRoute.qps,
+          paramsForRecognizer = {};
+
+      // We need to collect all non-default query params for this route.
+      for (var i = 0, len = qps.length; i < len; ++i) {
+        var qp = qps[i];
+
+        // Check if the link-to provides a value for this qp.
+        var providedType = null, value;
+        if (qp.prop in suppliedParams) {
+          value = suppliedParams[qp.prop];
+          providedType = queryParamsObject.types[qp.prop];
+          delete suppliedParams[qp.prop];
+        } else if (qp.urlKey in suppliedParams) {
+          value = suppliedParams[qp.urlKey];
+          providedType = queryParamsObject.types[qp.urlKey];
+          delete suppliedParams[qp.urlKey];
+        }
+
+        if (providedType) {
+          if (providedType === 'ID') {
+            var normalizedPath = EmberHandlebars.normalizePath(helperParameters.context, value, helperParameters.options.data);
+            value = EmberHandlebars.get(normalizedPath.root, normalizedPath.path, helperParameters.options);
+          }
+
+          value = qp.route.serializeQueryParam(value, qp.urlKey, qp.type);
+        } else {
+          value = qp.svalue;
+        }
+
+        if (stripDefaultValues && value === qp.sdef) {
+          continue;
+        }
+
+        paramsForRecognizer[qp.urlKey] = value;
+      }
+
+      return paramsForRecognizer;
+    }
+
+    function routeArgsWithoutDefaultQueryParams(linkView) {
+      var routeArgs = linkView.get('routeArgs');
+
+      if (!routeArgs[routeArgs.length-1].queryParams) {
+        return routeArgs;
+      }
+
+      routeArgs = routeArgs.slice();
+      routeArgs[routeArgs.length-1] = {
+        queryParams: computeQueryParams(linkView, true)
+      };
+      return routeArgs;
+    }
+
+    function getResolvedPaths(options) {
+
+      var types = options.options.types,
+          data = options.options.data;
+
+      return resolvePaths(options.context, options.params, { types: types, data: data });
+    }
+
+    /**
+      `Ember.LinkView` renders an element whose `click` event triggers a
+      transition of the application's instance of `Ember.Router` to
+      a supplied route by name.
+
+      Instances of `LinkView` will most likely be created through
+      the `link-to` Handlebars helper, but properties of this class
+      can be overridden to customize application-wide behavior.
+
+      @class LinkView
+      @namespace Ember
+      @extends Ember.View
+      @see {Handlebars.helpers.link-to}
+    **/
+    var LinkView = Ember.LinkView = EmberView.extend({
+      tagName: 'a',
+      currentWhen: null,
+
+      /**
+        Sets the `title` attribute of the `LinkView`'s HTML element.
+
+        @property title
+        @default null
+      **/
+      title: null,
+
+      /**
+        Sets the `rel` attribute of the `LinkView`'s HTML element.
+
+        @property rel
+        @default null
+      **/
+      rel: null,
+
+      /**
+        The CSS class to apply to `LinkView`'s element when its `active`
+        property is `true`.
+
+        @property activeClass
+        @type String
+        @default active
+      **/
+      activeClass: 'active',
+
+      /**
+        The CSS class to apply to `LinkView`'s element when its `loading`
+        property is `true`.
+
+        @property loadingClass
+        @type String
+        @default loading
+      **/
+      loadingClass: 'loading',
+
+      /**
+        The CSS class to apply to a `LinkView`'s element when its `disabled`
+        property is `true`.
+
+        @property disabledClass
+        @type String
+        @default disabled
+      **/
+      disabledClass: 'disabled',
+      _isDisabled: false,
+
+      /**
+        Determines whether the `LinkView` will trigger routing via
+        the `replaceWith` routing strategy.
+
+        @property replace
+        @type Boolean
+        @default false
+      **/
+      replace: false,
+
+      /**
+        By default the `{{link-to}}` helper will bind to the `href` and
+        `title` attributes. It's discourage that you override these defaults,
+        however you can push onto the array if needed.
+
+        @property attributeBindings
+        @type Array | String
+        @default ['href', 'title', 'rel']
+       **/
+      attributeBindings: ['href', 'title', 'rel'],
+
+      /**
+        By default the `{{link-to}}` helper will bind to the `active`, `loading`, and
+        `disabled` classes. It is discouraged to override these directly.
+
+        @property classNameBindings
+        @type Array
+        @default ['active', 'loading', 'disabled']
+       **/
+      classNameBindings: ['active', 'loading', 'disabled'],
+
+      /**
+        By default the `{{link-to}}` helper responds to the `click` event. You
+        can override this globally by setting this property to your custom
+        event name.
+
+        This is particularly useful on mobile when one wants to avoid the 300ms
+        click delay using some sort of custom `tap` event.
+
+        @property eventName
+        @type String
+        @default click
+      */
+      eventName: 'click',
+
+      // this is doc'ed here so it shows up in the events
+      // section of the API documentation, which is where
+      // people will likely go looking for it.
+      /**
+        Triggers the `LinkView`'s routing behavior. If
+        `eventName` is changed to a value other than `click`
+        the routing behavior will trigger on that custom event
+        instead.
+
+        @event click
+      **/
+
+      /**
+        An overridable method called when LinkView objects are instantiated.
+
+        Example:
+
+        ```javascript
+        App.MyLinkView = Ember.LinkView.extend({
+          init: function() {
+            this._super();
+            Ember.Logger.log('Event is ' + this.get('eventName'));
+          }
+        });
+        ```
+
+        NOTE: If you do override `init` for a framework class like `Ember.View` or
+        `Ember.ArrayController`, be sure to call `this._super()` in your
+        `init` declaration! If you don't, Ember may not have an opportunity to
+        do important setup work, and you'll see strange behavior in your
+        application.
+
+        @method init
+      */
+      init: function() {
+        this._super.apply(this, arguments);
+
+        // Map desired event name to invoke function
+        var eventName = get(this, 'eventName');
+        this.on(eventName, this, this._invoke);
+      },
+
+      /**
+        This method is invoked by observers installed during `init` that fire
+        whenever the params change
+
+        @private
+        @method _paramsChanged
+        @since 1.3.0
+       */
+      _paramsChanged: function() {
+        this.notifyPropertyChange('resolvedParams');
+      },
+
+      /**
+       This is called to setup observers that will trigger a rerender.
+
+       @private
+       @method _setupPathObservers
+       @since 1.3.0
+      **/
+      _setupPathObservers: function(){
+        var helperParameters = this.parameters,
+            linkTextPath     = helperParameters.options.linkTextPath,
+            paths = getResolvedPaths(helperParameters),
+            length = paths.length,
+            path, i, normalizedPath;
+
+        if (linkTextPath) {
+          normalizedPath = EmberHandlebars.normalizePath(helperParameters.context, linkTextPath, helperParameters.options.data);
+          this.registerObserver(normalizedPath.root, normalizedPath.path, this, this.rerender);
+        }
+
+        for(i=0; i < length; i++) {
+          path = paths[i];
+          if (null === path) {
+            // A literal value was provided, not a path, so nothing to observe.
+            continue;
+          }
+
+          normalizedPath = EmberHandlebars.normalizePath(helperParameters.context, path, helperParameters.options.data);
+          this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
+        }
+
+        var queryParamsObject = this.queryParamsObject;
+        if (queryParamsObject) {
+          var values = queryParamsObject.values;
+
+          // Install observers for all of the hash options
+          // provided in the (query-params) subexpression.
+          for (var k in values) {
+            if (!values.hasOwnProperty(k)) { continue; }
+
+            if (queryParamsObject.types[k] === 'ID') {
+              normalizedPath = EmberHandlebars.normalizePath(helperParameters.context, values[k], helperParameters.options.data);
+              this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
+            }
+          }
+        }
+      },
+
+      afterRender: function(){
+        this._super.apply(this, arguments);
+        this._setupPathObservers();
+      },
+
+      /**
+        Even though this isn't a virtual view, we want to treat it as if it is
+        so that you can access the parent with {{view.prop}}
+
+        @private
+        @method concreteView
+      **/
+      concreteView: computed(function() {
+        return get(this, 'parentView');
+      }).property('parentView'),
+
+      /**
+
+        Accessed as a classname binding to apply the `LinkView`'s `disabledClass`
+        CSS `class` to the element when the link is disabled.
+
+        When `true` interactions with the element will not trigger route changes.
+        @property disabled
+      */
+      disabled: computed(function computeLinkViewDisabled(key, value) {
+        if (value !== undefined) { this.set('_isDisabled', value); }
+
+        return value ? get(this, 'disabledClass') : false;
+      }),
+
+      /**
+        Accessed as a classname binding to apply the `LinkView`'s `activeClass`
+        CSS `class` to the element when the link is active.
+
+        A `LinkView` is considered active when its `currentWhen` property is `true`
+        or the application's current route is the route the `LinkView` would trigger
+        transitions into.
+
+        @property active
+      **/
+      active: computed(function computeLinkViewActive() {
+        if (get(this, 'loading')) { return false; }
+
+        var router = get(this, 'router'),
+            routeArgs = get(this, 'routeArgs'),
+            contexts = routeArgs.slice(1),
+            resolvedParams = get(this, 'resolvedParams'),
+            currentWhen = this.currentWhen || routeArgs[0],
+            maximumContexts = numberOfContextsAcceptedByHandler(currentWhen, router.router.recognizer.handlersFor(currentWhen));
+
+        // if we don't have enough contexts revert back to full route name
+        // this is because the leaf route will use one of the contexts
+        if (contexts.length > maximumContexts)
+          currentWhen = routeArgs[0];
+
+        var isActive = router.isActive.apply(router, [currentWhen].concat(contexts));
+
+        if (isActive) { return get(this, 'activeClass'); }
+      }).property('resolvedParams', 'routeArgs'),
+
+      /**
+        Accessed as a classname binding to apply the `LinkView`'s `loadingClass`
+        CSS `class` to the element when the link is loading.
+
+        A `LinkView` is considered loading when it has at least one
+        parameter whose value is currently null or undefined. During
+        this time, clicking the link will perform no transition and
+        emit a warning that the link is still in a loading state.
+
+        @property loading
+      **/
+      loading: computed(function computeLinkViewLoading() {
+        if (!get(this, 'routeArgs')) { return get(this, 'loadingClass'); }
+      }).property('routeArgs'),
+
+      /**
+        Returns the application's main router from the container.
+
+        @private
+        @property router
+      **/
+      router: computed(function() {
+        return get(this, 'controller').container.lookup('router:main');
+      }),
+
+      /**
+        Event handler that invokes the link, activating the associated route.
+
+        @private
+        @method _invoke
+        @param {Event} event
+      */
+      _invoke: function(event) {
+        if (!isSimpleClick(event)) { return true; }
+
+        if (this.preventDefault !== false) { event.preventDefault(); }
+        if (this.bubbles === false) { event.stopPropagation(); }
+
+        if (get(this, '_isDisabled')) { return false; }
+
+        if (get(this, 'loading')) {
+          Ember.Logger.warn("This link-to is in an inactive loading state because at least one of its parameters presently has a null/undefined value, or the provided route name is invalid.");
+          return false;
+        }
+
+        var router = get(this, 'router'),
+            routeArgs = get(this, 'routeArgs');
+
+        var transition;
+        if (get(this, 'replace')) {
+          transition = router.replaceWith.apply(router, routeArgs);
+        } else {
+          transition = router.transitionTo.apply(router, routeArgs);
+        }
+
+        // Schedule eager URL update, but after we've given the transition
+        // a chance to synchronously redirect.
+        // We need to always generate the URL instead of using the href because
+        // the href will include any rootURL set, but the router expects a URL
+        // without it! Note that we don't use the first level router because it
+        // calls location.formatURL(), which also would add the rootURL!
+        var url = router.router.generate.apply(router.router, routeArgsWithoutDefaultQueryParams(this));
+        run.scheduleOnce('routerTransitions', this, this._eagerUpdateUrl, transition, url);
+      },
+
+      /**
+        @private
+        @method _eagerUpdateUrl
+        @param transition
+        @param href
+       */
+      _eagerUpdateUrl: function(transition, href) {
+        if (!transition.isActive || !transition.urlMethod) {
+          // transition was aborted, already ran to completion,
+          // or it has a null url-updated method.
+          return;
+        }
+
+        if (href.indexOf('#') === 0) {
+          href = href.slice(1);
+        }
+
+        // Re-use the routerjs hooks set up by the Ember router.
+        var routerjs = get(this, 'router.router');
+        if (transition.urlMethod === 'update') {
+          routerjs.updateURL(href);
+        } else if (transition.urlMethod === 'replace') {
+          routerjs.replaceURL(href);
+        }
+
+        // Prevent later update url refire.
+        transition.method(null);
+      },
+
+      /**
+        Computed property that returns an array of the
+        resolved parameters passed to the `link-to` helper,
+        e.g.:
+
+        ```hbs
+        {{link-to a b '123' c}}
+        ```
+
+        will generate a `resolvedParams` of:
+
+        ```js
+        [aObject, bObject, '123', cObject]
+        ```
+
+        @private
+        @property
+        @return {Array}
+       */
+      resolvedParams: computed(function() {
+        var parameters = this.parameters,
+            options = parameters.options,
+            types = options.types,
+            data = options.data;
+
+        if (parameters.params.length === 0) {
+          var appController = this.container.lookup('controller:application');
+          return [get(appController, 'currentRouteName')];
+        } else {
+          return resolveParams(parameters.context, parameters.params, { types: types, data: data });
+        }
+      }).property('router.url'),
+
+      /**
+        Computed property that returns the current route name and
+        any dynamic segments.
+
+        @private
+        @property
+        @return {Array} An array with the route name and any dynamic segments
+       */
+      routeArgs: computed(function computeLinkViewRouteArgs() {
+        var resolvedParams = get(this, 'resolvedParams').slice(0),
+            router = get(this, 'router'),
+            namedRoute = resolvedParams[0];
+
+        if (!namedRoute) { return; }
+
+        Ember.assert(fmt("The attempt to link-to route '%@' failed. " +
+                         "The router did not find '%@' in its possible routes: '%@'",
+                         [namedRoute, namedRoute, keys(router.router.recognizer.names).join("', '")]),
+                         router.hasRoute(namedRoute));
+
+        //normalize route name
+        var handlers = router.router.recognizer.handlersFor(namedRoute);
+        var normalizedPath = handlers[handlers.length - 1].handler;
+        if (namedRoute !== normalizedPath) {
+          //set namedRoute as currentWhen only when currentWhen is not given explicitly
+          if (!this.currentWhen) {
+            this.set('currentWhen', namedRoute);
+          }
+          namedRoute = handlers[handlers.length - 1].handler;
+          resolvedParams[0] = namedRoute;
+        }
+
+        for (var i = 1, len = resolvedParams.length; i < len; ++i) {
+          var param = resolvedParams[i];
+          if (param === null || typeof param === 'undefined') {
+            // If contexts aren't present, consider the linkView unloaded.
+            return;
+          }
+        }
+
+        
+        return resolvedParams;
+      }).property('resolvedParams', 'queryParams'),
+
+      queryParamsObject: null,
+      queryParams: computed(function computeLinkViewQueryParams() {
+        return computeQueryParams(this, false);
+      }).property('resolvedParams.[]'),
+
+      /**
+        Sets the element's `href` attribute to the url for
+        the `LinkView`'s targeted route.
+
+        If the `LinkView`'s `tagName` is changed to a value other
+        than `a`, this property will be ignored.
+
+        @property href
+      **/
+      href: computed(function computeLinkViewHref() {
+        if (get(this, 'tagName') !== 'a') { return; }
+
+        var router = get(this, 'router'),
+            routeArgs = get(this, 'routeArgs');
+
+        if (!routeArgs) {
+          return get(this, 'loadingHref');
+        }
+
+        
+        return router.generate.apply(router, routeArgs);
+      }).property('routeArgs'),
+
+      /**
+        The default href value to use while a link-to is loading.
+        Only applies when tagName is 'a'
+
+        @property loadingHref
+        @type String
+        @default #
+      */
+      loadingHref: '#'
+    });
+
+    LinkView.toString = function() { return "LinkView"; };
+
+    /**
+      The `{{link-to}}` helper renders a link to the supplied
+      `routeName` passing an optionally supplied model to the
+      route as its `model` context of the route. The block
+      for `{{link-to}}` becomes the innerHTML of the rendered
+      element:
+
+      ```handlebars
+      {{#link-to 'photoGallery'}}
+        Great Hamster Photos
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos">
+        Great Hamster Photos
+      </a>
+      ```
+
+      ### Supplying a tagName
+      By default `{{link-to}}` renders an `<a>` element. This can
+      be overridden for a single use of `{{link-to}}` by supplying
+      a `tagName` option:
+
+      ```handlebars
+      {{#link-to 'photoGallery' tagName="li"}}
+        Great Hamster Photos
+      {{/link-to}}
+      ```
+
+      ```html
+      <li>
+        Great Hamster Photos
+      </li>
+      ```
+
+      To override this option for your entire application, see
+      "Overriding Application-wide Defaults".
+
+      ### Disabling the `link-to` helper
+      By default `{{link-to}}` is enabled.
+      any passed value to `disabled` helper property will disable the `link-to` helper.
+
+      static use: the `disabled` option:
+
+      ```handlebars
+      {{#link-to 'photoGallery' disabled=true}}
+        Great Hamster Photos
+      {{/link-to}}
+      ```
+
+      dynamic use: the `disabledWhen` option:
+
+      ```handlebars
+      {{#link-to 'photoGallery' disabledWhen=controller.someProperty}}
+        Great Hamster Photos
+      {{/link-to}}
+      ```
+
+      any passed value to `disabled` will disable it except `undefined`.
+      to ensure that only `true` disable the `link-to` helper you can
+      override the global behaviour of `Ember.LinkView`.
+
+      ```javascript
+      Ember.LinkView.reopen({
+        disabled: Ember.computed(function(key, value) {
+          if (value !== undefined) {
+            this.set('_isDisabled', value === true);
+          }
+          return value === true ? get(this, 'disabledClass') : false;
+        })
+      });
+      ```
+
+      see "Overriding Application-wide Defaults" for more.
+
+      ### Handling `href`
+      `{{link-to}}` will use your application's Router to
+      fill the element's `href` property with a url that
+      matches the path to the supplied `routeName` for your
+      routers's configured `Location` scheme, which defaults
+      to Ember.HashLocation.
+
+      ### Handling current route
+      `{{link-to}}` will apply a CSS class name of 'active'
+      when the application's current route matches
+      the supplied routeName. For example, if the application's
+      current route is 'photoGallery.recent' the following
+      use of `{{link-to}}`:
+
+      ```handlebars
+      {{#link-to 'photoGallery.recent'}}
+        Great Hamster Photos from the last week
+      {{/link-to}}
+      ```
+
+      will result in
+
+      ```html
+      <a href="/hamster-photos/this-week" class="active">
+        Great Hamster Photos
+      </a>
+      ```
+
+      The CSS class name used for active classes can be customized
+      for a single use of `{{link-to}}` by passing an `activeClass`
+      option:
+
+      ```handlebars
+      {{#link-to 'photoGallery.recent' activeClass="current-url"}}
+        Great Hamster Photos from the last week
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos/this-week" class="current-url">
+        Great Hamster Photos
+      </a>
+      ```
+
+      To override this option for your entire application, see
+      "Overriding Application-wide Defaults".
+
+      ### Supplying a model
+      An optional model argument can be used for routes whose
+      paths contain dynamic segments. This argument will become
+      the model context of the linked route:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource("photoGallery", {path: "hamster-photos/:photo_id"});
+      });
+      ```
+
+      ```handlebars
+      {{#link-to 'photoGallery' aPhoto}}
+        {{aPhoto.title}}
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos/42">
+        Tomster
+      </a>
+      ```
+
+      ### Supplying multiple models
+      For deep-linking to route paths that contain multiple
+      dynamic segments, multiple model arguments can be used.
+      As the router transitions through the route path, each
+      supplied model argument will become the context for the
+      route with the dynamic segments:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource("photoGallery", {path: "hamster-photos/:photo_id"}, function() {
+          this.route("comment", {path: "comments/:comment_id"});
+        });
+      });
+      ```
+      This argument will become the model context of the linked route:
+
+      ```handlebars
+      {{#link-to 'photoGallery.comment' aPhoto comment}}
+        {{comment.body}}
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos/42/comment/718">
+        A+++ would snuggle again.
+      </a>
+      ```
+
+      ### Supplying an explicit dynamic segment value
+      If you don't have a model object available to pass to `{{link-to}}`,
+      an optional string or integer argument can be passed for routes whose
+      paths contain dynamic segments. This argument will become the value
+      of the dynamic segment:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource("photoGallery", {path: "hamster-photos/:photo_id"});
+      });
+      ```
+
+      ```handlebars
+      {{#link-to 'photoGallery' aPhotoId}}
+        {{aPhoto.title}}
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos/42">
+        Tomster
+      </a>
+      ```
+
+      When transitioning into the linked route, the `model` hook will
+      be triggered with parameters including this passed identifier.
+
+      ### Allowing Default Action
+
+     By default the `{{link-to}}` helper prevents the default browser action
+     by calling `preventDefault()` as this sort of action bubbling is normally
+     handled internally and we do not want to take the browser to a new URL (for
+     example).
+
+     If you need to override this behavior specify `preventDefault=false` in
+     your template:
+
+      ```handlebars
+      {{#link-to 'photoGallery' aPhotoId preventDefault=false}}
+        {{aPhotoId.title}}
+      {{/link-to}}
+      ```
+
+      ### Overriding attributes
+      You can override any given property of the Ember.LinkView
+      that is generated by the `{{link-to}}` helper by passing
+      key/value pairs, like so:
+
+      ```handlebars
+      {{#link-to  aPhoto tagName='li' title='Following this link will change your life' classNames='pic sweet'}}
+        Uh-mazing!
+      {{/link-to}}
+      ```
+
+      See [Ember.LinkView](/api/classes/Ember.LinkView.html) for a
+      complete list of overrideable properties. Be sure to also
+      check out inherited properties of `LinkView`.
+
+      ### Overriding Application-wide Defaults
+      ``{{link-to}}`` creates an instance of Ember.LinkView
+      for rendering. To override options for your entire
+      application, reopen Ember.LinkView and supply the
+      desired values:
+
+      ``` javascript
+      Ember.LinkView.reopen({
+        activeClass: "is-active",
+        tagName: 'li'
+      })
+      ```
+
+      It is also possible to override the default event in
+      this manner:
+
+      ``` javascript
+      Ember.LinkView.reopen({
+        eventName: 'customEventName'
+      });
+      ```
+
+      @method link-to
+      @for Ember.Handlebars.helpers
+      @param {String} routeName
+      @param {Object} [context]*
+      @param [options] {Object} Handlebars key/value pairs of options, you can override any property of Ember.LinkView
+      @return {String} HTML string
+      @see {Ember.LinkView}
+    */
+    function linkToHelper(name) {
+      var options = slice.call(arguments, -1)[0],
+          params = slice.call(arguments, 0, -1),
+          hash = options.hash;
+
+      if (params[params.length - 1] instanceof QueryParams) {
+        hash.queryParamsObject = params.pop();
+      }
+
+      hash.disabledBinding = hash.disabledWhen;
+
+      if (!options.fn) {
+        var linkTitle = params.shift();
+        var linkType = options.types.shift();
+        var context = this;
+        if (linkType === 'ID') {
+          options.linkTextPath = linkTitle;
+          options.fn = function() {
+            return EmberHandlebars.getEscaped(context, linkTitle, options);
+          };
+        } else {
+          options.fn = function() {
+            return linkTitle;
+          };
+        }
+      }
+
+      hash.parameters = {
+        context: this,
+        options: options,
+        params: params
+      };
+
+      options.helperName = options.helperName || 'link-to';
+
+      return viewHelper.call(this, LinkView, options);
+    };
+
+
+    
+    /**
+      See [link-to](/api/classes/Ember.Handlebars.helpers.html#method_link-to)
+
+      @method linkTo
+      @for Ember.Handlebars.helpers
+      @deprecated
+      @param {String} routeName
+      @param {Object} [context]*
+      @return {String} HTML string
+    */
+    function deprecatedLinkToHelper() {
+      Ember.warn("The 'linkTo' view helper is deprecated in favor of 'link-to'");
+      return linkToHelper.apply(this, arguments);
+    };
+
+    __exports__.LinkView = LinkView;
+    __exports__.deprecatedLinkToHelper = deprecatedLinkToHelper;
+    __exports__.linkToHelper = linkToHelper;
+  });
+define("ember-routing/helpers/outlet",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-views/views/container_view","ember-handlebars/views/metamorph_view","ember-handlebars/helpers/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var onLoad = __dependency4__.onLoad;
+    var ContainerView = __dependency5__["default"];
+    var _Metamorph = __dependency6__._Metamorph;
+    var viewHelper = __dependency7__.viewHelper;
+
+    // requireModule('ember-handlebars');
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+      /**
+      @module ember
+      @submodule ember-routing
+      */
+
+    var OutletView = ContainerView.extend(_Metamorph);
+
+    /**
+      The `outlet` helper is a placeholder that the router will fill in with
+      the appropriate template based on the current state of the application.
+
+      ``` handlebars
+      {{outlet}}
+      ```
+
+      By default, a template based on Ember's naming conventions will be rendered
+      into the `outlet` (e.g. `App.PostsRoute` will render the `posts` template).
+
+      You can render a different template by using the `render()` method in the
+      route's `renderTemplate` hook. The following will render the `favoritePost`
+      template into the `outlet`.
+
+      ``` javascript
+      App.PostsRoute = Ember.Route.extend({
+        renderTemplate: function() {
+          this.render('favoritePost');
+        }
+      });
+      ```
+
+      You can create custom named outlets for more control.
+
+      ``` handlebars
+      {{outlet 'favoritePost'}}
+      {{outlet 'posts'}}
+      ```
+
+      Then you can define what template is rendered into each outlet in your
+      route.
+
+
+      ``` javascript
+      App.PostsRoute = Ember.Route.extend({
+        renderTemplate: function() {
+          this.render('favoritePost', { outlet: 'favoritePost' });
+          this.render('posts', { outlet: 'posts' });
+        }
+      });
+      ```
+
+      You can specify the view that the outlet uses to contain and manage the
+      templates rendered into it.
+
+      ``` handlebars
+      {{outlet view='sectionContainer'}}
+      ```
+
+      ``` javascript
+      App.SectionContainer = Ember.ContainerView.extend({
+        tagName: 'section',
+        classNames: ['special']
+      });
+      ```
+
+      @method outlet
+      @for Ember.Handlebars.helpers
+      @param {String} property the property on the controller
+        that holds the view for this outlet
+      @return {String} HTML string
+    */
+    function outletHelper(property, options) {
+
+      var outletSource,
+          container,
+          viewName,
+          viewClass,
+          viewFullName;
+
+      if (property && property.data && property.data.isRenderData) {
+        options = property;
+        property = 'main';
+      }
+
+      container = options.data.view.container;
+
+      outletSource = options.data.view;
+      while (!outletSource.get('template.isTop')) {
+        outletSource = outletSource.get('_parentView');
+      }
+
+      // provide controller override
+      viewName = options.hash.view;
+
+      if (viewName) {
+        viewFullName = 'view:' + viewName;
+        Ember.assert("Using a quoteless view parameter with {{outlet}} is not supported. Please update to quoted usage '{{outlet \"" + viewName + "\"}}.", options.hashTypes.view !== 'ID');
+        Ember.assert("The view name you supplied '" + viewName + "' did not resolve to a view.", container.has(viewFullName));
+      }
+
+      viewClass = viewName ? container.lookupFactory(viewFullName) : options.hash.viewClass || OutletView;
+
+      options.data.view.set('outletSource', outletSource);
+      options.hash.currentViewBinding = '_view.outletSource._outlets.' + property;
+
+      options.helperName = options.helperName || 'outlet';
+
+      return viewHelper.call(this, viewClass, options);
+    };
+
+    __exports__.outletHelper = outletHelper;
+    __exports__.OutletView = OutletView;
+  });
+define("ember-routing/helpers/render",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-routing/system/controller_for","ember-handlebars/ext","ember-handlebars/helpers/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // assert, deprecate
+    var EmberError = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var camelize = __dependency5__.camelize;
+    var generateControllerFactory = __dependency6__.generateControllerFactory;
+    var generateController = __dependency6__.generateController;
+    var handlebarsGet = __dependency7__.handlebarsGet;
+    var viewHelper = __dependency8__.viewHelper;
+
+
+    // requireModule('ember-handlebars');
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      Calling ``{{render}}`` from within a template will insert another
+      template that matches the provided name. The inserted template will
+      access its properties on its own controller (rather than the controller
+      of the parent template).
+
+      If a view class with the same name exists, the view class also will be used.
+
+      Note: A given controller may only be used *once* in your app in this manner.
+      A singleton instance of the controller will be created for you.
+
+      Example:
+
+      ```javascript
+      App.NavigationController = Ember.Controller.extend({
+        who: "world"
+      });
+      ```
+
+      ```handlebars
+      <!-- navigation.hbs -->
+      Hello, {{who}}.
+      ```
+
+      ```handelbars
+      <!-- application.hbs -->
+      <h1>My great app</h1>
+      {{render "navigation"}}
+      ```
+
+      ```html
+      <h1>My great app</h1>
+      <div class='ember-view'>
+        Hello, world.
+      </div>
+      ```
+
+      Optionally you may provide a second argument: a property path
+      that will be bound to the `model` property of the controller.
+
+      If a `model` property path is specified, then a new instance of the
+      controller will be created and `{{render}}` can be used multiple times
+      with the same name.
+
+     For example if you had this `author` template.
+
+     ```handlebars
+    <div class="author">
+    Written by {{firstName}} {{lastName}}.
+    Total Posts: {{postCount}}
+    </div>
+    ```
+
+    You could render it inside the `post` template using the `render` helper.
+
+    ```handlebars
+    <div class="post">
+    <h1>{{title}}</h1>
+    <div>{{body}}</div>
+    {{render "author" author}}
+    </div>
+     ```
+
+      @method render
+      @for Ember.Handlebars.helpers
+      @param {String} name
+      @param {Object?} contextString
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function renderHelper(name, contextString, options) {
+      var length = arguments.length;
+
+      var contextProvided = length === 3,
+          container, router, controller, view, context, lookupOptions;
+
+      container = (options || contextString).data.keywords.controller.container;
+      router = container.lookup('router:main');
+
+      if (length === 2) {
+        // use the singleton controller
+        options = contextString;
+        contextString = undefined;
+        Ember.assert("You can only use the {{render}} helper once without a model object as its second argument, as in {{render \"post\" post}}.", !router || !router._lookupActiveView(name));
+      } else if (length === 3) {
+        // create a new controller
+        context = handlebarsGet(options.contexts[1], contextString, options);
+      } else {
+        throw EmberError("You must pass a templateName to render");
+      }
+
+      Ember.deprecate("Using a quoteless parameter with {{render}} is deprecated. Please update to quoted usage '{{render \"" + name + "\"}}.", options.types[0] !== 'ID');
+
+      // # legacy namespace
+      name = name.replace(/\//g, '.');
+      // \ legacy slash as namespace support
+
+
+      view = container.lookup('view:' + name) || container.lookup('view:default');
+
+      // provide controller override
+      var controllerName = options.hash.controller || name;
+      var controllerFullName = 'controller:' + controllerName;
+
+      if (options.hash.controller) {
+        Ember.assert("The controller name you supplied '" + controllerName + "' did not resolve to a controller.", container.has(controllerFullName));
+      }
+
+      var parentController = options.data.keywords.controller;
+
+      // choose name
+      if (length > 2) {
+        var factory = container.lookupFactory(controllerFullName) ||
+                      generateControllerFactory(container, controllerName, context);
+
+        controller = factory.create({
+          model: context,
+          parentController: parentController,
+          target: parentController
+        });
+
+        view.one('willDestroyElement', function() {
+          controller.destroy();
+        });
+      } else {
+        controller = container.lookup(controllerFullName) ||
+                     generateController(container, controllerName);
+
+        controller.setProperties({
+          target: parentController,
+          parentController: parentController
+        });
+      }
+
+      var root = options.contexts[1];
+
+      if (root) {
+        view.registerObserver(root, contextString, function() {
+          controller.set('model', handlebarsGet(root, contextString, options));
+        });
+      }
+
+      options.hash.viewName = camelize(name);
+
+      var templateName = 'template:' + name;
+      Ember.assert("You used `{{render '" + name + "'}}`, but '" + name + "' can not be found as either a template or a view.", container.has("view:" + name) || container.has(templateName) || options.fn);
+      options.hash.template = container.lookup(templateName);
+
+      options.hash.controller = controller;
+
+      if (router && !context) {
+        router._connectActiveView(name, view);
+      }
+
+      options.helperName = options.helperName || ('render "' + name + '"');
+
+      viewHelper.call(this, view, options);
+    };
+
+    __exports__["default"] = renderHelper;
+  });
+define("ember-routing/helpers/shared",
+  ["ember-metal/property_get","ember-metal/array","ember-runtime/system/lazy_load","ember-runtime/controllers/controller","ember-routing/system/router","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var map = __dependency2__.map;
+    var onLoad = __dependency3__.onLoad;
+    var ControllerMixin = __dependency4__.ControllerMixin;
+    var EmberRouter = __dependency5__["default"];
+    var handlebarsResolve = __dependency6__.resolveParams;
+    var handlebarsGet = __dependency6__.handlebarsGet;
+
+    function resolveParams(context, params, options) {
+      return map.call(resolvePaths(context, params, options), function(path, i) {
+        if (null === path) {
+          // Param was string/number, not a path, so just return raw string/number.
+          return params[i];
+        } else {
+          return handlebarsGet(context, path, options);
+        }
+      });
+    }
+
+    function resolvePaths(context, params, options) {
+      var resolved = handlebarsResolve(context, params, options),
+          types = options.types;
+
+      return map.call(resolved, function(object, i) {
+        if (types[i] === 'ID') {
+          return unwrap(object, params[i]);
+        } else {
+          return null;
+        }
+      });
+
+      function unwrap(object, path) {
+        if (path === 'controller') { return path; }
+
+        if (ControllerMixin.detect(object)) {
+          return unwrap(get(object, 'model'), path ? path + '.model' : 'model');
+        } else {
+          return path;
+        }
+      }
+    }
+
+    __exports__.resolveParams = resolveParams;
+    __exports__.resolvePaths = resolvePaths;
+  });
+define("ember-routing/location/api",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // deprecate, assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      Ember.Location returns an instance of the correct implementation of
+      the `location` API.
+
+      ## Implementations
+
+      You can pass an implementation name (`hash`, `history`, `none`) to force a
+      particular implementation to be used in your application.
+
+      ### HashLocation
+
+      Using `HashLocation` results in URLs with a `#` (hash sign) separating the
+      server side URL portion of the URL from the portion that is used by Ember.
+      This relies upon the `hashchange` event existing in the browser.
+
+      Example:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource('posts', function() {
+          this.route('new');
+        });
+      });
+
+      App.Router.reopen({
+        location: 'hash'
+      });
+      ```
+
+      This will result in a posts.new url of `/#/posts/new`.
+
+      ### HistoryLocation
+
+      Using `HistoryLocation` results in URLs that are indistinguishable from a
+      standard URL. This relies upon the browser's `history` API.
+
+      Example:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource('posts', function() {
+          this.route('new');
+        });
+      });
+
+      App.Router.reopen({
+        location: 'history'
+      });
+      ```
+
+      This will result in a posts.new url of `/posts/new`.
+
+      Keep in mind that your server must serve the Ember app at all the routes you
+      define.
+
+      ### AutoLocation
+
+      Using `AutoLocation`, the router will use the best Location class supported by
+      the browser it is running in.
+
+      Browsers that support the `history` API will use `HistoryLocation`, those that
+      do not, but still support the `hashchange` event will use `HashLocation`, and
+      in the rare case neither is supported will use `NoneLocation`.
+
+      Example:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource('posts', function() {
+          this.route('new');
+        });
+      });
+
+      App.Router.reopen({
+        location: 'auto'
+      });
+      ```
+
+      This will result in a posts.new url of `/posts/new` for modern browsers that
+      support the `history` api or `/#/posts/new` for older ones, like Internet
+      Explorer 9 and below.
+
+      When a user visits a link to your application, they will be automatically
+      upgraded or downgraded to the appropriate `Location` class, with the URL
+      transformed accordingly, if needed.
+
+      Keep in mind that since some of your users will use `HistoryLocation`, your
+      server must serve the Ember app at all the routes you define.
+
+      ### NoneLocation
+
+      Using `NoneLocation` causes Ember to not store the applications URL state
+      in the actual URL. This is generally used for testing purposes, and is one
+      of the changes made when calling `App.setupForTesting()`.
+
+      ## Location API
+
+      Each location implementation must provide the following methods:
+
+      * implementation: returns the string name used to reference the implementation.
+      * getURL: returns the current URL.
+      * setURL(path): sets the current URL.
+      * replaceURL(path): replace the current URL (optional).
+      * onUpdateURL(callback): triggers the callback when the URL changes.
+      * formatURL(url): formats `url` to be placed into `href` attribute.
+
+      Calling setURL or replaceURL will not trigger onUpdateURL callbacks.
+
+      @class Location
+      @namespace Ember
+      @static
+    */
+    var EmberLocation = {
+      /**
+       This is deprecated in favor of using the container to lookup the location
+       implementation as desired.
+
+       For example:
+
+       ```javascript
+       // Given a location registered as follows:
+       container.register('location:history-test', HistoryTestLocation);
+
+       // You could create a new instance via:
+       container.lookup('location:history-test');
+       ```
+
+        @method create
+        @param {Object} options
+        @return {Object} an instance of an implementation of the `location` API
+        @deprecated Use the container to lookup the location implementation that you
+        need.
+      */
+      create: function(options) {
+        var implementation = options && options.implementation;
+        Ember.assert("Ember.Location.create: you must specify a 'implementation' option", !!implementation);
+
+        var implementationClass = this.implementations[implementation];
+        Ember.assert("Ember.Location.create: " + implementation + " is not a valid implementation", !!implementationClass);
+
+        return implementationClass.create.apply(implementationClass, arguments);
+      },
+
+      /**
+       This is deprecated in favor of using the container to register the
+       location implementation as desired.
+
+       Example:
+
+       ```javascript
+       Application.initializer({
+        name: "history-test-location",
+
+        initialize: function(container, application) {
+          application.register('location:history-test', HistoryTestLocation);
+        }
+       });
+       ```
+
+       @method registerImplementation
+       @param {String} name
+       @param {Object} implementation of the `location` API
+       @deprecated Register your custom location implementation with the
+       container directly.
+      */
+      registerImplementation: function(name, implementation) {
+        Ember.deprecate('Using the Ember.Location.registerImplementation is no longer supported. Register your custom location implementation with the container instead.', false);
+
+        this.implementations[name] = implementation;
+      },
+
+      implementations: {},
+      _location: window.location,
+
+      /**
+        Returns the current `location.hash` by parsing location.href since browsers
+        inconsistently URL-decode `location.hash`.
+
+        https://bugzilla.mozilla.org/show_bug.cgi?id=483304
+
+        @private
+        @method getHash
+        @since 1.4.0
+      */
+      _getHash: function () {
+        // AutoLocation has it at _location, HashLocation at .location.
+        // Being nice and not changing
+        var href = (this._location || this.location).href,
+            hashIndex = href.indexOf('#');
+
+        if (hashIndex === -1) {
+          return '';
+        } else {
+          return href.substr(hashIndex);
+        }
+      }
+    };
+
+    __exports__["default"] = EmberLocation;
+  });
+define("ember-routing/location/auto_location",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-routing/location/api","ember-routing/location/history_location","ember-routing/location/hash_location","ember-routing/location/none_location","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+
+    var EmberLocation = __dependency4__["default"];
+    var HistoryLocation = __dependency5__["default"];
+    var HashLocation = __dependency6__["default"];
+    var NoneLocation = __dependency7__["default"];
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      Ember.AutoLocation will select the best location option based off browser
+      support with the priority order: history, hash, none.
+
+      Clean pushState paths accessed by hashchange-only browsers will be redirected
+      to the hash-equivalent and vice versa so future transitions are consistent.
+
+      Keep in mind that since some of your users will use `HistoryLocation`, your
+      server must serve the Ember app at all the routes you define.
+
+      @class AutoLocation
+      @namespace Ember
+      @static
+    */
+    var AutoLocation = {
+
+      /**
+        @private
+
+        This property is used by router:main to know whether to cancel the routing
+        setup process, which is needed while we redirect the browser.
+
+        @since 1.5.1
+        @property cancelRouterSetup
+        @default false
+      */
+      cancelRouterSetup: false,
+
+      /**
+        @private
+
+        Will be pre-pended to path upon state change.
+
+        @since 1.5.1
+        @property rootURL
+        @default '/'
+      */
+      rootURL: '/',
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _window
+        @default window
+      */
+      _window: window,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @property location
+        @default window.location
+      */
+      _location: window.location,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _history
+        @default window.history
+      */
+      _history: window.history,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _HistoryLocation
+        @default Ember.HistoryLocation
+      */
+      _HistoryLocation: HistoryLocation,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _HashLocation
+        @default Ember.HashLocation
+      */
+      _HashLocation: HashLocation,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _NoneLocation
+        @default Ember.NoneLocation
+      */
+      _NoneLocation: NoneLocation,
+
+      /**
+        @private
+
+        Returns location.origin or builds it if device doesn't support it.
+
+        @method _getOrigin
+      */
+      _getOrigin: function () {
+        var location = this._location,
+            origin = location.origin;
+
+        // Older browsers, especially IE, don't have origin
+        if (!origin) {
+          origin = location.protocol + '//' + location.hostname;
+
+          if (location.port) {
+            origin += ':' + location.port;
+          }
+        }
+
+        return origin;
+      },
+
+      /**
+        @private
+
+        We assume that if the history object has a pushState method, the host should
+        support HistoryLocation.
+
+        @method _getSupportsHistory
+      */
+      _getSupportsHistory: function () {
+        // Boosted from Modernizr: https://github.com/Modernizr/Modernizr/blob/master/feature-detects/history.js
+        // The stock browser on Android 2.2 & 2.3 returns positive on history support
+        // Unfortunately support is really buggy and there is no clean way to detect
+        // these bugs, so we fall back to a user agent sniff :(
+        var userAgent = this._window.navigator.userAgent;
+
+        // We only want Android 2, stock browser, and not Chrome which identifies
+        // itself as 'Mobile Safari' as well
+        if (userAgent.indexOf('Android 2') !== -1 &&
+            userAgent.indexOf('Mobile Safari') !== -1 &&
+            userAgent.indexOf('Chrome') === -1) {
+          return false;
+        }
+
+        return !!(this._history && 'pushState' in this._history);
+      },
+
+      /**
+        @private
+
+        IE8 running in IE7 compatibility mode gives false positive, so we must also
+        check documentMode.
+
+        @method _getSupportsHashChange
+      */
+      _getSupportsHashChange: function () {
+        var _window = this._window,
+            documentMode = _window.document.documentMode;
+
+        return ('onhashchange' in _window && (documentMode === undefined || documentMode > 7 ));
+      },
+
+      /**
+        @private
+
+        Redirects the browser using location.replace, prepending the locatin.origin
+        to prevent phishing attempts
+
+        @method _replacePath
+      */
+      _replacePath: function (path) {
+        this._location.replace(this._getOrigin() + path);
+      },
+
+      /**
+        @since 1.5.1
+        @private
+        @method _getRootURL
+      */
+      _getRootURL: function () {
+        return this.rootURL;
+      },
+
+      /**
+        @private
+
+        Returns the current `location.pathname`, normalized for IE inconsistencies.
+
+        @method _getPath
+      */
+      _getPath: function () {
+        var pathname = this._location.pathname;
+        // Various versions of IE/Opera don't always return a leading slash
+        if (pathname.charAt(0) !== '/') {
+          pathname = '/' + pathname;
+        }
+
+        return pathname;
+      },
+
+      /**
+        @private
+
+        Returns normalized location.hash as an alias to Ember.Location._getHash
+
+        @since 1.5.1
+        @method _getHash
+      */
+      _getHash: EmberLocation._getHash,
+
+      /**
+        @private
+
+        Returns location.search
+
+        @since 1.5.1
+        @method _getQuery
+      */
+      _getQuery: function () {
+        return this._location.search;
+      },
+
+      /**
+        @private
+
+        Returns the full pathname including query and hash
+
+        @method _getFullPath
+      */
+      _getFullPath: function () {
+        return this._getPath() + this._getQuery() + this._getHash();
+      },
+
+      /**
+        @private
+
+        Returns the current path as it should appear for HistoryLocation supported
+        browsers. This may very well differ from the real current path (e.g. if it
+        starts off as a hashed URL)
+
+        @method _getHistoryPath
+      */
+      _getHistoryPath: function () {
+        var rootURL = this._getRootURL(),
+            path = this._getPath(),
+            hash = this._getHash(),
+            query = this._getQuery(),
+            rootURLIndex = path.indexOf(rootURL),
+            routeHash, hashParts;
+
+        Ember.assert('Path ' + path + ' does not start with the provided rootURL ' + rootURL, rootURLIndex === 0);
+
+        // By convention, Ember.js routes using HashLocation are required to start
+        // with `#/`. Anything else should NOT be considered a route and should
+        // be passed straight through, without transformation.
+        if (hash.substr(0, 2) === '#/') {
+          // There could be extra hash segments after the route
+          hashParts = hash.substr(1).split('#');
+          // The first one is always the route url
+          routeHash = hashParts.shift();
+
+          // If the path already has a trailing slash, remove the one
+          // from the hashed route so we don't double up.
+          if (path.slice(-1) === '/') {
+              routeHash = routeHash.substr(1);
+          }
+
+          // This is the "expected" final order
+          path += routeHash;
+          path += query;
+
+          if (hashParts.length) {
+            path += '#' + hashParts.join('#');
+          }
+        } else {
+          path += query;
+          path += hash;
+        }
+
+        return path;
+      },
+
+      /**
+        @private
+
+        Returns the current path as it should appear for HashLocation supported
+        browsers. This may very well differ from the real current path.
+
+        @method _getHashPath
+      */
+      _getHashPath: function () {
+        var rootURL = this._getRootURL(),
+            path = rootURL,
+            historyPath = this._getHistoryPath(),
+            routePath = historyPath.substr(rootURL.length);
+
+        if (routePath !== '') {
+          if (routePath.charAt(0) !== '/') {
+            routePath = '/' + routePath;
+          }
+
+          path += '#' + routePath;
+        }
+
+        return path;
+      },
+
+      /**
+        Selects the best location option based off browser support and returns an
+        instance of that Location class.
+
+        @see Ember.AutoLocation
+        @method create
+      */
+      create: function (options) {
+        if (options && options.rootURL) {
+          Ember.assert('rootURL must end with a trailing forward slash e.g. "/app/"', options.rootURL.charAt(options.rootURL.length-1) === '/');
+          this.rootURL = options.rootURL;
+        }
+
+        var historyPath, hashPath,
+            cancelRouterSetup = false,
+            implementationClass = this._NoneLocation,
+            currentPath = this._getFullPath();
+
+        if (this._getSupportsHistory()) {
+          historyPath = this._getHistoryPath();
+
+          // Since we support history paths, let's be sure we're using them else
+          // switch the location over to it.
+          if (currentPath === historyPath) {
+            implementationClass = this._HistoryLocation;
+          } else {
+            cancelRouterSetup = true;
+            this._replacePath(historyPath);
+          }
+
+        } else if (this._getSupportsHashChange()) {
+          hashPath = this._getHashPath();
+
+          // Be sure we're using a hashed path, otherwise let's switch over it to so
+          // we start off clean and consistent. We'll count an index path with no
+          // hash as "good enough" as well.
+          if (currentPath === hashPath || (currentPath === '/' && hashPath === '/#/')) {
+            implementationClass = this._HashLocation;
+          } else {
+            // Our URL isn't in the expected hash-supported format, so we want to
+            // cancel the router setup and replace the URL to start off clean
+            cancelRouterSetup = true;
+            this._replacePath(hashPath);
+          }
+        }
+
+        var implementation = implementationClass.create.apply(implementationClass, arguments);
+
+        if (cancelRouterSetup) {
+          set(implementation, 'cancelRouterSetup', true);
+        }
+
+        return implementation;
+      }
+    };
+
+    __exports__["default"] = AutoLocation;
+  });
+define("ember-routing/location/hash_location",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var run = __dependency3__["default"];
+    var guidFor = __dependency4__.guidFor;
+
+    var EmberObject = __dependency5__["default"];
+    var EmberLocation = __dependency6__["default"];
+    var jQuery = __dependency7__["default"];
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      `Ember.HashLocation` implements the location API using the browser's
+      hash. At present, it relies on a `hashchange` event existing in the
+      browser.
+
+      @class HashLocation
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var HashLocation = EmberObject.extend({
+      implementation: 'hash',
+
+      init: function() {
+        set(this, 'location', get(this, '_location') || window.location);
+      },
+
+      /**
+        @private
+
+        Returns normalized location.hash
+
+        @since 1.5.1
+        @method getHash
+      */
+      getHash: EmberLocation._getHash,
+
+      /**
+        Returns the current `location.hash`, minus the '#' at the front.
+
+        @private
+        @method getURL
+      */
+      getURL: function() {
+        return this.getHash().substr(1);
+      },
+
+      /**
+        Set the `location.hash` and remembers what was set. This prevents
+        `onUpdateURL` callbacks from triggering when the hash was set by
+        `HashLocation`.
+
+        @private
+        @method setURL
+        @param path {String}
+      */
+      setURL: function(path) {
+        get(this, 'location').hash = path;
+        set(this, 'lastSetURL', path);
+      },
+
+      /**
+        Uses location.replace to update the url without a page reload
+        or history modification.
+
+        @private
+        @method replaceURL
+        @param path {String}
+      */
+      replaceURL: function(path) {
+        get(this, 'location').replace('#' + path);
+        set(this, 'lastSetURL', path);
+      },
+
+      /**
+        Register a callback to be invoked when the hash changes. These
+        callbacks will execute when the user presses the back or forward
+        button, but not after `setURL` is invoked.
+
+        @private
+        @method onUpdateURL
+        @param callback {Function}
+      */
+      onUpdateURL: function(callback) {
+        var self = this;
+        var guid = guidFor(this);
+
+        jQuery(window).on('hashchange.ember-location-'+guid, function() {
+          run(function() {
+            var path = self.getURL();
+            if (get(self, 'lastSetURL') === path) { return; }
+
+            set(self, 'lastSetURL', null);
+
+            callback(path);
+          });
+        });
+      },
+
+      /**
+        Given a URL, formats it to be placed into the page as part
+        of an element's `href` attribute.
+
+        This is used, for example, when using the {{action}} helper
+        to generate a URL based on an event.
+
+        @private
+        @method formatURL
+        @param url {String}
+      */
+      formatURL: function(url) {
+        return '#'+url;
+      },
+
+      /**
+        Cleans up the HashLocation event listener.
+
+        @private
+        @method willDestroy
+      */
+      willDestroy: function() {
+        var guid = guidFor(this);
+
+        jQuery(window).off('hashchange.ember-location-'+guid);
+      }
+    });
+
+    __exports__["default"] = HashLocation;
+  });
+define("ember-routing/location/history_location",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/object","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+
+    var EmberObject = __dependency5__["default"];
+    var jQuery = __dependency6__["default"];
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    var popstateFired = false;
+    var supportsHistoryState = window.history && 'state' in window.history;
+
+    /**
+      Ember.HistoryLocation implements the location API using the browser's
+      history.pushState API.
+
+      @class HistoryLocation
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var HistoryLocation = EmberObject.extend({
+      implementation: 'history',
+
+      init: function() {
+        set(this, 'location', get(this, 'location') || window.location);
+        set(this, 'baseURL', jQuery('base').attr('href') || '');
+      },
+
+      /**
+        Used to set state on first call to setURL
+
+        @private
+        @method initState
+      */
+      initState: function() {
+        set(this, 'history', get(this, 'history') || window.history);
+        this.replaceState(this.formatURL(this.getURL()));
+      },
+
+      /**
+        Will be pre-pended to path upon state change
+
+        @property rootURL
+        @default '/'
+      */
+      rootURL: '/',
+
+      /**
+        Returns the current `location.pathname` without `rootURL` or `baseURL`
+
+        @private
+        @method getURL
+        @return url {String}
+      */
+      getURL: function() {
+        var rootURL = get(this, 'rootURL'),
+            location = get(this, 'location'),
+            path = location.pathname,
+            baseURL = get(this, 'baseURL');
+
+        rootURL = rootURL.replace(/\/$/, '');
+        baseURL = baseURL.replace(/\/$/, '');
+        var url = path.replace(baseURL, '').replace(rootURL, '');
+
+        
+        return url;
+      },
+
+      /**
+        Uses `history.pushState` to update the url without a page reload.
+
+        @private
+        @method setURL
+        @param path {String}
+      */
+      setURL: function(path) {
+        var state = this.getState();
+        path = this.formatURL(path);
+
+        if (!state || state.path !== path) {
+          this.pushState(path);
+        }
+      },
+
+      /**
+        Uses `history.replaceState` to update the url without a page reload
+        or history modification.
+
+        @private
+        @method replaceURL
+        @param path {String}
+      */
+      replaceURL: function(path) {
+        var state = this.getState();
+        path = this.formatURL(path);
+
+        if (!state || state.path !== path) {
+          this.replaceState(path);
+        }
+      },
+
+      /**
+       Get the current `history.state`. Checks for if a polyfill is
+       required and if so fetches this._historyState. The state returned
+       from getState may be null if an iframe has changed a window's
+       history.
+
+       @private
+       @method getState
+       @return state {Object}
+      */
+      getState: function() {
+        return supportsHistoryState ? get(this, 'history').state : this._historyState;
+      },
+
+      /**
+       Pushes a new state.
+
+       @private
+       @method pushState
+       @param path {String}
+      */
+      pushState: function(path) {
+        var state = { path: path };
+
+        get(this, 'history').pushState(state, null, path);
+
+        // store state if browser doesn't support `history.state`
+        if (!supportsHistoryState) {
+          this._historyState = state;
+        }
+
+        // used for webkit workaround
+        this._previousURL = this.getURL();
+      },
+
+      /**
+       Replaces the current state.
+
+       @private
+       @method replaceState
+       @param path {String}
+      */
+      replaceState: function(path) {
+        var state = { path: path };
+
+        get(this, 'history').replaceState(state, null, path);
+
+        // store state if browser doesn't support `history.state`
+        if (!supportsHistoryState) {
+          this._historyState = state;
+        }
+
+        // used for webkit workaround
+        this._previousURL = this.getURL();
+      },
+
+      /**
+        Register a callback to be invoked whenever the browser
+        history changes, including using forward and back buttons.
+
+        @private
+        @method onUpdateURL
+        @param callback {Function}
+      */
+      onUpdateURL: function(callback) {
+        var guid = guidFor(this),
+            self = this;
+
+        jQuery(window).on('popstate.ember-location-'+guid, function(e) {
+          // Ignore initial page load popstate event in Chrome
+          if (!popstateFired) {
+            popstateFired = true;
+            if (self.getURL() === self._previousURL) { return; }
+          }
+          callback(self.getURL());
+        });
+      },
+
+      /**
+        Used when using `{{action}}` helper.  The url is always appended to the rootURL.
+
+        @private
+        @method formatURL
+        @param url {String}
+        @return formatted url {String}
+      */
+      formatURL: function(url) {
+        var rootURL = get(this, 'rootURL'),
+            baseURL = get(this, 'baseURL');
+
+        if (url !== '') {
+          rootURL = rootURL.replace(/\/$/, '');
+          baseURL = baseURL.replace(/\/$/, '');
+        } else if(baseURL.match(/^\//) && rootURL.match(/^\//)) {
+          baseURL = baseURL.replace(/\/$/, '');
+        }
+
+        return baseURL + rootURL + url;
+      },
+
+      /**
+        Cleans up the HistoryLocation event listener.
+
+        @private
+        @method willDestroy
+      */
+      willDestroy: function() {
+        var guid = guidFor(this);
+
+        jQuery(window).off('popstate.ember-location-'+guid);
+      }
+    });
+
+    __exports__["default"] = HistoryLocation;
+  });
+define("ember-routing/location/none_location",
+  ["ember-metal/property_get","ember-metal/property_set","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var EmberObject = __dependency3__["default"];
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      Ember.NoneLocation does not interact with the browser. It is useful for
+      testing, or when you need to manage state with your Router, but temporarily
+      don't want it to muck with the URL (for example when you embed your
+      application in a larger page).
+
+      @class NoneLocation
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var NoneLocation = EmberObject.extend({
+      implementation: 'none',
+      path: '',
+
+      /**
+        Returns the current path.
+
+        @private
+        @method getURL
+        @return {String} path
+      */
+      getURL: function() {
+        return get(this, 'path');
+      },
+
+      /**
+        Set the path and remembers what was set. Using this method
+        to change the path will not invoke the `updateURL` callback.
+
+        @private
+        @method setURL
+        @param path {String}
+      */
+      setURL: function(path) {
+        set(this, 'path', path);
+      },
+
+      /**
+        Register a callback to be invoked when the path changes. These
+        callbacks will execute when the user presses the back or forward
+        button, but not after `setURL` is invoked.
+
+        @private
+        @method onUpdateURL
+        @param callback {Function}
+      */
+      onUpdateURL: function(callback) {
+        this.updateCallback = callback;
+      },
+
+      /**
+        Sets the path and calls the `updateURL` callback.
+
+        @private
+        @method handleURL
+        @param callback {Function}
+      */
+      handleURL: function(url) {
+        set(this, 'path', url);
+        this.updateCallback(url);
+      },
+
+      /**
+        Given a URL, formats it to be placed into the page as part
+        of an element's `href` attribute.
+
+        This is used, for example, when using the {{action}} helper
+        to generate a URL based on an event.
+
+        @private
+        @method formatURL
+        @param url {String}
+        @return {String} url
+      */
+      formatURL: function(url) {
+        // The return value is not overly meaningful, but we do not want to throw
+        // errors when test code renders templates containing {{action href=true}}
+        // helpers.
+        return url;
+      }
+    });
+
+    __exports__["default"] = NoneLocation;
+  });
+define("ember-routing",
+  ["ember-handlebars","ember-metal/core","ember-routing/ext/run_loop","ember-routing/ext/controller","ember-routing/ext/view","ember-routing/helpers/shared","ember-routing/helpers/link_to","ember-routing/location/api","ember-routing/location/none_location","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/system/controller_for","ember-routing/system/dsl","ember-routing/system/router","ember-routing/system/route","ember-routing/helpers/outlet","ember-routing/helpers/render","ember-routing/helpers/action","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
+    "use strict";
+    // require('ember-runtime');
+    // require('ember-views');
+    // require('ember-handlebars');
+
+    /**
+    Ember Routing
+
+    @module ember
+    @submodule ember-routing
+    @requires ember-views
+    */
+
+    var EmberHandlebars = __dependency1__["default"];
+    var Ember = __dependency2__["default"];
+
+    // ES6TODO: Cleanup modules with side-effects below
+
+    var resolvePaths = __dependency6__.resolvePaths;
+    var resolveParams = __dependency6__.resolveParams;
+    var deprecatedLinkToHelper = __dependency7__.deprecatedLinkToHelper;
+    var linkToHelper = __dependency7__.linkToHelper;
+    var LinkView = __dependency7__.LinkView;
+
+
+    // require('ember-views');
+    var EmberLocation = __dependency8__["default"];
+    var NoneLocation = __dependency9__["default"];
+    var HashLocation = __dependency10__["default"];
+    var HistoryLocation = __dependency11__["default"];
+    var AutoLocation = __dependency12__["default"];
+
+    var controllerFor = __dependency13__.controllerFor;
+    var generateControllerFactory = __dependency13__.generateControllerFactory;
+    var generateController = __dependency13__.generateController;
+    var RouterDSL = __dependency14__["default"];
+    var Router = __dependency15__["default"];
+    var Route = __dependency16__["default"];
+    var outletHelper = __dependency17__.outletHelper;
+    var OutletView = __dependency17__.OutletView;
+    var renderHelper = __dependency18__["default"];
+    var ActionHelper = __dependency19__.ActionHelper;
+    var actionHelper = __dependency19__.actionHelper;
+
+
+    Ember.Location = EmberLocation;
+    Ember.AutoLocation = AutoLocation;
+    Ember.HashLocation = HashLocation;
+    Ember.HistoryLocation = HistoryLocation;
+    Ember.NoneLocation = NoneLocation;
+
+    Ember.controllerFor = controllerFor;
+    Ember.generateControllerFactory = generateControllerFactory;
+    Ember.generateController = generateController;
+    Ember.RouterDSL = RouterDSL;
+    Ember.Router = Router;
+    Ember.Route = Route;
+    Ember.LinkView = LinkView;
+
+    Router.resolveParams = resolveParams;
+    Router.resolvePaths = resolvePaths;
+
+    EmberHandlebars.ActionHelper = ActionHelper;
+    EmberHandlebars.OutletView = OutletView;
+
+    EmberHandlebars.registerHelper('render', renderHelper)
+    EmberHandlebars.registerHelper('action', actionHelper);
+    EmberHandlebars.registerHelper('outlet', outletHelper);
+    EmberHandlebars.registerHelper('link-to', linkToHelper);
+    EmberHandlebars.registerHelper('linkTo', deprecatedLinkToHelper);
+
+    __exports__["default"] = Ember;
+  });
+define("ember-routing/system/controller_for",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Logger
+    var get = __dependency2__.get;
+    var isArray = __dependency3__.isArray;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+
+      Finds a controller instance.
+
+      @for Ember
+      @method controllerFor
+      @private
+    */
+    var controllerFor = function(container, controllerName, lookupOptions) {
+      return container.lookup('controller:' + controllerName, lookupOptions);
+    };
+
+    /**
+      Generates a controller factory
+
+      The type of the generated controller factory is derived
+      from the context. If the context is an array an array controller
+      is generated, if an object, an object controller otherwise, a basic
+      controller is generated.
+
+      You can customize your generated controllers by defining
+      `App.ObjectController` or `App.ArrayController`.
+
+      @for Ember
+      @method generateControllerFactory
+      @private
+    */
+    var generateControllerFactory = function(container, controllerName, context) {
+      var Factory, fullName, instance, name, factoryName, controllerType;
+
+      if (context && isArray(context)) {
+        controllerType = 'array';
+      } else if (context) {
+        controllerType = 'object';
+      } else {
+        controllerType = 'basic';
+      }
+
+      factoryName = 'controller:' + controllerType;
+
+      Factory = container.lookupFactory(factoryName).extend({
+        isGenerated: true,
+        toString: function() {
+          return "(generated " + controllerName + " controller)";
+        }
+      });
+
+      fullName = 'controller:' + controllerName;
+
+      container.register(fullName,  Factory);
+
+      return Factory;
+    };
+
+    /**
+      Generates and instantiates a controller.
+
+      The type of the generated controller factory is derived
+      from the context. If the context is an array an array controller
+      is generated, if an object, an object controller otherwise, a basic
+      controller is generated.
+
+      @for Ember
+      @method generateController
+      @private
+      @since 1.3.0
+    */
+    var generateController = function(container, controllerName, context) {
+      generateControllerFactory(container, controllerName, context);
+      var fullName = 'controller:' + controllerName;
+      var instance = container.lookup(fullName);
+
+      if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) {
+        Ember.Logger.info("generated -> " + fullName, { fullName: fullName });
+      }
+
+      return instance;
+    };
+
+    __exports__.controllerFor = controllerFor;
+    __exports__.generateControllerFactory = generateControllerFactory;
+    __exports__.generateController = generateController;
+  });
+define("ember-routing/system/dsl",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, assert
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    function DSL(name) {
+      this.parent = name;
+      this.matches = [];
+    }
+
+    DSL.prototype = {
+      resource: function(name, options, callback) {
+        Ember.assert("'basic' cannot be used as a resource name.", name !== 'basic');
+
+        if (arguments.length === 2 && typeof options === 'function') {
+          callback = options;
+          options = {};
+        }
+
+        if (arguments.length === 1) {
+          options = {};
+        }
+
+        if (typeof options.path !== 'string') {
+          options.path = "/" + name;
+        }
+
+        if (callback) {
+          var dsl = new DSL(name);
+          route(dsl, 'loading');
+          route(dsl, 'error', { path: "/_unused_dummy_error_path_route_" + name + "/:error" });
+          callback.call(dsl);
+          this.push(options.path, name, dsl.generate());
+        } else {
+          this.push(options.path, name, null);
+        }
+
+
+              },
+
+      push: function(url, name, callback) {
+        var parts = name.split('.');
+        if (url === "" || url === "/" || parts[parts.length-1] === "index") { this.explicitIndex = true; }
+
+        this.matches.push([url, name, callback]);
+      },
+
+      route: function(name, options) {
+        Ember.assert("'basic' cannot be used as a route name.", name !== 'basic');
+
+        route(this, name, options);
+              },
+
+      generate: function() {
+        var dslMatches = this.matches;
+
+        if (!this.explicitIndex) {
+          this.route("index", { path: "/" });
+        }
+
+        return function(match) {
+          for (var i=0, l=dslMatches.length; i<l; i++) {
+            var dslMatch = dslMatches[i];
+            var matchObj = match(dslMatch[0]).to(dslMatch[1], dslMatch[2]);
+          }
+        };
+      }
+    };
+
+    function route(dsl, name, options) {
+      Ember.assert("You must use `this.resource` to nest", typeof options !== 'function');
+
+      options = options || {};
+
+      if (typeof options.path !== 'string') {
+        options.path = "/" + name;
+      }
+
+      if (dsl.parent && dsl.parent !== 'application') {
+        name = dsl.parent + "." + name;
+      }
+
+      dsl.push(options.path, name, null);
+    }
+
+    DSL.map = function(callback) {
+      var dsl = new DSL();
+      callback.call(dsl);
+      return dsl;
+    };
+
+    __exports__["default"] = DSL;
+  });
+define("ember-routing/system/route",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/utils","ember-metal/run_loop","ember-runtime/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/controller_for","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, K, A, deprecate, assert, Logger
+    var EmberError = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var getProperties = __dependency5__["default"];
+    var EnumerableUtils = __dependency6__["default"];
+    var isNone = __dependency7__.isNone;
+    var computed = __dependency8__.computed;
+    var typeOf = __dependency9__.typeOf;
+    var run = __dependency10__["default"];
+
+    var keys = __dependency11__["default"];
+    var copy = __dependency12__["default"];
+    var classify = __dependency13__.classify;
+    var fmt = __dependency13__.fmt;
+    var EmberObject = __dependency14__["default"];
+    var ActionHandler = __dependency15__["default"];
+    var generateController = __dependency16__.generateController;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    var a_forEach = EnumerableUtils.forEach,
+        a_replace = EnumerableUtils.replace;
+
+    /**
+      The `Ember.Route` class is used to define individual routes. Refer to
+      the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+
+      @class Route
+      @namespace Ember
+      @extends Ember.Object
+      @uses Ember.ActionHandler
+    */
+    var Route = EmberObject.extend(ActionHandler, {
+
+      /**
+        @private
+
+        @method exit
+      */
+      exit: function() {
+                this.deactivate();
+        this.teardownViews();
+      },
+
+      /**
+        @private
+
+        @method enter
+      */
+      enter: function() {
+        this.activate();
+      },
+
+      /**
+        The name of the view to use by default when rendering this routes template.
+
+        When rendering a template, the route will, by default, determine the
+        template and view to use from the name of the route itself. If you need to
+        define a specific view, set this property.
+
+        This is useful when multiple routes would benefit from using the same view
+        because it doesn't require a custom `renderTemplate` method. For example,
+        the following routes will all render using the `App.PostsListView` view:
+
+        ```js
+        var PostsList = Ember.Route.extend({
+          viewName: 'postsList',
+        });
+
+        App.PostsIndexRoute = PostsList.extend();
+        App.PostsArchivedRoute = PostsList.extend();
+        ```
+
+        @property viewName
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      viewName: null,
+
+      /**
+        The name of the template to use by default when rendering this routes
+        template.
+
+        This is similar with `viewName`, but is useful when you just want a custom
+        template without a view.
+
+        ```js
+        var PostsList = Ember.Route.extend({
+          templateName: 'posts/list'
+        });
+
+        App.PostsIndexRoute = PostsList.extend();
+        App.PostsArchivedRoute = PostsList.extend();
+        ```
+
+        @property templateName
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      templateName: null,
+
+      /**
+        The name of the controller to associate with this route.
+
+        By default, Ember will lookup a route's controller that matches the name
+        of the route (i.e. `App.PostController` for `App.PostRoute`). However,
+        if you would like to define a specific controller to use, you can do so
+        using this property.
+
+        This is useful in many ways, as the controller specified will be:
+
+        * passed to the `setupController` method.
+        * used as the controller for the view being rendered by the route.
+        * returned from a call to `controllerFor` for the route.
+
+        @property controllerName
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      controllerName: null,
+
+      /**
+        The `willTransition` action is fired at the beginning of any
+        attempted transition with a `Transition` object as the sole
+        argument. This action can be used for aborting, redirecting,
+        or decorating the transition from the currently active routes.
+
+        A good example is preventing navigation when a form is
+        half-filled out:
+
+        ```js
+        App.ContactFormRoute = Ember.Route.extend({
+          actions: {
+            willTransition: function(transition) {
+              if (this.controller.get('userHasEnteredData')) {
+                this.controller.displayNavigationConfirm();
+                transition.abort();
+              }
+            }
+          }
+        });
+        ```
+
+        You can also redirect elsewhere by calling
+        `this.transitionTo('elsewhere')` from within `willTransition`.
+        Note that `willTransition` will not be fired for the
+        redirecting `transitionTo`, since `willTransition` doesn't
+        fire when there is already a transition underway. If you want
+        subsequent `willTransition` actions to fire for the redirecting
+        transition, you must first explicitly call
+        `transition.abort()`.
+
+        @event willTransition
+        @param {Transition} transition
+      */
+
+      /**
+        The `didTransition` action is fired after a transition has
+        successfully been completed. This occurs after the normal model
+        hooks (`beforeModel`, `model`, `afterModel`, `setupController`)
+        have resolved. The `didTransition` action has no arguments,
+        however, it can be useful for tracking page views or resetting
+        state on the controller.
+
+        ```js
+        App.LoginRoute = Ember.Route.extend({
+          actions: {
+            didTransition: function() {
+              this.controller.get('errors.base').clear();
+              return true; // Bubble the didTransition event
+            }
+          }
+        });
+        ```
+
+        @event didTransition
+        @since 1.2.0
+      */
+
+      /**
+        The `loading` action is fired on the route when a route's `model`
+        hook returns a promise that is not already resolved. The current
+        `Transition` object is the first parameter and the route that
+        triggered the loading event is the second parameter.
+
+        ```js
+        App.ApplicationRoute = Ember.Route.extend({
+          actions: {
+            loading: function(transition, route) {
+              var view = Ember.View.create({
+                classNames: ['app-loading']
+              })
+              .append();
+
+              this.router.one('didTransition', function () {
+                view.destroy();
+              });
+              return true; // Bubble the loading event
+            }
+          }
+        });
+        ```
+
+        @event loading
+        @param {Transition} transition
+        @param {Ember.Route} route The route that triggered the loading event
+        @since 1.2.0
+      */
+
+      /**
+        When attempting to transition into a route, any of the hooks
+        may return a promise that rejects, at which point an `error`
+        action will be fired on the partially-entered routes, allowing
+        for per-route error handling logic, or shared error handling
+        logic defined on a parent route.
+
+        Here is an example of an error handler that will be invoked
+        for rejected promises from the various hooks on the route,
+        as well as any unhandled errors from child routes:
+
+        ```js
+        App.AdminRoute = Ember.Route.extend({
+          beforeModel: function() {
+            return Ember.RSVP.reject("bad things!");
+          },
+
+          actions: {
+            error: function(error, transition) {
+              // Assuming we got here due to the error in `beforeModel`,
+              // we can expect that error === "bad things!",
+              // but a promise model rejecting would also
+              // call this hook, as would any errors encountered
+              // in `afterModel`.
+
+              // The `error` hook is also provided the failed
+              // `transition`, which can be stored and later
+              // `.retry()`d if desired.
+
+              this.transitionTo('login');
+            }
+          }
+        });
+        ```
+
+        `error` actions that bubble up all the way to `ApplicationRoute`
+        will fire a default error handler that logs the error. You can
+        specify your own global default error handler by overriding the
+        `error` handler on `ApplicationRoute`:
+
+        ```js
+        App.ApplicationRoute = Ember.Route.extend({
+          actions: {
+            error: function(error, transition) {
+              this.controllerFor('banner').displayError(error.message);
+            }
+          }
+        });
+        ```
+        @event error
+        @param {Error} error
+        @param {Transition} transition
+      */
+
+      /**
+        The controller associated with this route.
+
+        Example
+
+        ```javascript
+        App.FormRoute = Ember.Route.extend({
+          actions: {
+            willTransition: function(transition) {
+              if (this.controller.get('userHasEnteredData') &&
+                  !confirm("Are you sure you want to abandon progress?")) {
+                transition.abort();
+              } else {
+                // Bubble the `willTransition` action so that
+                // parent routes can decide whether or not to abort.
+                return true;
+              }
+            }
+          }
+        });
+        ```
+
+        @property controller
+        @type Ember.Controller
+        @since 1.6.0
+      */
+
+      _actions: {
+
+        queryParamsDidChange: function(changed, totalPresent, removed) {
+                  },
+
+        finalizeQueryParamChange: function(params, finalParams, transition) {
+                  }
+      },
+
+      /**
+        @deprecated
+
+        Please use `actions` instead.
+        @method events
+      */
+      events: null,
+
+      mergedProperties: ['events'],
+
+      /**
+        This hook is executed when the router completely exits this route. It is
+        not executed when the model for the route changes.
+
+        @method deactivate
+      */
+      deactivate: Ember.K,
+
+      /**
+        This hook is executed when the router enters the route. It is not executed
+        when the model for the route changes.
+
+        @method activate
+      */
+      activate: Ember.K,
+
+      /**
+        Transition the application into another route. The route may
+        be either a single route or route path:
+
+        ```javascript
+        this.transitionTo('blogPosts');
+        this.transitionTo('blogPosts.recentEntries');
+        ```
+
+        Optionally supply a model for the route in question. The model
+        will be serialized into the URL using the `serialize` hook of
+        the route:
+
+        ```javascript
+        this.transitionTo('blogPost', aPost);
+        ```
+
+        If a literal is passed (such as a number or a string), it will
+        be treated as an identifier instead. In this case, the `model`
+        hook of the route will be triggered:
+
+        ```javascript
+        this.transitionTo('blogPost', 1);
+        ```
+
+        Multiple models will be applied last to first recursively up the
+        resource tree.
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('blogPost', {path:':blogPostId'}, function(){
+            this.resource('blogComment', {path: ':blogCommentId'});
+          });
+        });
+
+        this.transitionTo('blogComment', aPost, aComment);
+        this.transitionTo('blogComment', 1, 13);
+        ```
+
+        It is also possible to pass a URL (a string that starts with a
+        `/`). This is intended for testing and debugging purposes and
+        should rarely be used in production code.
+
+        ```javascript
+        this.transitionTo('/');
+        this.transitionTo('/blog/post/1/comment/13');
+        ```
+
+        See also 'replaceWith'.
+
+        Simple Transition Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.route("index");
+          this.route("secret");
+          this.route("fourOhFour", { path: "*:"});
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            moveToSecret: function(context){
+              if (authorized()){
+                this.transitionTo('secret', context);
+              }
+                this.transitionTo('fourOhFour');
+            }
+          }
+        });
+        ```
+
+        Transition to a nested route
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('articles', { path: '/articles' }, function() {
+            this.route('new');
+          });
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            transitionToNewArticle: function() {
+              this.transitionTo('articles.new');
+            }
+          }
+        });
+        ```
+
+        Multiple Models Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.route("index");
+          this.resource('breakfast', {path:':breakfastId'}, function(){
+            this.resource('cereal', {path: ':cerealId'});
+          });
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            moveToChocolateCereal: function(){
+              var cereal = { cerealId: "ChocolateYumminess"},
+                  breakfast = {breakfastId: "CerealAndMilk"};
+
+              this.transitionTo('cereal', breakfast, cereal);
+            }
+          }
+        });
+        ```
+
+        @method transitionTo
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used while
+          transitioning to the route.
+        @return {Transition} the transition object associated with this
+          attempted transition
+      */
+      transitionTo: function(name, context) {
+        var router = this.router;
+        return router.transitionTo.apply(router, arguments);
+      },
+
+      /**
+        Perform a synchronous transition into another route without attempting
+        to resolve promises, update the URL, or abort any currently active
+        asynchronous transitions (i.e. regular transitions caused by
+        `transitionTo` or URL changes).
+
+        This method is handy for performing intermediate transitions on the
+        way to a final destination route, and is called internally by the
+        default implementations of the `error` and `loading` handlers.
+
+        @method intermediateTransitionTo
+        @param {String} name the name of the route
+        @param {...Object} models the model(s) to be used while transitioning
+        to the route.
+        @since 1.2.0
+       */
+      intermediateTransitionTo: function() {
+        var router = this.router;
+        router.intermediateTransitionTo.apply(router, arguments);
+      },
+
+      /**
+        Refresh the model on this route and any child routes, firing the
+        `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+        to how routes are entered when transitioning in from other route.
+        The current route params (e.g. `article_id`) will be passed in
+        to the respective model hooks, and if a different model is returned,
+        `setupController` and associated route hooks will re-fire as well.
+
+        An example usage of this method is re-querying the server for the
+        latest information using the same parameters as when the route
+        was first entered.
+
+        Note that this will cause `model` hooks to fire even on routes
+        that were provided a model object when the route was initially
+        entered.
+
+        @method refresh
+        @return {Transition} the transition object associated with this
+          attempted transition
+        @since 1.4.0
+       */
+      refresh: function() {
+        return this.router.router.refresh(this);
+      },
+
+      /**
+        Transition into another route while replacing the current URL, if possible.
+        This will replace the current history entry instead of adding a new one.
+        Beside that, it is identical to `transitionTo` in all other respects. See
+        'transitionTo' for additional information regarding multiple models.
+
+        Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.route("index");
+          this.route("secret");
+        });
+
+        App.SecretRoute = Ember.Route.extend({
+          afterModel: function() {
+            if (!authorized()){
+              this.replaceWith('index');
+            }
+          }
+        });
+        ```
+
+        @method replaceWith
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used while
+          transitioning to the route.
+        @return {Transition} the transition object associated with this
+          attempted transition
+      */
+      replaceWith: function() {
+        var router = this.router;
+        return router.replaceWith.apply(router, arguments);
+      },
+
+      /**
+        Sends an action to the router, which will delegate it to the currently
+        active route hierarchy per the bubbling rules explained under `actions`.
+
+        Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.route("index");
+        });
+
+        App.ApplicationRoute = Ember.Route.extend({
+          actions: {
+            track: function(arg) {
+              console.log(arg, 'was clicked');
+            }
+          }
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            trackIfDebug: function(arg) {
+              if (debug) {
+                this.send('track', arg);
+              }
+            }
+          }
+        });
+        ```
+
+        @method send
+        @param {String} name the name of the action to trigger
+        @param {...*} args
+      */
+      send: function() {
+        return this.router.send.apply(this.router, arguments);
+      },
+
+      /**
+        This hook is the entry point for router.js
+
+        @private
+        @method setup
+      */
+      setup: function(context, transition) {
+        var controllerName = this.controllerName || this.routeName,
+            controller = this.controllerFor(controllerName, true);
+        if (!controller) {
+          controller =  this.generateController(controllerName, context);
+        }
+
+        // Assign the route's controller so that it can more easily be
+        // referenced in action handlers
+        this.controller = controller;
+
+        
+        if (this.setupControllers) {
+          Ember.deprecate("Ember.Route.setupControllers is deprecated. Please use Ember.Route.setupController(controller, model) instead.");
+          this.setupControllers(controller, context);
+        } else {
+
+          
+            this.setupController(controller, context);
+          
+        }
+
+        if (this.renderTemplates) {
+          Ember.deprecate("Ember.Route.renderTemplates is deprecated. Please use Ember.Route.renderTemplate(controller, model) instead.");
+          this.renderTemplates(context);
+        } else {
+          this.renderTemplate(controller, context);
+        }
+      },
+
+      /**
+        This hook is the first of the route entry validation hooks
+        called when an attempt is made to transition into a route
+        or one of its children. It is called before `model` and
+        `afterModel`, and is appropriate for cases when:
+
+        1) A decision can be made to redirect elsewhere without
+           needing to resolve the model first.
+        2) Any async operations need to occur first before the
+           model is attempted to be resolved.
+
+        This hook is provided the current `transition` attempt
+        as a parameter, which can be used to `.abort()` the transition,
+        save it for a later `.retry()`, or retrieve values set
+        on it from a previous hook. You can also just call
+        `this.transitionTo` to another route to implicitly
+        abort the `transition`.
+
+        You can return a promise from this hook to pause the
+        transition until the promise resolves (or rejects). This could
+        be useful, for instance, for retrieving async code from
+        the server that is required to enter a route.
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          beforeModel: function(transition) {
+            if (!App.Post) {
+              return Ember.$.getScript('/models/post.js');
+            }
+          }
+        });
+        ```
+
+        If `App.Post` doesn't exist in the above example,
+        `beforeModel` will use jQuery's `getScript`, which
+        returns a promise that resolves after the server has
+        successfully retrieved and executed the code from the
+        server. Note that if an error were to occur, it would
+        be passed to the `error` hook on `Ember.Route`, but
+        it's also possible to handle errors specific to
+        `beforeModel` right from within the hook (to distinguish
+        from the shared error handling behavior of the `error`
+        hook):
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          beforeModel: function(transition) {
+            if (!App.Post) {
+              var self = this;
+              return Ember.$.getScript('post.js').then(null, function(e) {
+                self.transitionTo('help');
+
+                // Note that the above transitionTo will implicitly
+                // halt the transition. If you were to return
+                // nothing from this promise reject handler,
+                // according to promise semantics, that would
+                // convert the reject into a resolve and the
+                // transition would continue. To propagate the
+                // error so that it'd be handled by the `error`
+                // hook, you would have to either
+                return Ember.RSVP.reject(e);
+              });
+            }
+          }
+        });
+        ```
+
+        @method beforeModel
+        @param {Transition} transition
+        @param {Object} queryParams the active query params for this route
+        @return {Promise} if the value returned from this hook is
+          a promise, the transition will pause until the transition
+          resolves. Otherwise, non-promise return values are not
+          utilized in any way.
+      */
+      beforeModel: Ember.K,
+
+      /**
+        This hook is called after this route's model has resolved.
+        It follows identical async/promise semantics to `beforeModel`
+        but is provided the route's resolved model in addition to
+        the `transition`, and is therefore suited to performing
+        logic that can only take place after the model has already
+        resolved.
+
+        ```js
+        App.PostsRoute = Ember.Route.extend({
+          afterModel: function(posts, transition) {
+            if (posts.get('length') === 1) {
+              this.transitionTo('post.show', posts.get('firstObject'));
+            }
+          }
+        });
+        ```
+
+        Refer to documentation for `beforeModel` for a description
+        of transition-pausing semantics when a promise is returned
+        from this hook.
+
+        @method afterModel
+        @param {Object} resolvedModel the value returned from `model`,
+          or its resolved value if it was a promise
+        @param {Transition} transition
+        @param {Object} queryParams the active query params for this handler
+        @return {Promise} if the value returned from this hook is
+          a promise, the transition will pause until the transition
+          resolves. Otherwise, non-promise return values are not
+          utilized in any way.
+       */
+      afterModel: Ember.K,
+
+      /**
+        A hook you can implement to optionally redirect to another route.
+
+        If you call `this.transitionTo` from inside of this hook, this route
+        will not be entered in favor of the other hook.
+
+        `redirect` and `afterModel` behave very similarly and are
+        called almost at the same time, but they have an important
+        distinction in the case that, from one of these hooks, a
+        redirect into a child route of this route occurs: redirects
+        from `afterModel` essentially invalidate the current attempt
+        to enter this route, and will result in this route's `beforeModel`,
+        `model`, and `afterModel` hooks being fired again within
+        the new, redirecting transition. Redirects that occur within
+        the `redirect` hook, on the other hand, will _not_ cause
+        these hooks to be fired again the second time around; in
+        other words, by the time the `redirect` hook has been called,
+        both the resolved model and attempted entry into this route
+        are considered to be fully validated.
+
+        @method redirect
+        @param {Object} model the model for this route
+      */
+      redirect: Ember.K,
+
+      /**
+        Called when the context is changed by router.js.
+
+        @private
+        @method contextDidChange
+      */
+      contextDidChange: function() {
+        this.currentModel = this.context;
+      },
+
+      /**
+        A hook you can implement to convert the URL into the model for
+        this route.
+
+        ```js
+        App.Router.map(function() {
+          this.resource('post', {path: '/posts/:post_id'});
+        });
+        ```
+
+        The model for the `post` route is `App.Post.find(params.post_id)`.
+
+        By default, if your route has a dynamic segment ending in `_id`:
+
+        * The model class is determined from the segment (`post_id`'s
+          class is `App.Post`)
+        * The find method is called on the model class with the value of
+          the dynamic segment.
+
+        Note that for routes with dynamic segments, this hook is only
+        executed when entered via the URL. If the route is entered
+        through a transition (e.g. when using the `link-to` Handlebars
+        helper), then a model context is already provided and this hook
+        is not called. Routes without dynamic segments will always
+        execute the model hook.
+
+        This hook follows the asynchronous/promise semantics
+        described in the documentation for `beforeModel`. In particular,
+        if a promise returned from `model` fails, the error will be
+        handled by the `error` hook on `Ember.Route`.
+
+        Example
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          model: function(params) {
+            return App.Post.find(params.post_id);
+          }
+        });
+        ```
+
+        @method model
+        @param {Object} params the parameters extracted from the URL
+        @param {Transition} transition
+        @param {Object} queryParams the query params for this route
+        @return {Object|Promise} the model for this route. If
+          a promise is returned, the transition will pause until
+          the promise resolves, and the resolved value of the promise
+          will be used as the model for this route.
+      */
+      model: function(params, transition) {
+        var match, name, sawParams, value;
+
+        for (var prop in params) {
+          if (prop === 'queryParams') { continue; }
+
+          if (match = prop.match(/^(.*)_id$/)) {
+            name = match[1];
+            value = params[prop];
+          }
+          sawParams = true;
+        }
+
+        if (!name && sawParams) { return copy(params); }
+        else if (!name) {
+          if (transition.resolveIndex !== transition.state.handlerInfos.length-1) { return; }
+
+          var parentModel = transition.state.handlerInfos[transition.resolveIndex-1].context;
+
+          return parentModel;
+        }
+
+        return this.findModel(name, value);
+      },
+
+      /**
+        @private
+        @method deserialize
+        @param {Object} params the parameters extracted from the URL
+        @param {Transition} transition
+        @return {Object|Promise} the model for this route.
+
+        Router.js hook.
+       */
+      deserialize: function(params, transition) {
+        
+          return this.model(params, transition);
+        
+      },
+
+      /**
+
+        @method findModel
+        @param {String} type the model type
+        @param {Object} value the value passed to find
+      */
+      findModel: function(){
+        var store = get(this, 'store');
+        return store.find.apply(store, arguments);
+      },
+
+      /**
+        Store property provides a hook for data persistence libraries to inject themselves.
+
+        By default, this store property provides the exact same functionality previously
+        in the model hook.
+
+        Currently, the required interface is:
+
+        `store.find(modelName, findArguments)`
+
+        @method store
+        @param {Object} store
+      */
+      store: computed(function(){
+        var container = this.container;
+        var routeName = this.routeName;
+        var namespace = get(this, 'router.namespace');
+
+        return {
+          find: function(name, value) {
+            var modelClass = container.lookupFactory('model:' + name);
+
+            Ember.assert("You used the dynamic segment " + name + "_id in your route " +
+                         routeName + ", but " + namespace + "." + classify(name) +
+                         " did not exist and you did not override your route's `model` " +
+                         "hook.", modelClass);
+
+            if (!modelClass) { return; }
+
+            Ember.assert(classify(name) + ' has no method `find`.', typeof modelClass.find === 'function');
+
+            return modelClass.find(value);
+          }
+        };
+      }),
+
+      /**
+        A hook you can implement to convert the route's model into parameters
+        for the URL.
+
+        ```js
+        App.Router.map(function() {
+          this.resource('post', {path: '/posts/:post_id'});
+        });
+
+        App.PostRoute = Ember.Route.extend({
+          model: function(params) {
+            // the server returns `{ id: 12 }`
+            return jQuery.getJSON("/posts/" + params.post_id);
+          },
+
+          serialize: function(model) {
+            // this will make the URL `/posts/12`
+            return { post_id: model.id };
+          }
+        });
+        ```
+
+        The default `serialize` method will insert the model's `id` into the
+        route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+        If the route has multiple dynamic segments or does not contain '_id', `serialize`
+        will return `Ember.getProperties(model, params)`
+
+        This method is called when `transitionTo` is called with a context
+        in order to populate the URL.
+
+        @method serialize
+        @param {Object} model the route's model
+        @param {Array} params an Array of parameter names for the current
+          route (in the example, `['post_id']`.
+        @return {Object} the serialized parameters
+      */
+      serialize: function(model, params) {
+        if (params.length < 1) { return; }
+        if (!model) { return; }
+
+        var name = params[0], object = {};
+
+        if (/_id$/.test(name) && params.length === 1) {
+          object[name] = get(model, "id");
+        } else {
+          object = getProperties(model, params);
+        }
+
+        return object;
+      },
+
+      /**
+        A hook you can use to setup the controller for the current route.
+
+        This method is called with the controller for the current route and the
+        model supplied by the `model` hook.
+
+        By default, the `setupController` hook sets the `content` property of
+        the controller to the `model`.
+
+        If you implement the `setupController` hook in your Route, it will
+        prevent this default behavior. If you want to preserve that behavior
+        when implementing your `setupController` function, make sure to call
+        `_super`:
+
+        ```js
+        App.PhotosRoute = Ember.Route.extend({
+          model: function() {
+            return App.Photo.find();
+          },
+
+          setupController: function (controller, model) {
+            // Call _super for default behavior
+            this._super(controller, model);
+            // Implement your custom setup after
+            this.controllerFor('application').set('showingPhotos', true);
+          }
+        });
+        ```
+
+        This means that your template will get a proxy for the model as its
+        context, and you can act as though the model itself was the context.
+
+        The provided controller will be one resolved based on the name
+        of this route.
+
+        If no explicit controller is defined, Ember will automatically create
+        an appropriate controller for the model.
+
+        * if the model is an `Ember.Array` (including record arrays from Ember
+          Data), the controller is an `Ember.ArrayController`.
+        * otherwise, the controller is an `Ember.ObjectController`.
+
+        As an example, consider the router:
+
+        ```js
+        App.Router.map(function() {
+          this.resource('post', {path: '/posts/:post_id'});
+        });
+        ```
+
+        For the `post` route, a controller named `App.PostController` would
+        be used if it is defined. If it is not defined, an `Ember.ObjectController`
+        instance would be used.
+
+        Example
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          setupController: function(controller, model) {
+            controller.set('model', model);
+          }
+        });
+        ```
+
+        @method setupController
+        @param {Controller} controller instance
+        @param {Object} model
+      */
+      setupController: function(controller, context, transition) {
+        if (controller && (context !== undefined)) {
+          set(controller, 'model', context);
+        }
+      },
+
+      /**
+        Returns the controller for a particular route or name.
+
+        The controller instance must already have been created, either through entering the
+        associated route or using `generateController`.
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          setupController: function(controller, post) {
+            this._super(controller, post);
+            this.controllerFor('posts').set('currentPost', post);
+          }
+        });
+        ```
+
+        @method controllerFor
+        @param {String} name the name of the route or controller
+        @return {Ember.Controller}
+      */
+      controllerFor: function(name, _skipAssert) {
+        var container = this.container,
+            route = container.lookup('route:'+name),
+            controller;
+
+        if (route && route.controllerName) {
+          name = route.controllerName;
+        }
+
+        controller = container.lookup('controller:' + name);
+
+        // NOTE: We're specifically checking that skipAssert is true, because according
+        //   to the old API the second parameter was model. We do not want people who
+        //   passed a model to skip the assertion.
+        Ember.assert("The controller named '"+name+"' could not be found. Make sure " +
+                     "that this route exists and has already been entered at least " +
+                     "once. If you are accessing a controller not associated with a " +
+                     "route, make sure the controller class is explicitly defined.",
+                     controller || _skipAssert === true);
+
+        return controller;
+      },
+
+      /**
+        Generates a controller for a route.
+
+        If the optional model is passed then the controller type is determined automatically,
+        e.g., an ArrayController for arrays.
+
+        Example
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          setupController: function(controller, post) {
+            this._super(controller, post);
+            this.generateController('posts', post);
+          }
+        });
+        ```
+
+        @method generateController
+        @param {String} name the name of the controller
+        @param {Object} model the model to infer the type of the controller (optional)
+      */
+      generateController: function(name, model) {
+        var container = this.container;
+
+        model = model || this.modelFor(name);
+
+        return generateController(container, name, model);
+      },
+
+      /**
+        Returns the model of a parent (or any ancestor) route
+        in a route hierarchy.  During a transition, all routes
+        must resolve a model object, and if a route
+        needs access to a parent route's model in order to
+        resolve a model (or just reuse the model from a parent),
+        it can call `this.modelFor(theNameOfParentRoute)` to
+        retrieve it.
+
+        Example
+
+        ```js
+        App.Router.map(function() {
+            this.resource('post', { path: '/post/:post_id' }, function() {
+                this.resource('comments');
+            });
+        });
+
+        App.CommentsRoute = Ember.Route.extend({
+            afterModel: function() {
+                this.set('post', this.modelFor('post'));
+            }
+        });
+        ```
+
+        @method modelFor
+        @param {String} name the name of the route
+        @return {Object} the model object
+      */
+      modelFor: function(name) {
+        var route = this.container.lookup('route:' + name),
+            transition = this.router ? this.router.router.activeTransition : null;
+
+        // If we are mid-transition, we want to try and look up
+        // resolved parent contexts on the current transitionEvent.
+        if (transition) {
+          var modelLookupName = (route && route.routeName) || name;
+          if (transition.resolvedModels.hasOwnProperty(modelLookupName)) {
+            return transition.resolvedModels[modelLookupName];
+          }
+        }
+
+        return route && route.currentModel;
+      },
+
+      /**
+        A hook you can use to render the template for the current route.
+
+        This method is called with the controller for the current route and the
+        model supplied by the `model` hook. By default, it renders the route's
+        template, configured with the controller for the route.
+
+        This method can be overridden to set up and render additional or
+        alternative templates.
+
+        ```js
+        App.PostsRoute = Ember.Route.extend({
+          renderTemplate: function(controller, model) {
+            var favController = this.controllerFor('favoritePost');
+
+            // Render the `favoritePost` template into
+            // the outlet `posts`, and display the `favoritePost`
+            // controller.
+            this.render('favoritePost', {
+              outlet: 'posts',
+              controller: favController
+            });
+          }
+        });
+        ```
+
+        @method renderTemplate
+        @param {Object} controller the route's controller
+        @param {Object} model the route's model
+      */
+      renderTemplate: function(controller, model) {
+        this.render();
+      },
+
+      /**
+        Renders a template into an outlet.
+
+        This method has a number of defaults, based on the name of the
+        route specified in the router.
+
+        For example:
+
+        ```js
+        App.Router.map(function() {
+          this.route('index');
+          this.resource('post', {path: '/posts/:post_id'});
+        });
+
+        App.PostRoute = App.Route.extend({
+          renderTemplate: function() {
+            this.render();
+          }
+        });
+        ```
+
+        The name of the `PostRoute`, as defined by the router, is `post`.
+
+        By default, render will:
+
+        * render the `post` template
+        * with the `post` view (`PostView`) for event handling, if one exists
+        * and the `post` controller (`PostController`), if one exists
+        * into the `main` outlet of the `application` template
+
+        You can override this behavior:
+
+        ```js
+        App.PostRoute = App.Route.extend({
+          renderTemplate: function() {
+            this.render('myPost', {   // the template to render
+              into: 'index',          // the template to render into
+              outlet: 'detail',       // the name of the outlet in that template
+              controller: 'blogPost'  // the controller to use for the template
+            });
+          }
+        });
+        ```
+
+        Remember that the controller's `content` will be the route's model. In
+        this case, the default model will be `App.Post.find(params.post_id)`.
+
+        @method render
+        @param {String} name the name of the template to render
+        @param {Object} options the options
+      */
+      render: function(name, options) {
+        Ember.assert("The name in the given arguments is undefined", arguments.length > 0 ? !isNone(arguments[0]) : true);
+
+        var namePassed = typeof name === 'string' && !!name;
+
+        if (typeof name === 'object' && !options) {
+          options = name;
+          name = this.routeName;
+        }
+
+        options = options || {};
+
+        var templateName;
+
+        if (name) {
+          name = name.replace(/\//g, '.');
+          templateName = name;
+        } else {
+          name = this.routeName;
+          templateName = this.templateName || name;
+        }
+
+        var viewName = options.view || namePassed && name || this.viewName || name;
+
+        var container = this.container,
+            view = container.lookup('view:' + viewName),
+            template = view ? view.get('template') : null;
+
+        if (!template) {
+          template = container.lookup('template:' + templateName);
+        }
+
+        if (!view && !template) {
+          Ember.assert("Could not find \"" + name + "\" template or view.", Ember.isEmpty(arguments[0]));
+          if (get(this.router, 'namespace.LOG_VIEW_LOOKUPS')) {
+            Ember.Logger.info("Could not find \"" + name + "\" template or view. Nothing will be rendered", { fullName: 'template:' + name });
+          }
+          return;
+        }
+
+        options = normalizeOptions(this, name, template, options);
+        view = setupView(view, container, options);
+
+        if (options.outlet === 'main') { this.lastRenderedTemplate = name; }
+
+        appendView(this, view, options);
+      },
+
+      /**
+        Disconnects a view that has been rendered into an outlet.
+
+        You may pass any or all of the following options to `disconnectOutlet`:
+
+        * `outlet`: the name of the outlet to clear (default: 'main')
+        * `parentView`: the name of the view containing the outlet to clear
+           (default: the view rendered by the parent route)
+
+        Example:
+
+        ```js
+        App.ApplicationRoute = App.Route.extend({
+          actions: {
+            showModal: function(evt) {
+              this.render(evt.modalName, {
+                outlet: 'modal',
+                into: 'application'
+              });
+            },
+            hideModal: function(evt) {
+              this.disconnectOutlet({
+                outlet: 'modal',
+                parentView: 'application'
+              });
+            }
+          }
+        });
+        ```
+
+        Alternatively, you can pass the `outlet` name directly as a string.
+
+        Example:
+
+        ```js
+        hideModal: function(evt) {
+          this.disconnectOutlet('modal');
+        }
+        ```
+
+        @method disconnectOutlet
+        @param {Object|String} options the options hash or outlet name
+      */
+      disconnectOutlet: function(options) {
+        if (!options || typeof options === "string") {
+          var outletName = options;
+          options = {};
+          options.outlet = outletName;
+        }
+        options.parentView = options.parentView ? options.parentView.replace(/\//g, '.') : parentTemplate(this);
+        options.outlet = options.outlet || 'main';
+
+        var parentView = this.router._lookupActiveView(options.parentView);
+        if (parentView) { parentView.disconnectOutlet(options.outlet); }
+      },
+
+      willDestroy: function() {
+        this.teardownViews();
+      },
+
+      /**
+        @private
+
+        @method teardownViews
+      */
+      teardownViews: function() {
+        // Tear down the top level view
+        if (this.teardownTopLevelView) { this.teardownTopLevelView(); }
+
+        // Tear down any outlets rendered with 'into'
+        var teardownOutletViews = this.teardownOutletViews || [];
+        a_forEach(teardownOutletViews, function(teardownOutletView) {
+          teardownOutletView();
+        });
+
+        delete this.teardownTopLevelView;
+        delete this.teardownOutletViews;
+        delete this.lastRenderedTemplate;
+      }
+    });
+
+
+    
+    function parentRoute(route) {
+      var handlerInfos = route.router.router.state.handlerInfos;
+
+      if (!handlerInfos) { return; }
+
+      var parent, current;
+
+      for (var i=0, l=handlerInfos.length; i<l; i++) {
+        current = handlerInfos[i].handler;
+        if (current === route) { return parent; }
+        parent = current;
+      }
+    }
+
+    function parentTemplate(route) {
+      var parent = parentRoute(route), template;
+
+      if (!parent) { return; }
+
+      if (template = parent.lastRenderedTemplate) {
+        return template;
+      } else {
+        return parentTemplate(parent);
+      }
+    }
+
+    function normalizeOptions(route, name, template, options) {
+      options = options || {};
+      options.into = options.into ? options.into.replace(/\//g, '.') : parentTemplate(route);
+      options.outlet = options.outlet || 'main';
+      options.name = name;
+      options.template = template;
+      options.LOG_VIEW_LOOKUPS = get(route.router, 'namespace.LOG_VIEW_LOOKUPS');
+
+      Ember.assert("An outlet ("+options.outlet+") was specified but was not found.", options.outlet === 'main' || options.into);
+
+      var controller = options.controller,
+          model = options.model,
+          namedController;
+
+      if (options.controller) {
+        controller = options.controller;
+      } else if (namedController = route.container.lookup('controller:' + name)) {
+        controller = namedController;
+      } else {
+        controller = route.controllerName || route.routeName;
+      }
+
+      if (typeof controller === 'string') {
+        var controllerName = controller;
+        controller = route.container.lookup('controller:' + controllerName);
+        if (!controller) {
+          throw new EmberError("You passed `controller: '" + controllerName + "'` into the `render` method, but no such controller could be found.");
+        }
+      }
+
+      if (model) {
+        controller.set('model', model);
+      }
+
+      options.controller = controller;
+
+      return options;
+    }
+
+    function setupView(view, container, options) {
+      if (view) {
+        if (options.LOG_VIEW_LOOKUPS) {
+          Ember.Logger.info("Rendering " + options.name + " with " + view, { fullName: 'view:' + options.name });
+        }
+      } else {
+        var defaultView = options.into ? 'view:default' : 'view:toplevel';
+        view = container.lookup(defaultView);
+        if (options.LOG_VIEW_LOOKUPS) {
+          Ember.Logger.info("Rendering " + options.name + " with default view " + view, { fullName: 'view:' + options.name });
+        }
+      }
+
+      if (!get(view, 'templateName')) {
+        set(view, 'template', options.template);
+
+        set(view, '_debugTemplateName', options.name);
+      }
+
+      set(view, 'renderedName', options.name);
+      set(view, 'controller', options.controller);
+
+      return view;
+    }
+
+    function appendView(route, view, options) {
+      if (options.into) {
+        var parentView = route.router._lookupActiveView(options.into);
+        var teardownOutletView = generateOutletTeardown(parentView, options.outlet);
+        if (!route.teardownOutletViews) { route.teardownOutletViews = []; }
+        a_replace(route.teardownOutletViews, 0, 0, [teardownOutletView]);
+        parentView.connectOutlet(options.outlet, view);
+      } else {
+        var rootElement = get(route, 'router.namespace.rootElement');
+        // tear down view if one is already rendered
+        if (route.teardownTopLevelView) {
+          route.teardownTopLevelView();
+        }
+        route.router._connectActiveView(options.name, view);
+        route.teardownTopLevelView = generateTopLevelTeardown(view);
+        view.appendTo(rootElement);
+      }
+    }
+
+    function generateTopLevelTeardown(view) {
+      return function() { view.destroy(); };
+    }
+
+    function generateOutletTeardown(parentView, outlet) {
+      return function() { parentView.disconnectOutlet(outlet); };
+    }
+
+    function toggleQueryParamObservers(route, controller, enable) {
+      var queryParams = get(controller, 'queryParams'), i, len,
+          method = enable ? 'addObserver' : 'removeObserver';
+
+      for (i = 0, len = queryParams.length; i < len; ++i) {
+        var prop = queryParams[i].split(':')[0];
+        controller[method](prop,         route, route._qpChanged);
+        controller[method](prop + '.[]', route, route._qpChanged);
+      }
+    }
+
+    __exports__["default"] = Route;
+  });
+define("ember-routing/system/router",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/array","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, Logger, K, assert
+    var EmberError = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var forEach = __dependency5__.forEach;
+    var defineProperty = __dependency6__.defineProperty;
+    var computed = __dependency7__.computed;
+    var merge = __dependency8__["default"];
+    var run = __dependency9__["default"];
+    var EnumerableUtils = __dependency10__["default"];
+
+    var fmt = __dependency11__.fmt;
+    var EmberObject = __dependency12__["default"];
+    var Evented = __dependency13__["default"];
+    var EmberRouterDSL = __dependency14__["default"];
+    var EmberView = __dependency15__.View;
+    var EmberLocation = __dependency16__["default"];
+    var _MetamorphView = __dependency17__._MetamorphView;
+
+    // requireModule("ember-handlebars");
+    // requireModule("ember-runtime");
+    // requireModule("ember-views");
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    // // side effect of loading some Ember globals, for now
+    // requireModule("ember-handlebars");
+    // requireModule("ember-runtime");
+    // requireModule("ember-views");
+
+    var Router = requireModule("router")['default'];
+    var Transition = requireModule("router/transition").Transition;
+
+    var slice = [].slice;
+    var forEach = EnumerableUtils.forEach;
+
+    var DefaultView = _MetamorphView;
+
+    /**
+      The `Ember.Router` class manages the application state and URLs. Refer to
+      the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+
+      @class Router
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var EmberRouter = EmberObject.extend(Evented, {
+      /**
+        The `location` property determines the type of URL's that your
+        application will use.
+
+        The following location types are currently available:
+
+        * `hash`
+        * `history`
+        * `none`
+
+        @property location
+        @default 'hash'
+        @see {Ember.Location}
+      */
+      location: 'hash',
+
+      /**
+       Represents the URL of the root of the application, often '/'. This prefix is
+       assumed on all routes defined on this router.
+
+       @property rootURL
+       @default '/'
+      */
+      rootURL: '/',
+
+      init: function() {
+        this.router = this.constructor.router || this.constructor.map(Ember.K);
+        this._activeViews = {};
+        this._setupLocation();
+        this._qpCache = {};
+        this._queuedQPChanges = {};
+
+        if (get(this, 'namespace.LOG_TRANSITIONS_INTERNAL')) {
+          this.router.log = Ember.Logger.debug;
+        }
+      },
+
+      /**
+        Represents the current URL.
+
+        @method url
+        @return {String} The current URL.
+      */
+      url: computed(function() {
+        return get(this, 'location').getURL();
+      }),
+
+      /**
+        Initializes the current router instance and sets up the change handling
+        event listeners used by the instances `location` implementation.
+
+        A property named `initialURL` will be used to determine the initial URL.
+        If no value is found `/` will be used.
+
+        @method startRouting
+        @private
+      */
+      startRouting: function() {
+        this.router = this.router || this.constructor.map(Ember.K);
+
+        var router = this.router,
+            location = get(this, 'location'),
+            container = this.container,
+            self = this,
+            initialURL = get(this, 'initialURL');
+
+        // Allow the Location class to cancel the router setup while it refreshes
+        // the page
+        if (get(location, 'cancelRouterSetup')) {
+          return;
+        }
+
+        this._setupRouter(router, location);
+
+        container.register('view:default', DefaultView);
+        container.register('view:toplevel', EmberView.extend());
+
+        location.onUpdateURL(function(url) {
+          self.handleURL(url);
+        });
+
+        if (typeof initialURL === "undefined") {
+          initialURL = location.getURL();
+        }
+
+        this.handleURL(initialURL);
+      },
+
+      /**
+        Handles updating the paths and notifying any listeners of the URL
+        change.
+
+        Triggers the router level `didTransition` hook.
+
+        @method didTransition
+        @private
+        @since 1.2.0
+      */
+      didTransition: function(infos) {
+        updatePaths(this);
+
+        this._cancelLoadingEvent();
+
+        this.notifyPropertyChange('url');
+
+        // Put this in the runloop so url will be accurate. Seems
+        // less surprising than didTransition being out of sync.
+        run.once(this, this.trigger, 'didTransition');
+
+        if (get(this, 'namespace').LOG_TRANSITIONS) {
+          Ember.Logger.log("Transitioned into '" + EmberRouter._routePath(infos) + "'");
+        }
+      },
+
+      handleURL: function(url) {
+        return this._doTransition('handleURL', [url]);
+      },
+
+      transitionTo: function() {
+        return this._doTransition('transitionTo', arguments);
+      },
+
+      intermediateTransitionTo: function() {
+        this.router.intermediateTransitionTo.apply(this.router, arguments);
+
+        updatePaths(this);
+
+        var infos = this.router.currentHandlerInfos;
+        if (get(this, 'namespace').LOG_TRANSITIONS) {
+          Ember.Logger.log("Intermediate-transitioned into '" + EmberRouter._routePath(infos) + "'");
+        }
+      },
+
+      replaceWith: function() {
+        return this._doTransition('replaceWith', arguments);
+      },
+
+      generate: function() {
+        var url = this.router.generate.apply(this.router, arguments);
+        return this.location.formatURL(url);
+      },
+
+      /**
+        Determines if the supplied route is currently active.
+
+        @method isActive
+        @param routeName
+        @return {Boolean}
+        @private
+      */
+      isActive: function(routeName) {
+        var router = this.router;
+        return router.isActive.apply(router, arguments);
+      },
+
+      send: function(name, context) {
+        this.router.trigger.apply(this.router, arguments);
+      },
+
+      /**
+        Does this router instance have the given route.
+
+        @method hasRoute
+        @return {Boolean}
+        @private
+      */
+      hasRoute: function(route) {
+        return this.router.hasRoute(route);
+      },
+
+      /**
+        Resets the state of the router by clearing the current route
+        handlers and deactivating them.
+
+        @private
+        @method reset
+       */
+      reset: function() {
+        this.router.reset();
+      },
+
+      _lookupActiveView: function(templateName) {
+        var active = this._activeViews[templateName];
+        return active && active[0];
+      },
+
+      _connectActiveView: function(templateName, view) {
+        var existing = this._activeViews[templateName];
+
+        if (existing) {
+          existing[0].off('willDestroyElement', this, existing[1]);
+        }
+
+        function disconnectActiveView() {
+          delete this._activeViews[templateName];
+        }
+
+        this._activeViews[templateName] = [view, disconnectActiveView];
+        view.one('willDestroyElement', this, disconnectActiveView);
+      },
+
+      _setupLocation: function() {
+        var location = get(this, 'location'),
+            rootURL = get(this, 'rootURL');
+
+        if (rootURL && !this.container.has('-location-setting:root-url')) {
+          this.container.register('-location-setting:root-url', rootURL, { instantiate: false });
+        }
+
+        if ('string' === typeof location && this.container) {
+          var resolvedLocation = this.container.lookup('location:' + location);
+
+          if ('undefined' !== typeof resolvedLocation) {
+            location = set(this, 'location', resolvedLocation);
+          } else {
+            // Allow for deprecated registration of custom location API's
+            var options = {implementation: location};
+
+            location = set(this, 'location', EmberLocation.create(options));
+          }
+        }
+
+        if (rootURL && typeof rootURL === 'string') {
+          location.rootURL = rootURL;
+        }
+
+        // ensure that initState is called AFTER the rootURL is set on
+        // the location instance
+        if (typeof location.initState === 'function') { location.initState(); }
+      },
+
+      _getHandlerFunction: function() {
+        var seen = {}, container = this.container,
+            DefaultRoute = container.lookupFactory('route:basic'),
+            self = this;
+
+        return function(name) {
+          var routeName = 'route:' + name,
+              handler = container.lookup(routeName);
+
+          if (seen[name]) { return handler; }
+
+          seen[name] = true;
+
+          if (!handler) {
+            container.register(routeName, DefaultRoute.extend());
+            handler = container.lookup(routeName);
+
+            if (get(self, 'namespace.LOG_ACTIVE_GENERATION')) {
+              Ember.Logger.info("generated -> " + routeName, { fullName: routeName });
+            }
+          }
+
+          handler.routeName = name;
+          return handler;
+        };
+      },
+
+      _setupRouter: function(router, location) {
+        var lastURL, emberRouter = this;
+
+        router.getHandler = this._getHandlerFunction();
+
+        var doUpdateURL = function() {
+          location.setURL(lastURL);
+        };
+
+        router.updateURL = function(path) {
+          lastURL = path;
+          run.once(doUpdateURL);
+        };
+
+        if (location.replaceURL) {
+          var doReplaceURL = function() {
+            location.replaceURL(lastURL);
+          };
+
+          router.replaceURL = function(path) {
+            lastURL = path;
+            run.once(doReplaceURL);
+          };
+        }
+
+        router.didTransition = function(infos) {
+          emberRouter.didTransition(infos);
+        };
+      },
+
+      _doTransition: function(method, args) {
+        // Normalize blank route to root URL.
+        args = slice.call(args);
+        args[0] = args[0] || '/';
+
+        var name = args[0], self = this,
+          isQueryParamsOnly = false, queryParams;
+
+        
+        if (!isQueryParamsOnly && name.charAt(0) !== '/') {
+          Ember.assert("The route " + name + " was not found", this.router.hasRoute(name));
+        }
+
+        if (queryParams) {
+          // router.js expects queryParams to be passed in in
+          // their final serialized form, so we need to translate.
+
+          if (!name) {
+            // Need to determine destination route name.
+            var handlerInfos = this.router.activeTransition ?
+                               this.router.activeTransition.state.handlerInfos :
+                               this.router.state.handlerInfos;
+            name = handlerInfos[handlerInfos.length - 1].name;
+            args.unshift(name);
+          }
+
+          var qpCache = this._queryParamsFor(name), qps = qpCache.qps;
+
+          var finalParams = {};
+          for (var key in queryParams) {
+            if (!queryParams.hasOwnProperty(key)) { continue; }
+            var inputValue = queryParams[key],
+                qp = qpCache.map[key];
+
+            if (!qp) {
+              throw new EmberError("Unrecognized query param " + key + " provided as transition argument");
+            }
+            finalParams[qp.urlKey] = qp.route.serializeQueryParam(inputValue, qp.urlKey, qp.type);
+          }
+
+          // Perform any necessary serialization.
+          args[args.length-1].queryParams = finalParams;
+        }
+
+        var transitionPromise = this.router[method].apply(this.router, args);
+
+        transitionPromise.then(null, function(error) {
+          if (!error || !error.name) { return; }
+
+          if (error.name === "UnrecognizedURLError") {
+            Ember.assert("The URL '" + error.message + "' did not match any routes in your application");
+          } else if (error.name === 'TransitionAborted') {
+            // just ignore TransitionAborted here
+          } else {
+            logError(error);
+          }
+
+          return error;
+        }, 'Ember: Process errors from Router');
+
+        // We want to return the configurable promise object
+        // so that callers of this function can use `.method()` on it,
+        // which obviously doesn't exist for normal RSVP promises.
+        return transitionPromise;
+      },
+
+      _queryParamsFor: function(leafRouteName) {
+        if (this._qpCache[leafRouteName]) {
+          return this._qpCache[leafRouteName];
+        }
+
+        var map = {}, qps = [], qpCache = this._qpCache[leafRouteName] = {
+          map: map,
+          qps: qps
+        };
+
+        var routerjs = this.router,
+            recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
+
+        for (var i = 0, len = recogHandlerInfos.length; i < len; ++i) {
+          var recogHandler = recogHandlerInfos[i],
+              route = routerjs.getHandler(recogHandler.handler),
+              qpMeta = get(route, '_qp');
+
+          if (!qpMeta) { continue; }
+
+          merge(map, qpMeta.map);
+          qps.push.apply(qps, qpMeta.qps);
+        }
+
+        return {
+          qps: qps,
+          map: map
+        };
+      },
+
+      _scheduleLoadingEvent: function(transition, originRoute) {
+        this._cancelLoadingEvent();
+        this._loadingStateTimer = run.scheduleOnce('routerTransitions', this, '_fireLoadingEvent', transition, originRoute);
+      },
+
+      _fireLoadingEvent: function(transition, originRoute) {
+        if (!this.router.activeTransition) {
+          // Don't fire an event if we've since moved on from
+          // the transition that put us in a loading state.
+          return;
+        }
+
+        transition.trigger(true, 'loading', transition, originRoute);
+      },
+
+      _cancelLoadingEvent: function () {
+        if (this._loadingStateTimer) {
+          run.cancel(this._loadingStateTimer);
+        }
+        this._loadingStateTimer = null;
+      }
+    });
+
+    function controllerOrProtoFor(controllerName, container, getProto) {
+      var fullName = container.normalize('controller:' + controllerName);
+      if (!getProto && container.cache.has(fullName)) {
+        return container.lookup(fullName);
+      } else {
+        // Controller hasn't been instantiated yet; just return its proto.
+        var controllerClass = container.lookupFactory(fullName);
+        if (controllerClass && typeof controllerClass.proto === 'function') {
+          return controllerClass.proto();
+        } else {
+          return {};
+        }
+      }
+    }
+
+    /*
+      Helper function for iterating root-ward, starting
+      from (but not including) the provided `originRoute`.
+
+      Returns true if the last callback fired requested
+      to bubble upward.
+
+      @private
+     */
+    function forEachRouteAbove(originRoute, transition, callback) {
+      var handlerInfos = transition.state.handlerInfos,
+          originRouteFound = false;
+
+      for (var i = handlerInfos.length - 1; i >= 0; --i) {
+        var handlerInfo = handlerInfos[i],
+            route = handlerInfo.handler;
+
+        if (!originRouteFound) {
+          if (originRoute === route) {
+            originRouteFound = true;
+          }
+          continue;
+        }
+
+        if (callback(route, handlerInfos[i + 1].handler) !== true) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    // These get invoked when an action bubbles above ApplicationRoute
+    // and are not meant to be overridable.
+    var defaultActionHandlers = {
+
+      willResolveModel: function(transition, originRoute) {
+        originRoute.router._scheduleLoadingEvent(transition, originRoute);
+      },
+
+      error: function(error, transition, originRoute) {
+        // Attempt to find an appropriate error substate to enter.
+        var router = originRoute.router;
+
+        var tryTopLevel = forEachRouteAbove(originRoute, transition, function(route, childRoute) {
+          var childErrorRouteName = findChildRouteName(route, childRoute, 'error');
+          if (childErrorRouteName) {
+            router.intermediateTransitionTo(childErrorRouteName, error);
+            return;
+          }
+          return true;
+        });
+
+        if (tryTopLevel) {
+          // Check for top-level error state to enter.
+          if (routeHasBeenDefined(originRoute.router, 'application_error')) {
+            router.intermediateTransitionTo('application_error', error);
+            return;
+          }
+        } else {
+          // Don't fire an assertion if we found an error substate.
+          return;
+        }
+
+        logError(error, 'Error while processing route: ' + transition.targetName);
+      },
+
+      loading: function(transition, originRoute) {
+        // Attempt to find an appropriate loading substate to enter.
+        var router = originRoute.router;
+
+        var tryTopLevel = forEachRouteAbove(originRoute, transition, function(route, childRoute) {
+          var childLoadingRouteName = findChildRouteName(route, childRoute, 'loading');
+
+          if (childLoadingRouteName) {
+            router.intermediateTransitionTo(childLoadingRouteName);
+            return;
+          }
+
+          // Don't bubble above pivot route.
+          if (transition.pivotHandler !== route) {
+            return true;
+          }
+        });
+
+        if (tryTopLevel) {
+          // Check for top-level loading state to enter.
+          if (routeHasBeenDefined(originRoute.router, 'application_loading')) {
+            router.intermediateTransitionTo('application_loading');
+            return;
+          }
+        }
+      }
+    };
+
+    function logError(error, initialMessage) {
+      var errorArgs = [];
+
+      if (initialMessage) { errorArgs.push(initialMessage); }
+
+      if (error) {
+        if (error.message) { errorArgs.push(error.message); }
+        if (error.stack)   { errorArgs.push(error.stack); }
+
+        if (typeof error === "string") { errorArgs.push(error); }
+      }
+
+      Ember.Logger.error.apply(this, errorArgs);
+    }
+
+    function findChildRouteName(parentRoute, originatingChildRoute, name) {
+      var router = parentRoute.router,
+          childName,
+          targetChildRouteName = originatingChildRoute.routeName.split('.').pop(),
+          namespace = parentRoute.routeName === 'application' ? '' : parentRoute.routeName + '.';
+
+      
+      // Second, try general loading state, e.g. 'loading'
+      childName = namespace + name;
+      if (routeHasBeenDefined(router, childName)) {
+        return childName;
+      }
+    }
+
+    function routeHasBeenDefined(router, name) {
+      var container = router.container;
+      return router.hasRoute(name) &&
+             (container.has('template:' + name) || container.has('route:' + name));
+    }
+
+    function triggerEvent(handlerInfos, ignoreFailure, args) {
+      var name = args.shift();
+
+      if (!handlerInfos) {
+        if (ignoreFailure) { return; }
+        throw new EmberError("Can't trigger action '" + name + "' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call `.send()` on the `Transition` object passed to the `model/beforeModel/afterModel` hooks.");
+      }
+
+      var eventWasHandled = false;
+
+      for (var i = handlerInfos.length - 1; i >= 0; i--) {
+        var handlerInfo = handlerInfos[i],
+            handler = handlerInfo.handler;
+
+        if (handler._actions && handler._actions[name]) {
+          if (handler._actions[name].apply(handler, args) === true) {
+            eventWasHandled = true;
+          } else {
+            return;
+          }
+        }
+      }
+
+      if (defaultActionHandlers[name]) {
+        defaultActionHandlers[name].apply(null, args);
+        return;
+      }
+
+      if (!eventWasHandled && !ignoreFailure) {
+        throw new EmberError("Nothing handled the action '" + name + "'. If you did handle the action, this error can be caused by returning true from an action handler in a controller, causing the action to bubble.");
+      }
+    }
+
+    function updatePaths(router) {
+      var appController = router.container.lookup('controller:application');
+
+      if (!appController) {
+        // appController might not exist when top-level loading/error
+        // substates have been entered since ApplicationRoute hasn't
+        // actually been entered at that point.
+        return;
+      }
+
+      var infos = router.router.currentHandlerInfos,
+          path = EmberRouter._routePath(infos);
+
+      if (!('currentPath' in appController)) {
+        defineProperty(appController, 'currentPath');
+      }
+
+      set(appController, 'currentPath', path);
+
+      if (!('currentRouteName' in appController)) {
+        defineProperty(appController, 'currentRouteName');
+      }
+
+      set(appController, 'currentRouteName', infos[infos.length - 1].name);
+    }
+
+    EmberRouter.reopenClass({
+      router: null,
+      map: function(callback) {
+        var router = this.router;
+        if (!router) {
+          router = new Router();
+          router.callbacks = [];
+          router.triggerEvent = triggerEvent;
+          this.reopenClass({ router: router });
+        }
+
+        var dsl = EmberRouterDSL.map(function() {
+          this.resource('application', { path: "/" }, function() {
+            for (var i=0; i < router.callbacks.length; i++) {
+              router.callbacks[i].call(this);
+            }
+            callback.call(this);
+          });
+        });
+
+        router.callbacks.push(callback);
+        router.map(dsl.generate());
+        return router;
+      },
+
+      _routePath: function(handlerInfos) {
+        var path = [];
+
+        // We have to handle coalescing resource names that
+        // are prefixed with their parent's names, e.g.
+        // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz'
+
+        function intersectionMatches(a1, a2) {
+          for (var i = 0, len = a1.length; i < len; ++i) {
+            if (a1[i] !== a2[i]) {
+              return false;
+            }
+          }
+          return true;
+        }
+
+        for (var i=1, l=handlerInfos.length; i<l; i++) {
+          var name = handlerInfos[i].name,
+              nameParts = name.split("."),
+              oldNameParts = slice.call(path);
+
+          while (oldNameParts.length) {
+            if (intersectionMatches(oldNameParts, nameParts)) {
+              break;
+            }
+            oldNameParts.shift();
+          }
+
+          path.push.apply(path, nameParts.slice(oldNameParts.length));
+        }
+
+        return path.join(".");
+      }
+    });
+
+    __exports__["default"] = EmberRouter;
+  });
+define("route-recognizer",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var specials = [
+      '/', '.', '*', '+', '?', '|',
+      '(', ')', '[', ']', '{', '}', '\\'
+    ];
+
+    var escapeRegex = new RegExp('(\\' + specials.join('|\\') + ')', 'g');
+
+    function isArray(test) {
+      return Object.prototype.toString.call(test) === "[object Array]";
+    }
+
+    // A Segment represents a segment in the original route description.
+    // Each Segment type provides an `eachChar` and `regex` method.
+    //
+    // The `eachChar` method invokes the callback with one or more character
+    // specifications. A character specification consumes one or more input
+    // characters.
+    //
+    // The `regex` method returns a regex fragment for the segment. If the
+    // segment is a dynamic of star segment, the regex fragment also includes
+    // a capture.
+    //
+    // A character specification contains:
+    //
+    // * `validChars`: a String with a list of all valid characters, or
+    // * `invalidChars`: a String with a list of all invalid characters
+    // * `repeat`: true if the character specification can repeat
+
+    function StaticSegment(string) { this.string = string; }
+    StaticSegment.prototype = {
+      eachChar: function(callback) {
+        var string = this.string, ch;
+
+        for (var i=0, l=string.length; i<l; i++) {
+          ch = string.charAt(i);
+          callback({ validChars: ch });
+        }
+      },
+
+      regex: function() {
+        return this.string.replace(escapeRegex, '\\$1');
+      },
+
+      generate: function() {
+        return this.string;
+      }
+    };
+
+    function DynamicSegment(name) { this.name = name; }
+    DynamicSegment.prototype = {
+      eachChar: function(callback) {
+        callback({ invalidChars: "/", repeat: true });
+      },
+
+      regex: function() {
+        return "([^/]+)";
+      },
+
+      generate: function(params) {
+        return params[this.name];
+      }
+    };
+
+    function StarSegment(name) { this.name = name; }
+    StarSegment.prototype = {
+      eachChar: function(callback) {
+        callback({ invalidChars: "", repeat: true });
+      },
+
+      regex: function() {
+        return "(.+)";
+      },
+
+      generate: function(params) {
+        return params[this.name];
+      }
+    };
+
+    function EpsilonSegment() {}
+    EpsilonSegment.prototype = {
+      eachChar: function() {},
+      regex: function() { return ""; },
+      generate: function() { return ""; }
+    };
+
+    function parse(route, names, types) {
+      // normalize route as not starting with a "/". Recognition will
+      // also normalize.
+      if (route.charAt(0) === "/") { route = route.substr(1); }
+
+      var segments = route.split("/"), results = [];
+
+      for (var i=0, l=segments.length; i<l; i++) {
+        var segment = segments[i], match;
+
+        if (match = segment.match(/^:([^\/]+)$/)) {
+          results.push(new DynamicSegment(match[1]));
+          names.push(match[1]);
+          types.dynamics++;
+        } else if (match = segment.match(/^\*([^\/]+)$/)) {
+          results.push(new StarSegment(match[1]));
+          names.push(match[1]);
+          types.stars++;
+        } else if(segment === "") {
+          results.push(new EpsilonSegment());
+        } else {
+          results.push(new StaticSegment(segment));
+          types.statics++;
+        }
+      }
+
+      return results;
+    }
+
+    // A State has a character specification and (`charSpec`) and a list of possible
+    // subsequent states (`nextStates`).
+    //
+    // If a State is an accepting state, it will also have several additional
+    // properties:
+    //
+    // * `regex`: A regular expression that is used to extract parameters from paths
+    //   that reached this accepting state.
+    // * `handlers`: Information on how to convert the list of captures into calls
+    //   to registered handlers with the specified parameters
+    // * `types`: How many static, dynamic or star segments in this route. Used to
+    //   decide which route to use if multiple registered routes match a path.
+    //
+    // Currently, State is implemented naively by looping over `nextStates` and
+    // comparing a character specification against a character. A more efficient
+    // implementation would use a hash of keys pointing at one or more next states.
+
+    function State(charSpec) {
+      this.charSpec = charSpec;
+      this.nextStates = [];
+    }
+
+    State.prototype = {
+      get: function(charSpec) {
+        var nextStates = this.nextStates;
+
+        for (var i=0, l=nextStates.length; i<l; i++) {
+          var child = nextStates[i];
+
+          var isEqual = child.charSpec.validChars === charSpec.validChars;
+          isEqual = isEqual && child.charSpec.invalidChars === charSpec.invalidChars;
+
+          if (isEqual) { return child; }
+        }
+      },
+
+      put: function(charSpec) {
+        var state;
+
+        // If the character specification already exists in a child of the current
+        // state, just return that state.
+        if (state = this.get(charSpec)) { return state; }
+
+        // Make a new state for the character spec
+        state = new State(charSpec);
+
+        // Insert the new state as a child of the current state
+        this.nextStates.push(state);
+
+        // If this character specification repeats, insert the new state as a child
+        // of itself. Note that this will not trigger an infinite loop because each
+        // transition during recognition consumes a character.
+        if (charSpec.repeat) {
+          state.nextStates.push(state);
+        }
+
+        // Return the new state
+        return state;
+      },
+
+      // Find a list of child states matching the next character
+      match: function(ch) {
+        // DEBUG "Processing `" + ch + "`:"
+        var nextStates = this.nextStates,
+            child, charSpec, chars;
+
+        // DEBUG "  " + debugState(this)
+        var returned = [];
+
+        for (var i=0, l=nextStates.length; i<l; i++) {
+          child = nextStates[i];
+
+          charSpec = child.charSpec;
+
+          if (typeof (chars = charSpec.validChars) !== 'undefined') {
+            if (chars.indexOf(ch) !== -1) { returned.push(child); }
+          } else if (typeof (chars = charSpec.invalidChars) !== 'undefined') {
+            if (chars.indexOf(ch) === -1) { returned.push(child); }
+          }
+        }
+
+        return returned;
+      }
+
+      /** IF DEBUG
+      , debug: function() {
+        var charSpec = this.charSpec,
+            debug = "[",
+            chars = charSpec.validChars || charSpec.invalidChars;
+
+        if (charSpec.invalidChars) { debug += "^"; }
+        debug += chars;
+        debug += "]";
+
+        if (charSpec.repeat) { debug += "+"; }
+
+        return debug;
+      }
+      END IF **/
+    };
+
+    /** IF DEBUG
+    function debug(log) {
+      console.log(log);
+    }
+
+    function debugState(state) {
+      return state.nextStates.map(function(n) {
+        if (n.nextStates.length === 0) { return "( " + n.debug() + " [accepting] )"; }
+        return "( " + n.debug() + " <then> " + n.nextStates.map(function(s) { return s.debug() }).join(" or ") + " )";
+      }).join(", ")
+    }
+    END IF **/
+
+    // This is a somewhat naive strategy, but should work in a lot of cases
+    // A better strategy would properly resolve /posts/:id/new and /posts/edit/:id.
+    //
+    // This strategy generally prefers more static and less dynamic matching.
+    // Specifically, it
+    //
+    //  * prefers fewer stars to more, then
+    //  * prefers using stars for less of the match to more, then
+    //  * prefers fewer dynamic segments to more, then
+    //  * prefers more static segments to more
+    function sortSolutions(states) {
+      return states.sort(function(a, b) {
+        if (a.types.stars !== b.types.stars) { return a.types.stars - b.types.stars; }
+
+        if (a.types.stars) {
+          if (a.types.statics !== b.types.statics) { return b.types.statics - a.types.statics; }
+          if (a.types.dynamics !== b.types.dynamics) { return b.types.dynamics - a.types.dynamics; }
+        }
+
+        if (a.types.dynamics !== b.types.dynamics) { return a.types.dynamics - b.types.dynamics; }
+        if (a.types.statics !== b.types.statics) { return b.types.statics - a.types.statics; }
+
+        return 0;
+      });
+    }
+
+    function recognizeChar(states, ch) {
+      var nextStates = [];
+
+      for (var i=0, l=states.length; i<l; i++) {
+        var state = states[i];
+
+        nextStates = nextStates.concat(state.match(ch));
+      }
+
+      return nextStates;
+    }
+
+    var oCreate = Object.create || function(proto) {
+      function F() {}
+      F.prototype = proto;
+      return new F();
+    };
+
+    function RecognizeResults(queryParams) {
+      this.queryParams = queryParams || {};
+    }
+    RecognizeResults.prototype = oCreate({
+      splice: Array.prototype.splice,
+      slice:  Array.prototype.slice,
+      push:   Array.prototype.push,
+      length: 0,
+      queryParams: null
+    });
+
+    function findHandler(state, path, queryParams) {
+      var handlers = state.handlers, regex = state.regex;
+      var captures = path.match(regex), currentCapture = 1;
+      var result = new RecognizeResults(queryParams);
+
+      for (var i=0, l=handlers.length; i<l; i++) {
+        var handler = handlers[i], names = handler.names, params = {};
+
+        for (var j=0, m=names.length; j<m; j++) {
+          params[names[j]] = captures[currentCapture++];
+        }
+
+        result.push({ handler: handler.handler, params: params, isDynamic: !!names.length });
+      }
+
+      return result;
+    }
+
+    function addSegment(currentState, segment) {
+      segment.eachChar(function(ch) {
+        var state;
+
+        currentState = currentState.put(ch);
+      });
+
+      return currentState;
+    }
+
+    // The main interface
+
+    var RouteRecognizer = function() {
+      this.rootState = new State();
+      this.names = {};
+    };
+
+
+    RouteRecognizer.prototype = {
+      add: function(routes, options) {
+        var currentState = this.rootState, regex = "^",
+            types = { statics: 0, dynamics: 0, stars: 0 },
+            handlers = [], allSegments = [], name;
+
+        var isEmpty = true;
+
+        for (var i=0, l=routes.length; i<l; i++) {
+          var route = routes[i], names = [];
+
+          var segments = parse(route.path, names, types);
+
+          allSegments = allSegments.concat(segments);
+
+          for (var j=0, m=segments.length; j<m; j++) {
+            var segment = segments[j];
+
+            if (segment instanceof EpsilonSegment) { continue; }
+
+            isEmpty = false;
+
+            // Add a "/" for the new segment
+            currentState = currentState.put({ validChars: "/" });
+            regex += "/";
+
+            // Add a representation of the segment to the NFA and regex
+            currentState = addSegment(currentState, segment);
+            regex += segment.regex();
+          }
+
+          var handler = { handler: route.handler, names: names };
+          handlers.push(handler);
+        }
+
+        if (isEmpty) {
+          currentState = currentState.put({ validChars: "/" });
+          regex += "/";
+        }
+
+        currentState.handlers = handlers;
+        currentState.regex = new RegExp(regex + "$");
+        currentState.types = types;
+
+        if (name = options && options.as) {
+          this.names[name] = {
+            segments: allSegments,
+            handlers: handlers
+          };
+        }
+      },
+
+      handlersFor: function(name) {
+        var route = this.names[name], result = [];
+        if (!route) { throw new Error("There is no route named " + name); }
+
+        for (var i=0, l=route.handlers.length; i<l; i++) {
+          result.push(route.handlers[i]);
+        }
+
+        return result;
+      },
+
+      hasRoute: function(name) {
+        return !!this.names[name];
+      },
+
+      generate: function(name, params) {
+        var route = this.names[name], output = "";
+        if (!route) { throw new Error("There is no route named " + name); }
+
+        var segments = route.segments;
+
+        for (var i=0, l=segments.length; i<l; i++) {
+          var segment = segments[i];
+
+          if (segment instanceof EpsilonSegment) { continue; }
+
+          output += "/";
+          output += segment.generate(params);
+        }
+
+        if (output.charAt(0) !== '/') { output = '/' + output; }
+
+        if (params && params.queryParams) {
+          output += this.generateQueryString(params.queryParams, route.handlers);
+        }
+
+        return output;
+      },
+
+      generateQueryString: function(params, handlers) {
+        var pairs = [];
+        var keys = [];
+        for(var key in params) {
+          if (params.hasOwnProperty(key)) {
+            keys.push(key);
+          }
+        }
+        keys.sort();
+        for (var i = 0, len = keys.length; i < len; i++) {
+          key = keys[i];
+          var value = params[key];
+          if (value == null) {
+            continue;
+          }
+          var pair = key;
+          if (isArray(value)) {
+            for (var j = 0, l = value.length; j < l; j++) {
+              var arrayPair = key + '[]' + '=' + encodeURIComponent(value[j]);
+              pairs.push(arrayPair);
+            }
+          } else {
+            pair += "=" + encodeURIComponent(value);
+            pairs.push(pair);
+          }
+        }
+
+        if (pairs.length === 0) { return ''; }
+
+        return "?" + pairs.join("&");
+      },
+
+      parseQueryString: function(queryString) {
+        var pairs = queryString.split("&"), queryParams = {};
+        for(var i=0; i < pairs.length; i++) {
+          var pair      = pairs[i].split('='),
+              key       = decodeURIComponent(pair[0]),
+              keyLength = key.length,
+              isArray = false,
+              value;
+          if (pair.length === 1) {
+            value = 'true';
+          } else {
+            //Handle arrays
+            if (keyLength > 2 && key.slice(keyLength -2) === '[]') {
+              isArray = true;
+              key = key.slice(0, keyLength - 2);
+              if(!queryParams[key]) {
+                queryParams[key] = [];
+              }
+            }
+            value = pair[1] ? decodeURIComponent(pair[1]) : '';
+          }
+          if (isArray) {
+            queryParams[key].push(value);
+          } else {
+            queryParams[key] = decodeURIComponent(value);
+          }
+        }
+        return queryParams;
+      },
+
+      recognize: function(path) {
+        var states = [ this.rootState ],
+            pathLen, i, l, queryStart, queryParams = {},
+            isSlashDropped = false;
+
+        path = decodeURI(path);
+
+        queryStart = path.indexOf('?');
+        if (queryStart !== -1) {
+          var queryString = path.substr(queryStart + 1, path.length);
+          path = path.substr(0, queryStart);
+          queryParams = this.parseQueryString(queryString);
+        }
+
+        // DEBUG GROUP path
+
+        if (path.charAt(0) !== "/") { path = "/" + path; }
+
+        pathLen = path.length;
+        if (pathLen > 1 && path.charAt(pathLen - 1) === "/") {
+          path = path.substr(0, pathLen - 1);
+          isSlashDropped = true;
+        }
+
+        for (i=0, l=path.length; i<l; i++) {
+          states = recognizeChar(states, path.charAt(i));
+          if (!states.length) { break; }
+        }
+
+        // END DEBUG GROUP
+
+        var solutions = [];
+        for (i=0, l=states.length; i<l; i++) {
+          if (states[i].handlers) { solutions.push(states[i]); }
+        }
+
+        states = sortSolutions(solutions);
+
+        var state = solutions[0];
+
+        if (state && state.handlers) {
+          // if a trailing slash was dropped and a star segment is the last segment
+          // specified, put the trailing slash back
+          if (isSlashDropped && state.regex.source.slice(-5) === "(.+)$") {
+            path = path + "/";
+          }
+          return findHandler(state, path, queryParams);
+        }
+      }
+    };
+
+    __exports__["default"] = RouteRecognizer;
+
+    function Target(path, matcher, delegate) {
+      this.path = path;
+      this.matcher = matcher;
+      this.delegate = delegate;
+    }
+
+    Target.prototype = {
+      to: function(target, callback) {
+        var delegate = this.delegate;
+
+        if (delegate && delegate.willAddRoute) {
+          target = delegate.willAddRoute(this.matcher.target, target);
+        }
+
+        this.matcher.add(this.path, target);
+
+        if (callback) {
+          if (callback.length === 0) { throw new Error("You must have an argument in the function passed to `to`"); }
+          this.matcher.addChild(this.path, target, callback, this.delegate);
+        }
+        return this;
+      }
+    };
+
+    function Matcher(target) {
+      this.routes = {};
+      this.children = {};
+      this.target = target;
+    }
+
+    Matcher.prototype = {
+      add: function(path, handler) {
+        this.routes[path] = handler;
+      },
+
+      addChild: function(path, target, callback, delegate) {
+        var matcher = new Matcher(target);
+        this.children[path] = matcher;
+
+        var match = generateMatch(path, matcher, delegate);
+
+        if (delegate && delegate.contextEntered) {
+          delegate.contextEntered(target, match);
+        }
+
+        callback(match);
+      }
+    };
+
+    function generateMatch(startingPath, matcher, delegate) {
+      return function(path, nestedCallback) {
+        var fullPath = startingPath + path;
+
+        if (nestedCallback) {
+          nestedCallback(generateMatch(fullPath, matcher, delegate));
+        } else {
+          return new Target(startingPath + path, matcher, delegate);
+        }
+      };
+    }
+
+    function addRoute(routeArray, path, handler) {
+      var len = 0;
+      for (var i=0, l=routeArray.length; i<l; i++) {
+        len += routeArray[i].path.length;
+      }
+
+      path = path.substr(len);
+      var route = { path: path, handler: handler };
+      routeArray.push(route);
+    }
+
+    function eachRoute(baseRoute, matcher, callback, binding) {
+      var routes = matcher.routes;
+
+      for (var path in routes) {
+        if (routes.hasOwnProperty(path)) {
+          var routeArray = baseRoute.slice();
+          addRoute(routeArray, path, routes[path]);
+
+          if (matcher.children[path]) {
+            eachRoute(routeArray, matcher.children[path], callback, binding);
+          } else {
+            callback.call(binding, routeArray);
+          }
+        }
+      }
+    }
+
+    RouteRecognizer.prototype.map = function(callback, addRouteCallback) {
+      var matcher = new Matcher();
+
+      callback(generateMatch("", matcher, this.delegate));
+
+      eachRoute([], matcher, function(route) {
+        if (addRouteCallback) { addRouteCallback(this, route); }
+        else { this.add(route); }
+      }, this);
+    };
+  });
+
+define("router/handler-info", 
+  ["./utils","rsvp/promise","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var bind = __dependency1__.bind;
+    var merge = __dependency1__.merge;
+    var serialize = __dependency1__.serialize;
+    var promiseLabel = __dependency1__.promiseLabel;
+    var Promise = __dependency2__["default"];
+
+    function HandlerInfo(_props) {
+      var props = _props || {};
+      merge(this, props);
+      this.initialize(props);
+    }
+
+    HandlerInfo.prototype = {
+      name: null,
+      handler: null,
+      params: null,
+      context: null,
+
+      // Injected by the handler info factory.
+      factory: null,
+
+      initialize: function() {},
+
+      log: function(payload, message) {
+        if (payload.log) {
+          payload.log(this.name + ': ' + message);
+        }
+      },
+
+      promiseLabel: function(label) {
+        return promiseLabel("'" + this.name + "' " + label);
+      },
+
+      getUnresolved: function() {
+        return this;
+      },
+
+      serialize: function() {
+        return this.params || {};
+      },
+
+      resolve: function(shouldContinue, payload) {
+        var checkForAbort  = bind(this, this.checkForAbort,      shouldContinue),
+            beforeModel    = bind(this, this.runBeforeModelHook, payload),
+            model          = bind(this, this.getModel,           payload),
+            afterModel     = bind(this, this.runAfterModelHook,  payload),
+            becomeResolved = bind(this, this.becomeResolved,     payload);
+
+        return Promise.resolve(undefined, this.promiseLabel("Start handler"))
+               .then(checkForAbort, null, this.promiseLabel("Check for abort"))
+               .then(beforeModel, null, this.promiseLabel("Before model"))
+               .then(checkForAbort, null, this.promiseLabel("Check if aborted during 'beforeModel' hook"))
+               .then(model, null, this.promiseLabel("Model"))
+               .then(checkForAbort, null, this.promiseLabel("Check if aborted in 'model' hook"))
+               .then(afterModel, null, this.promiseLabel("After model"))
+               .then(checkForAbort, null, this.promiseLabel("Check if aborted in 'afterModel' hook"))
+               .then(becomeResolved, null, this.promiseLabel("Become resolved"));
+      },
+
+      runBeforeModelHook: function(payload) {
+        if (payload.trigger) {
+          payload.trigger(true, 'willResolveModel', payload, this.handler);
+        }
+        return this.runSharedModelHook(payload, 'beforeModel', []);
+      },
+
+      runAfterModelHook: function(payload, resolvedModel) {
+        // Stash the resolved model on the payload.
+        // This makes it possible for users to swap out
+        // the resolved model in afterModel.
+        var name = this.name;
+        this.stashResolvedModel(payload, resolvedModel);
+
+        return this.runSharedModelHook(payload, 'afterModel', [resolvedModel])
+                   .then(function() {
+                     // Ignore the fulfilled value returned from afterModel.
+                     // Return the value stashed in resolvedModels, which
+                     // might have been swapped out in afterModel.
+                     return payload.resolvedModels[name];
+                   }, null, this.promiseLabel("Ignore fulfillment value and return model value"));
+      },
+
+      runSharedModelHook: function(payload, hookName, args) {
+        this.log(payload, "calling " + hookName + " hook");
+
+        if (this.queryParams) {
+          args.push(this.queryParams);
+        }
+        args.push(payload);
+
+        var handler = this.handler;
+        var result = handler[hookName] && handler[hookName].apply(handler, args);
+
+        if (result && result.isTransition) {
+          result = null;
+        }
+
+        return Promise.resolve(result, null, this.promiseLabel("Resolve value returned from one of the model hooks"));
+      },
+
+      // overridden by subclasses
+      getModel: null,
+
+      checkForAbort: function(shouldContinue, promiseValue) {
+        return Promise.resolve(shouldContinue(), this.promiseLabel("Check for abort")).then(function() {
+          // We don't care about shouldContinue's resolve value;
+          // pass along the original value passed to this fn.
+          return promiseValue;
+        }, null, this.promiseLabel("Ignore fulfillment value and continue"));
+      },
+
+      stashResolvedModel: function(payload, resolvedModel) {
+        payload.resolvedModels = payload.resolvedModels || {};
+        payload.resolvedModels[this.name] = resolvedModel;
+      },
+
+      becomeResolved: function(payload, resolvedContext) {
+        var params = this.serialize(resolvedContext);
+
+        if (payload) {
+          this.stashResolvedModel(payload, resolvedContext);
+          payload.params = payload.params || {};
+          payload.params[this.name] = params;
+        }
+
+        return this.factory('resolved', {
+          context: resolvedContext,
+          name: this.name,
+          handler: this.handler,
+          params: params
+        });
+      },
+
+      shouldSupercede: function(other) {
+        // Prefer this newer handlerInfo over `other` if:
+        // 1) The other one doesn't exist
+        // 2) The names don't match
+        // 3) This handler has a context that doesn't match
+        //    the other one (or the other one doesn't have one).
+        // 4) This handler has parameters that don't match the other.
+        if (!other) { return true; }
+
+        var contextsMatch = (other.context === this.context);
+        return other.name !== this.name ||
+               (this.hasOwnProperty('context') && !contextsMatch) ||
+               (this.hasOwnProperty('params') && !paramsMatch(this.params, other.params));
+      }
+    };
+
+    function paramsMatch(a, b) {
+      if ((!a) ^ (!b)) {
+        // Only one is null.
+        return false;
+      }
+
+      if (!a) {
+        // Both must be null.
+        return true;
+      }
+
+      // Note: this assumes that both params have the same
+      // number of keys, but since we're comparing the
+      // same handlers, they should.
+      for (var k in a) {
+        if (a.hasOwnProperty(k) && a[k] !== b[k]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    __exports__["default"] = HandlerInfo;
+  });
+define("router/handler-info/factory", 
+  ["router/handler-info/resolved-handler-info","router/handler-info/unresolved-handler-info-by-object","router/handler-info/unresolved-handler-info-by-param","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var ResolvedHandlerInfo = __dependency1__["default"];
+    var UnresolvedHandlerInfoByObject = __dependency2__["default"];
+    var UnresolvedHandlerInfoByParam = __dependency3__["default"];
+
+    handlerInfoFactory.klasses = {
+      resolved: ResolvedHandlerInfo,
+      param: UnresolvedHandlerInfoByParam,
+      object: UnresolvedHandlerInfoByObject
+    };
+
+    function handlerInfoFactory(name, props) {
+      var Ctor = handlerInfoFactory.klasses[name],
+          handlerInfo = new Ctor(props || {});
+      handlerInfo.factory = handlerInfoFactory;
+      return handlerInfo;
+    }
+
+    __exports__["default"] = handlerInfoFactory;
+  });
+define("router/handler-info/resolved-handler-info", 
+  ["../handler-info","router/utils","rsvp/promise","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var HandlerInfo = __dependency1__["default"];
+    var subclass = __dependency2__.subclass;
+    var promiseLabel = __dependency2__.promiseLabel;
+    var Promise = __dependency3__["default"];
+
+    var ResolvedHandlerInfo = subclass(HandlerInfo, {
+      resolve: function(shouldContinue, payload) {
+        // A ResolvedHandlerInfo just resolved with itself.
+        if (payload && payload.resolvedModels) {
+          payload.resolvedModels[this.name] = this.context;
+        }
+        return Promise.resolve(this, this.promiseLabel("Resolve"));
+      },
+
+      getUnresolved: function() {
+        return this.factory('param', {
+          name: this.name,
+          handler: this.handler,
+          params: this.params
+        });
+      },
+
+      isResolved: true
+    });
+
+    __exports__["default"] = ResolvedHandlerInfo;
+  });
+define("router/handler-info/unresolved-handler-info-by-object", 
+  ["../handler-info","router/utils","rsvp/promise","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var HandlerInfo = __dependency1__["default"];
+    var merge = __dependency2__.merge;
+    var subclass = __dependency2__.subclass;
+    var promiseLabel = __dependency2__.promiseLabel;
+    var isParam = __dependency2__.isParam;
+    var Promise = __dependency3__["default"];
+
+    var UnresolvedHandlerInfoByObject = subclass(HandlerInfo, {
+      getModel: function(payload) {
+        this.log(payload, this.name + ": resolving provided model");
+        return Promise.resolve(this.context);
+      },
+
+      initialize: function(props) {
+        this.names = props.names || [];
+        this.context = props.context;
+      },
+
+      /**
+        @private
+
+        Serializes a handler using its custom `serialize` method or
+        by a default that looks up the expected property name from
+        the dynamic segment.
+
+        @param {Object} model the model to be serialized for this handler
+      */
+      serialize: function(_model) {
+        var model = _model || this.context,
+            names = this.names,
+            handler = this.handler;
+
+        var object = {};
+        if (isParam(model)) {
+          object[names[0]] = model;
+          return object;
+        }
+
+        // Use custom serialize if it exists.
+        if (handler.serialize) {
+          return handler.serialize(model, names);
+        }
+
+        if (names.length !== 1) { return; }
+
+        var name = names[0];
+
+        if (/_id$/.test(name)) {
+          object[name] = model.id;
+        } else {
+          object[name] = model;
+        }
+        return object;
+      }
+    });
+
+    __exports__["default"] = UnresolvedHandlerInfoByObject;
+  });
+define("router/handler-info/unresolved-handler-info-by-param", 
+  ["../handler-info","router/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var HandlerInfo = __dependency1__["default"];
+    var merge = __dependency2__.merge;
+    var subclass = __dependency2__.subclass;
+    var promiseLabel = __dependency2__.promiseLabel;
+
+    // Generated by URL transitions and non-dynamic route segments in named Transitions.
+    var UnresolvedHandlerInfoByParam = subclass (HandlerInfo, {
+      initialize: function(props) {
+        this.params = props.params || {};
+      },
+
+      getModel: function(payload) {
+        var fullParams = this.params;
+        if (payload && payload.queryParams) {
+          fullParams = {};
+          merge(fullParams, this.params);
+          fullParams.queryParams = payload.queryParams;
+        }
+
+        var hookName = typeof this.handler.deserialize === 'function' ?
+                       'deserialize' : 'model';
+
+        return this.runSharedModelHook(payload, hookName, [fullParams]);
+      }
+    });
+
+    __exports__["default"] = UnresolvedHandlerInfoByParam;
+  });
+define("router/router", 
+  ["route-recognizer","rsvp/promise","./utils","./transition-state","./transition","./transition-intent/named-transition-intent","./transition-intent/url-transition-intent","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var RouteRecognizer = __dependency1__["default"];
+    var Promise = __dependency2__["default"];
+    var trigger = __dependency3__.trigger;
+    var log = __dependency3__.log;
+    var slice = __dependency3__.slice;
+    var forEach = __dependency3__.forEach;
+    var merge = __dependency3__.merge;
+    var serialize = __dependency3__.serialize;
+    var extractQueryParams = __dependency3__.extractQueryParams;
+    var getChangelist = __dependency3__.getChangelist;
+    var promiseLabel = __dependency3__.promiseLabel;
+    var TransitionState = __dependency4__["default"];
+    var logAbort = __dependency5__.logAbort;
+    var Transition = __dependency5__.Transition;
+    var TransitionAborted = __dependency5__.TransitionAborted;
+    var NamedTransitionIntent = __dependency6__["default"];
+    var URLTransitionIntent = __dependency7__["default"];
+
+    var pop = Array.prototype.pop;
+
+    function Router() {
+      this.recognizer = new RouteRecognizer();
+      this.reset();
+    }
+
+    Router.prototype = {
+
+      /**
+        The main entry point into the router. The API is essentially
+        the same as the `map` method in `route-recognizer`.
+
+        This method extracts the String handler at the last `.to()`
+        call and uses it as the name of the whole route.
+
+        @param {Function} callback
+      */
+      map: function(callback) {
+        this.recognizer.delegate = this.delegate;
+
+        this.recognizer.map(callback, function(recognizer, routes) {
+          for (var i = routes.length - 1, proceed = true; i >= 0 && proceed; --i) {
+            var route = routes[i];
+            recognizer.add(routes, { as: route.handler });
+            proceed = route.path === '/' || route.path === '' || route.handler.slice(-6) === '.index';
+          }
+        });
+      },
+
+      hasRoute: function(route) {
+        return this.recognizer.hasRoute(route);
+      },
+
+      // NOTE: this doesn't really belong here, but here
+      // it shall remain until our ES6 transpiler can
+      // handle cyclical deps.
+      transitionByIntent: function(intent, isIntermediate) {
+
+        var wasTransitioning = !!this.activeTransition;
+        var oldState = wasTransitioning ? this.activeTransition.state : this.state;
+        var newTransition;
+        var router = this;
+
+        try {
+          var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
+
+          if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
+
+            // This is a no-op transition. See if query params changed.
+            var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
+            if (queryParamChangelist) {
+
+              // This is a little hacky but we need some way of storing
+              // changed query params given that no activeTransition
+              // is guaranteed to have occurred.
+              this._changedQueryParams = queryParamChangelist.changed;
+              for (var k in queryParamChangelist.removed) {
+                if (queryParamChangelist.removed.hasOwnProperty(k)) {
+                  this._changedQueryParams[k] = null;
+                }
+              }
+              trigger(this, newState.handlerInfos, true, ['queryParamsDidChange', queryParamChangelist.changed, queryParamChangelist.all, queryParamChangelist.removed]);
+              this._changedQueryParams = null;
+
+              if (!wasTransitioning && this.activeTransition) {
+                // One of the handlers in queryParamsDidChange
+                // caused a transition. Just return that transition.
+                return this.activeTransition;
+              } else {
+                // Running queryParamsDidChange didn't change anything.
+                // Just update query params and be on our way.
+
+                // We have to return a noop transition that will
+                // perform a URL update at the end. This gives
+                // the user the ability to set the url update
+                // method (default is replaceState).
+                newTransition = new Transition(this);
+
+                oldState.queryParams = finalizeQueryParamChange(this, newState.handlerInfos, newState.queryParams, newTransition);
+
+                newTransition.promise = newTransition.promise.then(function(result) {
+                  updateURL(newTransition, oldState, true);
+                  if (router.didTransition) {
+                    router.didTransition(router.currentHandlerInfos);
+                  }
+                  return result;
+                }, null, promiseLabel("Transition complete"));
+                return newTransition;
+              }
+            }
+
+            // No-op. No need to create a new transition.
+            return new Transition(this);
+          }
+
+          if (isIntermediate) {
+            setupContexts(this, newState);
+            return;
+          }
+
+          // Create a new transition to the destination route.
+          newTransition = new Transition(this, intent, newState);
+
+          // Abort and usurp any previously active transition.
+          if (this.activeTransition) {
+            this.activeTransition.abort();
+          }
+          this.activeTransition = newTransition;
+
+          // Transition promises by default resolve with resolved state.
+          // For our purposes, swap out the promise to resolve
+          // after the transition has been finalized.
+          newTransition.promise = newTransition.promise.then(function(result) {
+            return finalizeTransition(newTransition, result.state);
+          }, null, promiseLabel("Settle transition promise when transition is finalized"));
+
+          if (!wasTransitioning) {
+            trigger(this, this.state.handlerInfos, true, ['willTransition', newTransition]);
+          }
+
+          return newTransition;
+        } catch(e) {
+          return new Transition(this, intent, null, e);
+        }
+      },
+
+      /**
+        Clears the current and target route handlers and triggers exit
+        on each of them starting at the leaf and traversing up through
+        its ancestors.
+      */
+      reset: function() {
+        if (this.state) {
+          forEach(this.state.handlerInfos, function(handlerInfo) {
+            var handler = handlerInfo.handler;
+            if (handler.exit) {
+              handler.exit();
+            }
+          });
+        }
+
+        this.state = new TransitionState();
+        this.currentHandlerInfos = null;
+      },
+
+      activeTransition: null,
+
+      /**
+        var handler = handlerInfo.handler;
+        The entry point for handling a change to the URL (usually
+        via the back and forward button).
+
+        Returns an Array of handlers and the parameters associated
+        with those parameters.
+
+        @param {String} url a URL to process
+
+        @return {Array} an Array of `[handler, parameter]` tuples
+      */
+      handleURL: function(url) {
+        // Perform a URL-based transition, but don't change
+        // the URL afterward, since it already happened.
+        var args = slice.call(arguments);
+        if (url.charAt(0) !== '/') { args[0] = '/' + url; }
+
+        return doTransition(this, args).method(null);
+      },
+
+      /**
+        Hook point for updating the URL.
+
+        @param {String} url a URL to update to
+      */
+      updateURL: function() {
+        throw new Error("updateURL is not implemented");
+      },
+
+      /**
+        Hook point for replacing the current URL, i.e. with replaceState
+
+        By default this behaves the same as `updateURL`
+
+        @param {String} url a URL to update to
+      */
+      replaceURL: function(url) {
+        this.updateURL(url);
+      },
+
+      /**
+        Transition into the specified named route.
+
+        If necessary, trigger the exit callback on any handlers
+        that are no longer represented by the target route.
+
+        @param {String} name the name of the route
+      */
+      transitionTo: function(name) {
+        return doTransition(this, arguments);
+      },
+
+      intermediateTransitionTo: function(name) {
+        doTransition(this, arguments, true);
+      },
+
+      refresh: function(pivotHandler) {
+
+
+        var state = this.activeTransition ? this.activeTransition.state : this.state;
+        var handlerInfos = state.handlerInfos;
+        var params = {};
+        for (var i = 0, len = handlerInfos.length; i < len; ++i) {
+          var handlerInfo = handlerInfos[i];
+          params[handlerInfo.name] = handlerInfo.params || {};
+        }
+
+        log(this, "Starting a refresh transition");
+        var intent = new NamedTransitionIntent({
+          name: handlerInfos[handlerInfos.length - 1].name,
+          pivotHandler: pivotHandler || handlerInfos[0].handler,
+          contexts: [], // TODO collect contexts...?
+          queryParams: this._changedQueryParams || state.queryParams || {}
+        });
+
+        return this.transitionByIntent(intent, false);
+      },
+
+      /**
+        Identical to `transitionTo` except that the current URL will be replaced
+        if possible.
+
+        This method is intended primarily for use with `replaceState`.
+
+        @param {String} name the name of the route
+      */
+      replaceWith: function(name) {
+        return doTransition(this, arguments).method('replace');
+      },
+
+      /**
+        Take a named route and context objects and generate a
+        URL.
+
+        @param {String} name the name of the route to generate
+          a URL for
+        @param {...Object} objects a list of objects to serialize
+
+        @return {String} a URL
+      */
+      generate: function(handlerName) {
+
+        var partitionedArgs = extractQueryParams(slice.call(arguments, 1)),
+          suppliedParams = partitionedArgs[0],
+          queryParams = partitionedArgs[1];
+
+        // Construct a TransitionIntent with the provided params
+        // and apply it to the present state of the router.
+        var intent = new NamedTransitionIntent({ name: handlerName, contexts: suppliedParams });
+        var state = intent.applyToState(this.state, this.recognizer, this.getHandler);
+        var params = {};
+
+        for (var i = 0, len = state.handlerInfos.length; i < len; ++i) {
+          var handlerInfo = state.handlerInfos[i];
+          var handlerParams = handlerInfo.serialize();
+          merge(params, handlerParams);
+        }
+        params.queryParams = queryParams;
+
+        return this.recognizer.generate(handlerName, params);
+      },
+
+      isActive: function(handlerName) {
+
+        var partitionedArgs   = extractQueryParams(slice.call(arguments, 1)),
+            contexts          = partitionedArgs[0],
+            queryParams       = partitionedArgs[1],
+            activeQueryParams  = this.state.queryParams;
+
+        var targetHandlerInfos = this.state.handlerInfos,
+            found = false, names, object, handlerInfo, handlerObj, i, len;
+
+        if (!targetHandlerInfos.length) { return false; }
+
+        var targetHandler = targetHandlerInfos[targetHandlerInfos.length - 1].name;
+        var recogHandlers = this.recognizer.handlersFor(targetHandler);
+
+        var index = 0;
+        for (len = recogHandlers.length; index < len; ++index) {
+          handlerInfo = targetHandlerInfos[index];
+          if (handlerInfo.name === handlerName) { break; }
+        }
+
+        if (index === recogHandlers.length) {
+          // The provided route name isn't even in the route hierarchy.
+          return false;
+        }
+
+        var state = new TransitionState();
+        state.handlerInfos = targetHandlerInfos.slice(0, index + 1);
+        recogHandlers = recogHandlers.slice(0, index + 1);
+
+        var intent = new NamedTransitionIntent({
+          name: targetHandler,
+          contexts: contexts
+        });
+
+        var newState = intent.applyToHandlers(state, recogHandlers, this.getHandler, targetHandler, true, true);
+
+        // Get a hash of QPs that will still be active on new route
+        var activeQPsOnNewHandler = {};
+        merge(activeQPsOnNewHandler, queryParams);
+        for (var key in activeQueryParams) {
+          if (activeQueryParams.hasOwnProperty(key) &&
+              activeQPsOnNewHandler.hasOwnProperty(key)) {
+            activeQPsOnNewHandler[key] = activeQueryParams[key];
+          }
+        }
+
+        return handlerInfosEqual(newState.handlerInfos, state.handlerInfos) &&
+               !getChangelist(activeQPsOnNewHandler, queryParams);
+      },
+
+      trigger: function(name) {
+        var args = slice.call(arguments);
+        trigger(this, this.currentHandlerInfos, false, args);
+      },
+
+      /**
+        Hook point for logging transition status updates.
+
+        @param {String} message The message to log.
+      */
+      log: null
+    };
+
+    /**
+      @private
+
+      Takes an Array of `HandlerInfo`s, figures out which ones are
+      exiting, entering, or changing contexts, and calls the
+      proper handler hooks.
+
+      For example, consider the following tree of handlers. Each handler is
+      followed by the URL segment it handles.
+
+      ```
+      |~index ("/")
+      | |~posts ("/posts")
+      | | |-showPost ("/:id")
+      | | |-newPost ("/new")
+      | | |-editPost ("/edit")
+      | |~about ("/about/:id")
+      ```
+
+      Consider the following transitions:
+
+      1. A URL transition to `/posts/1`.
+         1. Triggers the `*model` callbacks on the
+            `index`, `posts`, and `showPost` handlers
+         2. Triggers the `enter` callback on the same
+         3. Triggers the `setup` callback on the same
+      2. A direct transition to `newPost`
+         1. Triggers the `exit` callback on `showPost`
+         2. Triggers the `enter` callback on `newPost`
+         3. Triggers the `setup` callback on `newPost`
+      3. A direct transition to `about` with a specified
+         context object
+         1. Triggers the `exit` callback on `newPost`
+            and `posts`
+         2. Triggers the `serialize` callback on `about`
+         3. Triggers the `enter` callback on `about`
+         4. Triggers the `setup` callback on `about`
+
+      @param {Router} transition
+      @param {TransitionState} newState
+    */
+    function setupContexts(router, newState, transition) {
+      var partition = partitionHandlers(router.state, newState);
+
+      forEach(partition.exited, function(handlerInfo) {
+        var handler = handlerInfo.handler;
+        delete handler.context;
+        if (handler.exit) { handler.exit(); }
+      });
+
+      var oldState = router.oldState = router.state;
+      router.state = newState;
+      var currentHandlerInfos = router.currentHandlerInfos = partition.unchanged.slice();
+
+      try {
+        forEach(partition.updatedContext, function(handlerInfo) {
+          return handlerEnteredOrUpdated(currentHandlerInfos, handlerInfo, false, transition);
+        });
+
+        forEach(partition.entered, function(handlerInfo) {
+          return handlerEnteredOrUpdated(currentHandlerInfos, handlerInfo, true, transition);
+        });
+      } catch(e) {
+        router.state = oldState;
+        router.currentHandlerInfos = oldState.handlerInfos;
+        throw e;
+      }
+
+      router.state.queryParams = finalizeQueryParamChange(router, currentHandlerInfos, newState.queryParams, transition);
+    }
+
+
+    /**
+      @private
+
+      Helper method used by setupContexts. Handles errors or redirects
+      that may happen in enter/setup.
+    */
+    function handlerEnteredOrUpdated(currentHandlerInfos, handlerInfo, enter, transition) {
+
+      var handler = handlerInfo.handler,
+          context = handlerInfo.context;
+
+      if (enter && handler.enter) { handler.enter(transition); }
+      if (transition && transition.isAborted) {
+        throw new TransitionAborted();
+      }
+
+      handler.context = context;
+      if (handler.contextDidChange) { handler.contextDidChange(); }
+
+      if (handler.setup) { handler.setup(context, transition); }
+      if (transition && transition.isAborted) {
+        throw new TransitionAborted();
+      }
+
+      currentHandlerInfos.push(handlerInfo);
+
+      return true;
+    }
+
+
+    /**
+      @private
+
+      This function is called when transitioning from one URL to
+      another to determine which handlers are no longer active,
+      which handlers are newly active, and which handlers remain
+      active but have their context changed.
+
+      Take a list of old handlers and new handlers and partition
+      them into four buckets:
+
+      * unchanged: the handler was active in both the old and
+        new URL, and its context remains the same
+      * updated context: the handler was active in both the
+        old and new URL, but its context changed. The handler's
+        `setup` method, if any, will be called with the new
+        context.
+      * exited: the handler was active in the old URL, but is
+        no longer active.
+      * entered: the handler was not active in the old URL, but
+        is now active.
+
+      The PartitionedHandlers structure has four fields:
+
+      * `updatedContext`: a list of `HandlerInfo` objects that
+        represent handlers that remain active but have a changed
+        context
+      * `entered`: a list of `HandlerInfo` objects that represent
+        handlers that are newly active
+      * `exited`: a list of `HandlerInfo` objects that are no
+        longer active.
+      * `unchanged`: a list of `HanderInfo` objects that remain active.
+
+      @param {Array[HandlerInfo]} oldHandlers a list of the handler
+        information for the previous URL (or `[]` if this is the
+        first handled transition)
+      @param {Array[HandlerInfo]} newHandlers a list of the handler
+        information for the new URL
+
+      @return {Partition}
+    */
+    function partitionHandlers(oldState, newState) {
+      var oldHandlers = oldState.handlerInfos;
+      var newHandlers = newState.handlerInfos;
+
+      var handlers = {
+            updatedContext: [],
+            exited: [],
+            entered: [],
+            unchanged: []
+          };
+
+      var handlerChanged, contextChanged, queryParamsChanged, i, l;
+
+      for (i=0, l=newHandlers.length; i<l; i++) {
+        var oldHandler = oldHandlers[i], newHandler = newHandlers[i];
+
+        if (!oldHandler || oldHandler.handler !== newHandler.handler) {
+          handlerChanged = true;
+        }
+
+        if (handlerChanged) {
+          handlers.entered.push(newHandler);
+          if (oldHandler) { handlers.exited.unshift(oldHandler); }
+        } else if (contextChanged || oldHandler.context !== newHandler.context || queryParamsChanged) {
+          contextChanged = true;
+          handlers.updatedContext.push(newHandler);
+        } else {
+          handlers.unchanged.push(oldHandler);
+        }
+      }
+
+      for (i=newHandlers.length, l=oldHandlers.length; i<l; i++) {
+        handlers.exited.unshift(oldHandlers[i]);
+      }
+
+      return handlers;
+    }
+
+    function updateURL(transition, state, inputUrl) {
+      var urlMethod = transition.urlMethod;
+
+      if (!urlMethod) {
+        return;
+      }
+
+      var router = transition.router,
+          handlerInfos = state.handlerInfos,
+          handlerName = handlerInfos[handlerInfos.length - 1].name,
+          params = {};
+
+      for (var i = handlerInfos.length - 1; i >= 0; --i) {
+        var handlerInfo = handlerInfos[i];
+        merge(params, handlerInfo.params);
+        if (handlerInfo.handler.inaccessibleByURL) {
+          urlMethod = null;
+        }
+      }
+
+      if (urlMethod) {
+        params.queryParams = transition._visibleQueryParams || state.queryParams;
+        var url = router.recognizer.generate(handlerName, params);
+
+        if (urlMethod === 'replace') {
+          router.replaceURL(url);
+        } else {
+          router.updateURL(url);
+        }
+      }
+    }
+
+    /**
+      @private
+
+      Updates the URL (if necessary) and calls `setupContexts`
+      to update the router's array of `currentHandlerInfos`.
+     */
+    function finalizeTransition(transition, newState) {
+
+      try {
+        log(transition.router, transition.sequence, "Resolved all models on destination route; finalizing transition.");
+
+        var router = transition.router,
+            handlerInfos = newState.handlerInfos,
+            seq = transition.sequence;
+
+        // Run all the necessary enter/setup/exit hooks
+        setupContexts(router, newState, transition);
+
+        // Check if a redirect occurred in enter/setup
+        if (transition.isAborted) {
+          // TODO: cleaner way? distinguish b/w targetHandlerInfos?
+          router.state.handlerInfos = router.currentHandlerInfos;
+          return Promise.reject(logAbort(transition));
+        }
+
+        updateURL(transition, newState, transition.intent.url);
+
+        transition.isActive = false;
+        router.activeTransition = null;
+
+        trigger(router, router.currentHandlerInfos, true, ['didTransition']);
+
+        if (router.didTransition) {
+          router.didTransition(router.currentHandlerInfos);
+        }
+
+        log(router, transition.sequence, "TRANSITION COMPLETE.");
+
+        // Resolve with the final handler.
+        return handlerInfos[handlerInfos.length - 1].handler;
+      } catch(e) {
+        if (!(e instanceof TransitionAborted)) {
+          //var erroneousHandler = handlerInfos.pop();
+          var infos = transition.state.handlerInfos;
+          transition.trigger(true, 'error', e, transition, infos[infos.length-1].handler);
+          transition.abort();
+        }
+
+        throw e;
+      }
+    }
+
+    /**
+      @private
+
+      Begins and returns a Transition based on the provided
+      arguments. Accepts arguments in the form of both URL
+      transitions and named transitions.
+
+      @param {Router} router
+      @param {Array[Object]} args arguments passed to transitionTo,
+        replaceWith, or handleURL
+    */
+    function doTransition(router, args, isIntermediate) {
+      // Normalize blank transitions to root URL transitions.
+      var name = args[0] || '/';
+
+      var lastArg = args[args.length-1];
+      var queryParams = {};
+      if (lastArg && lastArg.hasOwnProperty('queryParams')) {
+        queryParams = pop.call(args).queryParams;
+      }
+
+      var intent;
+      if (args.length === 0) {
+
+        log(router, "Updating query params");
+
+        // A query param update is really just a transition
+        // into the route you're already on.
+        var handlerInfos = router.state.handlerInfos;
+        intent = new NamedTransitionIntent({
+          name: handlerInfos[handlerInfos.length - 1].name,
+          contexts: [],
+          queryParams: queryParams
+        });
+
+      } else if (name.charAt(0) === '/') {
+
+        log(router, "Attempting URL transition to " + name);
+        intent = new URLTransitionIntent({ url: name });
+
+      } else {
+
+        log(router, "Attempting transition to " + name);
+        intent = new NamedTransitionIntent({
+          name: args[0],
+          contexts: slice.call(args, 1),
+          queryParams: queryParams
+        });
+      }
+
+      return router.transitionByIntent(intent, isIntermediate);
+    }
+
+    function handlerInfosEqual(handlerInfos, otherHandlerInfos) {
+      if (handlerInfos.length !== otherHandlerInfos.length) {
+        return false;
+      }
+
+      for (var i = 0, len = handlerInfos.length; i < len; ++i) {
+        if (handlerInfos[i] !== otherHandlerInfos[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    function finalizeQueryParamChange(router, resolvedHandlers, newQueryParams, transition) {
+      // We fire a finalizeQueryParamChange event which
+      // gives the new route hierarchy a chance to tell
+      // us which query params it's consuming and what
+      // their final values are. If a query param is
+      // no longer consumed in the final route hierarchy,
+      // its serialized segment will be removed
+      // from the URL.
+
+      for (var k in newQueryParams) {
+        if (newQueryParams.hasOwnProperty(k) &&
+            newQueryParams[k] === null) {
+          delete newQueryParams[k];
+        }
+      }
+
+      var finalQueryParamsArray = [];
+      trigger(router, resolvedHandlers, true, ['finalizeQueryParamChange', newQueryParams, finalQueryParamsArray, transition]);
+
+      if (transition) {
+        transition._visibleQueryParams = {};
+      }
+
+      var finalQueryParams = {};
+      for (var i = 0, len = finalQueryParamsArray.length; i < len; ++i) {
+        var qp = finalQueryParamsArray[i];
+        finalQueryParams[qp.key] = qp.value;
+        if (transition && qp.visible !== false) {
+          transition._visibleQueryParams[qp.key] = qp.value;
+        }
+      }
+      return finalQueryParams;
+    }
+
+    __exports__["default"] = Router;
+  });
+define("router/transition-intent", 
+  ["./utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var merge = __dependency1__.merge;
+
+    function TransitionIntent(props) {
+      this.initialize(props);
+
+      // TODO: wat
+      this.data = this.data || {};
+    }
+
+    TransitionIntent.prototype = {
+      initialize: null,
+      applyToState: null
+    };
+
+    __exports__["default"] = TransitionIntent;
+  });
+define("router/transition-intent/named-transition-intent", 
+  ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var TransitionIntent = __dependency1__["default"];
+    var TransitionState = __dependency2__["default"];
+    var handlerInfoFactory = __dependency3__["default"];
+    var isParam = __dependency4__.isParam;
+    var extractQueryParams = __dependency4__.extractQueryParams;
+    var merge = __dependency4__.merge;
+    var subclass = __dependency4__.subclass;
+
+    __exports__["default"] = subclass(TransitionIntent, {
+      name: null,
+      pivotHandler: null,
+      contexts: null,
+      queryParams: null,
+
+      initialize: function(props) {
+        this.name = props.name;
+        this.pivotHandler = props.pivotHandler;
+        this.contexts = props.contexts || [];
+        this.queryParams = props.queryParams;
+      },
+
+      applyToState: function(oldState, recognizer, getHandler, isIntermediate) {
+
+        var partitionedArgs     = extractQueryParams([this.name].concat(this.contexts)),
+          pureArgs              = partitionedArgs[0],
+          queryParams           = partitionedArgs[1],
+          handlers              = recognizer.handlersFor(pureArgs[0]);
+
+        var targetRouteName = handlers[handlers.length-1].handler;
+
+        return this.applyToHandlers(oldState, handlers, getHandler, targetRouteName, isIntermediate);
+      },
+
+      applyToHandlers: function(oldState, handlers, getHandler, targetRouteName, isIntermediate, checkingIfActive) {
+
+        var i;
+        var newState = new TransitionState();
+        var objects = this.contexts.slice(0);
+
+        var invalidateIndex = handlers.length;
+
+        // Pivot handlers are provided for refresh transitions
+        if (this.pivotHandler) {
+          for (i = 0; i < handlers.length; ++i) {
+            if (getHandler(handlers[i].handler) === this.pivotHandler) {
+              invalidateIndex = i;
+              break;
+            }
+          }
+        }
+
+        var pivotHandlerFound = !this.pivotHandler;
+
+        for (i = handlers.length - 1; i >= 0; --i) {
+          var result = handlers[i];
+          var name = result.handler;
+          var handler = getHandler(name);
+
+          var oldHandlerInfo = oldState.handlerInfos[i];
+          var newHandlerInfo = null;
+
+          if (result.names.length > 0) {
+            if (i >= invalidateIndex) {
+              newHandlerInfo = this.createParamHandlerInfo(name, handler, result.names, objects, oldHandlerInfo);
+            } else {
+              newHandlerInfo = this.getHandlerInfoForDynamicSegment(name, handler, result.names, objects, oldHandlerInfo, targetRouteName, i);
+            }
+          } else {
+            // This route has no dynamic segment.
+            // Therefore treat as a param-based handlerInfo
+            // with empty params. This will cause the `model`
+            // hook to be called with empty params, which is desirable.
+            newHandlerInfo = this.createParamHandlerInfo(name, handler, result.names, objects, oldHandlerInfo);
+          }
+
+          if (checkingIfActive) {
+            // If we're performing an isActive check, we want to
+            // serialize URL params with the provided context, but
+            // ignore mismatches between old and new context.
+            newHandlerInfo = newHandlerInfo.becomeResolved(null, newHandlerInfo.context);
+            var oldContext = oldHandlerInfo && oldHandlerInfo.context;
+            if (result.names.length > 0 && newHandlerInfo.context === oldContext) {
+              // If contexts match in isActive test, assume params also match.
+              // This allows for flexibility in not requiring that every last
+              // handler provide a `serialize` method
+              newHandlerInfo.params = oldHandlerInfo && oldHandlerInfo.params;
+            }
+            newHandlerInfo.context = oldContext;
+          }
+
+          var handlerToUse = oldHandlerInfo;
+          if (i >= invalidateIndex || newHandlerInfo.shouldSupercede(oldHandlerInfo)) {
+            invalidateIndex = Math.min(i, invalidateIndex);
+            handlerToUse = newHandlerInfo;
+          }
+
+          if (isIntermediate && !checkingIfActive) {
+            handlerToUse = handlerToUse.becomeResolved(null, handlerToUse.context);
+          }
+
+          newState.handlerInfos.unshift(handlerToUse);
+        }
+
+        if (objects.length > 0) {
+          throw new Error("More context objects were passed than there are dynamic segments for the route: " + targetRouteName);
+        }
+
+        if (!isIntermediate) {
+          this.invalidateChildren(newState.handlerInfos, invalidateIndex);
+        }
+
+        merge(newState.queryParams, oldState.queryParams);
+        merge(newState.queryParams, this.queryParams || {});
+
+        return newState;
+      },
+
+      invalidateChildren: function(handlerInfos, invalidateIndex) {
+        for (var i = invalidateIndex, l = handlerInfos.length; i < l; ++i) {
+          var handlerInfo = handlerInfos[i];
+          handlerInfos[i] = handlerInfos[i].getUnresolved();
+        }
+      },
+
+      getHandlerInfoForDynamicSegment: function(name, handler, names, objects, oldHandlerInfo, targetRouteName, i) {
+
+        var numNames = names.length;
+        var objectToUse;
+        if (objects.length > 0) {
+
+          // Use the objects provided for this transition.
+          objectToUse = objects[objects.length - 1];
+          if (isParam(objectToUse)) {
+            return this.createParamHandlerInfo(name, handler, names, objects, oldHandlerInfo);
+          } else {
+            objects.pop();
+          }
+        } else if (oldHandlerInfo && oldHandlerInfo.name === name) {
+          // Reuse the matching oldHandlerInfo
+          return oldHandlerInfo;
+        } else {
+          if (this.preTransitionState) {
+            var preTransitionHandlerInfo = this.preTransitionState.handlerInfos[i];
+            objectToUse = preTransitionHandlerInfo && preTransitionHandlerInfo.context;
+          } else {
+            // Ideally we should throw this error to provide maximal
+            // information to the user that not enough context objects
+            // were provided, but this proves too cumbersome in Ember
+            // in cases where inner template helpers are evaluated
+            // before parent helpers un-render, in which cases this
+            // error somewhat prematurely fires.
+            //throw new Error("Not enough context objects were provided to complete a transition to " + targetRouteName + ". Specifically, the " + name + " route needs an object that can be serialized into its dynamic URL segments [" + names.join(', ') + "]");
+            return oldHandlerInfo;
+          }
+        }
+
+        return handlerInfoFactory('object', {
+          name: name,
+          handler: handler,
+          context: objectToUse,
+          names: names
+        });
+      },
+
+      createParamHandlerInfo: function(name, handler, names, objects, oldHandlerInfo) {
+        var params = {};
+
+        // Soak up all the provided string/numbers
+        var numNames = names.length;
+        while (numNames--) {
+
+          // Only use old params if the names match with the new handler
+          var oldParams = (oldHandlerInfo && name === oldHandlerInfo.name && oldHandlerInfo.params) || {};
+
+          var peek = objects[objects.length - 1];
+          var paramName = names[numNames];
+          if (isParam(peek)) {
+            params[paramName] = "" + objects.pop();
+          } else {
+            // If we're here, this means only some of the params
+            // were string/number params, so try and use a param
+            // value from a previous handler.
+            if (oldParams.hasOwnProperty(paramName)) {
+              params[paramName] = oldParams[paramName];
+            } else {
+              throw new Error("You didn't provide enough string/numeric parameters to satisfy all of the dynamic segments for route " + name);
+            }
+          }
+        }
+
+        return handlerInfoFactory('param', {
+          name: name,
+          handler: handler,
+          params: params
+        });
+      }
+    });
+  });
+define("router/transition-intent/url-transition-intent", 
+  ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var TransitionIntent = __dependency1__["default"];
+    var TransitionState = __dependency2__["default"];
+    var handlerInfoFactory = __dependency3__["default"];
+    var oCreate = __dependency4__.oCreate;
+    var merge = __dependency4__.merge;
+    var subclass = __dependency4__.subclass;
+
+    __exports__["default"] = subclass(TransitionIntent, {
+      url: null,
+
+      initialize: function(props) {
+        this.url = props.url;
+      },
+
+      applyToState: function(oldState, recognizer, getHandler) {
+        var newState = new TransitionState();
+
+        var results = recognizer.recognize(this.url),
+            queryParams = {},
+            i, len;
+
+        if (!results) {
+          throw new UnrecognizedURLError(this.url);
+        }
+
+        var statesDiffer = false;
+
+        for (i = 0, len = results.length; i < len; ++i) {
+          var result = results[i];
+          var name = result.handler;
+          var handler = getHandler(name);
+
+          if (handler.inaccessibleByURL) {
+            throw new UnrecognizedURLError(this.url);
+          }
+
+          var newHandlerInfo = handlerInfoFactory('param', {
+            name: name,
+            handler: handler,
+            params: result.params
+          });
+
+          var oldHandlerInfo = oldState.handlerInfos[i];
+          if (statesDiffer || newHandlerInfo.shouldSupercede(oldHandlerInfo)) {
+            statesDiffer = true;
+            newState.handlerInfos[i] = newHandlerInfo;
+          } else {
+            newState.handlerInfos[i] = oldHandlerInfo;
+          }
+        }
+
+        merge(newState.queryParams, results.queryParams);
+
+        return newState;
+      }
+    });
+
+    /**
+      Promise reject reasons passed to promise rejection
+      handlers for failed transitions.
+     */
+    function UnrecognizedURLError(message) {
+      this.message = (message || "UnrecognizedURLError");
+      this.name = "UnrecognizedURLError";
+    }
+  });
+define("router/transition-state", 
+  ["./handler-info","./utils","rsvp/promise","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var ResolvedHandlerInfo = __dependency1__.ResolvedHandlerInfo;
+    var forEach = __dependency2__.forEach;
+    var promiseLabel = __dependency2__.promiseLabel;
+    var Promise = __dependency3__["default"];
+
+    function TransitionState(other) {
+      this.handlerInfos = [];
+      this.queryParams = {};
+      this.params = {};
+    }
+
+    TransitionState.prototype = {
+      handlerInfos: null,
+      queryParams: null,
+      params: null,
+
+      promiseLabel: function(label) {
+        var targetName = '';
+        forEach(this.handlerInfos, function(handlerInfo) {
+          if (targetName !== '') {
+            targetName += '.';
+          }
+          targetName += handlerInfo.name;
+        });
+        return promiseLabel("'" + targetName + "': " + label);
+      },
+
+      resolve: function(shouldContinue, payload) {
+        var self = this;
+        // First, calculate params for this state. This is useful
+        // information to provide to the various route hooks.
+        var params = this.params;
+        forEach(this.handlerInfos, function(handlerInfo) {
+          params[handlerInfo.name] = handlerInfo.params || {};
+        });
+
+        payload = payload || {};
+        payload.resolveIndex = 0;
+
+        var currentState = this;
+        var wasAborted = false;
+
+        // The prelude RSVP.resolve() asyncs us into the promise land.
+        return Promise.resolve(null, this.promiseLabel("Start transition"))
+        .then(resolveOneHandlerInfo, null, this.promiseLabel('Resolve handler'))['catch'](handleError, this.promiseLabel('Handle error'));
+
+        function innerShouldContinue() {
+          return Promise.resolve(shouldContinue(), promiseLabel("Check if should continue"))['catch'](function(reason) {
+            // We distinguish between errors that occurred
+            // during resolution (e.g. beforeModel/model/afterModel),
+            // and aborts due to a rejecting promise from shouldContinue().
+            wasAborted = true;
+            return Promise.reject(reason);
+          }, promiseLabel("Handle abort"));
+        }
+
+        function handleError(error) {
+          // This is the only possible
+          // reject value of TransitionState#resolve
+          var handlerInfos = currentState.handlerInfos;
+          var errorHandlerIndex = payload.resolveIndex >= handlerInfos.length ?
+                                  handlerInfos.length - 1 : payload.resolveIndex;
+          return Promise.reject({
+            error: error,
+            handlerWithError: currentState.handlerInfos[errorHandlerIndex].handler,
+            wasAborted: wasAborted,
+            state: currentState
+          });
+        }
+
+        function proceed(resolvedHandlerInfo) {
+          var wasAlreadyResolved = currentState.handlerInfos[payload.resolveIndex].isResolved;
+
+          // Swap the previously unresolved handlerInfo with
+          // the resolved handlerInfo
+          currentState.handlerInfos[payload.resolveIndex++] = resolvedHandlerInfo;
+
+          if (!wasAlreadyResolved) {
+            // Call the redirect hook. The reason we call it here
+            // vs. afterModel is so that redirects into child
+            // routes don't re-run the model hooks for this
+            // already-resolved route.
+            var handler = resolvedHandlerInfo.handler;
+            if (handler && handler.redirect) {
+              handler.redirect(resolvedHandlerInfo.context, payload);
+            }
+          }
+
+          // Proceed after ensuring that the redirect hook
+          // didn't abort this transition by transitioning elsewhere.
+          return innerShouldContinue().then(resolveOneHandlerInfo, null, promiseLabel('Resolve handler'));
+        }
+
+        function resolveOneHandlerInfo() {
+          if (payload.resolveIndex === currentState.handlerInfos.length) {
+            // This is is the only possible
+            // fulfill value of TransitionState#resolve
+            return {
+              error: null,
+              state: currentState
+            };
+          }
+
+          var handlerInfo = currentState.handlerInfos[payload.resolveIndex];
+
+          return handlerInfo.resolve(innerShouldContinue, payload)
+                            .then(proceed, null, promiseLabel('Proceed'));
+        }
+      }
+    };
+
+    __exports__["default"] = TransitionState;
+  });
+define("router/transition", 
+  ["rsvp/promise","./handler-info","./utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var ResolvedHandlerInfo = __dependency2__.ResolvedHandlerInfo;
+    var trigger = __dependency3__.trigger;
+    var slice = __dependency3__.slice;
+    var log = __dependency3__.log;
+    var promiseLabel = __dependency3__.promiseLabel;
+
+    /**
+      @private
+
+      A Transition is a thennable (a promise-like object) that represents
+      an attempt to transition to another route. It can be aborted, either
+      explicitly via `abort` or by attempting another transition while a
+      previous one is still underway. An aborted transition can also
+      be `retry()`d later.
+     */
+    function Transition(router, intent, state, error) {
+      var transition = this;
+      this.state = state || router.state;
+      this.intent = intent;
+      this.router = router;
+      this.data = this.intent && this.intent.data || {};
+      this.resolvedModels = {};
+      this.queryParams = {};
+
+      if (error) {
+        this.promise = Promise.reject(error);
+        return;
+      }
+
+      if (state) {
+        this.params = state.params;
+        this.queryParams = state.queryParams;
+
+        var len = state.handlerInfos.length;
+        if (len) {
+          this.targetName = state.handlerInfos[state.handlerInfos.length-1].name;
+        }
+
+        for (var i = 0; i < len; ++i) {
+          var handlerInfo = state.handlerInfos[i];
+
+          // TODO: this all seems hacky
+          if (!handlerInfo.isResolved) { break; }
+          this.pivotHandler = handlerInfo.handler;
+        }
+
+        this.sequence = Transition.currentSequence++;
+        this.promise = state.resolve(checkForAbort, this)['catch'](function(result) {
+          if (result.wasAborted || transition.isAborted) {
+            return Promise.reject(logAbort(transition));
+          } else {
+            transition.trigger('error', result.error, transition, result.handlerWithError);
+            transition.abort();
+            return Promise.reject(result.error);
+          }
+        }, promiseLabel('Handle Abort'));
+      } else {
+        this.promise = Promise.resolve(this.state);
+        this.params = {};
+      }
+
+      function checkForAbort() {
+        if (transition.isAborted) {
+          return Promise.reject(undefined, promiseLabel("Transition aborted - reject"));
+        }
+      }
+    }
+
+    Transition.currentSequence = 0;
+
+    Transition.prototype = {
+      targetName: null,
+      urlMethod: 'update',
+      intent: null,
+      params: null,
+      pivotHandler: null,
+      resolveIndex: 0,
+      handlerInfos: null,
+      resolvedModels: null,
+      isActive: true,
+      state: null,
+
+      isTransition: true,
+
+      /**
+        @public
+
+        The Transition's internal promise. Calling `.then` on this property
+        is that same as calling `.then` on the Transition object itself, but
+        this property is exposed for when you want to pass around a
+        Transition's promise, but not the Transition object itself, since
+        Transition object can be externally `abort`ed, while the promise
+        cannot.
+       */
+      promise: null,
+
+      /**
+        @public
+
+        Custom state can be stored on a Transition's `data` object.
+        This can be useful for decorating a Transition within an earlier
+        hook and shared with a later hook. Properties set on `data` will
+        be copied to new transitions generated by calling `retry` on this
+        transition.
+       */
+      data: null,
+
+      /**
+        @public
+
+        A standard promise hook that resolves if the transition
+        succeeds and rejects if it fails/redirects/aborts.
+
+        Forwards to the internal `promise` property which you can
+        use in situations where you want to pass around a thennable,
+        but not the Transition itself.
+
+        @param {Function} success
+        @param {Function} failure
+       */
+      then: function(success, failure) {
+        return this.promise.then(success, failure);
+      },
+
+      /**
+        @public
+
+        Aborts the Transition. Note you can also implicitly abort a transition
+        by initiating another transition while a previous one is underway.
+       */
+      abort: function() {
+        if (this.isAborted) { return this; }
+        log(this.router, this.sequence, this.targetName + ": transition was aborted");
+        this.intent.preTransitionState = this.router.state;
+        this.isAborted = true;
+        this.isActive = false;
+        this.router.activeTransition = null;
+        return this;
+      },
+
+      /**
+        @public
+
+        Retries a previously-aborted transition (making sure to abort the
+        transition if it's still active). Returns a new transition that
+        represents the new attempt to transition.
+       */
+      retry: function() {
+        // TODO: add tests for merged state retry()s
+        this.abort();
+        return this.router.transitionByIntent(this.intent, false);
+      },
+
+      /**
+        @public
+
+        Sets the URL-changing method to be employed at the end of a
+        successful transition. By default, a new Transition will just
+        use `updateURL`, but passing 'replace' to this method will
+        cause the URL to update using 'replaceWith' instead. Omitting
+        a parameter will disable the URL change, allowing for transitions
+        that don't update the URL at completion (this is also used for
+        handleURL, since the URL has already changed before the
+        transition took place).
+
+        @param {String} method the type of URL-changing method to use
+          at the end of a transition. Accepted values are 'replace',
+          falsy values, or any other non-falsy value (which is
+          interpreted as an updateURL transition).
+
+        @return {Transition} this transition
+       */
+      method: function(method) {
+        this.urlMethod = method;
+        return this;
+      },
+
+      /**
+        @public
+
+        Fires an event on the current list of resolved/resolving
+        handlers within this transition. Useful for firing events
+        on route hierarchies that haven't fully been entered yet.
+
+        Note: This method is also aliased as `send`
+
+        @param {Boolean} [ignoreFailure=false] a boolean specifying whether unhandled events throw an error
+        @param {String} name the name of the event to fire
+       */
+      trigger: function (ignoreFailure) {
+        var args = slice.call(arguments);
+        if (typeof ignoreFailure === 'boolean') {
+          args.shift();
+        } else {
+          // Throw errors on unhandled trigger events by default
+          ignoreFailure = false;
+        }
+        trigger(this.router, this.state.handlerInfos.slice(0, this.resolveIndex + 1), ignoreFailure, args);
+      },
+
+      /**
+        @public
+
+        Transitions are aborted and their promises rejected
+        when redirects occur; this method returns a promise
+        that will follow any redirects that occur and fulfill
+        with the value fulfilled by any redirecting transitions
+        that occur.
+
+        @return {Promise} a promise that fulfills with the same
+          value that the final redirecting transition fulfills with
+       */
+      followRedirects: function() {
+        var router = this.router;
+        return this.promise['catch'](function(reason) {
+          if (router.activeTransition) {
+            return router.activeTransition.followRedirects();
+          }
+          return Promise.reject(reason);
+        });
+      },
+
+      toString: function() {
+        return "Transition (sequence " + this.sequence + ")";
+      },
+
+      /**
+        @private
+       */
+      log: function(message) {
+        log(this.router, this.sequence, message);
+      }
+    };
+
+    // Alias 'trigger' as 'send'
+    Transition.prototype.send = Transition.prototype.trigger;
+
+    /**
+      @private
+
+      Logs and returns a TransitionAborted error.
+     */
+    function logAbort(transition) {
+      log(transition.router, transition.sequence, "detected abort.");
+      return new TransitionAborted();
+    }
+
+    function TransitionAborted(message) {
+      this.message = (message || "TransitionAborted");
+      this.name = "TransitionAborted";
+    }
+
+    __exports__.Transition = Transition;
+    __exports__.logAbort = logAbort;
+    __exports__.TransitionAborted = TransitionAborted;
+  });
+define("router/utils", 
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var slice = Array.prototype.slice;
+
+    var _isArray;
+    if (!Array.isArray) {
+      _isArray = function (x) {
+        return Object.prototype.toString.call(x) === "[object Array]";
+      };
+    } else {
+      _isArray = Array.isArray;
+    }
+
+    var isArray = _isArray;
+    __exports__.isArray = isArray;
+    function merge(hash, other) {
+      for (var prop in other) {
+        if (other.hasOwnProperty(prop)) { hash[prop] = other[prop]; }
+      }
+    }
+
+    var oCreate = Object.create || function(proto) {
+      function F() {}
+      F.prototype = proto;
+      return new F();
+    };
+    __exports__.oCreate = oCreate;
+    /**
+      @private
+
+      Extracts query params from the end of an array
+    **/
+    function extractQueryParams(array) {
+      var len = (array && array.length), head, queryParams;
+
+      if(len && len > 0 && array[len - 1] && array[len - 1].hasOwnProperty('queryParams')) {
+        queryParams = array[len - 1].queryParams;
+        head = slice.call(array, 0, len - 1);
+        return [head, queryParams];
+      } else {
+        return [array, null];
+      }
+    }
+
+    __exports__.extractQueryParams = extractQueryParams;/**
+      @private
+
+      Coerces query param properties and array elements into strings.
+    **/
+    function coerceQueryParamsToString(queryParams) {
+      for (var key in queryParams) {
+        if (typeof queryParams[key] === 'number') {
+          queryParams[key] = '' + queryParams[key];
+        } else if (isArray(queryParams[key])) {
+          for (var i = 0, l = queryParams[key].length; i < l; i++) {
+            queryParams[key][i] = '' + queryParams[key][i];
+          }
+        }
+      }
+    }
+    /**
+      @private
+     */
+    function log(router, sequence, msg) {
+      if (!router.log) { return; }
+
+      if (arguments.length === 3) {
+        router.log("Transition #" + sequence + ": " + msg);
+      } else {
+        msg = sequence;
+        router.log(msg);
+      }
+    }
+
+    __exports__.log = log;function bind(context, fn) {
+      var boundArgs = arguments;
+      return function(value) {
+        var args = slice.call(boundArgs, 2);
+        args.push(value);
+        return fn.apply(context, args);
+      };
+    }
+
+    __exports__.bind = bind;function isParam(object) {
+      return (typeof object === "string" || object instanceof String || typeof object === "number" || object instanceof Number);
+    }
+
+
+    function forEach(array, callback) {
+      for (var i=0, l=array.length; i<l && false !== callback(array[i]); i++) { }
+    }
+
+    __exports__.forEach = forEach;function trigger(router, handlerInfos, ignoreFailure, args) {
+      if (router.triggerEvent) {
+        router.triggerEvent(handlerInfos, ignoreFailure, args);
+        return;
+      }
+
+      var name = args.shift();
+
+      if (!handlerInfos) {
+        if (ignoreFailure) { return; }
+        throw new Error("Could not trigger event '" + name + "'. There are no active handlers");
+      }
+
+      var eventWasHandled = false;
+
+      for (var i=handlerInfos.length-1; i>=0; i--) {
+        var handlerInfo = handlerInfos[i],
+            handler = handlerInfo.handler;
+
+        if (handler.events && handler.events[name]) {
+          if (handler.events[name].apply(handler, args) === true) {
+            eventWasHandled = true;
+          } else {
+            return;
+          }
+        }
+      }
+
+      if (!eventWasHandled && !ignoreFailure) {
+        throw new Error("Nothing handled the event '" + name + "'.");
+      }
+    }
+
+    __exports__.trigger = trigger;function getChangelist(oldObject, newObject) {
+      var key;
+      var results = {
+        all: {},
+        changed: {},
+        removed: {}
+      };
+
+      merge(results.all, newObject);
+
+      var didChange = false;
+      coerceQueryParamsToString(oldObject);
+      coerceQueryParamsToString(newObject);
+
+      // Calculate removals
+      for (key in oldObject) {
+        if (oldObject.hasOwnProperty(key)) {
+          if (!newObject.hasOwnProperty(key)) {
+            didChange = true;
+            results.removed[key] = oldObject[key];
+          }
+        }
+      }
+
+      // Calculate changes
+      for (key in newObject) {
+        if (newObject.hasOwnProperty(key)) {
+          if (isArray(oldObject[key]) && isArray(newObject[key])) {
+            if (oldObject[key].length !== newObject[key].length) {
+              results.changed[key] = newObject[key];
+              didChange = true;
+            } else {
+              for (var i = 0, l = oldObject[key].length; i < l; i++) {
+                if (oldObject[key][i] !== newObject[key][i]) {
+                  results.changed[key] = newObject[key];
+                  didChange = true;
+                }
+              }
+            }
+          }
+          else {
+            if (oldObject[key] !== newObject[key]) {
+              results.changed[key] = newObject[key];
+              didChange = true;
+            }
+          }
+        }
+      }
+
+      return didChange && results;
+    }
+
+    __exports__.getChangelist = getChangelist;function promiseLabel(label) {
+      return 'Router: ' + label;
+    }
+
+    __exports__.promiseLabel = promiseLabel;function subclass(parentConstructor, proto) {
+      function C(props) {
+        parentConstructor.call(this, props || {});
+      }
+      C.prototype = oCreate(parentConstructor.prototype);
+      merge(C.prototype, proto);
+      return C;
+    }
+
+    __exports__.subclass = subclass;__exports__.merge = merge;
+    __exports__.slice = slice;
+    __exports__.isParam = isParam;
+    __exports__.coerceQueryParamsToString = coerceQueryParamsToString;
+  });
+define("router", 
+  ["./router/router","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Router = __dependency1__["default"];
+
+    __exports__["default"] = Router;
+  });
+
+})();
+
+(function() {
+define("ember-application/ext/controller",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/utils","ember-metal/computed","ember-runtime/controllers/controller","ember-routing/system/controller_for","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-application
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EmberError = __dependency4__["default"];
+    var inspect = __dependency5__.inspect;
+    var computed = __dependency6__.computed;
+    var ControllerMixin = __dependency7__.ControllerMixin;
+    var meta = __dependency5__.meta;
+    var controllerFor = __dependency8__.controllerFor;
+    var meta = __dependency5__.meta;
+
+    function verifyNeedsDependencies(controller, container, needs) {
+      var dependency, i, l, missing = [];
+
+      for (i=0, l=needs.length; i<l; i++) {
+        dependency = needs[i];
+
+        Ember.assert(inspect(controller) + "#needs must not specify dependencies with periods in their names (" + dependency + ")", dependency.indexOf('.') === -1);
+
+        if (dependency.indexOf(':') === -1) {
+          dependency = "controller:" + dependency;
+        }
+
+        // Structure assert to still do verification but not string concat in production
+        if (!container.has(dependency)) {
+          missing.push(dependency);
+        }
+      }
+      if (missing.length) {
+        throw new EmberError(inspect(controller) + " needs [ " + missing.join(', ') + " ] but " + (missing.length > 1 ? 'they' : 'it') + " could not be found");
+      }
+    }
+
+    var defaultControllersComputedProperty = computed(function() {
+      var controller = this;
+
+      return {
+        needs: get(controller, 'needs'),
+        container: get(controller, 'container'),
+        unknownProperty: function(controllerName) {
+          var needs = this.needs,
+            dependency, i, l;
+          for (i=0, l=needs.length; i<l; i++) {
+            dependency = needs[i];
+            if (dependency === controllerName) {
+              return this.container.lookup('controller:' + controllerName);
+            }
+          }
+
+          var errorMessage = inspect(controller) + '#needs does not include `' + controllerName + '`. To access the ' + controllerName + ' controller from ' + inspect(controller) + ', ' + inspect(controller) + ' should have a `needs` property that is an array of the controllers it has access to.';
+          throw new ReferenceError(errorMessage);
+        },
+        setUnknownProperty: function (key, value) {
+          throw new Error("You cannot overwrite the value of `controllers." + key + "` of " + inspect(controller));
+        }
+      };
+    });
+
+    /**
+      @class ControllerMixin
+      @namespace Ember
+    */
+    ControllerMixin.reopen({
+      concatenatedProperties: ['needs'],
+
+      /**
+        An array of other controller objects available inside
+        instances of this controller via the `controllers`
+        property:
+
+        For example, when you define a controller:
+
+        ```javascript
+        App.CommentsController = Ember.ArrayController.extend({
+          needs: ['post']
+        });
+        ```
+
+        The application's single instance of these other
+        controllers are accessible by name through the
+        `controllers` property:
+
+        ```javascript
+        this.get('controllers.post'); // instance of App.PostController
+        ```
+
+        Given that you have a nested controller (nested resource):
+
+        ```javascript
+        App.CommentsNewController = Ember.ObjectController.extend({
+        });
+        ```
+
+        When you define a controller that requires access to a nested one:
+
+        ```javascript
+        App.IndexController = Ember.ObjectController.extend({
+          needs: ['commentsNew']
+        });
+        ```
+
+        You will be able to get access to it:
+
+        ```javascript
+        this.get('controllers.commentsNew'); // instance of App.CommentsNewController
+        ```
+
+        This is only available for singleton controllers.
+
+        @property {Array} needs
+        @default []
+      */
+      needs: [],
+
+      init: function() {
+        var needs = get(this, 'needs'),
+        length = get(needs, 'length');
+
+        if (length > 0) {
+          Ember.assert(' `' + inspect(this) + ' specifies `needs`, but does ' +
+                       "not have a container. Please ensure this controller was " +
+                       "instantiated with a container.",
+                       this.container || meta(this, false).descs.controllers !== defaultControllersComputedProperty);
+
+          if (this.container) {
+            verifyNeedsDependencies(this, this.container, needs);
+          }
+
+          // if needs then initialize controllers proxy
+          get(this, 'controllers');
+        }
+
+        this._super.apply(this, arguments);
+      },
+
+      /**
+        @method controllerFor
+        @see {Ember.Route#controllerFor}
+        @deprecated Use `needs` instead
+      */
+      controllerFor: function(controllerName) {
+        Ember.deprecate("Controller#controllerFor is deprecated, please use Controller#needs instead");
+        return controllerFor(get(this, 'container'), controllerName);
+      },
+
+      /**
+        Stores the instances of other controllers available from within
+        this controller. Any controller listed by name in the `needs`
+        property will be accessible by name through this property.
+
+        ```javascript
+        App.CommentsController = Ember.ArrayController.extend({
+          needs: ['post'],
+          postTitle: function(){
+            var currentPost = this.get('controllers.post'); // instance of App.PostController
+            return currentPost.get('title');
+          }.property('controllers.post.title')
+        });
+        ```
+
+        @see {Ember.ControllerMixin#needs}
+        @property {Object} controllers
+        @default null
+      */
+      controllers: defaultControllersComputedProperty
+    });
+
+    __exports__["default"] = ControllerMixin;
+  });
+define("ember-application",
+  ["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/dag","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var runLoadHooks = __dependency2__.runLoadHooks;
+
+    /**
+    Ember Application
+
+    @module ember
+    @submodule ember-application
+    @requires ember-views, ember-routing
+    */
+
+    var DAG = __dependency3__["default"];var Resolver = __dependency4__.Resolver;
+    var DefaultResolver = __dependency4__.DefaultResolver;
+    var Application = __dependency5__["default"];
+    // side effect of extending ControllerMixin
+
+    Ember.Application = Application;
+    Ember.DAG = DAG;
+    Ember.Resolver = Resolver;
+    Ember.DefaultResolver = DefaultResolver;
+
+    runLoadHooks('Ember.Application', Application);
+  });
+define("ember-application/system/application",
+  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-views/system/event_dispatcher","ember-extension-support/container_debug_adapter","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-application
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.FEATURES, Ember.deprecate, Ember.assert, Ember.libraries, LOG_VERSION, Namespace, BOOTED
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var runLoadHooks = __dependency4__.runLoadHooks;
+    var DAG = __dependency5__["default"];var Namespace = __dependency6__["default"];
+    var DeferredMixin = __dependency7__["default"];
+    var DefaultResolver = __dependency8__.DefaultResolver;
+    var create = __dependency9__.create;
+    var run = __dependency10__["default"];
+    var canInvoke = __dependency11__.canInvoke;
+    var Container = __dependency12__["default"];
+    var Controller = __dependency13__.Controller;
+    var EnumerableUtils = __dependency14__["default"];
+    var ObjectController = __dependency15__["default"];
+    var ArrayController = __dependency16__["default"];
+    var EventDispatcher = __dependency17__["default"];
+    var ContainerDebugAdapter = __dependency18__["default"];
+    var jQuery = __dependency19__["default"];
+    var Route = __dependency20__["default"];
+    var Router = __dependency21__["default"];
+    var HashLocation = __dependency22__["default"];
+    var HistoryLocation = __dependency23__["default"];
+    var AutoLocation = __dependency24__["default"];
+    var NoneLocation = __dependency25__["default"];
+
+    var EmberHandlebars = __dependency26__["default"];
+
+    var K = Ember.K;
+
+    function DeprecatedContainer(container) {
+      this._container = container;
+    }
+
+    DeprecatedContainer.deprecate = function(method) {
+      return function() {
+        var container = this._container;
+
+        Ember.deprecate('Using the defaultContainer is no longer supported. [defaultContainer#' + method + '] see: http://git.io/EKPpnA', false);
+        return container[method].apply(container, arguments);
+      };
+    };
+
+    DeprecatedContainer.prototype = {
+      _container: null,
+      lookup: DeprecatedContainer.deprecate('lookup'),
+      resolve: DeprecatedContainer.deprecate('resolve'),
+      register: DeprecatedContainer.deprecate('register')
+    };
+
+    /**
+      An instance of `Ember.Application` is the starting point for every Ember
+      application. It helps to instantiate, initialize and coordinate the many
+      objects that make up your app.
+
+      Each Ember app has one and only one `Ember.Application` object. In fact, the
+      very first thing you should do in your application is create the instance:
+
+      ```javascript
+      window.App = Ember.Application.create();
+      ```
+
+      Typically, the application object is the only global variable. All other
+      classes in your app should be properties on the `Ember.Application` instance,
+      which highlights its first role: a global namespace.
+
+      For example, if you define a view class, it might look like this:
+
+      ```javascript
+      App.MyView = Ember.View.extend();
+      ```
+
+      By default, calling `Ember.Application.create()` will automatically initialize
+      your application by calling the `Ember.Application.initialize()` method. If
+      you need to delay initialization, you can call your app's `deferReadiness()`
+      method. When you are ready for your app to be initialized, call its
+      `advanceReadiness()` method.
+
+      You can define a `ready` method on the `Ember.Application` instance, which
+      will be run by Ember when the application is initialized.
+
+      Because `Ember.Application` inherits from `Ember.Namespace`, any classes
+      you create will have useful string representations when calling `toString()`.
+      See the `Ember.Namespace` documentation for more information.
+
+      While you can think of your `Ember.Application` as a container that holds the
+      other classes in your application, there are several other responsibilities
+      going on under-the-hood that you may want to understand.
+
+      ### Event Delegation
+
+      Ember uses a technique called _event delegation_. This allows the framework
+      to set up a global, shared event listener instead of requiring each view to
+      do it manually. For example, instead of each view registering its own
+      `mousedown` listener on its associated element, Ember sets up a `mousedown`
+      listener on the `body`.
+
+      If a `mousedown` event occurs, Ember will look at the target of the event and
+      start walking up the DOM node tree, finding corresponding views and invoking
+      their `mouseDown` method as it goes.
+
+      `Ember.Application` has a number of default events that it listens for, as
+      well as a mapping from lowercase events to camel-cased view method names. For
+      example, the `keypress` event causes the `keyPress` method on the view to be
+      called, the `dblclick` event causes `doubleClick` to be called, and so on.
+
+      If there is a bubbling browser event that Ember does not listen for by
+      default, you can specify custom events and their corresponding view method
+      names by setting the application's `customEvents` property:
+
+      ```javascript
+      App = Ember.Application.create({
+        customEvents: {
+          // add support for the paste event
+          paste: "paste"
+        }
+      });
+      ```
+
+      By default, the application sets up these event listeners on the document
+      body. However, in cases where you are embedding an Ember application inside
+      an existing page, you may want it to set up the listeners on an element
+      inside the body.
+
+      For example, if only events inside a DOM element with the ID of `ember-app`
+      should be delegated, set your application's `rootElement` property:
+
+      ```javascript
+      window.App = Ember.Application.create({
+        rootElement: '#ember-app'
+      });
+      ```
+
+      The `rootElement` can be either a DOM element or a jQuery-compatible selector
+      string. Note that *views appended to the DOM outside the root element will
+      not receive events.* If you specify a custom root element, make sure you only
+      append views inside it!
+
+      To learn more about the advantages of event delegation and the Ember view
+      layer, and a list of the event listeners that are setup by default, visit the
+      [Ember View Layer guide](http://emberjs.com/guides/understanding-ember/the-view-layer/#toc_event-delegation).
+
+      ### Initializers
+
+      Libraries on top of Ember can add initializers, like so:
+
+      ```javascript
+      Ember.Application.initializer({
+        name: 'api-adapter',
+
+        initialize: function(container, application) {
+          application.register('api-adapter:main', ApiAdapter);
+        }
+      });
+      ```
+
+      Initializers provide an opportunity to access the container, which
+      organizes the different components of an Ember application. Additionally
+      they provide a chance to access the instantiated application. Beyond
+      being used for libraries, initializers are also a great way to organize
+      dependency injection or setup in your own application.
+
+      ### Routing
+
+      In addition to creating your application's router, `Ember.Application` is
+      also responsible for telling the router when to start routing. Transitions
+      between routes can be logged with the `LOG_TRANSITIONS` flag, and more
+      detailed intra-transition logging can be logged with
+      the `LOG_TRANSITIONS_INTERNAL` flag:
+
+      ```javascript
+      window.App = Ember.Application.create({
+        LOG_TRANSITIONS: true, // basic logging of successful transitions
+        LOG_TRANSITIONS_INTERNAL: true // detailed logging of all routing steps
+      });
+      ```
+
+      By default, the router will begin trying to translate the current URL into
+      application state once the browser emits the `DOMContentReady` event. If you
+      need to defer routing, you can call the application's `deferReadiness()`
+      method. Once routing can begin, call the `advanceReadiness()` method.
+
+      If there is any setup required before routing begins, you can implement a
+      `ready()` method on your app that will be invoked immediately before routing
+      begins.
+      ```
+
+      @class Application
+      @namespace Ember
+      @extends Ember.Namespace
+    */
+
+    var Application = Namespace.extend(DeferredMixin, {
+
+      /**
+        The root DOM element of the Application. This can be specified as an
+        element or a
+        [jQuery-compatible selector string](http://api.jquery.com/category/selectors/).
+
+        This is the element that will be passed to the Application's,
+        `eventDispatcher`, which sets up the listeners for event delegation. Every
+        view in your application should be a child of the element you specify here.
+
+        @property rootElement
+        @type DOMElement
+        @default 'body'
+      */
+      rootElement: 'body',
+
+      /**
+        The `Ember.EventDispatcher` responsible for delegating events to this
+        application's views.
+
+        The event dispatcher is created by the application at initialization time
+        and sets up event listeners on the DOM element described by the
+        application's `rootElement` property.
+
+        See the documentation for `Ember.EventDispatcher` for more information.
+
+        @property eventDispatcher
+        @type Ember.EventDispatcher
+        @default null
+      */
+      eventDispatcher: null,
+
+      /**
+        The DOM events for which the event dispatcher should listen.
+
+        By default, the application's `Ember.EventDispatcher` listens
+        for a set of standard DOM events, such as `mousedown` and
+        `keyup`, and delegates them to your application's `Ember.View`
+        instances.
+
+        If you would like additional bubbling events to be delegated to your
+        views, set your `Ember.Application`'s `customEvents` property
+        to a hash containing the DOM event name as the key and the
+        corresponding view method name as the value. For example:
+
+        ```javascript
+        App = Ember.Application.create({
+          customEvents: {
+            // add support for the paste event
+            paste: "paste"
+          }
+        });
+        ```
+
+        @property customEvents
+        @type Object
+        @default null
+      */
+      customEvents: null,
+
+      // Start off the number of deferrals at 1. This will be
+      // decremented by the Application's own `initialize` method.
+      _readinessDeferrals: 1,
+
+      init: function() {
+        if (!this.$) { this.$ = jQuery; }
+        this.__container__ = this.buildContainer();
+
+        this.Router = this.defaultRouter();
+
+        this._super();
+
+        this.scheduleInitialize();
+
+        Ember.libraries.registerCoreLibrary('Handlebars', EmberHandlebars.VERSION);
+        Ember.libraries.registerCoreLibrary('jQuery', jQuery().jquery);
+
+        if ( Ember.LOG_VERSION ) {
+          Ember.LOG_VERSION = false; // we only need to see this once per Application#init
+
+          var nameLengths = EnumerableUtils.map(Ember.libraries, function(item) {
+            return get(item, "name.length");
+          });
+
+          var maxNameLength = Math.max.apply(this, nameLengths);
+
+          Ember.debug('-------------------------------');
+          Ember.libraries.each(function(name, version) {
+            var spaces = new Array(maxNameLength - name.length + 1).join(" ");
+            Ember.debug([name, spaces, ' : ', version].join(""));
+          });
+          Ember.debug('-------------------------------');
+        }
+      },
+
+      /**
+        Build the container for the current application.
+
+        Also register a default application view in case the application
+        itself does not.
+
+        @private
+        @method buildContainer
+        @return {Ember.Container} the configured container
+      */
+      buildContainer: function() {
+        var container = this.__container__ = Application.buildContainer(this);
+
+        return container;
+      },
+
+      /**
+        If the application has not opted out of routing and has not explicitly
+        defined a router, supply a default router for the application author
+        to configure.
+
+        This allows application developers to do:
+
+        ```javascript
+        var App = Ember.Application.create();
+
+        App.Router.map(function() {
+          this.resource('posts');
+        });
+        ```
+
+        @private
+        @method defaultRouter
+        @return {Ember.Router} the default router
+      */
+
+      defaultRouter: function() {
+        if (this.Router === false) { return; }
+        var container = this.__container__;
+
+        if (this.Router) {
+          container.unregister('router:main');
+          container.register('router:main', this.Router);
+        }
+
+        return container.lookupFactory('router:main');
+      },
+
+      /**
+        Automatically initialize the application once the DOM has
+        become ready.
+
+        The initialization itself is scheduled on the actions queue
+        which ensures that application loading finishes before
+        booting.
+
+        If you are asynchronously loading code, you should call
+        `deferReadiness()` to defer booting, and then call
+        `advanceReadiness()` once all of your code has finished
+        loading.
+
+        @private
+        @method scheduleInitialize
+      */
+      scheduleInitialize: function() {
+        var self = this;
+
+        if (!this.$ || this.$.isReady) {
+          run.schedule('actions', self, '_initialize');
+        } else {
+          this.$().ready(function runInitialize() {
+            run(self, '_initialize');
+          });
+        }
+      },
+
+      /**
+        Use this to defer readiness until some condition is true.
+
+        Example:
+
+        ```javascript
+        App = Ember.Application.create();
+        App.deferReadiness();
+
+        jQuery.getJSON("/auth-token", function(token) {
+          App.token = token;
+          App.advanceReadiness();
+        });
+        ```
+
+        This allows you to perform asynchronous setup logic and defer
+        booting your application until the setup has finished.
+
+        However, if the setup requires a loading UI, it might be better
+        to use the router for this purpose.
+
+        @method deferReadiness
+      */
+      deferReadiness: function() {
+        Ember.assert("You must call deferReadiness on an instance of Ember.Application", this instanceof Application);
+        Ember.assert("You cannot defer readiness since the `ready()` hook has already been called.", this._readinessDeferrals > 0);
+        this._readinessDeferrals++;
+      },
+
+      /**
+        Call `advanceReadiness` after any asynchronous setup logic has completed.
+        Each call to `deferReadiness` must be matched by a call to `advanceReadiness`
+        or the application will never become ready and routing will not begin.
+
+        @method advanceReadiness
+        @see {Ember.Application#deferReadiness}
+      */
+      advanceReadiness: function() {
+        Ember.assert("You must call advanceReadiness on an instance of Ember.Application", this instanceof Application);
+        this._readinessDeferrals--;
+
+        if (this._readinessDeferrals === 0) {
+          run.once(this, this.didBecomeReady);
+        }
+      },
+
+      /**
+        Registers a factory that can be used for dependency injection (with
+        `App.inject`) or for service lookup. Each factory is registered with
+        a full name including two parts: `type:name`.
+
+        A simple example:
+
+        ```javascript
+        var App = Ember.Application.create();
+        App.Orange  = Ember.Object.extend();
+        App.register('fruit:favorite', App.Orange);
+        ```
+
+        Ember will resolve factories from the `App` namespace automatically.
+        For example `App.CarsController` will be discovered and returned if
+        an application requests `controller:cars`.
+
+        An example of registering a controller with a non-standard name:
+
+        ```javascript
+        var App = Ember.Application.create(),
+            Session  = Ember.Controller.extend();
+
+        App.register('controller:session', Session);
+
+        // The Session controller can now be treated like a normal controller,
+        // despite its non-standard name.
+        App.ApplicationController = Ember.Controller.extend({
+          needs: ['session']
+        });
+        ```
+
+        Registered factories are **instantiated** by having `create`
+        called on them. Additionally they are **singletons**, each time
+        they are looked up they return the same instance.
+
+        Some examples modifying that default behavior:
+
+        ```javascript
+        var App = Ember.Application.create();
+
+        App.Person  = Ember.Object.extend();
+        App.Orange  = Ember.Object.extend();
+        App.Email   = Ember.Object.extend();
+        App.session = Ember.Object.create();
+
+        App.register('model:user', App.Person, {singleton: false });
+        App.register('fruit:favorite', App.Orange);
+        App.register('communication:main', App.Email, {singleton: false});
+        App.register('session', App.session, {instantiate: false});
+        ```
+
+        @method register
+        @param  fullName {String} type:name (e.g., 'model:user')
+        @param  factory {Function} (e.g., App.Person)
+        @param  options {Object} (optional) disable instantiation or singleton usage
+      **/
+      register: function() {
+        var container = this.__container__;
+        container.register.apply(container, arguments);
+      },
+
+      /**
+        Define a dependency injection onto a specific factory or all factories
+        of a type.
+
+        When Ember instantiates a controller, view, or other framework component
+        it can attach a dependency to that component. This is often used to
+        provide services to a set of framework components.
+
+        An example of providing a session object to all controllers:
+
+        ```javascript
+        var App = Ember.Application.create(),
+            Session = Ember.Object.extend({ isAuthenticated: false });
+
+        // A factory must be registered before it can be injected
+        App.register('session:main', Session);
+
+        // Inject 'session:main' onto all factories of the type 'controller'
+        // with the name 'session'
+        App.inject('controller', 'session', 'session:main');
+
+        App.IndexController = Ember.Controller.extend({
+          isLoggedIn: Ember.computed.alias('session.isAuthenticated')
+        });
+        ```
+
+        Injections can also be performed on specific factories.
+
+        ```javascript
+        App.inject(<full_name or type>, <property name>, <full_name>)
+        App.inject('route', 'source', 'source:main')
+        App.inject('route:application', 'email', 'model:email')
+        ```
+
+        It is important to note that injections can only be performed on
+        classes that are instantiated by Ember itself. Instantiating a class
+        directly (via `create` or `new`) bypasses the dependency injection
+        system.
+
+        Ember-Data instantiates its models in a unique manner, and consequently
+        injections onto models (or all models) will not work as expected. Injections
+        on models can be enabled by setting `Ember.MODEL_FACTORY_INJECTIONS`
+        to `true`.
+
+        @method inject
+        @param  factoryNameOrType {String}
+        @param  property {String}
+        @param  injectionName {String}
+      **/
+      inject: function() {
+        var container = this.__container__;
+        container.injection.apply(container, arguments);
+      },
+
+      /**
+        Calling initialize manually is not supported.
+
+        Please see Ember.Application#advanceReadiness and
+        Ember.Application#deferReadiness.
+
+        @private
+        @deprecated
+        @method initialize
+       **/
+      initialize: function() {
+        Ember.deprecate('Calling initialize manually is not supported. Please see Ember.Application#advanceReadiness and Ember.Application#deferReadiness');
+      },
+
+      /**
+        Initialize the application. This happens automatically.
+
+        Run any initializers and run the application load hook. These hooks may
+        choose to defer readiness. For example, an authentication hook might want
+        to defer readiness until the auth token has been retrieved.
+
+        @private
+        @method _initialize
+      */
+      _initialize: function() {
+        if (this.isDestroyed) { return; }
+
+        // At this point, the App.Router must already be assigned
+        if (this.Router) {
+          var container = this.__container__;
+          container.unregister('router:main');
+          container.register('router:main', this.Router);
+        }
+
+        this.runInitializers();
+        runLoadHooks('application', this);
+
+        // At this point, any initializers or load hooks that would have wanted
+        // to defer readiness have fired. In general, advancing readiness here
+        // will proceed to didBecomeReady.
+        this.advanceReadiness();
+
+        return this;
+      },
+
+      /**
+        Reset the application. This is typically used only in tests. It cleans up
+        the application in the following order:
+
+        1. Deactivate existing routes
+        2. Destroy all objects in the container
+        3. Create a new application container
+        4. Re-route to the existing url
+
+        Typical Example:
+
+        ```javascript
+
+        var App;
+
+        run(function() {
+          App = Ember.Application.create();
+        });
+
+        module("acceptance test", {
+          setup: function() {
+            App.reset();
+          }
+        });
+
+        test("first test", function() {
+          // App is freshly reset
+        });
+
+        test("first test", function() {
+          // App is again freshly reset
+        });
+        ```
+
+        Advanced Example:
+
+        Occasionally you may want to prevent the app from initializing during
+        setup. This could enable extra configuration, or enable asserting prior
+        to the app becoming ready.
+
+        ```javascript
+
+        var App;
+
+        run(function() {
+          App = Ember.Application.create();
+        });
+
+        module("acceptance test", {
+          setup: function() {
+            run(function() {
+              App.reset();
+              App.deferReadiness();
+            });
+          }
+        });
+
+        test("first test", function() {
+          ok(true, 'something before app is initialized');
+
+          run(function() {
+            App.advanceReadiness();
+          });
+          ok(true, 'something after app is initialized');
+        });
+        ```
+
+        @method reset
+      **/
+      reset: function() {
+        this._readinessDeferrals = 1;
+
+        function handleReset() {
+          var router = this.__container__.lookup('router:main');
+          router.reset();
+
+          run(this.__container__, 'destroy');
+
+          this.buildContainer();
+
+          run.schedule('actions', this, function() {
+            this._initialize();
+          });
+        }
+
+        run.join(this, handleReset);
+      },
+
+      /**
+        @private
+        @method runInitializers
+      */
+      runInitializers: function() {
+        var initializers = get(this.constructor, 'initializers'),
+            container = this.__container__,
+            graph = new DAG(),
+            namespace = this,
+            name, initializer;
+
+        for (name in initializers) {
+          initializer = initializers[name];
+          graph.addEdges(initializer.name, initializer.initialize, initializer.before, initializer.after);
+        }
+
+        graph.topsort(function (vertex) {
+          var initializer = vertex.value;
+          Ember.assert("No application initializer named '"+vertex.name+"'", initializer);
+          initializer(container, namespace);
+        });
+      },
+
+      /**
+        @private
+        @method didBecomeReady
+      */
+      didBecomeReady: function() {
+        this.setupEventDispatcher();
+        this.ready(); // user hook
+        this.startRouting();
+
+        if (!Ember.testing) {
+          // Eagerly name all classes that are already loaded
+          Ember.Namespace.processAll();
+          Ember.BOOTED = true;
+        }
+
+        this.resolve(this);
+      },
+
+      /**
+        Setup up the event dispatcher to receive events on the
+        application's `rootElement` with any registered
+        `customEvents`.
+
+        @private
+        @method setupEventDispatcher
+      */
+      setupEventDispatcher: function() {
+        var customEvents = get(this, 'customEvents'),
+            rootElement = get(this, 'rootElement'),
+            dispatcher = this.__container__.lookup('event_dispatcher:main');
+
+        set(this, 'eventDispatcher', dispatcher);
+        dispatcher.setup(customEvents, rootElement);
+      },
+
+      /**
+        If the application has a router, use it to route to the current URL, and
+        trigger a new call to `route` whenever the URL changes.
+
+        @private
+        @method startRouting
+        @property router {Ember.Router}
+      */
+      startRouting: function() {
+        var router = this.__container__.lookup('router:main');
+        if (!router) { return; }
+
+        router.startRouting();
+      },
+
+      handleURL: function(url) {
+        var router = this.__container__.lookup('router:main');
+
+        router.handleURL(url);
+      },
+
+      /**
+        Called when the Application has become ready.
+        The call will be delayed until the DOM has become ready.
+
+        @event ready
+      */
+      ready: K,
+
+      /**
+        @deprecated Use 'Resolver' instead
+        Set this to provide an alternate class to `Ember.DefaultResolver`
+
+
+        @property resolver
+      */
+      resolver: null,
+
+      /**
+        Set this to provide an alternate class to `Ember.DefaultResolver`
+
+        @property resolver
+      */
+      Resolver: null,
+
+      willDestroy: function() {
+        Ember.BOOTED = false;
+        // Ensure deactivation of routes before objects are destroyed
+        this.__container__.lookup('router:main').reset();
+
+        this.__container__.destroy();
+      },
+
+      initializer: function(options) {
+        this.constructor.initializer(options);
+      }
+    });
+
+    Application.reopenClass({
+      initializers: {},
+
+      /**
+        Initializer receives an object which has the following attributes:
+        `name`, `before`, `after`, `initialize`. The only required attribute is
+        `initialize, all others are optional.
+
+        * `name` allows you to specify under which name the initializer is registered.
+        This must be a unique name, as trying to register two initializers with the
+        same name will result in an error.
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'namedInitializer',
+          initialize: function(container, application) {
+            Ember.debug("Running namedInitializer!");
+          }
+        });
+        ```
+
+        * `before` and `after` are used to ensure that this initializer is ran prior
+        or after the one identified by the value. This value can be a single string
+        or an array of strings, referencing the `name` of other initializers.
+
+        An example of ordering initializers, we create an initializer named `first`:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'first',
+          initialize: function(container, application) {
+            Ember.debug("First initializer!");
+          }
+        });
+
+        // DEBUG: First initializer!
+        ```
+
+        We add another initializer named `second`, specifying that it should run
+        after the initializer named `first`:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'second',
+          after: 'first',
+
+          initialize: function(container, application) {
+            Ember.debug("Second initializer!");
+          }
+        });
+
+        // DEBUG: First initializer!
+        // DEBUG: Second initializer!
+        ```
+
+        Afterwards we add a further initializer named `pre`, this time specifying
+        that it should run before the initializer named `first`:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'pre',
+          before: 'first',
+
+          initialize: function(container, application) {
+            Ember.debug("Pre initializer!");
+          }
+        });
+
+        // DEBUG: Pre initializer!
+        // DEBUG: First initializer!
+        // DEBUG: Second initializer!
+        ```
+
+        Finally we add an initializer named `post`, specifying it should run after
+        both the `first` and the `second` initializers:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'post',
+          after: ['first', 'second'],
+
+          initialize: function(container, application) {
+            Ember.debug("Post initializer!");
+          }
+        });
+
+        // DEBUG: Pre initializer!
+        // DEBUG: First initializer!
+        // DEBUG: Second initializer!
+        // DEBUG: Post initializer!
+        ```
+
+        * `initialize` is a callback function that receives two arguments, `container`
+        and `application` on which you can operate.
+
+        Example of using `container` to preload data into the store:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: "preload-data",
+
+          initialize: function(container, application) {
+            var store = container.lookup('store:main');
+            store.pushPayload(preloadedData);
+          }
+        });
+        ```
+
+        Example of using `application` to register an adapter:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'api-adapter',
+
+          initialize: function(container, application) {
+            application.register('api-adapter:main', ApiAdapter);
+          }
+        });
+        ```
+
+        @method initializer
+        @param initializer {Object}
+       */
+      initializer: function(initializer) {
+        // If this is the first initializer being added to a subclass, we are going to reopen the class
+        // to make sure we have a new `initializers` object, which extends from the parent class' using
+        // prototypal inheritance. Without this, attempting to add initializers to the subclass would
+        // pollute the parent class as well as other subclasses.
+        if (this.superclass.initializers !== undefined && this.superclass.initializers === this.initializers) {
+          this.reopenClass({
+            initializers: create(this.initializers)
+          });
+        }
+
+        Ember.assert("The initializer '" + initializer.name + "' has already been registered", !this.initializers[initializer.name]);
+        Ember.assert("An initializer cannot be registered without an initialize function", canInvoke(initializer, 'initialize'));
+
+        this.initializers[initializer.name] = initializer;
+      },
+
+      /**
+        This creates a container with the default Ember naming conventions.
+
+        It also configures the container:
+
+        * registered views are created every time they are looked up (they are
+          not singletons)
+        * registered templates are not factories; the registered value is
+          returned directly.
+        * the router receives the application as its `namespace` property
+        * all controllers receive the router as their `target` and `controllers`
+          properties
+        * all controllers receive the application as their `namespace` property
+        * the application view receives the application controller as its
+          `controller` property
+        * the application view receives the application template as its
+          `defaultTemplate` property
+
+        @private
+        @method buildContainer
+        @static
+        @param {Ember.Application} namespace the application to build the
+          container for.
+        @return {Ember.Container} the built container
+      */
+      buildContainer: function(namespace) {
+        var container = new Container();
+
+        Container.defaultContainer = new DeprecatedContainer(container);
+
+        container.set = set;
+        container.resolver  = resolverFor(namespace);
+        container.normalize = container.resolver.normalize;
+        container.describe  = container.resolver.describe;
+        container.makeToString = container.resolver.makeToString;
+
+        container.optionsForType('component', { singleton: false });
+        container.optionsForType('view', { singleton: false });
+        container.optionsForType('template', { instantiate: false });
+        container.optionsForType('helper', { instantiate: false });
+
+        container.register('application:main', namespace, { instantiate: false });
+
+        container.register('controller:basic', Controller, { instantiate: false });
+        container.register('controller:object', ObjectController, { instantiate: false });
+        container.register('controller:array', ArrayController, { instantiate: false });
+        container.register('route:basic', Route, { instantiate: false });
+        container.register('event_dispatcher:main', EventDispatcher);
+
+        container.register('router:main',  Router);
+        container.injection('router:main', 'namespace', 'application:main');
+
+        container.register('location:auto', AutoLocation);
+        container.register('location:hash', HashLocation);
+        container.register('location:history', HistoryLocation);
+        container.register('location:none', NoneLocation);
+
+        container.injection('controller', 'target', 'router:main');
+        container.injection('controller', 'namespace', 'application:main');
+
+        container.injection('route', 'router', 'router:main');
+        container.injection('location', 'rootURL', '-location-setting:root-url');
+
+        // DEBUGGING
+        container.register('resolver-for-debugging:main', container.resolver.__resolver__, { instantiate: false });
+        container.injection('container-debug-adapter:main', 'resolver', 'resolver-for-debugging:main');
+        container.injection('data-adapter:main', 'containerDebugAdapter', 'container-debug-adapter:main');
+        // Custom resolver authors may want to register their own ContainerDebugAdapter with this key
+
+        // ES6TODO: resolve this via import once ember-application package is ES6'ed
+        requireModule('ember-extension-support');
+        container.register('container-debug-adapter:main', ContainerDebugAdapter);
+
+        return container;
+      }
+    });
+
+    /**
+      This function defines the default lookup rules for container lookups:
+
+      * templates are looked up on `Ember.TEMPLATES`
+      * other names are looked up on the application after classifying the name.
+        For example, `controller:post` looks up `App.PostController` by default.
+      * if the default lookup fails, look for registered classes on the container
+
+      This allows the application to register default injections in the container
+      that could be overridden by the normal naming convention.
+
+      @private
+      @method resolverFor
+      @param {Ember.Namespace} namespace the namespace to look for classes
+      @return {*} the resolved value for a given lookup
+    */
+    function resolverFor(namespace) {
+      if (namespace.get('resolver')) {
+        Ember.deprecate('Application.resolver is deprecated in favor of Application.Resolver', false);
+      }
+
+      var ResolverClass = namespace.get('resolver') || namespace.get('Resolver') || DefaultResolver;
+      var resolver = ResolverClass.create({
+        namespace: namespace
+      });
+
+      function resolve(fullName) {
+        return resolver.resolve(fullName);
+      }
+
+      resolve.describe = function(fullName) {
+        return resolver.lookupDescription(fullName);
+      };
+
+      resolve.makeToString = function(factory, fullName) {
+        return resolver.makeToString(factory, fullName);
+      };
+
+      resolve.normalize = function(fullName) {
+        if (resolver.normalize) {
+          return resolver.normalize(fullName);
+        } else {
+          Ember.deprecate('The Resolver should now provide a \'normalize\' function', false);
+          return fullName;
+        }
+      };
+
+      resolve.__resolver__ = resolver;
+
+      return resolve;
+    }
+
+    __exports__["default"] = Application;
+  });
+define("ember-application/system/dag",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function visit(vertex, fn, visited, path) {
+      var name = vertex.name,
+        vertices = vertex.incoming,
+        names = vertex.incomingNames,
+        len = names.length,
+        i;
+      if (!visited) {
+        visited = {};
+      }
+      if (!path) {
+        path = [];
+      }
+      if (visited.hasOwnProperty(name)) {
+        return;
+      }
+      path.push(name);
+      visited[name] = true;
+      for (i = 0; i < len; i++) {
+        visit(vertices[names[i]], fn, visited, path);
+      }
+      fn(vertex, path);
+      path.pop();
+    }
+
+    function DAG() {
+      this.names = [];
+      this.vertices = {};
+    }
+
+    DAG.prototype.add = function(name) {
+      if (!name) { return; }
+      if (this.vertices.hasOwnProperty(name)) {
+        return this.vertices[name];
+      }
+      var vertex = {
+        name: name, incoming: {}, incomingNames: [], hasOutgoing: false, value: null
+      };
+      this.vertices[name] = vertex;
+      this.names.push(name);
+      return vertex;
+    };
+
+    DAG.prototype.map = function(name, value) {
+      this.add(name).value = value;
+    };
+
+    DAG.prototype.addEdge = function(fromName, toName) {
+      if (!fromName || !toName || fromName === toName) {
+        return;
+      }
+      var from = this.add(fromName), to = this.add(toName);
+      if (to.incoming.hasOwnProperty(fromName)) {
+        return;
+      }
+      function checkCycle(vertex, path) {
+        if (vertex.name === toName) {
+          throw new EmberError("cycle detected: " + toName + " <- " + path.join(" <- "));
+        }
+      }
+      visit(from, checkCycle);
+      from.hasOutgoing = true;
+      to.incoming[fromName] = from;
+      to.incomingNames.push(fromName);
+    };
+
+    DAG.prototype.topsort = function(fn) {
+      var visited = {},
+        vertices = this.vertices,
+        names = this.names,
+        len = names.length,
+        i, vertex;
+      for (i = 0; i < len; i++) {
+        vertex = vertices[names[i]];
+        if (!vertex.hasOutgoing) {
+          visit(vertex, fn, visited);
+        }
+      }
+    };
+
+    DAG.prototype.addEdges = function(name, value, before, after) {
+      var i;
+      this.map(name, value);
+      if (before) {
+        if (typeof before === 'string') {
+          this.addEdge(name, before);
+        } else {
+          for (i = 0; i < before.length; i++) {
+            this.addEdge(name, before[i]);
+          }
+        }
+      }
+      if (after) {
+        if (typeof after === 'string') {
+          this.addEdge(after, name);
+        } else {
+          for (i = 0; i < after.length; i++) {
+            this.addEdge(after[i], name);
+          }
+        }
+      }
+    };
+
+    __exports__["default"] = DAG;
+  });
+define("ember-application/system/resolver",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-application
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.TEMPLATES, Ember.assert
+    var get = __dependency2__.get;
+    var Logger = __dependency3__["default"];
+    var classify = __dependency4__.classify;
+    var capitalize = __dependency4__.capitalize;
+    var decamelize = __dependency4__.decamelize;
+    var EmberObject = __dependency5__["default"];
+    var Namespace = __dependency6__["default"];
+    var EmberHandlebars = __dependency7__["default"];
+
+    var Resolver = EmberObject.extend({
+      /**
+        This will be set to the Application instance when it is
+        created.
+
+        @property namespace
+      */
+      namespace: null,
+      normalize: function(fullName) {
+        throw new Error("Invalid call to `resolver.normalize(fullName)`. Please override the 'normalize' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      resolve: function(fullName) {
+       throw new Error("Invalid call to `resolver.resolve(parsedName)`. Please override the 'resolve' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      parseName: function(parsedName) {
+       throw new Error("Invalid call to `resolver.resolveByType(parsedName)`. Please override the 'resolveByType' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      lookupDescription: function(fullName) {
+        throw new Error("Invalid call to `resolver.lookupDescription(fullName)`. Please override the 'lookupDescription' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      makeToString: function(factory, fullName) {
+        throw new Error("Invalid call to `resolver.makeToString(factory, fullName)`. Please override the 'makeToString' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      resolveOther: function(parsedName) {
+       throw new Error("Invalid call to `resolver.resolveOther(parsedName)`. Please override the 'resolveOther' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      _logLookup: function(found, parsedName) {
+       throw new Error("Invalid call to `resolver._logLookup(found, parsedName)`. Please override the '_logLookup' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      }
+    });
+
+
+
+    /**
+      The DefaultResolver defines the default lookup rules to resolve
+      container lookups before consulting the container for registered
+      items:
+
+      * templates are looked up on `Ember.TEMPLATES`
+      * other names are looked up on the application after converting
+        the name. For example, `controller:post` looks up
+        `App.PostController` by default.
+      * there are some nuances (see examples below)
+
+      ### How Resolving Works
+
+      The container calls this object's `resolve` method with the
+      `fullName` argument.
+
+      It first parses the fullName into an object using `parseName`.
+
+      Then it checks for the presence of a type-specific instance
+      method of the form `resolve[Type]` and calls it if it exists.
+      For example if it was resolving 'template:post', it would call
+      the `resolveTemplate` method.
+
+      Its last resort is to call the `resolveOther` method.
+
+      The methods of this object are designed to be easy to override
+      in a subclass. For example, you could enhance how a template
+      is resolved like so:
+
+      ```javascript
+      App = Ember.Application.create({
+        Resolver: Ember.DefaultResolver.extend({
+          resolveTemplate: function(parsedName) {
+            var resolvedTemplate = this._super(parsedName);
+            if (resolvedTemplate) { return resolvedTemplate; }
+            return Ember.TEMPLATES['not_found'];
+          }
+        })
+      });
+      ```
+
+      Some examples of how names are resolved:
+
+      ```
+      'template:post' //=> Ember.TEMPLATES['post']
+      'template:posts/byline' //=> Ember.TEMPLATES['posts/byline']
+      'template:posts.byline' //=> Ember.TEMPLATES['posts/byline']
+      'template:blogPost' //=> Ember.TEMPLATES['blogPost']
+                          //   OR
+                          //   Ember.TEMPLATES['blog_post']
+      'controller:post' //=> App.PostController
+      'controller:posts.index' //=> App.PostsIndexController
+      'controller:blog/post' //=> Blog.PostController
+      'controller:basic' //=> Ember.Controller
+      'route:post' //=> App.PostRoute
+      'route:posts.index' //=> App.PostsIndexRoute
+      'route:blog/post' //=> Blog.PostRoute
+      'route:basic' //=> Ember.Route
+      'view:post' //=> App.PostView
+      'view:posts.index' //=> App.PostsIndexView
+      'view:blog/post' //=> Blog.PostView
+      'view:basic' //=> Ember.View
+      'foo:post' //=> App.PostFoo
+      'model:post' //=> App.Post
+      ```
+
+      @class DefaultResolver
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var DefaultResolver = EmberObject.extend({
+      /**
+        This will be set to the Application instance when it is
+        created.
+
+        @property namespace
+      */
+      namespace: null,
+
+      normalize: function(fullName) {
+        var split = fullName.split(':', 2),
+            type = split[0],
+            name = split[1];
+
+        Ember.assert("Tried to normalize a container name without a colon (:) in it. You probably tried to lookup a name that did not contain a type, a colon, and a name. A proper lookup name would be `view:post`.", split.length === 2);
+
+        if (type !== 'template') {
+          var result = name;
+
+          if (result.indexOf('.') > -1) {
+            result = result.replace(/\.(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+          }
+
+          if (name.indexOf('_') > -1) {
+            result = result.replace(/_(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+          }
+
+          return type + ':' + result;
+        } else {
+          return fullName;
+        }
+      },
+
+
+      /**
+        This method is called via the container's resolver method.
+        It parses the provided `fullName` and then looks up and
+        returns the appropriate template or class.
+
+        @method resolve
+        @param {String} fullName the lookup string
+        @return {Object} the resolved factory
+      */
+      resolve: function(fullName) {
+        var parsedName = this.parseName(fullName),
+            resolveMethodName = parsedName.resolveMethodName,
+            resolved;
+
+        if (!(parsedName.name && parsedName.type)) {
+          throw new TypeError("Invalid fullName: `" + fullName + "`, must be of the form `type:name` ");
+        }
+
+        if (this[resolveMethodName]) {
+          resolved = this[resolveMethodName](parsedName);
+        }
+
+        if (!resolved) {
+          resolved = this.resolveOther(parsedName);
+        }
+
+        if (parsedName.root && parsedName.root.LOG_RESOLVER) {
+          this._logLookup(resolved, parsedName);
+        }
+
+        return resolved;
+      },
+      /**
+        Convert the string name of the form "type:name" to
+        a Javascript object with the parsed aspects of the name
+        broken out.
+
+        @protected
+        @param {String} fullName the lookup string
+        @method parseName
+      */
+      parseName: function(fullName) {
+        var nameParts = fullName.split(":"),
+            type = nameParts[0], fullNameWithoutType = nameParts[1],
+            name = fullNameWithoutType,
+            namespace = get(this, 'namespace'),
+            root = namespace;
+
+        if (type !== 'template' && name.indexOf('/') !== -1) {
+          var parts = name.split('/');
+          name = parts[parts.length - 1];
+          var namespaceName = capitalize(parts.slice(0, -1).join('.'));
+          root = Namespace.byName(namespaceName);
+
+          Ember.assert('You are looking for a ' + name + ' ' + type + ' in the ' + namespaceName + ' namespace, but the namespace could not be found', root);
+        }
+
+        return {
+          fullName: fullName,
+          type: type,
+          fullNameWithoutType: fullNameWithoutType,
+          name: name,
+          root: root,
+          resolveMethodName: "resolve" + classify(type)
+        };
+      },
+
+      /**
+        Returns a human-readable description for a fullName. Used by the
+        Application namespace in assertions to describe the
+        precise name of the class that Ember is looking for, rather than
+        container keys.
+
+        @protected
+        @param {String} fullName the lookup string
+        @method lookupDescription
+      */
+      lookupDescription: function(fullName) {
+        var parsedName = this.parseName(fullName);
+
+        if (parsedName.type === 'template') {
+          return "template at " + parsedName.fullNameWithoutType.replace(/\./g, '/');
+        }
+
+        var description = parsedName.root + "." + classify(parsedName.name);
+        if (parsedName.type !== 'model') { description += classify(parsedName.type); }
+
+        return description;
+      },
+
+      makeToString: function(factory, fullName) {
+        return factory.toString();
+      },
+      /**
+        Given a parseName object (output from `parseName`), apply
+        the conventions expected by `Ember.Router`
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method useRouterNaming
+      */
+      useRouterNaming: function(parsedName) {
+        parsedName.name = parsedName.name.replace(/\./g, '_');
+        if (parsedName.name === 'basic') {
+          parsedName.name = '';
+        }
+      },
+      /**
+        Look up the template in Ember.TEMPLATES
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveTemplate
+      */
+      resolveTemplate: function(parsedName) {
+        var templateName = parsedName.fullNameWithoutType.replace(/\./g, '/');
+
+        if (Ember.TEMPLATES[templateName]) {
+          return Ember.TEMPLATES[templateName];
+        }
+
+        templateName = decamelize(templateName);
+        if (Ember.TEMPLATES[templateName]) {
+          return Ember.TEMPLATES[templateName];
+        }
+      },
+      /**
+        Lookup the view using `resolveOther`
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveView
+      */
+      resolveView: function(parsedName) {
+        this.useRouterNaming(parsedName);
+        return this.resolveOther(parsedName);
+      },
+      /**
+        Lookup the controller using `resolveOther`
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveController
+      */
+      resolveController: function(parsedName) {
+        this.useRouterNaming(parsedName);
+        return this.resolveOther(parsedName);
+      },
+      /**
+        Lookup the route using `resolveOther`
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveRoute
+      */
+      resolveRoute: function(parsedName) {
+        this.useRouterNaming(parsedName);
+        return this.resolveOther(parsedName);
+      },
+
+      /**
+        Lookup the model on the Application namespace
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveModel
+      */
+      resolveModel: function(parsedName) {
+        var className = classify(parsedName.name),
+            factory = get(parsedName.root, className);
+
+         if (factory) { return factory; }
+      },
+      /**
+        Look up the specified object (from parsedName) on the appropriate
+        namespace (usually on the Application)
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveHelper
+      */
+      resolveHelper: function(parsedName) {
+        return this.resolveOther(parsedName) || EmberHandlebars.helpers[parsedName.fullNameWithoutType];
+      },
+      /**
+        Look up the specified object (from parsedName) on the appropriate
+        namespace (usually on the Application)
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveOther
+      */
+      resolveOther: function(parsedName) {
+        var className = classify(parsedName.name) + classify(parsedName.type),
+            factory = get(parsedName.root, className);
+        if (factory) { return factory; }
+      },
+
+      /**
+       @method _logLookup
+       @param {Boolean} found
+       @param {Object} parsedName
+       @private
+      */
+      _logLookup: function(found, parsedName) {
+        var symbol, padding;
+
+        if (found) { symbol = '[✓]'; }
+        else          { symbol = '[ ]'; }
+
+        if (parsedName.fullName.length > 60) {
+          padding = '.';
+        } else {
+          padding = new Array(60 - parsedName.fullName.length).join('.');
+        }
+
+        Logger.info(symbol, parsedName.fullName, padding, this.lookupDescription(parsedName.fullName));
+      }
+    });
+
+    __exports__.Resolver = Resolver;
+    __exports__.DefaultResolver = DefaultResolver;
+  });
+})();
+
+(function() {
+define("ember-extension-support/container_debug_adapter",
+  ["ember-metal/core","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var typeOf = __dependency2__.typeOf;
+    var dasherize = __dependency3__.dasherize;
+    var classify = __dependency3__.classify;
+    var Namespace = __dependency4__["default"];
+    var EmberObject = __dependency5__["default"];
+
+    /**
+    @module ember
+    @submodule ember-extension-support
+    */
+
+    /**
+      The `ContainerDebugAdapter` helps the container and resolver interface
+      with tools that debug Ember such as the
+      [Ember Extension](https://github.com/tildeio/ember-extension)
+      for Chrome and Firefox.
+
+      This class can be extended by a custom resolver implementer
+      to override some of the methods with library-specific code.
+
+      The methods likely to be overridden are:
+
+      * `canCatalogEntriesByType`
+      * `catalogEntriesByType`
+
+      The adapter will need to be registered
+      in the application's container as `container-debug-adapter:main`
+
+      Example:
+
+      ```javascript
+      Application.initializer({
+        name: "containerDebugAdapter",
+
+        initialize: function(container, application) {
+          application.register('container-debug-adapter:main', require('app/container-debug-adapter'));
+        }
+      });
+      ```
+
+      @class ContainerDebugAdapter
+      @namespace Ember
+      @extends EmberObject
+      @since 1.5.0
+    */
+    var ContainerDebugAdapter = EmberObject.extend({
+      /**
+        The container of the application being debugged.
+        This property will be injected
+        on creation.
+
+        @property container
+        @default null
+      */
+      container: null,
+
+      /**
+        The resolver instance of the application
+        being debugged. This property will be injected
+        on creation.
+
+        @property resolver
+        @default null
+      */
+      resolver: null,
+
+      /**
+        Returns true if it is possible to catalog a list of available
+        classes in the resolver for a given type.
+
+        @method canCatalogEntriesByType
+        @param {string} type The type. e.g. "model", "controller", "route"
+        @return {boolean} whether a list is available for this type.
+      */
+      canCatalogEntriesByType: function(type) {
+        if (type === 'model' || type === 'template') return false;
+        return true;
+      },
+
+      /**
+        Returns the available classes a given type.
+
+        @method catalogEntriesByType
+        @param {string} type The type. e.g. "model", "controller", "route"
+        @return {Array} An array of strings.
+      */
+      catalogEntriesByType: function(type) {
+        var namespaces = Ember.A(Namespace.NAMESPACES), types = Ember.A(), self = this;
+        var typeSuffixRegex = new RegExp(classify(type) + "$");
+
+        namespaces.forEach(function(namespace) {
+          if (namespace !== Ember) {
+            for (var key in namespace) {
+              if (!namespace.hasOwnProperty(key)) { continue; }
+              if (typeSuffixRegex.test(key)) {
+                var klass = namespace[key];
+                if (typeOf(klass) === 'class') {
+                  types.push(dasherize(key.replace(typeSuffixRegex, '')));
+                }
+              }
+            }
+          }
+        });
+        return types;
+      }
+    });
+
+    __exports__["default"] = ContainerDebugAdapter;
+  });
+define("ember-extension-support/data_adapter",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/run_loop","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/native_array","ember-application/system/application","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var run = __dependency3__["default"];
+    var dasherize = __dependency4__.dasherize;
+    var Namespace = __dependency5__["default"];
+    var EmberObject = __dependency6__["default"];
+    var A = __dependency7__.A;
+    var Application = __dependency8__["default"];
+
+    /**
+    @module ember
+    @submodule ember-extension-support
+    */
+
+    /**
+      The `DataAdapter` helps a data persistence library
+      interface with tools that debug Ember such
+      as the [Ember Extension](https://github.com/tildeio/ember-extension)
+      for Chrome and Firefox.
+
+      This class will be extended by a persistence library
+      which will override some of the methods with
+      library-specific code.
+
+      The methods likely to be overridden are:
+
+      * `getFilters`
+      * `detect`
+      * `columnsForType`
+      * `getRecords`
+      * `getRecordColumnValues`
+      * `getRecordKeywords`
+      * `getRecordFilterValues`
+      * `getRecordColor`
+      * `observeRecord`
+
+      The adapter will need to be registered
+      in the application's container as `dataAdapter:main`
+
+      Example:
+
+      ```javascript
+      Application.initializer({
+        name: "data-adapter",
+
+        initialize: function(container, application) {
+          application.register('data-adapter:main', DS.DataAdapter);
+        }
+      });
+      ```
+
+      @class DataAdapter
+      @namespace Ember
+      @extends EmberObject
+    */
+    var DataAdapter = EmberObject.extend({
+      init: function() {
+        this._super();
+        this.releaseMethods = A();
+      },
+
+      /**
+        The container of the application being debugged.
+        This property will be injected
+        on creation.
+
+        @property container
+        @default null
+        @since 1.3.0
+      */
+      container: null,
+
+
+      /**
+        The container-debug-adapter which is used
+        to list all models.
+
+        @property containerDebugAdapter
+        @default undefined
+        @since 1.5.0
+      **/
+      containerDebugAdapter: undefined,
+
+      /**
+        Number of attributes to send
+        as columns. (Enough to make the record
+        identifiable).
+
+        @private
+        @property attributeLimit
+        @default 3
+        @since 1.3.0
+      */
+      attributeLimit: 3,
+
+      /**
+        Stores all methods that clear observers.
+        These methods will be called on destruction.
+
+        @private
+        @property releaseMethods
+        @since 1.3.0
+      */
+      releaseMethods: A(),
+
+      /**
+        Specifies how records can be filtered.
+        Records returned will need to have a `filterValues`
+        property with a key for every name in the returned array.
+
+        @public
+        @method getFilters
+        @return {Array} List of objects defining filters.
+         The object should have a `name` and `desc` property.
+      */
+      getFilters: function() {
+        return A();
+      },
+
+      /**
+        Fetch the model types and observe them for changes.
+
+        @public
+        @method watchModelTypes
+
+        @param {Function} typesAdded Callback to call to add types.
+        Takes an array of objects containing wrapped types (returned from `wrapModelType`).
+
+        @param {Function} typesUpdated Callback to call when a type has changed.
+        Takes an array of objects containing wrapped types.
+
+        @return {Function} Method to call to remove all observers
+      */
+      watchModelTypes: function(typesAdded, typesUpdated) {
+        var modelTypes = this.getModelTypes(),
+            self = this, typesToSend, releaseMethods = A();
+
+        typesToSend = modelTypes.map(function(type) {
+          var klass = type.klass;
+          var wrapped = self.wrapModelType(klass, type.name);
+          releaseMethods.push(self.observeModelType(klass, typesUpdated));
+          return wrapped;
+        });
+
+        typesAdded(typesToSend);
+
+        var release = function() {
+          releaseMethods.forEach(function(fn) { fn(); });
+          self.releaseMethods.removeObject(release);
+        };
+        this.releaseMethods.pushObject(release);
+        return release;
+      },
+
+      _nameToClass: function(type) {
+        if (typeof type === 'string') {
+          type = this.container.lookupFactory('model:' + type);
+        }
+        return type;
+      },
+
+      /**
+        Fetch the records of a given type and observe them for changes.
+
+        @public
+        @method watchRecords
+
+        @param {Function} recordsAdded Callback to call to add records.
+        Takes an array of objects containing wrapped records.
+        The object should have the following properties:
+          columnValues: {Object} key and value of a table cell
+          object: {Object} the actual record object
+
+        @param {Function} recordsUpdated Callback to call when a record has changed.
+        Takes an array of objects containing wrapped records.
+
+        @param {Function} recordsRemoved Callback to call when a record has removed.
+        Takes the following parameters:
+          index: the array index where the records were removed
+          count: the number of records removed
+
+        @return {Function} Method to call to remove all observers
+      */
+      watchRecords: function(type, recordsAdded, recordsUpdated, recordsRemoved) {
+        var self = this, releaseMethods = A(), records = this.getRecords(type), release;
+
+        var recordUpdated = function(updatedRecord) {
+          recordsUpdated([updatedRecord]);
+        };
+
+        var recordsToSend = records.map(function(record) {
+          releaseMethods.push(self.observeRecord(record, recordUpdated));
+          return self.wrapRecord(record);
+        });
+
+
+        var contentDidChange = function(array, idx, removedCount, addedCount) {
+          for (var i = idx; i < idx + addedCount; i++) {
+            var record = array.objectAt(i);
+            var wrapped = self.wrapRecord(record);
+            releaseMethods.push(self.observeRecord(record, recordUpdated));
+            recordsAdded([wrapped]);
+          }
+
+          if (removedCount) {
+            recordsRemoved(idx, removedCount);
+          }
+        };
+
+        var observer = { didChange: contentDidChange, willChange: Ember.K };
+        records.addArrayObserver(self, observer);
+
+        release = function() {
+          releaseMethods.forEach(function(fn) { fn(); });
+          records.removeArrayObserver(self, observer);
+          self.releaseMethods.removeObject(release);
+        };
+
+        recordsAdded(recordsToSend);
+
+        this.releaseMethods.pushObject(release);
+        return release;
+      },
+
+      /**
+        Clear all observers before destruction
+        @private
+        @method willDestroy
+      */
+      willDestroy: function() {
+        this._super();
+        this.releaseMethods.forEach(function(fn) {
+          fn();
+        });
+      },
+
+      /**
+        Detect whether a class is a model.
+
+        Test that against the model class
+        of your persistence library
+
+        @private
+        @method detect
+        @param {Class} klass The class to test
+        @return boolean Whether the class is a model class or not
+      */
+      detect: function(klass) {
+        return false;
+      },
+
+      /**
+        Get the columns for a given model type.
+
+        @private
+        @method columnsForType
+        @param {Class} type The model type
+        @return {Array} An array of columns of the following format:
+         name: {String} name of the column
+         desc: {String} Humanized description (what would show in a table column name)
+      */
+      columnsForType: function(type) {
+        return A();
+      },
+
+      /**
+        Adds observers to a model type class.
+
+        @private
+        @method observeModelType
+        @param {Class} type The model type class
+        @param {Function} typesUpdated Called when a type is modified.
+        @return {Function} The function to call to remove observers
+      */
+
+      observeModelType: function(type, typesUpdated) {
+        var self = this, records = this.getRecords(type);
+
+        var onChange = function() {
+          typesUpdated([self.wrapModelType(type)]);
+        };
+        var observer = {
+          didChange: function() {
+            run.scheduleOnce('actions', this, onChange);
+          },
+          willChange: Ember.K
+        };
+
+        records.addArrayObserver(this, observer);
+
+        var release = function() {
+          records.removeArrayObserver(self, observer);
+        };
+
+        return release;
+      },
+
+
+      /**
+        Wraps a given model type and observes changes to it.
+
+        @private
+        @method wrapModelType
+        @param {Class} type A model class
+        @param {String}  Optional name of the class
+        @return {Object} contains the wrapped type and the function to remove observers
+        Format:
+          type: {Object} the wrapped type
+            The wrapped type has the following format:
+              name: {String} name of the type
+              count: {Integer} number of records available
+              columns: {Columns} array of columns to describe the record
+              object: {Class} the actual Model type class
+          release: {Function} The function to remove observers
+      */
+      wrapModelType: function(type, name) {
+        var release, records = this.getRecords(type),
+            typeToSend, self = this;
+
+        typeToSend = {
+          name: name || type.toString(),
+          count: get(records, 'length'),
+          columns: this.columnsForType(type),
+          object: type
+        };
+
+
+        return typeToSend;
+      },
+
+
+      /**
+        Fetches all models defined in the application.
+
+        @private
+        @method getModelTypes
+        @return {Array} Array of model types
+      */
+      getModelTypes: function() {
+        var types, self = this,
+            containerDebugAdapter = this.get('containerDebugAdapter');
+
+        if (containerDebugAdapter.canCatalogEntriesByType('model')) {
+          types = containerDebugAdapter.catalogEntriesByType('model');
+        } else {
+          types = this._getObjectsOnNamespaces();
+        }
+
+        // New adapters return strings instead of classes
+        types = A(types).map(function(name) {
+          return {
+            klass: self._nameToClass(name),
+            name: name
+          };
+        });
+        types = A(types).filter(function(type) {
+          return self.detect(type.klass);
+        });
+
+        return A(types);
+      },
+
+      /**
+        Loops over all namespaces and all objects
+        attached to them
+
+        @private
+        @method _getObjectsOnNamespaces
+        @return {Array} Array of model type strings
+      */
+      _getObjectsOnNamespaces: function() {
+        var namespaces = A(Namespace.NAMESPACES),
+            types = A(),
+            self = this;
+
+        namespaces.forEach(function(namespace) {
+          for (var key in namespace) {
+            if (!namespace.hasOwnProperty(key)) { continue; }
+            // Even though we will filter again in `getModelTypes`,
+            // we should not call `lookupContainer` on non-models
+            // (especially when `Ember.MODEL_FACTORY_INJECTIONS` is `true`)
+            if (!self.detect(namespace[key])) { continue; }
+            var name = dasherize(key);
+            if (!(namespace instanceof Application) && namespace.toString()) {
+              name = namespace + '/' + name;
+            }
+            types.push(name);
+          }
+        });
+        return types;
+      },
+
+      /**
+        Fetches all loaded records for a given type.
+
+        @private
+        @method getRecords
+        @return {Array} An array of records.
+         This array will be observed for changes,
+         so it should update when new records are added/removed.
+      */
+      getRecords: function(type) {
+        return A();
+      },
+
+      /**
+        Wraps a record and observers changes to it.
+
+        @private
+        @method wrapRecord
+        @param {Object} record The record instance.
+        @return {Object} The wrapped record. Format:
+        columnValues: {Array}
+        searchKeywords: {Array}
+      */
+      wrapRecord: function(record) {
+        var recordToSend = { object: record }, columnValues = {}, self = this;
+
+        recordToSend.columnValues = this.getRecordColumnValues(record);
+        recordToSend.searchKeywords = this.getRecordKeywords(record);
+        recordToSend.filterValues = this.getRecordFilterValues(record);
+        recordToSend.color = this.getRecordColor(record);
+
+        return recordToSend;
+      },
+
+      /**
+        Gets the values for each column.
+
+        @private
+        @method getRecordColumnValues
+        @return {Object} Keys should match column names defined
+        by the model type.
+      */
+      getRecordColumnValues: function(record) {
+        return {};
+      },
+
+      /**
+        Returns keywords to match when searching records.
+
+        @private
+        @method getRecordKeywords
+        @return {Array} Relevant keywords for search.
+      */
+      getRecordKeywords: function(record) {
+        return A();
+      },
+
+      /**
+        Returns the values of filters defined by `getFilters`.
+
+        @private
+        @method getRecordFilterValues
+        @param {Object} record The record instance
+        @return {Object} The filter values
+      */
+      getRecordFilterValues: function(record) {
+        return {};
+      },
+
+      /**
+        Each record can have a color that represents its state.
+
+        @private
+        @method getRecordColor
+        @param {Object} record The record instance
+        @return {String} The record's color
+          Possible options: black, red, blue, green
+      */
+      getRecordColor: function(record) {
+        return null;
+      },
+
+      /**
+        Observes all relevant properties and re-sends the wrapped record
+        when a change occurs.
+
+        @private
+        @method observerRecord
+        @param {Object} record The record instance
+        @param {Function} recordUpdated The callback to call when a record is updated.
+        @return {Function} The function to call to remove all observers.
+      */
+      observeRecord: function(record, recordUpdated) {
+        return function(){};
+      }
+
+    });
+
+    __exports__["default"] = DataAdapter;
+  });
+define("ember-extension-support/initializers",
+  [],
+  function() {
+    "use strict";
+
+  });
+define("ember-extension-support",
+  ["ember-metal/core","ember-extension-support/data_adapter","ember-extension-support/container_debug_adapter"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
+    "use strict";
+    /**
+    Ember Extension Support
+
+    @module ember
+    @submodule ember-extension-support
+    @requires ember-application
+    */
+
+    var Ember = __dependency1__["default"];
+    var DataAdapter = __dependency2__["default"];
+    var ContainerDebugAdapter = __dependency3__["default"];
+
+    Ember.DataAdapter = DataAdapter;
+    Ember.ContainerDebugAdapter = ContainerDebugAdapter;
+  });
+})();
+
+(function() {
+define("ember-testing/adapters/adapter",
+  ["ember-metal/core","ember-metal/utils","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.K
+    var inspect = __dependency2__.inspect;
+    var EmberObject = __dependency3__["default"];
+
+    /**
+     @module ember
+     @submodule ember-testing
+    */
+
+    /**
+      The primary purpose of this class is to create hooks that can be implemented
+      by an adapter for various test frameworks.
+
+      @class Adapter
+      @namespace Ember.Test
+    */
+    var Adapter = EmberObject.extend({
+      /**
+        This callback will be called whenever an async operation is about to start.
+
+        Override this to call your framework's methods that handle async
+        operations.
+
+        @public
+        @method asyncStart
+      */
+      asyncStart: Ember.K,
+
+      /**
+        This callback will be called whenever an async operation has completed.
+
+        @public
+        @method asyncEnd
+      */
+      asyncEnd: Ember.K,
+
+      /**
+        Override this method with your testing framework's false assertion.
+        This function is called whenever an exception occurs causing the testing
+        promise to fail.
+
+        QUnit example:
+
+        ```javascript
+          exception: function(error) {
+            ok(false, error);
+          };
+        ```
+
+        @public
+        @method exception
+        @param {String} error The exception to be raised.
+      */
+      exception: function(error) {
+        throw error;
+      }
+    });
+
+    __exports__["default"] = Adapter;
+  });
+define("ember-testing/adapters/qunit",
+  ["ember-testing/adapters/adapter","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Adapter = __dependency1__["default"];
+    var inspect = __dependency2__.inspect;
+
+    /**
+      This class implements the methods defined by Ember.Test.Adapter for the
+      QUnit testing framework.
+
+      @class QUnitAdapter
+      @namespace Ember.Test
+      @extends Ember.Test.Adapter
+    */
+    var QUnitAdapter = Adapter.extend({
+      asyncStart: function() {
+        QUnit.stop();
+      },
+      asyncEnd: function() {
+        QUnit.start();
+      },
+      exception: function(error) {
+        ok(false, inspect(error));
+      }
+    });
+
+    __exports__["default"] = QUnitAdapter;
+  });
+define("ember-testing/helpers",
+  ["ember-metal/property_get","ember-metal/error","ember-metal/run_loop","ember-views/system/jquery","ember-testing/test"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var EmberError = __dependency2__["default"];
+    var run = __dependency3__["default"];
+    var jQuery = __dependency4__["default"];
+    var Test = __dependency5__["default"];
+
+    /**
+    * @module ember
+    * @submodule ember-testing
+    */
+
+    var helper = Test.registerHelper,
+        asyncHelper = Test.registerAsyncHelper,
+        countAsync = 0;
+
+    function currentRouteName(app){
+      var appController = app.__container__.lookup('controller:application');
+
+      return get(appController, 'currentRouteName');
+    }
+
+    function currentPath(app){
+      var appController = app.__container__.lookup('controller:application');
+
+      return get(appController, 'currentPath');
+    }
+
+    function currentURL(app){
+      var router = app.__container__.lookup('router:main');
+
+      return get(router, 'location').getURL();
+    }
+
+    function visit(app, url) {
+      var router = app.__container__.lookup('router:main');
+      router.location.setURL(url);
+
+      if (app._readinessDeferrals > 0) {
+        router['initialURL'] = url;
+        run(app, 'advanceReadiness');
+        delete router['initialURL'];
+      } else {
+        run(app, app.handleURL, url);
+      }
+
+      return wait(app);
+    }
+
+    function click(app, selector, context) {
+      var $el = findWithAssert(app, selector, context);
+      run($el, 'mousedown');
+
+      if ($el.is(':input')) {
+        var type = $el.prop('type');
+        if (type !== 'checkbox' && type !== 'radio' && type !== 'hidden') {
+          run($el, function(){
+            // Firefox does not trigger the `focusin` event if the window
+            // does not have focus. If the document doesn't have focus just
+            // use trigger('focusin') instead.
+            if (!document.hasFocus || document.hasFocus()) {
+              this.focus();
+            } else {
+              this.trigger('focusin');
+            }
+          });
+        }
+      }
+
+      run($el, 'mouseup');
+      run($el, 'click');
+
+      return wait(app);
+    }
+
+    function triggerEvent(app, selector, context, type, options){
+      if (arguments.length === 3) {
+        type = context;
+        context = null;
+      }
+
+      if (typeof options === 'undefined') {
+        options = {};
+      }
+
+      var $el = findWithAssert(app, selector, context);
+
+      var event = jQuery.Event(type, options);
+
+      run($el, 'trigger', event);
+
+      return wait(app);
+    }
+
+    function keyEvent(app, selector, context, type, keyCode) {
+      if (typeof keyCode === 'undefined') {
+        keyCode = type;
+        type = context;
+        context = null;
+      }
+
+      return triggerEvent(app, selector, context, type, { keyCode: keyCode, which: keyCode });
+    }
+
+    function fillIn(app, selector, context, text) {
+      var $el;
+      if (typeof text === 'undefined') {
+        text = context;
+        context = null;
+      }
+      $el = findWithAssert(app, selector, context);
+      run(function() {
+        $el.val(text).change();
+      });
+      return wait(app);
+    }
+
+    function findWithAssert(app, selector, context) {
+      var $el = find(app, selector, context);
+      if ($el.length === 0) {
+        throw new EmberError("Element " + selector + " not found.");
+      }
+      return $el;
+    }
+
+    function find(app, selector, context) {
+      var $el;
+      context = context || get(app, 'rootElement');
+      $el = app.$(selector, context);
+
+      return $el;
+    }
+
+    function andThen(app, callback) {
+      return wait(app, callback(app));
+    }
+
+    function wait(app, value) {
+      return Test.promise(function(resolve) {
+        // If this is the first async promise, kick off the async test
+        if (++countAsync === 1) {
+          Test.adapter.asyncStart();
+        }
+
+        // Every 10ms, poll for the async thing to have finished
+        var watcher = setInterval(function() {
+          // 1. If the router is loading, keep polling
+          var routerIsLoading = !!app.__container__.lookup('router:main').router.activeTransition;
+          if (routerIsLoading) { return; }
+
+          // 2. If there are pending Ajax requests, keep polling
+          if (Test.pendingAjaxRequests) { return; }
+
+          // 3. If there are scheduled timers or we are inside of a run loop, keep polling
+          if (run.hasScheduledTimers() || run.currentRunLoop) { return; }
+          if (Test.waiters && Test.waiters.any(function(waiter) {
+            var context = waiter[0];
+            var callback = waiter[1];
+            return !callback.call(context);
+          })) { return; }
+          // Stop polling
+          clearInterval(watcher);
+
+          // If this is the last async promise, end the async test
+          if (--countAsync === 0) {
+            Test.adapter.asyncEnd();
+          }
+
+          // Synchronously resolve the promise
+          run(null, resolve, value);
+        }, 10);
+      });
+
+    }
+
+
+    /**
+    * Loads a route, sets up any controllers, and renders any templates associated
+    * with the route as though a real user had triggered the route change while
+    * using your app.
+    *
+    * Example:
+    *
+    * ```javascript
+    * visit('posts/index').then(function() {
+    *   // assert something
+    * });
+    * ```
+    *
+    * @method visit
+    * @param {String} url the name of the route
+    * @return {RSVP.Promise}
+    */
+    asyncHelper('visit', visit);
+
+    /**
+    * Clicks an element and triggers any actions triggered by the element's `click`
+    * event.
+    *
+    * Example:
+    *
+    * ```javascript
+    * click('.some-jQuery-selector').then(function() {
+    *   // assert something
+    * });
+    * ```
+    *
+    * @method click
+    * @param {String} selector jQuery selector for finding element on the DOM
+    * @return {RSVP.Promise}
+    */
+    asyncHelper('click', click);
+
+    /**
+    * Simulates a key event, e.g. `keypress`, `keydown`, `keyup` with the desired keyCode
+    *
+    * Example:
+    *
+    * ```javascript
+    * keyEvent('.some-jQuery-selector', 'keypress', 13).then(function() {
+    *  // assert something
+    * });
+    * ```
+    *
+    * @method keyEvent
+    * @param {String} selector jQuery selector for finding element on the DOM
+    * @param {String} type the type of key event, e.g. `keypress`, `keydown`, `keyup`
+    * @param {Number} keyCode the keyCode of the simulated key event
+    * @return {RSVP.Promise}
+    * @since 1.5.0
+    */
+    asyncHelper('keyEvent', keyEvent);
+
+    /**
+    * Fills in an input element with some text.
+    *
+    * Example:
+    *
+    * ```javascript
+    * fillIn('#email', 'you@example.com').then(function() {
+    *   // assert something
+    * });
+    * ```
+    *
+    * @method fillIn
+    * @param {String} selector jQuery selector finding an input element on the DOM
+    * to fill text with
+    * @param {String} text text to place inside the input element
+    * @return {RSVP.Promise}
+    */
+    asyncHelper('fillIn', fillIn);
+
+    /**
+    * Finds an element in the context of the app's container element. A simple alias
+    * for `app.$(selector)`.
+    *
+    * Example:
+    *
+    * ```javascript
+    * var $el = find('.my-selector');
+    * ```
+    *
+    * @method find
+    * @param {String} selector jQuery string selector for element lookup
+    * @return {Object} jQuery object representing the results of the query
+    */
+    helper('find', find);
+
+    /**
+    * Like `find`, but throws an error if the element selector returns no results.
+    *
+    * Example:
+    *
+    * ```javascript
+    * var $el = findWithAssert('.doesnt-exist'); // throws error
+    * ```
+    *
+    * @method findWithAssert
+    * @param {String} selector jQuery selector string for finding an element within
+    * the DOM
+    * @return {Object} jQuery object representing the results of the query
+    * @throws {Error} throws error if jQuery object returned has a length of 0
+    */
+    helper('findWithAssert', findWithAssert);
+
+    /**
+      Causes the run loop to process any pending events. This is used to ensure that
+      any async operations from other helpers (or your assertions) have been processed.
+
+      This is most often used as the return value for the helper functions (see 'click',
+      'fillIn','visit',etc).
+
+      Example:
+
+      ```javascript
+      Ember.Test.registerAsyncHelper('loginUser', function(app, username, password) {
+        visit('secured/path/here')
+        .fillIn('#username', username)
+        .fillIn('#password', username)
+        .click('.submit')
+
+        return wait();
+      });
+
+      @method wait
+      @param {Object} value The value to be returned.
+      @return {RSVP.Promise}
+    */
+    asyncHelper('wait', wait);
+    asyncHelper('andThen', andThen);
+
+
+    /**
+      Returns the currently active route name.
+
+    Example:
+
+    ```javascript
+    function validateRouteName(){
+    equal(currentRouteName(), 'some.path', "correct route was transitioned into.");
+    }
+
+    visit('/some/path').then(validateRouteName)
+    ```
+
+    @method currentRouteName
+    @return {Object} The name of the currently active route.
+    @since 1.5.0
+    */
+    helper('currentRouteName', currentRouteName);
+
+    /**
+      Returns the current path.
+
+    Example:
+
+    ```javascript
+    function validateURL(){
+    equal(currentPath(), 'some.path.index', "correct path was transitioned into.");
+    }
+
+    click('#some-link-id').then(validateURL);
+    ```
+
+    @method currentPath
+    @return {Object} The currently active path.
+    @since 1.5.0
+    */
+    helper('currentPath', currentPath);
+
+    /**
+      Returns the current URL.
+
+    Example:
+
+    ```javascript
+    function validateURL(){
+    equal(currentURL(), '/some/path', "correct URL was transitioned into.");
+    }
+
+    click('#some-link-id').then(validateURL);
+    ```
+
+    @method currentURL
+    @return {Object} The currently active URL.
+    @since 1.5.0
+    */
+    helper('currentURL', currentURL);
+
+    /**
+      Triggers the given event on the element identified by the provided selector.
+
+      Example:
+
+      ```javascript
+      triggerEvent('#some-elem-id', 'blur');
+      ```
+
+      This is actually used internally by the `keyEvent` helper like so:
+
+      ```javascript
+      triggerEvent('#some-elem-id', 'keypress', { keyCode: 13 });
+      ```
+
+     @method triggerEvent
+     @param {String} selector jQuery selector for finding element on the DOM
+     @param {String} type The event type to be triggered.
+     @param {String} options The options to be passed to jQuery.Event.
+     @return {RSVP.Promise}
+     @since 1.5.0
+    */
+    asyncHelper('triggerEvent', triggerEvent);
+  });
+define("ember-testing/initializers",
+  ["ember-runtime/system/lazy_load"],
+  function(__dependency1__) {
+    "use strict";
+    var onLoad = __dependency1__.onLoad;
+
+    var name = 'deferReadiness in `testing` mode';
+
+    onLoad('Ember.Application', function(Application) {
+      if (!Application.initializers[name]) {
+        Application.initializer({
+          name: name,
+
+          initialize: function(container, application){
+            if (application.testing) {
+              application.deferReadiness();
+            }
+          }
+        });
+      }
+    });
+  });
+define("ember-testing",
+  ["ember-metal/core","ember-testing/initializers","ember-testing/support","ember-testing/setup_for_testing","ember-testing/test","ember-testing/adapters/adapter","ember-testing/adapters/qunit","ember-testing/helpers"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+
+    // to setup initializer
+         // to handle various edge cases
+
+    var setupForTesting = __dependency4__["default"];
+    var Test = __dependency5__["default"];
+    var Adapter = __dependency6__["default"];
+    var QUnitAdapter = __dependency7__["default"];
+         // adds helpers to helpers object in Test
+
+    /**
+      Ember Testing
+
+      @module ember
+      @submodule ember-testing
+      @requires ember-application
+    */
+
+    Ember.Test = Test;
+    Ember.Test.Adapter = Adapter;
+    Ember.Test.QUnitAdapter = QUnitAdapter;
+    Ember.setupForTesting = setupForTesting;
+  });
+define("ember-testing/setup_for_testing",
+  ["ember-metal/core","ember-testing/adapters/qunit","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // import Test from "ember-testing/test";  // ES6TODO: fix when cycles are supported
+    var QUnitAdapter = __dependency2__["default"];
+    var jQuery = __dependency3__["default"];
+
+    var Test;
+
+    function incrementAjaxPendingRequests(){
+      Test.pendingAjaxRequests++;
+    }
+
+    function decrementAjaxPendingRequests(){
+      Ember.assert("An ajaxComplete event which would cause the number of pending AJAX " +
+                   "requests to be negative has been triggered. This is most likely " +
+                   "caused by AJAX events that were started before calling " +
+                   "`injectTestHelpers()`.", Test.pendingAjaxRequests !== 0);
+      Test.pendingAjaxRequests--;
+    }
+
+    /**
+      Sets Ember up for testing. This is useful to perform
+      basic setup steps in order to unit test.
+
+      Use `App.setupForTesting` to perform integration tests (full
+      application testing).
+
+      @method setupForTesting
+      @namespace Ember
+      @since 1.5.0
+    */
+    function setupForTesting() {
+      if (!Test) { Test = requireModule('ember-testing/test')['default']; }
+
+      Ember.testing = true;
+
+      // if adapter is not manually set default to QUnit
+      if (!Test.adapter) {
+        Test.adapter = QUnitAdapter.create();
+      }
+
+      if (!Test.pendingAjaxRequests) {
+        Test.pendingAjaxRequests = 0;
+      }
+
+      jQuery(document).off('ajaxSend', incrementAjaxPendingRequests);
+      jQuery(document).off('ajaxComplete', decrementAjaxPendingRequests);
+      jQuery(document).on('ajaxSend', incrementAjaxPendingRequests);
+      jQuery(document).on('ajaxComplete', decrementAjaxPendingRequests);
+    };
+
+    __exports__["default"] = setupForTesting;
+  });
+define("ember-testing/support",
+  ["ember-metal/core","ember-views/system/jquery"],
+  function(__dependency1__, __dependency2__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var jQuery = __dependency2__["default"];
+
+    /**
+      @module ember
+      @submodule ember-testing
+     */
+
+    var $ = jQuery;
+
+    /**
+      This method creates a checkbox and triggers the click event to fire the
+      passed in handler. It is used to correct for a bug in older versions
+      of jQuery (e.g 1.8.3).
+
+      @private
+      @method testCheckboxClick
+    */
+    function testCheckboxClick(handler) {
+      $('<input type="checkbox">')
+        .css({ position: 'absolute', left: '-1000px', top: '-1000px' })
+        .appendTo('body')
+        .on('click', handler)
+        .trigger('click')
+        .remove();
+    }
+
+    $(function() {
+      /*
+        Determine whether a checkbox checked using jQuery's "click" method will have
+        the correct value for its checked property.
+
+        If we determine that the current jQuery version exhibits this behavior,
+        patch it to work correctly as in the commit for the actual fix:
+        https://github.com/jquery/jquery/commit/1fb2f92.
+      */
+      testCheckboxClick(function() {
+        if (!this.checked && !$.event.special.click) {
+          $.event.special.click = {
+            // For checkbox, fire native event so checked state will be right
+            trigger: function() {
+              if ($.nodeName( this, "input" ) && this.type === "checkbox" && this.click) {
+                this.click();
+                return false;
+              }
+            }
+          };
+        }
+      });
+
+      // Try again to verify that the patch took effect or blow up.
+      testCheckboxClick(function() {
+        Ember.warn("clicked checkboxes should be checked! the jQuery patch didn't work", this.checked);
+      });
+    });
+  });
+define("ember-testing/test",
+  ["ember-metal/core","ember-metal/run_loop","ember-metal/platform","ember-runtime/compare","ember-runtime/ext/rsvp","ember-testing/setup_for_testing","ember-application/system/application","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var emberRun = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var compare = __dependency4__["default"];
+    var RSVP = __dependency5__["default"];
+    var setupForTesting = __dependency6__["default"];
+    var EmberApplication = __dependency7__["default"];
+
+    /**
+      @module ember
+      @submodule ember-testing
+     */
+    var slice = [].slice,
+        helpers = {},
+        injectHelpersCallbacks = [];
+
+    /**
+      This is a container for an assortment of testing related functionality:
+
+      * Choose your default test adapter (for your framework of choice).
+      * Register/Unregister additional test helpers.
+      * Setup callbacks to be fired when the test helpers are injected into
+        your application.
+
+      @class Test
+      @namespace Ember
+    */
+    var Test = {
+
+      /**
+        `registerHelper` is used to register a test helper that will be injected
+        when `App.injectTestHelpers` is called.
+
+        The helper method will always be called with the current Application as
+        the first parameter.
+
+        For example:
+
+        ```javascript
+        Ember.Test.registerHelper('boot', function(app) {
+          Ember.run(app, app.advanceReadiness);
+        });
+        ```
+
+        This helper can later be called without arguments because it will be
+        called with `app` as the first parameter.
+
+        ```javascript
+        App = Ember.Application.create();
+        App.injectTestHelpers();
+        boot();
+        ```
+
+        @public
+        @method registerHelper
+        @param {String} name The name of the helper method to add.
+        @param {Function} helperMethod
+        @param options {Object}
+      */
+      registerHelper: function(name, helperMethod) {
+        helpers[name] = {
+          method: helperMethod,
+          meta: { wait: false }
+        };
+      },
+
+      /**
+        `registerAsyncHelper` is used to register an async test helper that will be injected
+        when `App.injectTestHelpers` is called.
+
+        The helper method will always be called with the current Application as
+        the first parameter.
+
+        For example:
+
+        ```javascript
+        Ember.Test.registerAsyncHelper('boot', function(app) {
+          Ember.run(app, app.advanceReadiness);
+        });
+        ```
+
+        The advantage of an async helper is that it will not run
+        until the last async helper has completed.  All async helpers
+        after it will wait for it complete before running.
+
+
+        For example:
+
+        ```javascript
+        Ember.Test.registerAsyncHelper('deletePost', function(app, postId) {
+          click('.delete-' + postId);
+        });
+
+        // ... in your test
+        visit('/post/2');
+        deletePost(2);
+        visit('/post/3');
+        deletePost(3);
+        ```
+
+        @public
+        @method registerAsyncHelper
+        @param {String} name The name of the helper method to add.
+        @param {Function} helperMethod
+        @since 1.2.0
+      */
+      registerAsyncHelper: function(name, helperMethod) {
+        helpers[name] = {
+          method: helperMethod,
+          meta: { wait: true }
+        };
+      },
+
+      /**
+        Remove a previously added helper method.
+
+        Example:
+
+        ```javascript
+        Ember.Test.unregisterHelper('wait');
+        ```
+
+        @public
+        @method unregisterHelper
+        @param {String} name The helper to remove.
+      */
+      unregisterHelper: function(name) {
+        delete helpers[name];
+        delete Test.Promise.prototype[name];
+      },
+
+      /**
+        Used to register callbacks to be fired whenever `App.injectTestHelpers`
+        is called.
+
+        The callback will receive the current application as an argument.
+
+        Example:
+
+        ```javascript
+        Ember.Test.onInjectHelpers(function() {
+          Ember.$(document).ajaxSend(function() {
+            Test.pendingAjaxRequests++;
+          });
+
+          Ember.$(document).ajaxComplete(function() {
+            Test.pendingAjaxRequests--;
+          });
+        });
+        ```
+
+        @public
+        @method onInjectHelpers
+        @param {Function} callback The function to be called.
+      */
+      onInjectHelpers: function(callback) {
+        injectHelpersCallbacks.push(callback);
+      },
+
+      /**
+        This returns a thenable tailored for testing.  It catches failed
+        `onSuccess` callbacks and invokes the `Ember.Test.adapter.exception`
+        callback in the last chained then.
+
+        This method should be returned by async helpers such as `wait`.
+
+        @public
+        @method promise
+        @param {Function} resolver The function used to resolve the promise.
+      */
+      promise: function(resolver) {
+        return new Test.Promise(resolver);
+      },
+
+      /**
+       Used to allow ember-testing to communicate with a specific testing
+       framework.
+
+       You can manually set it before calling `App.setupForTesting()`.
+
+       Example:
+
+       ```javascript
+       Ember.Test.adapter = MyCustomAdapter.create()
+       ```
+
+       If you do not set it, ember-testing will default to `Ember.Test.QUnitAdapter`.
+
+       @public
+       @property adapter
+       @type {Class} The adapter to be used.
+       @default Ember.Test.QUnitAdapter
+      */
+      adapter: null,
+
+      /**
+        Replacement for `Ember.RSVP.resolve`
+        The only difference is this uses
+        and instance of `Ember.Test.Promise`
+
+        @public
+        @method resolve
+        @param {Mixed} The value to resolve
+        @since 1.2.0
+      */
+      resolve: function(val) {
+        return Test.promise(function(resolve) {
+          return resolve(val);
+        });
+      },
+
+      /**
+         This allows ember-testing to play nicely with other asynchronous
+         events, such as an application that is waiting for a CSS3
+         transition or an IndexDB transaction.
+
+         For example:
+
+         ```javascript
+         Ember.Test.registerWaiter(function() {
+           return myPendingTransactions() == 0;
+         });
+         ```
+         The `context` argument allows you to optionally specify the `this`
+         with which your callback will be invoked.
+
+         For example:
+
+         ```javascript
+         Ember.Test.registerWaiter(MyDB, MyDB.hasPendingTransactions);
+         ```
+
+         @public
+         @method registerWaiter
+         @param {Object} context (optional)
+         @param {Function} callback
+         @since 1.2.0
+      */
+      registerWaiter: function(context, callback) {
+        if (arguments.length === 1) {
+          callback = context;
+          context = null;
+        }
+        if (!this.waiters) {
+          this.waiters = Ember.A();
+        }
+        this.waiters.push([context, callback]);
+      },
+      /**
+         `unregisterWaiter` is used to unregister a callback that was
+         registered with `registerWaiter`.
+
+         @public
+         @method unregisterWaiter
+         @param {Object} context (optional)
+         @param {Function} callback
+         @since 1.2.0
+      */
+      unregisterWaiter: function(context, callback) {
+        var pair;
+        if (!this.waiters) { return; }
+        if (arguments.length === 1) {
+          callback = context;
+          context = null;
+        }
+        pair = [context, callback];
+        this.waiters = Ember.A(this.waiters.filter(function(elt) {
+          return compare(elt, pair)!==0;
+        }));
+      }
+    };
+
+    function helper(app, name) {
+      var fn = helpers[name].method,
+          meta = helpers[name].meta;
+
+      return function() {
+        var args = slice.call(arguments),
+            lastPromise = Test.lastPromise;
+
+        args.unshift(app);
+
+        // some helpers are not async and
+        // need to return a value immediately.
+        // example: `find`
+        if (!meta.wait) {
+          return fn.apply(app, args);
+        }
+
+        if (!lastPromise) {
+          // It's the first async helper in current context
+          lastPromise = fn.apply(app, args);
+        } else {
+          // wait for last helper's promise to resolve
+          // and then execute
+          run(function() {
+            lastPromise = Test.resolve(lastPromise).then(function() {
+              return fn.apply(app, args);
+            });
+          });
+        }
+
+        return lastPromise;
+      };
+    }
+
+    function run(fn) {
+      if (!emberRun.currentRunLoop) {
+        emberRun(fn);
+      } else {
+        fn();
+      }
+    }
+
+    EmberApplication.reopen({
+      /**
+       This property contains the testing helpers for the current application. These
+       are created once you call `injectTestHelpers` on your `Ember.Application`
+       instance. The included helpers are also available on the `window` object by
+       default, but can be used from this object on the individual application also.
+
+        @property testHelpers
+        @type {Object}
+        @default {}
+      */
+      testHelpers: {},
+
+      /**
+       This property will contain the original methods that were registered
+       on the `helperContainer` before `injectTestHelpers` is called.
+
+       When `removeTestHelpers` is called, these methods are restored to the
+       `helperContainer`.
+
+        @property originalMethods
+        @type {Object}
+        @default {}
+        @private
+        @since 1.3.0
+      */
+      originalMethods: {},
+
+
+      /**
+      This property indicates whether or not this application is currently in
+      testing mode. This is set when `setupForTesting` is called on the current
+      application.
+
+      @property testing
+      @type {Boolean}
+      @default false
+      @since 1.3.0
+      */
+      testing: false,
+
+      /**
+       This hook defers the readiness of the application, so that you can start
+       the app when your tests are ready to run. It also sets the router's
+       location to 'none', so that the window's location will not be modified
+       (preventing both accidental leaking of state between tests and interference
+       with your testing framework).
+
+       Example:
+
+      ```
+      App.setupForTesting();
+      ```
+
+        @method setupForTesting
+      */
+      setupForTesting: function() {
+        setupForTesting();
+
+        this.testing = true;
+
+        this.Router.reopen({
+          location: 'none'
+        });
+      },
+
+      /**
+        This will be used as the container to inject the test helpers into. By
+        default the helpers are injected into `window`.
+
+        @property helperContainer
+        @type {Object} The object to be used for test helpers.
+        @default window
+        @since 1.2.0
+      */
+      helperContainer: window,
+
+      /**
+        This injects the test helpers into the `helperContainer` object. If an object is provided
+        it will be used as the helperContainer. If `helperContainer` is not set it will default
+        to `window`. If a function of the same name has already been defined it will be cached
+        (so that it can be reset if the helper is removed with `unregisterHelper` or
+        `removeTestHelpers`).
+
+       Any callbacks registered with `onInjectHelpers` will be called once the
+       helpers have been injected.
+
+      Example:
+      ```
+      App.injectTestHelpers();
+      ```
+
+        @method injectTestHelpers
+      */
+      injectTestHelpers: function(helperContainer) {
+        if (helperContainer) { this.helperContainer = helperContainer; }
+
+        this.testHelpers = {};
+        for (var name in helpers) {
+          this.originalMethods[name] = this.helperContainer[name];
+          this.testHelpers[name] = this.helperContainer[name] = helper(this, name);
+          protoWrap(Test.Promise.prototype, name, helper(this, name), helpers[name].meta.wait);
+        }
+
+        for(var i = 0, l = injectHelpersCallbacks.length; i < l; i++) {
+          injectHelpersCallbacks[i](this);
+        }
+      },
+
+      /**
+        This removes all helpers that have been registered, and resets and functions
+        that were overridden by the helpers.
+
+        Example:
+
+        ```javascript
+        App.removeTestHelpers();
+        ```
+
+        @public
+        @method removeTestHelpers
+      */
+      removeTestHelpers: function() {
+        for (var name in helpers) {
+          this.helperContainer[name] = this.originalMethods[name];
+          delete this.testHelpers[name];
+          delete this.originalMethods[name];
+        }
+      }
+    });
+
+    // This method is no longer needed
+    // But still here for backwards compatibility
+    // of helper chaining
+    function protoWrap(proto, name, callback, isAsync) {
+      proto[name] = function() {
+        var args = arguments;
+        if (isAsync) {
+          return callback.apply(this, args);
+        } else {
+          return this.then(function() {
+            return callback.apply(this, args);
+          });
+        }
+      };
+    }
+
+    Test.Promise = function() {
+      RSVP.Promise.apply(this, arguments);
+      Test.lastPromise = this;
+    };
+
+    Test.Promise.prototype = create(RSVP.Promise.prototype);
+    Test.Promise.prototype.constructor = Test.Promise;
+
+    // Patch `then` to isolate async methods
+    // specifically `Ember.Test.lastPromise`
+    var originalThen = RSVP.Promise.prototype.then;
+    Test.Promise.prototype.then = function(onSuccess, onFailure) {
+      return originalThen.call(this, function(val) {
+        return isolate(onSuccess, val);
+      }, onFailure);
+    };
+
+    // This method isolates nested async methods
+    // so that they don't conflict with other last promises.
+    //
+    // 1. Set `Ember.Test.lastPromise` to null
+    // 2. Invoke method
+    // 3. Return the last promise created during method
+    // 4. Restore `Ember.Test.lastPromise` to original value
+    function isolate(fn, val) {
+      var value, lastPromise;
+
+      // Reset lastPromise for nested helpers
+      Test.lastPromise = null;
+
+      value = fn(val);
+
+      lastPromise = Test.lastPromise;
+
+      // If the method returned a promise
+      // return that promise. If not,
+      // return the last async helper's promise
+      if ((value && (value instanceof Test.Promise)) || !lastPromise) {
+        return value;
+      } else {
+        run(function() {
+          lastPromise = Test.resolve(lastPromise).then(function() {
+            return value;
+          });
+        });
+        return lastPromise;
+      }
+    }
+
+    __exports__["default"] = Test;
+  });
+})();
+
+define("container/container",
+  ["container/inheriting_dict","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var InheritingDict = __dependency1__["default"];
+
+    // A lightweight container that helps to assemble and decouple components.
+    // Public api for the container is still in flux.
+    // The public api, specified on the application namespace should be considered the stable api.
+    function Container(parent) {
+      this.parent = parent;
+      this.children = [];
+
+      this.resolver = parent && parent.resolver || function() {};
+
+      this.registry = new InheritingDict(parent && parent.registry);
+      this.cache = new InheritingDict(parent && parent.cache);
+      this.factoryCache = new InheritingDict(parent && parent.factoryCache);
+      this.resolveCache = new InheritingDict(parent && parent.resolveCache);
+      this.typeInjections = new InheritingDict(parent && parent.typeInjections);
+      this.injections = {};
+
+      this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
+      this.factoryInjections = {};
+
+      this._options = new InheritingDict(parent && parent._options);
+      this._typeOptions = new InheritingDict(parent && parent._typeOptions);
+    }
+
+    Container.prototype = {
+
+      /**
+        @property parent
+        @type Container
+        @default null
+      */
+      parent: null,
+
+      /**
+        @property children
+        @type Array
+        @default []
+      */
+      children: null,
+
+      /**
+        @property resolver
+        @type function
+      */
+      resolver: null,
+
+      /**
+        @property registry
+        @type InheritingDict
+      */
+      registry: null,
+
+      /**
+        @property cache
+        @type InheritingDict
+      */
+      cache: null,
+
+      /**
+        @property typeInjections
+        @type InheritingDict
+      */
+      typeInjections: null,
+
+      /**
+        @property injections
+        @type Object
+        @default {}
+      */
+      injections: null,
+
+      /**
+        @private
+
+        @property _options
+        @type InheritingDict
+        @default null
+      */
+      _options: null,
+
+      /**
+        @private
+
+        @property _typeOptions
+        @type InheritingDict
+      */
+      _typeOptions: null,
+
+      /**
+        Returns a new child of the current container. These children are configured
+        to correctly inherit from the current container.
+
+        @method child
+        @return {Container}
+      */
+      child: function() {
+        var container = new Container(this);
+        this.children.push(container);
+        return container;
+      },
+
+      /**
+        Sets a key-value pair on the current container. If a parent container,
+        has the same key, once set on a child, the parent and child will diverge
+        as expected.
+
+        @method set
+        @param {Object} object
+        @param {String} key
+        @param {any} value
+      */
+      set: function(object, key, value) {
+        object[key] = value;
+      },
+
+      /**
+        Registers a factory for later injection.
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('model:user', Person, {singleton: false });
+        container.register('fruit:favorite', Orange);
+        container.register('communication:main', Email, {singleton: false});
+        ```
+
+        @method register
+        @param {String} fullName
+        @param {Function} factory
+        @param {Object} options
+      */
+      register: function(fullName, factory, options) {
+        validateFullName(fullName);
+
+        if (factory === undefined) {
+          throw new TypeError('Attempting to register an unknown factory: `' + fullName + '`');
+        }
+
+        var normalizedName = this.normalize(fullName);
+
+        if (this.cache.has(normalizedName)) {
+          throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
+        }
+
+        this.registry.set(normalizedName, factory);
+        this._options.set(normalizedName, options || {});
+      },
+
+      /**
+        Unregister a fullName
+
+        ```javascript
+        var container = new Container();
+        container.register('model:user', User);
+
+        container.lookup('model:user') instanceof User //=> true
+
+        container.unregister('model:user')
+        container.lookup('model:user') === undefined //=> true
+        ```
+
+        @method unregister
+        @param {String} fullName
+       */
+      unregister: function(fullName) {
+        validateFullName(fullName);
+
+        var normalizedName = this.normalize(fullName);
+
+        this.registry.remove(normalizedName);
+        this.cache.remove(normalizedName);
+        this.factoryCache.remove(normalizedName);
+        this.resolveCache.remove(normalizedName);
+        this._options.remove(normalizedName);
+      },
+
+      /**
+        Given a fullName return the corresponding factory.
+
+        By default `resolve` will retrieve the factory from
+        its container's registry.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        container.resolve('api:twitter') // => Twitter
+        ```
+
+        Optionally the container can be provided with a custom resolver.
+        If provided, `resolve` will first provide the custom resolver
+        the opportunity to resolve the fullName, otherwise it will fallback
+        to the registry.
+
+        ```javascript
+        var container = new Container();
+        container.resolver = function(fullName) {
+          // lookup via the module system of choice
+        };
+
+        // the twitter factory is added to the module system
+        container.resolve('api:twitter') // => Twitter
+        ```
+
+        @method resolve
+        @param {String} fullName
+        @return {Function} fullName's factory
+      */
+      resolve: function(fullName) {
+        validateFullName(fullName);
+
+        var normalizedName = this.normalize(fullName);
+        var cached = this.resolveCache.get(normalizedName);
+
+        if (cached) { return cached; }
+
+        var resolved = this.resolver(normalizedName) || this.registry.get(normalizedName);
+
+        this.resolveCache.set(normalizedName, resolved);
+
+        return resolved;
+      },
+
+      /**
+        A hook that can be used to describe how the resolver will
+        attempt to find the factory.
+
+        For example, the default Ember `.describe` returns the full
+        class name (including namespace) where Ember's resolver expects
+        to find the `fullName`.
+
+        @method describe
+        @param {String} fullName
+        @return {string} described fullName
+      */
+      describe: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        A hook to enable custom fullName normalization behaviour
+
+        @method normalize
+        @param {String} fullName
+        @return {string} normalized fullName
+      */
+      normalize: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        @method makeToString
+
+        @param {any} factory
+        @param {string} fullName
+        @return {function} toString function
+      */
+      makeToString: function(factory, fullName) {
+        return factory.toString();
+      },
+
+      /**
+        Given a fullName return a corresponding instance.
+
+        The default behaviour is for lookup to return a singleton instance.
+        The singleton is scoped to the container, allowing multiple containers
+        to all have their own locally scoped singletons.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        var twitter = container.lookup('api:twitter');
+
+        twitter instanceof Twitter; // => true
+
+        // by default the container will return singletons
+        var twitter2 = container.lookup('api:twitter');
+        twitter2 instanceof Twitter; // => true
+
+        twitter === twitter2; //=> true
+        ```
+
+        If singletons are not wanted an optional flag can be provided at lookup.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        var twitter = container.lookup('api:twitter', { singleton: false });
+        var twitter2 = container.lookup('api:twitter', { singleton: false });
+
+        twitter === twitter2; //=> false
+        ```
+
+        @method lookup
+        @param {String} fullName
+        @param {Object} options
+        @return {any}
+      */
+      lookup: function(fullName, options) {
+        validateFullName(fullName);
+        return lookup(this, this.normalize(fullName), options);
+      },
+
+      /**
+        Given a fullName return the corresponding factory.
+
+        @method lookupFactory
+        @param {String} fullName
+        @return {any}
+      */
+      lookupFactory: function(fullName) {
+        validateFullName(fullName);
+        return factoryFor(this, this.normalize(fullName));
+      },
+
+      /**
+        Given a fullName check if the container is aware of its factory
+        or singleton instance.
+
+        @method has
+        @param {String} fullName
+        @return {Boolean}
+      */
+      has: function(fullName) {
+        validateFullName(fullName);
+        return has(this, this.normalize(fullName));
+      },
+
+      /**
+        Allow registering options for all factories of a type.
+
+        ```javascript
+        var container = new Container();
+
+        // if all of type `connection` must not be singletons
+        container.optionsForType('connection', { singleton: false });
+
+        container.register('connection:twitter', TwitterConnection);
+        container.register('connection:facebook', FacebookConnection);
+
+        var twitter = container.lookup('connection:twitter');
+        var twitter2 = container.lookup('connection:twitter');
+
+        twitter === twitter2; // => false
+
+        var facebook = container.lookup('connection:facebook');
+        var facebook2 = container.lookup('connection:facebook');
+
+        facebook === facebook2; // => false
+        ```
+
+        @method optionsForType
+        @param {String} type
+        @param {Object} options
+      */
+      optionsForType: function(type, options) {
+        if (this.parent) { illegalChildOperation('optionsForType'); }
+
+        this._typeOptions.set(type, options);
+      },
+
+      /**
+        @method options
+        @param {String} type
+        @param {Object} options
+      */
+      options: function(type, options) {
+        this.optionsForType(type, options);
+      },
+
+      /**
+        Used only via `injection`.
+
+        Provides a specialized form of injection, specifically enabling
+        all objects of one type to be injected with a reference to another
+        object.
+
+        For example, provided each object of type `controller` needed a `router`.
+        one would do the following:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('router:main', Router);
+        container.register('controller:user', UserController);
+        container.register('controller:post', PostController);
+
+        container.typeInjection('controller', 'router', 'router:main');
+
+        var user = container.lookup('controller:user');
+        var post = container.lookup('controller:post');
+
+        user.router instanceof Router; //=> true
+        post.router instanceof Router; //=> true
+
+        // both controllers share the same router
+        user.router === post.router; //=> true
+        ```
+
+        @private
+        @method typeInjection
+        @param {String} type
+        @param {String} property
+        @param {String} fullName
+      */
+      typeInjection: function(type, property, fullName) {
+        validateFullName(fullName);
+        if (this.parent) { illegalChildOperation('typeInjection'); }
+
+        var fullNameType = fullName.split(':')[0];
+        if(fullNameType === type) {
+          throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
+        }
+        addTypeInjection(this.typeInjections, type, property, fullName);
+      },
+
+      /**
+        Defines injection rules.
+
+        These rules are used to inject dependencies onto objects when they
+        are instantiated.
+
+        Two forms of injections are possible:
+
+        * Injecting one fullName on another fullName
+        * Injecting one fullName on a type
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('source:main', Source);
+        container.register('model:user', User);
+        container.register('model:post', Post);
+
+        // injecting one fullName on another fullName
+        // eg. each user model gets a post model
+        container.injection('model:user', 'post', 'model:post');
+
+        // injecting one fullName on another type
+        container.injection('model', 'source', 'source:main');
+
+        var user = container.lookup('model:user');
+        var post = container.lookup('model:post');
+
+        user.source instanceof Source; //=> true
+        post.source instanceof Source; //=> true
+
+        user.post instanceof Post; //=> true
+
+        // and both models share the same source
+        user.source === post.source; //=> true
+        ```
+
+        @method injection
+        @param {String} factoryName
+        @param {String} property
+        @param {String} injectionName
+      */
+      injection: function(fullName, property, injectionName) {
+        if (this.parent) { illegalChildOperation('injection'); }
+
+        validateFullName(injectionName);
+        var normalizedInjectionName = this.normalize(injectionName);
+
+        if (fullName.indexOf(':') === -1) {
+          return this.typeInjection(fullName, property, normalizedInjectionName);
+        }
+
+        validateFullName(fullName);
+        var normalizedName = this.normalize(fullName);
+
+        addInjection(this.injections, normalizedName, property, normalizedInjectionName);
+      },
+
+
+      /**
+        Used only via `factoryInjection`.
+
+        Provides a specialized form of injection, specifically enabling
+        all factory of one type to be injected with a reference to another
+        object.
+
+        For example, provided each factory of type `model` needed a `store`.
+        one would do the following:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('store:main', SomeStore);
+
+        container.factoryTypeInjection('model', 'store', 'store:main');
+
+        var store = container.lookup('store:main');
+        var UserFactory = container.lookupFactory('model:user');
+
+        UserFactory.store instanceof SomeStore; //=> true
+        ```
+
+        @private
+        @method factoryTypeInjection
+        @param {String} type
+        @param {String} property
+        @param {String} fullName
+      */
+      factoryTypeInjection: function(type, property, fullName) {
+        if (this.parent) { illegalChildOperation('factoryTypeInjection'); }
+
+        addTypeInjection(this.factoryTypeInjections, type, property, this.normalize(fullName));
+      },
+
+      /**
+        Defines factory injection rules.
+
+        Similar to regular injection rules, but are run against factories, via
+        `Container#lookupFactory`.
+
+        These rules are used to inject objects onto factories when they
+        are looked up.
+
+        Two forms of injections are possible:
+
+      * Injecting one fullName on another fullName
+      * Injecting one fullName on a type
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('store:main', Store);
+        container.register('store:secondary', OtherStore);
+        container.register('model:user', User);
+        container.register('model:post', Post);
+
+        // injecting one fullName on another type
+        container.factoryInjection('model', 'store', 'store:main');
+
+        // injecting one fullName on another fullName
+        container.factoryInjection('model:post', 'secondaryStore', 'store:secondary');
+
+        var UserFactory = container.lookupFactory('model:user');
+        var PostFactory = container.lookupFactory('model:post');
+        var store = container.lookup('store:main');
+
+        UserFactory.store instanceof Store; //=> true
+        UserFactory.secondaryStore instanceof OtherStore; //=> false
+
+        PostFactory.store instanceof Store; //=> true
+        PostFactory.secondaryStore instanceof OtherStore; //=> true
+
+        // and both models share the same source instance
+        UserFactory.store === PostFactory.store; //=> true
+        ```
+
+        @method factoryInjection
+        @param {String} factoryName
+        @param {String} property
+        @param {String} injectionName
+      */
+      factoryInjection: function(fullName, property, injectionName) {
+        if (this.parent) { illegalChildOperation('injection'); }
+
+        var normalizedName = this.normalize(fullName);
+        var normalizedInjectionName = this.normalize(injectionName);
+
+        validateFullName(injectionName);
+
+        if (fullName.indexOf(':') === -1) {
+          return this.factoryTypeInjection(normalizedName, property, normalizedInjectionName);
+        }
+
+        validateFullName(fullName);
+
+        addInjection(this.factoryInjections, normalizedName, property, normalizedInjectionName);
+      },
+
+      /**
+        A depth first traversal, destroying the container, its descendant containers and all
+        their managed objects.
+
+        @method destroy
+      */
+      destroy: function() {
+        for (var i=0, l=this.children.length; i<l; i++) {
+          this.children[i].destroy();
+        }
+
+        this.children = [];
+
+        eachDestroyable(this, function(item) {
+          item.destroy();
+        });
+
+        this.parent = undefined;
+        this.isDestroyed = true;
+      },
+
+      /**
+        @method reset
+      */
+      reset: function() {
+        for (var i=0, l=this.children.length; i<l; i++) {
+          resetCache(this.children[i]);
+        }
+        resetCache(this);
+      }
+    };
+
+    function has(container, fullName){
+      if (container.cache.has(fullName)) {
+        return true;
+      }
+
+      return !!container.resolve(fullName);
+    }
+
+    function lookup(container, fullName, options) {
+      options = options || {};
+
+      if (container.cache.has(fullName) && options.singleton !== false) {
+        return container.cache.get(fullName);
+      }
+
+      var value = instantiate(container, fullName);
+
+      if (value === undefined) { return; }
+
+      if (isSingleton(container, fullName) && options.singleton !== false) {
+        container.cache.set(fullName, value);
+      }
+
+      return value;
+    }
+
+    function illegalChildOperation(operation) {
+      throw new Error(operation + " is not currently supported on child containers");
+    }
+
+    function isSingleton(container, fullName) {
+      var singleton = option(container, fullName, 'singleton');
+
+      return singleton !== false;
+    }
+
+    function buildInjections(container, injections) {
+      var hash = {};
+
+      if (!injections) { return hash; }
+
+      var injection, injectable;
+
+      for (var i=0, l=injections.length; i<l; i++) {
+        injection = injections[i];
+        injectable = lookup(container, injection.fullName);
+
+        if (injectable !== undefined) {
+          hash[injection.property] = injectable;
+        } else {
+          throw new Error('Attempting to inject an unknown injection: `' + injection.fullName + '`');
+        }
+      }
+
+      return hash;
+    }
+
+    function option(container, fullName, optionName) {
+      var options = container._options.get(fullName);
+
+      if (options && options[optionName] !== undefined) {
+        return options[optionName];
+      }
+
+      var type = fullName.split(":")[0];
+      options = container._typeOptions.get(type);
+
+      if (options) {
+        return options[optionName];
+      }
+    }
+
+    function factoryFor(container, fullName) {
+      var name = fullName;
+      var factory = container.resolve(name);
+      var injectedFactory;
+      var cache = container.factoryCache;
+      var type = fullName.split(":")[0];
+
+      if (factory === undefined) { return; }
+
+      if (cache.has(fullName)) {
+        return cache.get(fullName);
+      }
+
+      if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
+        // TODO: think about a 'safe' merge style extension
+        // for now just fallback to create time injection
+        return factory;
+      } else {
+
+        var injections        = injectionsFor(container, fullName);
+        var factoryInjections = factoryInjectionsFor(container, fullName);
+
+        factoryInjections._toString = container.makeToString(factory, fullName);
+
+        injectedFactory = factory.extend(injections);
+        injectedFactory.reopenClass(factoryInjections);
+
+        cache.set(fullName, injectedFactory);
+
+        return injectedFactory;
+      }
+    }
+
+    function injectionsFor(container, fullName) {
+      var splitName = fullName.split(":"),
+        type = splitName[0],
+        injections = [];
+
+      injections = injections.concat(container.typeInjections.get(type) || []);
+      injections = injections.concat(container.injections[fullName] || []);
+
+      injections = buildInjections(container, injections);
+      injections._debugContainerKey = fullName;
+      injections.container = container;
+
+      return injections;
+    }
+
+    function factoryInjectionsFor(container, fullName) {
+      var splitName = fullName.split(":"),
+        type = splitName[0],
+        factoryInjections = [];
+
+      factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
+      factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
+
+      factoryInjections = buildInjections(container, factoryInjections);
+      factoryInjections._debugContainerKey = fullName;
+
+      return factoryInjections;
+    }
+
+    function instantiate(container, fullName) {
+      var factory = factoryFor(container, fullName);
+
+      if (option(container, fullName, 'instantiate') === false) {
+        return factory;
+      }
+
+      if (factory) {
+        if (typeof factory.extend === 'function') {
+          // assume the factory was extendable and is already injected
+          return factory.create();
+        } else {
+          // assume the factory was extendable
+          // to create time injections
+          // TODO: support new'ing for instantiation and merge injections for pure JS Functions
+          return factory.create(injectionsFor(container, fullName));
+        }
+      }
+    }
+
+    function eachDestroyable(container, callback) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        callback(value);
+      });
+    }
+
+    function resetCache(container) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        value.destroy();
+      });
+      container.cache.dict = {};
+    }
+
+    function addTypeInjection(rules, type, property, fullName) {
+      var injections = rules.get(type);
+
+      if (!injections) {
+        injections = [];
+        rules.set(type, injections);
+      }
+
+      injections.push({
+        property: property,
+        fullName: fullName
+      });
+    }
+
+    var VALID_FULL_NAME_REGEXP = /^[^:]+.+:[^:]+$/;
+    function validateFullName(fullName) {
+      if (!VALID_FULL_NAME_REGEXP.test(fullName)) {
+        throw new TypeError('Invalid Fullname, expected: `type:name` got: ' + fullName);
+      }
+    }
+
+    function addInjection(rules, factoryName, property, injectionName) {
+      var injections = rules[factoryName] = rules[factoryName] || [];
+      injections.push({ property: property, fullName: injectionName });
+    }
+
+    __exports__["default"] = Container;
+  });define("ember-runtime/ext/rsvp",
+  ["ember-metal/core","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var Logger = __dependency2__["default"];
+
+    var RSVP = requireModule("rsvp");
+    var Test, testModuleName = 'ember-testing/test';
+
+    RSVP.onerrorDefault = function(error) {
+      if (error instanceof Error) {
+        if (Ember.testing) {
+          // ES6TODO: remove when possible
+          if (!Test && Ember.__loader.registry[testModuleName]) {
+            Test = requireModule(testModuleName)['default'];
+          }
+
+          if (Test && Test.adapter) {
+            Test.adapter.exception(error);
+          } else {
+            throw error;
+          }
+        } else if (Ember.onerror) {
+          Ember.onerror(error);
+        } else {
+          Logger.error(error.stack);
+          Ember.assert(error, false);
+        }
+      }
+    };
+
+    RSVP.on('error', RSVP.onerrorDefault);
+
+    __exports__["default"] = RSVP;
+  });define("ember-runtime/system/container",
+  ["ember-metal/property_set","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var set = __dependency1__["default"];
+
+    var Container = requireModule('container')["default"];
+    Container.set = set;
+
+    __exports__["default"] = Container;
+  });(function() {
+// ensure that minispade loads the following modules first
+// ensure that the global exports have occurred for above
+// required packages
+requireModule('ember-metal');
+requireModule('ember-runtime');
+requireModule('ember-handlebars');
+requireModule('ember-views');
+requireModule('ember-routing');
+requireModule('ember-application');
+requireModule('ember-extension-support');
+
+// do this to ensure that Ember.Test is defined properly on the global
+// if it is present.
+if (Ember.__loader.registry['ember-testing']) {
+  requireModule('ember-testing');
+}
+
+/**
+Ember
+
+@module ember
+*/
+
+function throwWithMessage(msg) {
+  return function() {
+    throw new Ember.Error(msg);
+  };
+}
+
+function generateRemovedClass(className) {
+  var msg = " has been moved into a plugin: https://github.com/emberjs/ember-states";
+
+  return {
+    extend: throwWithMessage(className + msg),
+    create: throwWithMessage(className + msg)
+  };
+}
+
+Ember.StateManager = generateRemovedClass("Ember.StateManager");
+
+/**
+  This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
+
+  @class StateManager
+  @namespace Ember
+*/
+
+Ember.State = generateRemovedClass("Ember.State");
+
+/**
+  This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
+
+  @class State
+  @namespace Ember
+*/
+
+})();
+
+
+})();
diff --git a/vendor/assets/ember/production/ember-data.js b/vendor/assets/ember/production/ember-data.js
new file mode 100644
index 000000000..eba4dc73f
--- /dev/null
+++ b/vendor/assets/ember/production/ember-data.js
@@ -0,0 +1,10189 @@
+// Fetched from channel: tags/v0.14, with url http://builds.emberjs.com/tags/v0.14/ember-data.prod.js
+// Fetched on: 2024-01-19T09:54:38Z
+(function() {
+var define, requireModule;
+
+(function() {
+  var registry = {}, seen = {};
+
+  define = function(name, deps, callback) {
+    registry[name] = { deps: deps, callback: callback };
+  };
+
+  requireModule = function(name) {
+    if (seen[name]) { return seen[name]; }
+    seen[name] = {};
+
+    var mod, deps, callback, reified , exports;
+
+    mod = registry[name];
+
+    if (!mod) {
+      throw new Error("Module '" + name + "' not found.");
+    }
+
+    deps = mod.deps;
+    callback = mod.callback;
+    reified = [];
+    exports;
+
+    for (var i=0, l=deps.length; i<l; i++) {
+      if (deps[i] === 'exports') {
+        reified.push(exports = {});
+      } else {
+        reified.push(requireModule(deps[i]));
+      }
+    }
+
+    var value = callback.apply(this, reified);
+    return seen[name] = exports || value;
+  };
+})();
+(function() {
+/**
+  @module ember-data
+*/
+
+/**
+  All Ember Data methods and functions are defined inside of this namespace.
+
+  @class DS
+  @static
+*/
+
+if ('undefined' === typeof DS) {
+  /*global DS:true*/
+  DS = Ember.Namespace.create({
+    VERSION: '0.14'
+  });
+
+  if ('undefined' !== typeof window) {
+    window.DS = DS;
+  }
+}
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set;
+
+DS.NewJSONSerializer = Ember.Object.extend({
+  deserialize: function(type, data) {
+    var store = get(this, 'store');
+
+    type.eachRelationship(function(key, relationship) {
+      var type = relationship.type,
+          value = data[key];
+
+      if (value == null) { return; }
+
+      if (relationship.kind === 'belongsTo') {
+        this.deserializeRecordId(data, key, type, value);
+      } else if (relationship.kind === 'hasMany') {
+        this.deserializeRecordIds(data, key, type, value);
+      }
+    }, this);
+
+    return data;
+  },
+
+  deserializeRecordId: function(data, key, type, id) {
+    if (typeof id === 'number' || typeof id === 'string') {
+      data[key] = get(this, 'store').recordFor(type, id);
+    }
+  },
+
+  deserializeRecordIds: function(data, key, type, ids) {
+    for (var i=0, l=ids.length; i<l; i++) {
+      this.deserializeRecordId(ids, i, type, ids[i]);
+    }
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+// Keep ED compatible with previous versions of ember
+// TODO: Remove this check for Ember 1.0
+if (!Ember.DataAdapter) { return; }
+
+var get = Ember.get, capitalize = Ember.String.capitalize, underscore = Ember.String.underscore, DS = window.DS ;
+
+/**
+  Extend `Ember.DataAdapter` with ED specific code.
+*/
+DS.DebugAdapter = Ember.DataAdapter.extend({
+  getFilters: function() {
+    return [
+      { name: 'isNew', desc: 'New' },
+      { name: 'isModified', desc: 'Modified' },
+      { name: 'isClean', desc: 'Clean' }
+    ];
+  },
+
+  detect: function(klass) {
+    return klass !== DS.Model && DS.Model.detect(klass);
+  },
+
+  columnsForType: function(type) {
+    var columns = [{ name: 'id', desc: 'Id' }], count = 0, self = this;
+    Ember.A(get(type, 'attributes')).forEach(function(name, meta) {
+        if (count++ > self.attributeLimit) { return false; }
+        var desc = capitalize(underscore(name).replace('_', ' '));
+        columns.push({ name: name, desc: desc });
+    });
+    return columns;
+  },
+
+  getRecords: function(type) {
+    return this.get('store').all(type);
+  },
+
+  getRecordColumnValues: function(record) {
+    var self = this, count = 0,
+        columnValues = { id: get(record, 'id') };
+
+    record.eachAttribute(function(key) {
+      if (count++ > self.attributeLimit) {
+        return false;
+      }
+      var value = get(record, key);
+      columnValues[key] = value;
+    });
+    return columnValues;
+  },
+
+  getRecordKeywords: function(record) {
+    var keywords = [], keys = Ember.A(['id']);
+    record.eachAttribute(function(key) {
+      keys.push(key);
+    });
+    keys.forEach(function(key) {
+      keywords.push(get(record, key));
+    });
+    return keywords;
+  },
+
+  getRecordFilterValues: function(record) {
+    return {
+      isNew: record.get('isNew'),
+      isModified: record.get('isDirty') && !record.get('isNew'),
+      isClean: !record.get('isDirty')
+    };
+  },
+
+  getRecordColor: function(record) {
+    var color = 'black';
+    if (record.get('isNew')) {
+      color = 'green';
+    } else if (record.get('isDirty')) {
+      color = 'blue';
+    }
+    return color;
+  },
+
+  observeRecord: function(record, recordUpdated) {
+    var releaseMethods = Ember.A(), self = this,
+        keysToObserve = Ember.A(['id', 'isNew', 'isDirty']);
+
+    record.eachAttribute(function(key) {
+      keysToObserve.push(key);
+    });
+
+    keysToObserve.forEach(function(key) {
+      var handler = function() {
+        recordUpdated(self.wrapRecord(record));
+      };
+      Ember.addObserver(record, key, handler);
+      releaseMethods.push(function() {
+        Ember.removeObserver(record, key, handler);
+      });
+    });
+
+    var release = function() {
+      releaseMethods.forEach(function(fn) { fn(); } );
+    };
+
+    return release;
+  }
+
+});
+
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var set = Ember.set;
+
+/*
+  This code registers an injection for Ember.Application.
+
+  If an Ember.js developer defines a subclass of DS.Store on their application,
+  this code will automatically instantiate it and make it available on the
+  router.
+
+  Additionally, after an application's controllers have been injected, they will
+  each have the store made available to them.
+
+  For example, imagine an Ember.js application with the following classes:
+
+  App.Store = DS.Store.extend({
+    adapter: 'App.MyCustomAdapter'
+  });
+
+  App.PostsController = Ember.ArrayController.extend({
+    // ...
+  });
+
+  When the application is initialized, `App.Store` will automatically be
+  instantiated, and the instance of `App.PostsController` will have its `store`
+  property set to that instance.
+
+  Note that this code will only be run if the `ember-application` package is
+  loaded. If Ember Data is being used in an environment other than a
+  typical application (e.g., node.js where only `ember-runtime` is available),
+  this code will be ignored.
+*/
+
+Ember.onLoad('Ember.Application', function(Application) {
+  Application.initializer({
+    name: "store",
+
+    initialize: function(container, application) {
+
+
+      application.register('store:main', application.Store);
+      application.register('serializer:_default', DS.NewJSONSerializer);
+
+      // Eagerly generate the store so defaultStore is populated.
+      // TODO: Do this in a finisher hook
+      container.lookup('store:main');
+    }
+  });
+
+  // Keep ED compatible with previous versions of ember
+  // TODO: Remove the if statement for Ember 1.0
+  if (DS.DebugAdapter) {
+    Application.initializer({
+      name: "dataAdapter",
+
+      initialize: function(container, application) {
+        application.register('dataAdapter:main', DS.DebugAdapter);
+      }
+    });
+  }
+
+  Application.initializer({
+    name: "injectStore",
+
+    initialize: function(container, application) {
+      application.inject('controller', 'store', 'store:main');
+      application.inject('route', 'store', 'store:main');
+      application.inject('dataAdapter', 'store', 'store:main');
+    }
+  });
+
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+/**
+  Date.parse with progressive enhancement for ISO 8601 <https://github.com/csnover/js-iso8601>
+
+  © 2011 Colin Snover <http://zetafleet.com>
+
+  Released under MIT license.
+
+  @class Date
+  @namespace Ember
+  @static
+*/
+Ember.Date = Ember.Date || {};
+
+var origParse = Date.parse, numericKeys = [ 1, 4, 5, 6, 7, 10, 11 ];
+
+/**
+  @method parse
+  @param date
+*/
+Ember.Date.parse = function (date) {
+    var timestamp, struct, minutesOffset = 0;
+
+    // ES5 §15.9.4.2 states that the string should attempt to be parsed as a Date Time String Format string
+    // before falling back to any implementation-specific date parsing, so that’s what we do, even if native
+    // implementations could be faster
+    //              1 YYYY                2 MM       3 DD           4 HH    5 mm       6 ss        7 msec        8 Z 9 ±    10 tzHH    11 tzmm
+    if ((struct = /^(\d{4}|[+\-]\d{6})(?:-(\d{2})(?:-(\d{2}))?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(\d{2})(?::(\d{2}))?)?)?$/.exec(date))) {
+        // avoid NaN timestamps caused by “undefined” values being passed to Date.UTC
+        for (var i = 0, k; (k = numericKeys[i]); ++i) {
+            struct[k] = +struct[k] || 0;
+        }
+
+        // allow undefined days and months
+        struct[2] = (+struct[2] || 1) - 1;
+        struct[3] = +struct[3] || 1;
+
+        if (struct[8] !== 'Z' && struct[9] !== undefined) {
+            minutesOffset = struct[10] * 60 + struct[11];
+
+            if (struct[9] === '+') {
+                minutesOffset = 0 - minutesOffset;
+            }
+        }
+
+        timestamp = Date.UTC(struct[1], struct[2], struct[3], struct[4], struct[5] + minutesOffset, struct[6], struct[7]);
+    }
+    else {
+        timestamp = origParse ? origParse(date) : NaN;
+    }
+
+    return timestamp;
+};
+
+if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Date) {
+  Date.parse = Ember.Date.parse;
+}
+
+})();
+
+
+
+(function() {
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var Evented = Ember.Evented,              // ember-runtime/mixins/evented
+    Deferred = Ember.DeferredMixin,       // ember-runtime/mixins/evented
+    run = Ember.run,                      // ember-metal/run-loop
+    get = Ember.get;                      // ember-metal/accessors
+
+var LoadPromise = Ember.Mixin.create(Evented, Deferred, {
+  init: function() {
+    this._super.apply(this, arguments);
+
+    this.one('didLoad', this, function() {
+      this.resolve(this);
+    });
+
+    this.one('becameError', this, function() {
+      this.reject(this);
+    });
+
+    if (get(this, 'isLoaded')) {
+      this.trigger('didLoad');
+    }
+  }
+});
+
+DS.LoadPromise = LoadPromise;
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+var LoadPromise = DS.LoadPromise; // system/mixins/load_promise
+
+/**
+  A record array is an array that contains records of a certain type. The record
+  array materializes records as needed when they are retrieved for the first
+  time. You should not create record arrays yourself. Instead, an instance of
+  DS.RecordArray or its subclasses will be returned by your application's store
+  in response to queries.
+
+  @class RecordArray
+  @namespace DS
+  @extends Ember.ArrayProxy
+  @uses Ember.Evented
+  @uses DS.LoadPromise
+*/
+
+DS.RecordArray = Ember.ArrayProxy.extend(LoadPromise, {
+  /**
+    The model type contained by this record array.
+
+    @property type
+    @type DS.Model
+  */
+  type: null,
+
+  // The array of client ids backing the record array. When a
+  // record is requested from the record array, the record
+  // for the client id at the same index is materialized, if
+  // necessary, by the store.
+  content: null,
+
+  isLoaded: false,
+  isUpdating: false,
+
+  // The store that created this record array.
+  store: null,
+
+  objectAtContent: function(index) {
+    var content = get(this, 'content'),
+        reference = content.objectAt(index),
+        store = get(this, 'store');
+
+    if (reference instanceof DS.Model) {
+      return reference;
+    }
+
+    if (reference) {
+      return store.recordForReference(reference);
+    }
+  },
+
+  materializedObjectAt: function(index) {
+    var reference = get(this, 'content').objectAt(index);
+    if (!reference) { return; }
+
+    if (get(this, 'store').recordIsMaterialized(reference)) {
+      return this.objectAt(index);
+    }
+  },
+
+  update: function() {
+    if (get(this, 'isUpdating')) { return; }
+
+    var store = get(this, 'store'),
+        type = get(this, 'type');
+
+    store.fetchAll(type, this);
+  },
+
+  addReference: function(reference) {
+    get(this, 'content').addObject(reference);
+  },
+
+  removeReference: function(reference) {
+    get(this, 'content').removeObject(reference);
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get;
+
+/**
+  @class FilteredRecordArray
+  @namespace DS
+  @extends DS.RecordArray
+*/
+DS.FilteredRecordArray = DS.RecordArray.extend({
+  filterFunction: null,
+  isLoaded: true,
+
+  replace: function() {
+    var type = get(this, 'type').toString();
+    throw new Error("The result of a client-side filter (on " + type + ") is immutable.");
+  },
+
+  updateFilter: Ember.observer(function() {
+    var manager = get(this, 'manager');
+    manager.updateFilter(this, get(this, 'type'), get(this, 'filterFunction'));
+  }, 'filterFunction')
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+/**
+  @class AdapterPopulatedRecordArray
+  @namespace DS
+  @extends DS.RecordArray
+*/
+DS.AdapterPopulatedRecordArray = DS.RecordArray.extend({
+  query: null,
+
+  replace: function() {
+    var type = get(this, 'type').toString();
+    throw new Error("The result of a server query (on " + type + ") is immutable.");
+  },
+
+  load: function(references) {
+    this.setProperties({
+      content: Ember.A(references),
+      isLoaded: true
+    });
+
+    // TODO: does triggering didLoad event should be the last action of the runLoop?
+    Ember.run.once(this, 'trigger', 'didLoad');
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+var map = Ember.EnumerableUtils.map;
+
+/**
+  A ManyArray is a RecordArray that represents the contents of a has-many
+  relationship.
+
+  The ManyArray is instantiated lazily the first time the relationship is
+  requested.
+
+  ### Inverses
+
+  Often, the relationships in Ember Data applications will have
+  an inverse. For example, imagine the following models are
+  defined:
+
+      App.Post = DS.Model.extend({
+        comments: DS.hasMany('App.Comment')
+      });
+
+      App.Comment = DS.Model.extend({
+        post: DS.belongsTo('App.Post')
+      });
+
+  If you created a new instance of `App.Post` and added
+  a `App.Comment` record to its `comments` has-many
+  relationship, you would expect the comment's `post`
+  property to be set to the post that contained
+  the has-many.
+
+  We call the record to which a relationship belongs the
+  relationship's _owner_.
+
+  @class ManyArray
+  @namespace DS
+  @extends DS.RecordArray
+*/
+DS.ManyArray = DS.RecordArray.extend({
+  init: function() {
+    this._super.apply(this, arguments);
+    this._changesToSync = Ember.OrderedSet.create();
+  },
+
+  /**
+    The record to which this relationship belongs.
+
+    @property {DS.Model}
+    @private
+  */
+  owner: null,
+
+  /**
+    `true` if the relationship is polymorphic, `false` otherwise.
+
+    @property {Boolean}
+    @private
+  */
+  isPolymorphic: false,
+
+  // LOADING STATE
+
+  isLoaded: false,
+
+  loadingRecordsCount: function(count) {
+    this.loadingRecordsCount = count;
+  },
+
+  loadedRecord: function() {
+    this.loadingRecordsCount--;
+    if (this.loadingRecordsCount === 0) {
+      set(this, 'isLoaded', true);
+      this.trigger('didLoad');
+    }
+  },
+
+  fetch: function() {
+    var references = get(this, 'content'),
+        store = get(this, 'store'),
+        owner = get(this, 'owner');
+
+    store.fetchUnloadedReferences(references, owner);
+  },
+
+  // Overrides Ember.Array's replace method to implement
+  replaceContent: function(index, removed, added) {
+    // Map the array of record objects into an array of  client ids.
+    added = map(added, function(record) {
+
+      return get(record, '_reference');
+    }, this);
+
+    this._super(index, removed, added);
+  },
+
+  arrangedContentDidChange: function() {
+    this.fetch();
+  },
+
+  arrayContentWillChange: function(index, removed, added) {
+    var owner = get(this, 'owner'),
+        name = get(this, 'name');
+
+    if (!owner._suspendedRelationships) {
+      // This code is the first half of code that continues inside
+      // of arrayContentDidChange. It gets or creates a change from
+      // the child object, adds the current owner as the old
+      // parent if this is the first time the object was removed
+      // from a ManyArray, and sets `newParent` to null.
+      //
+      // Later, if the object is added to another ManyArray,
+      // the `arrayContentDidChange` will set `newParent` on
+      // the change.
+      for (var i=index; i<index+removed; i++) {
+        var reference = get(this, 'content').objectAt(i);
+
+        var change = DS.RelationshipChange.createChange(owner.get('_reference'), reference, get(this, 'store'), {
+          parentType: owner.constructor,
+          changeType: "remove",
+          kind: "hasMany",
+          key: name
+        });
+
+        this._changesToSync.add(change);
+      }
+    }
+
+    return this._super.apply(this, arguments);
+  },
+
+  arrayContentDidChange: function(index, removed, added) {
+    this._super.apply(this, arguments);
+
+    var owner = get(this, 'owner'),
+        name = get(this, 'name'),
+        store = get(this, 'store');
+
+    if (!owner._suspendedRelationships) {
+      // This code is the second half of code that started in
+      // `arrayContentWillChange`. It gets or creates a change
+      // from the child object, and adds the current owner as
+      // the new parent.
+      for (var i=index; i<index+added; i++) {
+        var reference = get(this, 'content').objectAt(i);
+
+        var change = DS.RelationshipChange.createChange(owner.get('_reference'), reference, store, {
+          parentType: owner.constructor,
+          changeType: "add",
+          kind:"hasMany",
+          key: name
+        });
+        change.hasManyName = name;
+
+        this._changesToSync.add(change);
+      }
+
+      // We wait until the array has finished being
+      // mutated before syncing the OneToManyChanges created
+      // in arrayContentWillChange, so that the array
+      // membership test in the sync() logic operates
+      // on the final results.
+      this._changesToSync.forEach(function(change) {
+        change.sync();
+      });
+      DS.OneToManyChange.ensureSameTransaction(this._changesToSync, store);
+      this._changesToSync.clear();
+    }
+  },
+
+  // Create a child record within the owner
+  createRecord: function(hash, transaction) {
+    var owner = get(this, 'owner'),
+        store = get(owner, 'store'),
+        type = get(this, 'type'),
+        record;
+
+
+    transaction = transaction || get(owner, 'transaction');
+
+    record = store.createRecord.call(store, type, hash, transaction);
+    this.pushObject(record);
+
+    return record;
+  }
+
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set, forEach = Ember.EnumerableUtils.forEach;
+
+/**
+  @module ember-data
+*/
+
+/**
+  A transaction allows you to collect multiple records into a unit of work
+  that can be committed or rolled back as a group.
+
+  For example, if a record has local modifications that have not yet
+  been saved, calling `commit()` on its transaction will cause those
+  modifications to be sent to the adapter to be saved. Calling
+  `rollback()` on its transaction would cause all of the modifications to
+  be discarded and the record to return to the last known state before
+  changes were made.
+
+  If a newly created record's transaction is rolled back, it will
+  immediately transition to the deleted state.
+
+  If you do not explicitly create a transaction, a record is assigned to
+  an implicit transaction called the default transaction. In these cases,
+  you can treat your application's instance of `DS.Store` as a transaction
+  and call the `commit()` and `rollback()` methods on the store itself.
+
+  Once a record has been successfully committed or rolled back, it will
+  be moved back to the implicit transaction. Because it will now be in
+  a clean state, it can be moved to a new transaction if you wish.
+
+  ### Creating a Transaction
+
+  To create a new transaction, call the `transaction()` method of your
+  application's `DS.Store` instance:
+
+      var transaction = App.store.transaction();
+
+  This will return a new instance of `DS.Transaction` with no records
+  yet assigned to it.
+
+  ### Adding Existing Records
+
+  Add records to a transaction using the `add()` method:
+
+      record = App.store.find(App.Person, 1);
+      transaction.add(record);
+
+  Note that only records whose `isDirty` flag is `false` may be added
+  to a transaction. Once modifications to a record have been made
+  (its `isDirty` flag is `true`), it is not longer able to be added to
+  a transaction.
+
+  ### Creating New Records
+
+  Because newly created records are dirty from the time they are created,
+  and because dirty records can not be added to a transaction, you must
+  use the `createRecord()` method to assign new records to a transaction.
+
+  For example, instead of this:
+
+    var transaction = store.transaction();
+    var person = App.Person.createRecord({ name: "Steve" });
+
+    // won't work because person is dirty
+    transaction.add(person);
+
+  Call `createRecord()` on the transaction directly:
+
+    var transaction = store.transaction();
+    transaction.createRecord(App.Person, { name: "Steve" });
+
+  ### Asynchronous Commits
+
+  Typically, all of the records in a transaction will be committed
+  together. However, new records that have a dependency on other new
+  records need to wait for their parent record to be saved and assigned an
+  ID. In that case, the child record will continue to live in the
+  transaction until its parent is saved, at which time the transaction will
+  attempt to commit again.
+
+  For this reason, you should not re-use transactions once you have committed
+  them. Always make a new transaction and move the desired records to it before
+  calling commit.
+
+  @class Transaction
+  @namespace DS
+  @extends Ember.Object
+*/
+DS.Transaction = Ember.Object.extend({
+  /**
+    Creates the bucket data structure used to segregate records by
+    type.
+
+    @method init
+    @private
+  */
+  init: function() {
+    set(this, 'records', Ember.OrderedSet.create());
+  },
+
+  /**
+    Creates a new record of the given type and assigns it to the transaction
+    on which the method was called.
+
+    This is useful as only clean records can be added to a transaction and
+    new records created using other methods immediately become dirty.
+
+    @method createRecord
+    @param {DS.Model} type the model type to create
+    @param {Object} hash the data hash to assign the new record
+  */
+  createRecord: function(type, hash) {
+    var store = get(this, 'store');
+
+    return store.createRecord(type, hash, this);
+  },
+
+  isEqualOrDefault: function(other) {
+    if (this === other || other === get(this, 'store.defaultTransaction')) {
+      return true;
+    }
+  },
+
+  isDefault: Ember.computed(function() {
+    return this === get(this, 'store.defaultTransaction');
+  }).volatile(),
+
+  /**
+    Adds an existing record to this transaction. Only records without
+    modificiations (i.e., records whose `isDirty` property is `false`)
+    can be added to a transaction.
+
+    @method add
+    @param {DS.Model} record the record to add to the transaction
+  */
+  add: function(record) {
+
+
+    var store = get(this, 'store');
+    var adapter = get(store, '_adapter');
+    var serializer = get(adapter, 'serializer');
+    serializer.eachEmbeddedRecord(record, function(embeddedRecord, embeddedType) {
+      if (embeddedType === 'load') { return; }
+
+      this.add(embeddedRecord);
+    }, this);
+
+    this.adoptRecord(record);
+  },
+
+  relationships: Ember.computed(function() {
+    var relationships = Ember.OrderedSet.create(),
+        records = get(this, 'records'),
+        store = get(this, 'store');
+
+    forEach(records, function(record) {
+      var reference = get(record, '_reference');
+      var changes = store.relationshipChangesFor(reference);
+      for(var i = 0; i < changes.length; i++) {
+        relationships.add(changes[i]);
+      }
+    });
+
+    return relationships;
+  }).volatile(),
+
+  commitDetails: Ember.computed(function() {
+    var commitDetails = Ember.MapWithDefault.create({
+      defaultValue: function() {
+        return {
+          created: Ember.OrderedSet.create(),
+          updated: Ember.OrderedSet.create(),
+          deleted: Ember.OrderedSet.create()
+        };
+      }
+    });
+
+    var records = get(this, 'records'),
+        store = get(this, 'store');
+
+    forEach(records, function(record) {
+      if(!get(record, 'isDirty')) return;
+      record.send('willCommit');
+      var adapter = store.adapterForType(record.constructor);
+      commitDetails.get(adapter)[get(record, 'dirtyType')].add(record);
+    });
+
+    return commitDetails;
+  }).volatile(),
+
+  /**
+    Commits the transaction, which causes all of the modified records that
+    belong to the transaction to be sent to the adapter to be saved.
+
+    Once you call `commit()` on a transaction, you should not re-use it.
+
+    When a record is saved, it will be removed from this transaction and
+    moved back to the store's default transaction.
+
+    @method commit
+  */
+  commit: function() {
+    var store = get(this, 'store');
+
+    if (get(this, 'isDefault')) {
+      set(store, 'defaultTransaction', store.transaction());
+    }
+
+    this.removeCleanRecords();
+
+    var commitDetails = get(this, 'commitDetails'),
+        relationships = get(this, 'relationships');
+
+    forEach(commitDetails, function(adapter, commitDetails) {
+
+
+
+      adapter.commit(store, commitDetails);
+    });
+
+    // Once we've committed the transaction, there is no need to
+    // keep the OneToManyChanges around. Destroy them so they
+    // can be garbage collected.
+    relationships.forEach(function(relationship) {
+      relationship.destroy();
+    });
+  },
+
+  /**
+    Rolling back a transaction resets the records that belong to
+    that transaction.
+
+    Updated records have their properties reset to the last known
+    value from the persistence layer. Deleted records are reverted
+    to a clean, non-deleted state. Newly created records immediately
+    become deleted, and are not sent to the adapter to be persisted.
+
+    After the transaction is rolled back, any records that belong
+    to it will return to the store's default transaction, and the
+    current transaction should not be used again.
+
+    @method rollback
+  */
+  rollback: function() {
+    // Destroy all relationship changes and compute
+    // all references affected
+    var references = Ember.OrderedSet.create();
+    var relationships = get(this, 'relationships');
+    relationships.forEach(function(r) {
+      references.add(r.firstRecordReference);
+      references.add(r.secondRecordReference);
+      r.destroy();
+    });
+
+    var records = get(this, 'records');
+    forEach(records, function(record) {
+      if (!record.get('isDirty')) return;
+      record.send('rollback');
+    });
+
+    // Now that all records in the transaction are guaranteed to be
+    // clean, migrate them all to the store's default transaction.
+    this.removeCleanRecords();
+
+    // Remaining associated references are not part of the transaction, but
+    // can still have hasMany's which have not been reloaded
+    references.forEach(function(r) {
+      if (r && r.record) {
+        var record = r.record;
+        record.suspendRelationshipObservers(function() {
+          record.reloadHasManys();
+        });
+      }
+    }, this);
+  },
+
+  /**
+    Removes a record from this transaction and back to the store's
+    default transaction.
+
+    Note: This method is private for now, but should probably be exposed
+    in the future once we have stricter error checking (for example, in the
+    case of the record being dirty).
+
+    @method remove
+    @private
+    @param {DS.Model} record
+  */
+  remove: function(record) {
+    var defaultTransaction = get(this, 'store.defaultTransaction');
+    defaultTransaction.adoptRecord(record);
+  },
+
+  /**
+    Removes all of the records in the transaction's clean bucket.
+
+    @method removeCleanRecords
+    @private
+  */
+  removeCleanRecords: function() {
+    var records = get(this, 'records');
+    forEach(records, function(record) {
+      if(!record.get('isDirty')) {
+        this.remove(record);
+      }
+    }, this);
+  },
+
+  /**
+    This method moves a record into a different transaction without the normal
+    checks that ensure that the user is not doing something weird, like moving
+    a dirty record into a new transaction.
+
+    It is designed for internal use, such as when we are moving a clean record
+    into a new transaction when the transaction is committed.
+
+    This method must not be called unless the record is clean.
+
+    @method adoptRecord
+    @private
+    @param {DS.Model} record
+  */
+  adoptRecord: function(record) {
+    var oldTransaction = get(record, 'transaction');
+
+    if (oldTransaction) {
+      oldTransaction.removeRecord(record);
+    }
+
+    get(this, 'records').add(record);
+    set(record, 'transaction', this);
+  },
+
+  /**
+   Removes the record without performing the normal checks
+   to ensure that the record is re-added to the store's
+   default transaction.
+
+   @method removeRecord
+   @private
+   @param record
+  */
+  removeRecord: function(record) {
+    get(this, 'records').remove(record);
+  }
+
+});
+
+DS.Transaction.reopenClass({
+  ensureSameTransaction: function(records){
+    var transactions = Ember.A();
+    forEach( records, function(record){
+      if (record){ transactions.pushObject(get(record, 'transaction')); }
+    });
+
+    var transaction = transactions.reduce(function(prev, t) {
+      if (!get(t, 'isDefault')) {
+        if (prev === null) { return t; }
+
+      }
+
+      return prev;
+    }, null);
+
+    if (transaction) {
+      forEach( records, function(record){
+        if (record){ transaction.add(record); }
+      });
+    } else {
+      transaction = transactions.objectAt(0);
+    }
+    return transaction;
+   }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get;
+
+var resolveMapConflict = function(oldValue, newValue) {
+  return oldValue;
+};
+
+var transformMapKey = function(key, value) {
+  return key;
+};
+
+var transformMapValue = function(key, value) {
+  return value;
+};
+
+/**
+  The Mappable mixin is designed for classes that would like to
+  behave as a map for configuration purposes.
+
+  For example, the DS.Adapter class can behave like a map, with
+  more semantic API, via the `map` API:
+
+    DS.Adapter.map('App.Person', { firstName: { key: 'FIRST' } });
+
+  Class configuration via a map-like API has a few common requirements
+  that differentiate it from the standard Ember.Map implementation.
+
+  First, values often are provided as strings that should be normalized
+  into classes the first time the configuration options are used.
+
+  Second, the values configured on parent classes should also be taken
+  into account.
+
+  Finally, setting the value of a key sometimes should merge with the
+  previous value, rather than replacing it.
+
+  This mixin provides a instance method, `createInstanceMapFor`, that
+  will reify all of the configuration options set on an instance's
+  constructor and provide it for the instance to use.
+
+  Classes can implement certain hooks that allow them to customize
+  the requirements listed above:
+
+  * `resolveMapConflict` - called when a value is set for an existing
+    value
+  * `transformMapKey` - allows a key name (for example, a global path
+    to a class) to be normalized
+  * `transformMapValue` - allows a value (for example, a class that
+    should be instantiated) to be normalized
+
+  Classes that implement this mixin should also implement a class
+  method built using the `generateMapFunctionFor` method:
+
+    DS.Adapter.reopenClass({
+      map: DS.Mappable.generateMapFunctionFor('attributes', function(key, newValue, map) {
+        var existingValue = map.get(key);
+
+        for (var prop in newValue) {
+          if (!newValue.hasOwnProperty(prop)) { continue; }
+          existingValue[prop] = newValue[prop];
+        }
+      })
+    });
+
+  The function passed to `generateMapFunctionFor` is invoked every time a
+  new value is added to the map.
+
+  @class _Mappable
+  @private
+  @namespace DS
+**/
+DS._Mappable = Ember.Mixin.create({
+  createInstanceMapFor: function(mapName) {
+    var instanceMeta = getMappableMeta(this);
+
+    instanceMeta.values = instanceMeta.values || {};
+
+    if (instanceMeta.values[mapName]) { return instanceMeta.values[mapName]; }
+
+    var instanceMap = instanceMeta.values[mapName] = new Ember.Map();
+
+    var klass = this.constructor;
+
+    while (klass && klass !== DS.Store) {
+      this._copyMap(mapName, klass, instanceMap);
+      klass = klass.superclass;
+    }
+
+    instanceMeta.values[mapName] = instanceMap;
+    return instanceMap;
+  },
+
+  _copyMap: function(mapName, klass, instanceMap) {
+    var classMeta = getMappableMeta(klass);
+
+    var classMap = classMeta[mapName];
+    if (classMap) {
+      classMap.forEach(eachMap, this);
+    }
+
+    function eachMap(key, value) {
+      var transformedKey = (klass.transformMapKey || transformMapKey)(key, value);
+      var transformedValue = (klass.transformMapValue || transformMapValue)(key, value);
+
+      var oldValue = instanceMap.get(transformedKey);
+      var newValue = transformedValue;
+
+      if (oldValue) {
+        newValue = (this.constructor.resolveMapConflict || resolveMapConflict)(oldValue, newValue);
+      }
+
+      instanceMap.set(transformedKey, newValue);
+    }
+  }
+
+
+});
+
+DS._Mappable.generateMapFunctionFor = function(mapName, transform) {
+  return function(key, value) {
+    var meta = getMappableMeta(this);
+
+    var map = meta[mapName] || Ember.MapWithDefault.create({
+      defaultValue: function() { return {}; }
+    });
+
+    transform.call(this, key, value, map);
+
+    meta[mapName] = map;
+  };
+};
+
+function getMappableMeta(obj) {
+  var meta = Ember.meta(obj, true),
+      keyName = 'DS.Mappable',
+      value = meta[keyName];
+
+  if (!value) { meta[keyName] = {}; }
+
+  if (!meta.hasOwnProperty(keyName)) {
+    meta[keyName] = Ember.create(meta[keyName]);
+  }
+
+  return meta[keyName];
+}
+
+})();
+
+
+
+(function() {
+/*globals Ember*/
+/*jshint eqnull:true*/
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+var once = Ember.run.once;
+var isNone = Ember.isNone;
+var forEach = Ember.EnumerableUtils.forEach;
+var indexOf = Ember.EnumerableUtils.indexOf;
+var map = Ember.EnumerableUtils.map;
+
+// These values are used in the data cache when clientIds are
+// needed but the underlying data has not yet been loaded by
+// the server.
+var UNLOADED = 'unloaded';
+var LOADING = 'loading';
+var MATERIALIZED = { materialized: true };
+var CREATED = { created: true };
+
+// Implementors Note:
+//
+//   The variables in this file are consistently named according to the following
+//   scheme:
+//
+//   * +id+ means an identifier managed by an external source, provided inside
+//     the data provided by that source. These are always coerced to be strings
+//     before being used internally.
+//   * +clientId+ means a transient numerical identifier generated at runtime by
+//     the data store. It is important primarily because newly created objects may
+//     not yet have an externally generated id.
+//   * +reference+ means a record reference object, which holds metadata about a
+//     record, even if it has not yet been fully materialized.
+//   * +type+ means a subclass of DS.Model.
+
+// Used by the store to normalize IDs entering the store.  Despite the fact
+// that developers may provide IDs as numbers (e.g., `store.find(Person, 1)`),
+// it is important that internally we use strings, since IDs may be serialized
+// and lose type information.  For example, Ember's router may put a record's
+// ID into the URL, and if we later try to deserialize that URL and find the
+// corresponding record, we will not know if it is a string or a number.
+var coerceId = function(id) {
+  return id == null ? null : id+'';
+};
+
+/**
+  The store contains all of the data for records loaded from the server.
+  It is also responsible for creating instances of DS.Model that wrap
+  the individual data for a record, so that they can be bound to in your
+  Handlebars templates.
+
+  Define your application's store like this:
+
+       MyApp.Store = DS.Store.extend();
+
+  Most Ember.js applications will only have a single `DS.Store` that is
+  automatically created by their `Ember.Application`.
+
+  You can retrieve models from the store in several ways. To retrieve a record
+  for a specific id, use `DS.Model`'s `find()` method:
+
+       var person = App.Person.find(123);
+
+  If your application has multiple `DS.Store` instances (an unusual case), you can
+  specify which store should be used:
+
+      var person = store.find(App.Person, 123);
+
+  In general, you should retrieve models using the methods on `DS.Model`; you should
+  rarely need to interact with the store directly.
+
+  By default, the store will talk to your backend using a standard REST mechanism.
+  You can customize how the store talks to your backend by specifying a custom adapter:
+
+       MyApp.store = DS.Store.create({
+         adapter: 'MyApp.CustomAdapter'
+       });
+
+  You can learn more about writing a custom adapter by reading the `DS.Adapter`
+  documentation.
+
+  @class Store
+  @namespace DS
+  @extends Ember.Object
+  @uses DS._Mappable
+*/
+DS.Store = Ember.Object.extend(DS._Mappable, {
+
+  /**
+    Many methods can be invoked without specifying which store should be used.
+    In those cases, the first store created will be used as the default. If
+    an application has multiple stores, it should specify which store to use
+    when performing actions, such as finding records by ID.
+
+    The init method registers this store as the default if none is specified.
+
+    @method init
+  */
+  init: function() {
+    if (!get(DS, 'defaultStore') || get(this, 'isDefaultStore')) {
+      set(DS, 'defaultStore', this);
+    }
+
+    // internal bookkeeping; not observable
+    this.typeMaps = {};
+    this.recordArrayManager = DS.RecordArrayManager.create({
+      store: this
+    });
+    this.relationshipChanges = {};
+
+    set(this, 'currentTransaction', this.transaction());
+    set(this, 'defaultTransaction', this.transaction());
+  },
+
+  /**
+    Returns a new transaction scoped to this store. This delegates
+    responsibility for invoking the adapter's commit mechanism to
+    a transaction.
+
+    Transaction are responsible for tracking changes to records
+    added to them, and supporting `commit` and `rollback`
+    functionality. Committing a transaction invokes the store's
+    adapter, while rolling back a transaction reverses all
+    changes made to records added to the transaction.
+
+    A store has an implicit (default) transaction, which tracks changes
+    made to records not explicitly added to a transaction.
+
+    @method transaction
+    @returns DS.Transaction
+  */
+  transaction: function() {
+    return DS.Transaction.create({ store: this });
+  },
+
+  /**
+    Instructs the store to materialize the data for a given record.
+
+    To materialize a record, the store first retrieves the opaque data that was
+    passed to either `load()` or `loadMany()`. Then, the data and the record
+    are passed to the adapter's `materialize()` method, which allows the adapter
+    to translate arbitrary data structures from the adapter into the normalized
+    form the record expects.
+
+    The adapter's `materialize()` method will invoke `materializeAttribute()`,
+    `materializeHasMany()` and `materializeBelongsTo()` on the record to
+    populate it with normalized values.
+
+    @method materializeData
+    @private
+    @param {DS.Model} record
+  */
+  materializeData: function(record) {
+    var reference = get(record, '_reference'),
+        data = reference.data,
+        adapter = this.adapterForType(record.constructor);
+
+    reference.data = MATERIALIZED;
+
+    record.setupData();
+
+    if (data !== CREATED) {
+      // Instructs the adapter to extract information from the
+      // opaque data and materialize the record's attributes and
+      // relationships.
+      adapter.materialize(record, data, reference.prematerialized);
+    }
+  },
+
+  /**
+    The adapter to use to communicate to a backend server or other persistence layer.
+
+    This can be specified as an instance, a class, or a property path that specifies
+    where the adapter can be located.
+
+    @property adapter
+    @type {DS.Adapter|String}
+  */
+  adapter: Ember.computed(function(){
+    if (!Ember.testing) {
+
+    }
+
+    return 'DS.RESTAdapter';
+  }).property(),
+
+
+  /**
+    Returns a JSON representation of the record using the adapter's
+    serialization strategy. This method exists primarily to enable
+    a record, which has access to its store (but not the store's
+    adapter) to provide a `serialize()` convenience.
+
+    The available options are:
+
+    * `includeId`: `true` if the record's ID should be included in
+      the JSON representation
+
+    @method serialize
+    @private
+    @param {DS.Model} record the record to serialize
+    @param {Object} options an options hash
+  */
+  serialize: function(record, options) {
+    return this.adapterForType(record.constructor).serialize(record, options);
+  },
+
+  /**
+    This property returns the adapter, after resolving a possible
+    property path.
+
+    If the supplied `adapter` was a class, or a String property
+    path resolved to a class, this property will instantiate the
+    class.
+
+    This property is cacheable, so the same instance of a specified
+    adapter class should be used for the lifetime of the store.
+
+    @property _adapter
+    @private
+    @returns DS.Adapter
+  */
+  _adapter: Ember.computed(function() {
+    var adapter = get(this, 'adapter');
+    if (typeof adapter === 'string') {
+      adapter = get(this, adapter, false) || get(Ember.lookup, adapter);
+    }
+
+    if (DS.Adapter.detect(adapter)) {
+      adapter = adapter.create();
+    }
+
+    return adapter;
+  }).property('adapter'),
+
+  /**
+    A monotonically increasing number to be used to uniquely identify
+    data and records.
+
+    It starts at 1 so other parts of the code can test for truthiness
+    when provided a `clientId` instead of having to explicitly test
+    for undefined.
+
+    @property clientIdCounter
+    @private
+  */
+  clientIdCounter: 1,
+
+  // .....................
+  // . CREATE NEW RECORD .
+  // .....................
+
+  /**
+    Create a new record in the current store. The properties passed
+    to this method are set on the newly created record.
+
+    Note: The third `transaction` property is for internal use only.
+    If you want to create a record inside of a given transaction,
+    use `transaction.createRecord()` instead of `store.createRecord()`.
+
+    @method createRecord
+    @param {subclass of DS.Model} type
+    @param {Object} properties a hash of properties to set on the
+      newly created record.
+    @returns DS.Model
+  */
+  createRecord: function(type, properties, transaction) {
+    properties = properties || {};
+
+    // Create a new instance of the model `type` and put it
+    // into the specified `transaction`. If no transaction is
+    // specified, the default transaction will be used.
+    var record = type._create({
+      store: this
+    });
+
+    transaction = transaction || get(this, 'defaultTransaction');
+
+    // adoptRecord is an internal API that allows records to move
+    // into a transaction without assertions designed for app
+    // code. It is used here to ensure that regardless of new
+    // restrictions on the use of the public `transaction.add()`
+    // API, we will always be able to insert new records into
+    // their transaction.
+    transaction.adoptRecord(record);
+
+    // `id` is a special property that may not be a `DS.attr`
+    var id = properties.id;
+
+    // If the passed properties do not include a primary key,
+    // give the adapter an opportunity to generate one. Typically,
+    // client-side ID generators will use something like uuid.js
+    // to avoid conflicts.
+
+    if (isNone(id)) {
+      var adapter = this.adapterForType(type);
+
+      if (adapter && adapter.generateIdForRecord) {
+        id = coerceId(adapter.generateIdForRecord(this, record));
+        properties.id = id;
+      }
+    }
+
+    // Coerce ID to a string
+    id = coerceId(id);
+
+    // Create a new `clientId` and associate it with the
+    // specified (or generated) `id`. Since we don't have
+    // any data for the server yet (by definition), store
+    // the sentinel value CREATED as the data for this
+    // clientId. If we see this value later, we will skip
+    // materialization.
+    var reference = this.createReference(type, id);
+    reference.data = CREATED;
+
+    // Now that we have a reference, attach it to the record we
+    // just created.
+    set(record, '_reference', reference);
+    reference.record = record;
+
+    // Move the record out of its initial `empty` state into
+    // the `loaded` state.
+    record.loadedData();
+
+    record.setupData();
+
+    // Set the properties specified on the record.
+    record.setProperties(properties);
+
+    // Resolve record promise
+    Ember.run(record, 'resolve', record);
+
+    return record;
+  },
+
+  // .................
+  // . DELETE RECORD .
+  // .................
+
+  /**
+    For symmetry, a record can be deleted via the store.
+
+    @method deleteRecord
+    @param {DS.Model} record
+  */
+  deleteRecord: function(record) {
+    record.deleteRecord();
+  },
+
+  /**
+    For symmetry, a record can be unloaded via the store.
+
+    @method unloadRecord
+    @param {DS.Model} record
+  */
+  unloadRecord: function(record) {
+    record.unloadRecord();
+  },
+
+  // ................
+  // . FIND RECORDS .
+  // ................
+
+  /**
+    This is the main entry point into finding records. The first parameter to
+    this method is always a subclass of `DS.Model`.
+
+    You can use the `find` method on a subclass of `DS.Model` directly if your
+    application only has one store. For example, instead of
+    `store.find(App.Person, 1)`, you could say `App.Person.find(1)`.
+
+    ---
+
+    To find a record by ID, pass the `id` as the second parameter:
+
+        store.find(App.Person, 1);
+        App.Person.find(1);
+
+    If the record with that `id` had not previously been loaded, the store will
+    return an empty record immediately and ask the adapter to find the data by
+    calling the adapter's `find` method.
+
+    The `find` method will always return the same object for a given type and
+    `id`. To check whether the adapter has populated a record, you can check
+    its `isLoaded` property.
+
+    ---
+
+    To find all records for a type, call `find` with no additional parameters:
+
+        store.find(App.Person);
+        App.Person.find();
+
+    This will return a `RecordArray` representing all known records for the
+    given type and kick off a request to the adapter's `findAll` method to load
+    any additional records for the type.
+
+    The `RecordArray` returned by `find()` is live. If any more records for the
+    type are added at a later time through any mechanism, it will automatically
+    update to reflect the change.
+
+    ---
+
+    To find a record by a query, call `find` with a hash as the second
+    parameter:
+
+        store.find(App.Person, { page: 1 });
+        App.Person.find({ page: 1 });
+
+    This will return a `RecordArray` immediately, but it will always be an
+    empty `RecordArray` at first. It will call the adapter's `findQuery`
+    method, which will populate the `RecordArray` once the server has returned
+    results.
+
+    You can check whether a query results `RecordArray` has loaded by checking
+    its `isLoaded` property.
+
+    @method find
+    @param {DS.Model} type
+    @param {Object|String|Integer|null} id
+  */
+  find: function(type, id) {
+    type = this.modelFor(type);
+
+    if (id === undefined) {
+      return this.findAll(type);
+    }
+
+    // We are passed a query instead of an id.
+    if (Ember.typeOf(id) === 'object') {
+      return this.findQuery(type, id);
+    }
+
+    return this.findById(type, coerceId(id));
+  },
+
+  /**
+    This method returns a record for a given type and id combination.
+
+    If the store has never seen this combination of type and id before, it
+    creates a new `clientId` with the LOADING sentinel and asks the adapter to
+    load the data.
+
+    If the store has seen the combination, this method delegates to
+    `getByReference`.
+
+    @method findById
+    @private
+    @param type
+    @param id
+  */
+  findById: function(type, id) {
+    var reference;
+
+    if (this.hasReferenceForId(type, id)) {
+      reference = this.referenceForId(type, id);
+
+      if (reference.data !== UNLOADED) {
+        return this.recordForReference(reference);
+      }
+    }
+
+    if (!reference) {
+      reference = this.createReference(type, id);
+    }
+
+    reference.data = LOADING;
+
+    // create a new instance of the model type in the
+    // 'isLoading' state
+    var record = this.legacyMaterializeRecord(reference);
+
+    if (reference.data === LOADING) {
+      // let the adapter set the data, possibly async
+      var adapter = this.adapterForType(type),
+          store = this;
+
+
+
+      var thenable = adapter.find(this, type, id);
+
+      if (thenable && thenable.then) {
+        thenable.then(null /* for future use */, function(error) {
+          store.recordWasError(record);
+        });
+      }
+    }
+
+    return record;
+  },
+
+  reloadRecord: function(record) {
+    var type = record.constructor,
+        adapter = this.adapterForType(type),
+        store = this,
+        id = get(record, 'id');
+
+
+
+
+    var thenable = adapter.find(this, type, id);
+
+    if (thenable && thenable.then) {
+      thenable.then(null /* for future use */, function(error) {
+        store.recordWasError(record);
+      });
+    }
+  },
+
+  /**
+    This method returns a record for a given record reference.
+
+    If no record for the reference has yet been materialized, this method will
+    materialize a new `DS.Model` instance. This allows adapters to eagerly load
+    large amounts of data into the store, and avoid incurring the cost of
+    creating models until they are requested.
+
+    In short, it's a convenient way to get a record for a known
+    record reference, materializing it if necessary.
+
+    @method recordForReference
+    @private
+    @param {Object} reference
+    @returns {DS.Model}
+  */
+  recordForReference: function(reference) {
+    var record = reference.record;
+
+    if (!record) {
+      // create a new instance of the model type in the
+      // 'isLoading' state
+      record = this.legacyMaterializeRecord(reference);
+    }
+
+    return record;
+  },
+
+  /**
+    Given an array of `reference`s, determines which of those
+    `clientId`s has not yet been loaded.
+
+    In preparation for loading, this method also marks any unloaded
+    `clientId`s as loading.
+
+    @method unloadedReferences
+    @private
+    @param references
+  */
+  unloadedReferences: function(references) {
+    var unloadedReferences = [];
+
+    for (var i=0, l=references.length; i<l; i++) {
+      var reference = references[i];
+
+      if (reference instanceof DS.Model) {
+        if (get(reference, 'isEmpty')) {
+          unloadedReferences.push(reference);
+        }
+
+        continue;
+      }
+
+      if (reference.data === UNLOADED) {
+        unloadedReferences.push(reference);
+        reference.data = LOADING;
+      }
+    }
+
+    return unloadedReferences;
+  },
+
+  /**
+    This method is the entry point that relationships use to update
+    themselves when their underlying data changes.
+
+    First, it determines which of its `reference`s are still unloaded,
+    then invokes `findMany` on the adapter.
+
+    @method fetchUnloadedReferences
+    @private
+    @param references
+    @param owner
+  */
+  fetchUnloadedReferences: function(references, owner) {
+    var unloadedReferences = this.unloadedReferences(references);
+    this.fetchMany(unloadedReferences, owner);
+  },
+
+  /**
+    This method takes a list of `reference`s, groups the `reference`s by type,
+    converts the `reference`s into IDs, and then invokes the adapter's `findMany`
+    method.
+
+    The `reference`s are grouped by type to invoke `findMany` on adapters
+    for each unique type in `reference`s.
+
+    It is used both by a brand new relationship (via the `findMany`
+    method) or when the data underlying an existing relationship
+    changes (via the `fetchUnloadedReferences` method).
+
+    @method fetchMany
+    @private
+    @param references
+    @param owner
+  */
+  fetchMany: function(references, owner) {
+    if (!references.length) { return; }
+
+    // Group By Type
+    var referencesByTypeMap = Ember.MapWithDefault.create({
+      defaultValue: function() { return Ember.A(); }
+    });
+    forEach(references, function(reference) {
+      referencesByTypeMap.get(reference.type).push(reference);
+    });
+
+    forEach(referencesByTypeMap, function(type) {
+      var references = referencesByTypeMap.get(type),
+          ids = map(references, function(reference) { return reference.id; });
+
+      var adapter = this.adapterForType(type);
+
+
+
+      adapter.findMany(this, type, ids, owner);
+    }, this);
+  },
+
+  hasReferenceForId: function(type, id) {
+    id = coerceId(id);
+
+    return !!this.typeMapFor(type).idToReference[id];
+  },
+
+  referenceForId: function(type, id) {
+    id = coerceId(id);
+
+    // Check to see if we have seen this type/id pair before.
+    var reference = this.typeMapFor(type).idToReference[id];
+
+    // If not, create a reference for it but don't populate it
+    // with any data yet.
+    if (!reference) {
+      reference = this.createReference(type, id);
+      reference.data = UNLOADED;
+    }
+
+    return reference;
+  },
+
+  /**
+    `findMany` is the entry point that relationships use to generate a
+    new `ManyArray` for the list of IDs specified by the server for
+    the relationship.
+
+    Its responsibilities are:
+
+    * convert the IDs into clientIds
+    * determine which of the clientIds still need to be loaded
+    * create a new ManyArray whose content is *all* of the clientIds
+    * notify the ManyArray of the number of its elements that are
+      already loaded
+    * insert the unloaded references into the `loadingRecordArrays`
+      bookkeeping structure, which will allow the `ManyArray` to know
+      when all of its loading elements are loaded from the server.
+    * ask the adapter to load the unloaded elements, by invoking
+      findMany with the still-unloaded IDs.
+
+    @method findMany
+    @private
+    @param type
+    @param idsOrReferencesOrOpaque
+    @param record
+    @param relationship
+  */
+  findMany: function(type, idsOrReferencesOrOpaque, record, relationship) {
+    // 1. Determine which of the client ids need to be loaded
+    // 2. Create a new ManyArray whose content is ALL of the clientIds
+    // 3. Decrement the ManyArray's counter by the number of loaded clientIds
+    // 4. Put the ManyArray into our bookkeeping data structure, keyed on
+    //    the needed clientIds
+    // 5. Ask the adapter to load the records for the unloaded clientIds (but
+    //    convert them back to ids)
+
+    if (!Ember.isArray(idsOrReferencesOrOpaque)) {
+      var adapter = this.adapterForType(type);
+
+      if (adapter && adapter.findHasMany) {
+        adapter.findHasMany(this, record, relationship, idsOrReferencesOrOpaque);
+      } else if (!isNone(idsOrReferencesOrOpaque)) {
+
+
+      }
+
+      return this.recordArrayManager.createManyArray(type, Ember.A());
+    }
+
+    // Coerce server IDs into Record Reference
+    var references = map(idsOrReferencesOrOpaque, function(reference) {
+      if (typeof reference !== 'object' && reference !== null && !(reference instanceof DS.Model)) {
+        return this.referenceForId(type, reference);
+      }
+
+      return reference;
+    }, this);
+
+    var unloadedReferences = this.unloadedReferences(references),
+        manyArray = this.recordArrayManager.createManyArray(type, Ember.A(references)),
+        reference, i, l;
+
+    // Start the decrementing counter on the ManyArray at the number of
+    // records we need to load from the adapter
+    manyArray.loadingRecordsCount(unloadedReferences.length);
+
+    if (unloadedReferences.length) {
+      for (i=0, l=unloadedReferences.length; i<l; i++) {
+        reference = unloadedReferences[i];
+
+        // keep track of the record arrays that a given loading record
+        // is part of. This way, if the same record is in multiple
+        // ManyArrays, all of their loading records counters will be
+        // decremented when the adapter provides the data.
+        this.recordArrayManager.registerWaitingRecordArray(manyArray, reference);
+      }
+
+      this.fetchMany(unloadedReferences, record);
+    } else {
+      // all requested records are available
+      manyArray.set('isLoaded', true);
+
+      Ember.run.once(function() {
+        manyArray.trigger('didLoad');
+      });
+    }
+
+    return manyArray;
+  },
+
+  /**
+    This method delegates a query to the adapter. This is the one place where
+    adapter-level semantics are exposed to the application.
+
+    Exposing queries this way seems preferable to creating an abstract query
+    language for all server-side queries, and then require all adapters to
+    implement them.
+
+    @method findQuery
+    @private
+    @param {Class} type
+    @param {Object} query an opaque query to be used by the adapter
+    @return {DS.AdapterPopulatedRecordArray}
+  */
+  findQuery: function(type, query) {
+    var array = DS.AdapterPopulatedRecordArray.create({
+      type: type,
+      query: query,
+      content: Ember.A(),
+      store: this
+    });
+
+    var adapter = this.adapterForType(type);
+
+
+
+    adapter.findQuery(this, type, query, array);
+
+    return array;
+  },
+
+  /**
+    This method returns an array of all records adapter can find.
+    It triggers the adapter's `findAll` method to give it an opportunity to populate
+    the array with records of that type.
+
+    @method findAll
+    @private
+    @param {Class} type
+    @return {DS.AdapterPopulatedRecordArray}
+  */
+  findAll: function(type) {
+    return this.fetchAll(type, this.all(type));
+  },
+
+  /**
+    @method fetchAll
+    @private
+    @param type
+    @param array
+  */
+  fetchAll: function(type, array) {
+    var adapter = this.adapterForType(type),
+        sinceToken = this.typeMapFor(type).metadata.since;
+
+    set(array, 'isUpdating', true);
+
+
+
+    adapter.findAll(this, type, sinceToken);
+
+    return array;
+  },
+
+  /**
+    @method metaForType
+    @param type
+    @param property
+    @param data
+  */
+  metaForType: function(type, property, data) {
+    var target = this.typeMapFor(type).metadata;
+    set(target, property, data);
+  },
+
+  /**
+    @method didUpdateAll
+    @param type
+  */
+  didUpdateAll: function(type) {
+    var findAllCache = this.typeMapFor(type).findAllCache;
+    set(findAllCache, 'isUpdating', false);
+  },
+
+  /**
+    This method returns a filtered array that contains all of the known records
+    for a given type.
+
+    Note that because it's just a filter, it will have any locally
+    created records of the type.
+
+    Also note that multiple calls to `all` for a given type will always
+    return the same RecordArray.
+
+    @method all
+    @param {Class} type
+    @return {DS.RecordArray}
+  */
+  all: function(type) {
+    var typeMap = this.typeMapFor(type),
+        findAllCache = typeMap.findAllCache;
+
+    if (findAllCache) { return findAllCache; }
+
+    var array = DS.RecordArray.create({
+      type: type,
+      content: Ember.A(),
+      store: this,
+      isLoaded: true
+    });
+
+    this.recordArrayManager.registerFilteredRecordArray(array, type);
+
+    typeMap.findAllCache = array;
+    return array;
+  },
+
+  /**
+    Takes a type and filter function, and returns a live RecordArray that
+    remains up to date as new records are loaded into the store or created
+    locally.
+
+    The callback function takes a materialized record, and returns true
+    if the record should be included in the filter and false if it should
+    not.
+
+    The filter function is called once on all records for the type when
+    it is created, and then once on each newly loaded or created record.
+
+    If any of a record's properties change, or if it changes state, the
+    filter function will be invoked again to determine whether it should
+    still be in the array.
+
+    Note that the existence of a filter on a type will trigger immediate
+    materialization of all loaded data for a given type, so you might
+    not want to use filters for a type if you are loading many records
+    into the store, many of which are not active at any given time.
+
+    In this scenario, you might want to consider filtering the raw
+    data before loading it into the store.
+
+    @method filter
+    @param {Class} type
+    @param {Function} filter
+    @return {DS.FilteredRecordArray}
+  */
+  filter: function(type, query, filter) {
+    // allow an optional server query
+    if (arguments.length === 3) {
+      this.findQuery(type, query);
+    } else if (arguments.length === 2) {
+      filter = query;
+    }
+
+    var array = DS.FilteredRecordArray.create({
+      type: type,
+      content: Ember.A(),
+      store: this,
+      manager: this.recordArrayManager,
+      filterFunction: filter
+    });
+
+    this.recordArrayManager.registerFilteredRecordArray(array, type, filter);
+
+    return array;
+  },
+
+  /**
+    This method returns if a certain record is already loaded
+    in the store. Use this function to know beforehand if a find()
+    will result in a request or that it will be a cache hit.
+
+    @method recordIsLoaded
+    @param {Class} type
+    @param {string} id
+    @return {boolean}
+  */
+  recordIsLoaded: function(type, id) {
+    if (!this.hasReferenceForId(type, id)) { return false; }
+    return typeof this.referenceForId(type, id).data === 'object';
+  },
+
+  // ............
+  // . UPDATING .
+  // ............
+
+  /**
+    If the adapter updates attributes or acknowledges creation
+    or deletion, the record will notify the store to update its
+    membership in any filters.
+
+    To avoid thrashing, this method is invoked only once per
+    run loop per record.
+
+    @method dataWasUpdated
+    @private
+    @param {Class} type
+    @param {Number|String} clientId
+    @param {DS.Model} record
+  */
+  dataWasUpdated: function(type, reference, record) {
+    // Because data updates are invoked at the end of the run loop,
+    // it is possible that a record might be deleted after its data
+    // has been modified and this method was scheduled to be called.
+    //
+    // If that's the case, the record would have already been removed
+    // from all record arrays; calling updateRecordArrays would just
+    // add it back. If the record is deleted, just bail. It shouldn't
+    // give us any more trouble after this.
+
+    if (get(record, 'isDeleted')) { return; }
+
+    if (typeof reference.data === "object") {
+      this.recordArrayManager.referenceDidChange(reference);
+    }
+  },
+
+  // ..............
+  // . PERSISTING .
+  // ..............
+
+  /**
+    This method delegates saving to the store's implicit
+    transaction.
+
+    Calling this method is essentially a request to persist
+    any changes to records that were not explicitly added to
+    a transaction.
+
+    @method save
+  */
+  save: function() {
+    once(this, 'commitDefaultTransaction');
+  },
+  commit: Ember.aliasMethod('save'),
+
+  commitDefaultTransaction: function() {
+    get(this, 'defaultTransaction').commit();
+  },
+
+  scheduleSave: function(record) {
+    get(this, 'currentTransaction').add(record);
+    once(this, 'flushSavedRecords');
+  },
+
+  flushSavedRecords: function() {
+    get(this, 'currentTransaction').commit();
+    set(this, 'currentTransaction', this.transaction());
+  },
+
+  /**
+    Adapters should call this method if they would like to acknowledge
+    that all changes related to a record (other than relationship
+    changes) have persisted.
+
+    Because relationship changes affect multiple records, the adapter
+    is responsible for acknowledging the change to the relationship
+    directly (using `store.didUpdateRelationship`) when all aspects
+    of the relationship change have persisted.
+
+    It can be called for created, deleted or updated records.
+
+    If the adapter supplies new data, that data will become the new
+    canonical data for the record. That will result in blowing away
+    all local changes and rematerializing the record with the new
+    data (the "sledgehammer" approach).
+
+    Alternatively, if the adapter does not supply new data, the record
+    will collapse all local changes into its saved data. Subsequent
+    rollbacks of the record will roll back to this point.
+
+    If an adapter is acknowledging receipt of a newly created record
+    that did not generate an id in the client, it *must* either
+    provide data or explicitly invoke `store.didReceiveId` with
+    the server-provided id.
+
+    Note that an adapter may not supply new data when acknowledging
+    a deleted record.
+
+    @method didSaveRecord
+    @param {DS.Model} record the in-flight record
+    @param {Object} data optional data (see above)
+  */
+  didSaveRecord: function(record, data) {
+    if (data) {
+      this.updateId(record, data);
+      this.updateRecordData(record, data);
+    } else {
+      this.didUpdateAttributes(record);
+    }
+
+    record.adapterDidCommit();
+  },
+
+  /**
+    For convenience, if an adapter is performing a bulk commit, it can also
+    acknowledge all of the records at once.
+
+    If the adapter supplies an array of data, they must be in the same order as
+    the array of records passed in as the first parameter.
+
+    @method didSaveRecords
+    @param {#forEach} list a list of records whose changes the
+      adapter is acknowledging. You can pass any object that
+      has an ES5-like `forEach` method, including the
+      `OrderedSet` objects passed into the adapter at commit
+      time.
+    @param {Array[Object]} dataList an Array of data. This
+      parameter must be an integer-indexed Array-like.
+  */
+  didSaveRecords: function(list, dataList) {
+    var i = 0;
+    forEach(list, function(record) {
+      this.didSaveRecord(record, dataList && dataList[i++]);
+    }, this);
+  },
+
+  /**
+    This method allows the adapter to specify that a record
+    could not be saved because it had backend-supplied validation
+    errors.
+
+    The errors object must have keys that correspond to the
+    attribute names. Once each of the specified attributes have
+    changed, the record will automatically move out of the
+    invalid state and be ready to commit again.
+
+    TODO: We should probably automate the process of converting
+    server names to attribute names using the existing serializer
+    infrastructure.
+
+    @method recordWasInvalid
+    @param {DS.Model} record
+    @param {Object} errors
+  */
+  recordWasInvalid: function(record, errors) {
+    record.adapterDidInvalidate(errors);
+  },
+
+  /**
+    This method allows the adapter to specify that a record
+    could not be saved because the server returned an unhandled
+    error.
+
+    @method recordWasError
+    @param {DS.Model} record
+  */
+  recordWasError: function(record) {
+    record.adapterDidError();
+  },
+
+  /**
+    This is a lower-level API than `didSaveRecord` that allows an
+    adapter to acknowledge the persistence of a single attribute.
+
+    This is useful if an adapter needs to make multiple asynchronous
+    calls to fully persist a record. The record will keep track of
+    which attributes and relationships are still outstanding and
+    automatically move into the `saved` state once the adapter has
+    acknowledged everything.
+
+    If a value is provided, it clobbers the locally specified value.
+    Otherwise, the local value becomes the record's last known
+    saved value (which is used when rolling back a record).
+
+    Note that the specified attributeName is the normalized name
+    specified in the definition of the `DS.Model`, not a key in
+    the server-provided data.
+
+    Also note that the adapter is responsible for performing any
+    transformations on the value using the serializer API.
+
+    @method didUpdateAttribute
+    @param {DS.Model} record
+    @param {String} attributeName
+    @param {Object} value
+  */
+  didUpdateAttribute: function(record, attributeName, value) {
+    record.adapterDidUpdateAttribute(attributeName, value);
+  },
+
+  /**
+    This method allows an adapter to acknowledge persistence
+    of all attributes of a record but not relationships or
+    other factors.
+
+    It loops through the record's defined attributes and
+    notifies the record that they are all acknowledged.
+
+    This method does not take optional values, because
+    the adapter is unlikely to have a hash of normalized
+    keys and transformed values, and instead of building
+    one up, it should just call `didUpdateAttribute` as
+    needed.
+
+    This method is intended as a middle-ground between
+    `didSaveRecord`, which acknowledges all changes to
+    a record, and `didUpdateAttribute`, which allows an
+    adapter fine-grained control over updates.
+
+    @method didUpdateAttributes
+    @param {DS.Model} record
+  */
+  didUpdateAttributes: function(record) {
+    record.eachAttribute(function(attributeName) {
+      this.didUpdateAttribute(record, attributeName);
+    }, this);
+  },
+
+  /**
+    This allows an adapter to acknowledge that it has saved all
+    necessary aspects of a relationship change.
+
+    This is separated from acknowledging the record itself
+    (via `didSaveRecord`) because a relationship change can
+    involve as many as three separate records. Records should
+    only move out of the in-flight state once the server has
+    acknowledged all of their relationships, and this differs
+    based upon the adapter's semantics.
+
+    There are three basic scenarios by which an adapter can
+    save a relationship.
+
+    ### Foreign Key
+
+    An adapter can save all relationship changes by updating
+    a foreign key on the child record. If it does this, it
+    should acknowledge the changes when the child record is
+    saved.
+
+        record.eachRelationship(function(name, meta) {
+          if (meta.kind === 'belongsTo') {
+            store.didUpdateRelationship(record, name);
+          }
+        });
+
+        store.didSaveRecord(record, data);
+
+    ### Embedded in Parent
+
+    An adapter can save one-to-many relationships by embedding
+    IDs (or records) in the parent object. In this case, the
+    relationship is not considered acknowledged until both the
+    old parent and new parent have acknowledged the change.
+
+    In this case, the adapter should keep track of the old
+    parent and new parent, and acknowledge the relationship
+    change once both have acknowledged. If one of the two
+    sides does not exist (e.g. the new parent does not exist
+    because of nulling out the belongs-to relationship),
+    the adapter should acknowledge the relationship once
+    the other side has acknowledged.
+
+    ### Separate Entity
+
+    An adapter can save relationships as separate entities
+    on the server. In this case, they should acknowledge
+    the relationship as saved once the server has
+    acknowledged the entity.
+
+    @method didUpdateRelationship
+    @param {DS.Model} record
+    @param {DS.Model} relationshipName
+  */
+  didUpdateRelationship: function(record, relationshipName) {
+    var clientId = get(record, '_reference').clientId;
+
+    var relationship = this.relationshipChangeFor(clientId, relationshipName);
+    //TODO(Igor)
+    if (relationship) { relationship.adapterDidUpdate(); }
+  },
+
+  /**
+    This allows an adapter to acknowledge all relationship changes
+    for a given record.
+
+    Like `didUpdateAttributes`, this is intended as a middle ground
+    between `didSaveRecord` and fine-grained control via the
+    `didUpdateRelationship` API.
+
+    @method didUpdateRelationships
+    @param record
+  */
+  didUpdateRelationships: function(record) {
+    var changes = this.relationshipChangesFor(get(record, '_reference'));
+
+    for (var name in changes) {
+      if (!changes.hasOwnProperty(name)) { continue; }
+      changes[name].adapterDidUpdate();
+    }
+  },
+
+  /**
+    When acknowledging the creation of a locally created record,
+    adapters must supply an id (if they did not implement
+    `generateIdForRecord` to generate an id locally).
+
+    If an adapter does not use `didSaveRecord` and supply a hash
+    (for example, if it needs to make multiple HTTP requests to
+    create and then update the record), it will need to invoke
+    `didReceiveId` with the backend-supplied id.
+
+    When not using `didSaveRecord`, an adapter will need to
+    invoke:
+
+    * didReceiveId (unless the id was generated locally)
+    * didCreateRecord
+    * didUpdateAttribute(s)
+    * didUpdateRelationship(s)
+
+    @method didReceiveId
+    @param {DS.Model} record
+    @param {Number|String} id
+  */
+  didReceiveId: function(record, id) {
+    var typeMap = this.typeMapFor(record.constructor),
+        clientId = get(record, 'clientId'),
+        oldId = get(record, 'id');
+
+
+    typeMap.idToCid[id] = clientId;
+    this.clientIdToId[clientId] = id;
+  },
+
+  /**
+    This method re-indexes the data by its clientId in the store
+    and then notifies the record that it should rematerialize
+    itself.
+
+    @method updateRecordData
+    @private
+    @param {DS.Model} record
+    @param {Object} data
+  */
+  updateRecordData: function(record, data) {
+    get(record, '_reference').data = data;
+    record.didChangeData();
+  },
+
+  /**
+    If an adapter invokes `didSaveRecord` with data, this method
+    extracts the id from the supplied data (using the adapter's
+    `extractId()` method) and indexes the clientId with that id.
+
+    @method updateId
+    @private
+    @param {DS.Model} record
+    @param {Object} data
+  */
+  updateId: function(record, data) {
+    var type = record.constructor,
+        typeMap = this.typeMapFor(type),
+        reference = get(record, '_reference'),
+        oldId = get(record, 'id'),
+        id = this.preprocessData(type, data);
+
+
+    typeMap.idToReference[id] = reference;
+    reference.id = id;
+  },
+
+  /**
+    This method receives opaque data provided by the adapter and
+    preprocesses it, returning an ID.
+
+    The actual preprocessing takes place in the adapter. If you would
+    like to change the default behavior, you should override the
+    appropriate hooks in `DS.Serializer`.
+
+    @method preprocessData
+    @private
+    @param type
+    @param data
+    @return {String} id the id represented by the data
+  */
+  preprocessData: function(type, data) {
+    return this.adapterForType(type).extractId(type, data);
+  },
+
+  /**
+    Returns a map of IDs to client IDs for a given type.
+
+    @method typeMapFor
+    @private
+    @param type
+  */
+  typeMapFor: function(type) {
+    var typeMaps = get(this, 'typeMaps'),
+        guid = Ember.guidFor(type),
+        typeMap;
+
+    typeMap = typeMaps[guid];
+
+    if (typeMap) { return typeMap; }
+
+    typeMap = {
+      idToReference: {},
+      references: [],
+      metadata: {}
+    };
+
+    typeMaps[guid] = typeMap;
+
+    return typeMap;
+  },
+
+  // ................
+  // . LOADING DATA .
+  // ................
+
+  /**
+    Load new data into the store for a given id and type combination.
+    If data for that record had been loaded previously, the new information
+    overwrites the old.
+
+    If the record you are loading data for has outstanding changes that have not
+    yet been saved, an exception will be thrown.
+
+    @method load
+    @param {DS.Model} type
+    @param data
+    @param prematerialized
+  */
+  load: function(type, data, prematerialized) {
+    var id;
+
+    if (typeof data === 'number' || typeof data === 'string') {
+      id = data;
+      data = prematerialized;
+      prematerialized = null;
+    }
+
+    if (prematerialized && prematerialized.id) {
+      id = prematerialized.id;
+    } else if (id === undefined) {
+      id = this.preprocessData(type, data);
+    }
+
+    id = coerceId(id);
+
+    var reference = this.referenceForId(type, id);
+
+    if (reference.record) {
+      once(reference.record, 'loadedData');
+    }
+
+    reference.data = data;
+    reference.prematerialized = prematerialized;
+
+    this.recordArrayManager.referenceDidChange(reference);
+
+    return reference;
+  },
+
+  newLoad: function(type, data) {
+    var id = coerceId(data.id),
+        reference = this.referenceForId(type, id);
+
+    reference.data = MATERIALIZED;
+
+    if (reference.record) { reference.record.setupData(data); }
+
+    this.recordArrayManager.referenceDidChange(reference);
+
+    return reference;
+  },
+
+  modelFor: function(key) {
+    if (typeof key !== 'string') {
+      return key;
+    }
+
+    var factory = this.container.lookupFactory('model:'+key);
+    factory.store = this;
+
+    return factory;
+  },
+
+  push: function(type, data) {
+    var serializer = this.serializerFor(type);
+    type = this.modelFor(type);
+
+    data = serializer.deserialize(type, data);
+
+    this.newLoad(type, data);
+
+    var reference = this.referenceForId(type, data.id),
+        record = reference.record;
+
+    if (record) {
+      return record;
+    } else {
+      return this.materializeRecord(reference, data);
+    }
+  },
+
+  recordFor: function(type, id) {
+    type = this.modelFor(type);
+
+    var reference = this.referenceForId(type, id);
+    if (reference.record) { return reference.record; }
+
+    return this.materializeRecord(reference);
+  },
+
+  loadMany: function(type, ids, dataList) {
+    if (dataList === undefined) {
+      dataList = ids;
+      ids = map(dataList, function(data) {
+        return this.preprocessData(type, data);
+      }, this);
+    }
+
+    return map(ids, function(id, i) {
+      return this.load(type, id, dataList[i]);
+    }, this);
+  },
+
+  loadHasMany: function(record, key, ids) {
+    //It looks sad to have to do the conversion in the store
+    var type = record.get(key + '.type'),
+        tuples = map(ids, function(id) {
+          return {id: id, type: type};
+        });
+    record.materializeHasMany(key, tuples);
+
+    // Update any existing many arrays that use the previous IDs,
+    // if necessary.
+    record.hasManyDidChange(key);
+
+    var relationship = record.cacheFor(key);
+
+    // TODO (tomdale) this assumes that loadHasMany *always* means
+    // that the records for the provided IDs are loaded.
+    if (relationship) {
+      set(relationship, 'isLoaded', true);
+      relationship.trigger('didLoad');
+    }
+  },
+
+  /**
+    Creates a new reference for a given type & ID pair. Metadata about the
+    record can be stored in the reference without having to create a full-blown
+    DS.Model instance.
+
+    @method createReference
+    @private
+    @param {DS.Model} type
+    @param {String|Number} id
+    @returns {Reference}
+  */
+  createReference: function(type, id) {
+    var typeMap = this.typeMapFor(type),
+        idToReference = typeMap.idToReference;
+
+
+    var reference = {
+      id: id,
+      clientId: this.clientIdCounter++,
+      type: type
+    };
+
+    // if we're creating an item, this process will be done
+    // later, once the object has been persisted.
+    if (id) {
+      idToReference[id] = reference;
+    }
+
+    typeMap.references.push(reference);
+
+    return reference;
+  },
+
+  // ..........................
+  // . RECORD MATERIALIZATION .
+  // ..........................
+
+  materializeRecord: function(reference, data) {
+    var record = reference.type._create({
+      id: reference.id,
+      store: this,
+      _reference: reference
+    });
+
+    reference.record = record;
+
+    get(this, 'defaultTransaction').adoptRecord(record);
+
+    if (data) {
+      record.setupData(data);
+    }
+
+    return record;
+  },
+
+  legacyMaterializeRecord: function(reference) {
+    var record = reference.type._create({
+      id: reference.id,
+      store: this,
+      _reference: reference
+    });
+
+    reference.record = record;
+
+    get(this, 'defaultTransaction').adoptRecord(record);
+
+    record.loadingData();
+
+    if (typeof reference.data === 'object') {
+      record.loadedData();
+    }
+
+    return record;
+  },
+
+  dematerializeRecord: function(record) {
+    var reference = get(record, '_reference'),
+        type = reference.type,
+        id = reference.id,
+        typeMap = this.typeMapFor(type);
+
+    record.updateRecordArrays();
+
+    if (id) { delete typeMap.idToReference[id]; }
+
+    var loc = indexOf(typeMap.references, reference);
+    typeMap.references.splice(loc, 1);
+  },
+
+  willDestroy: function() {
+    if (get(DS, 'defaultStore') === this) {
+      set(DS, 'defaultStore', null);
+    }
+  },
+
+  // ........................
+  // . RELATIONSHIP CHANGES .
+  // ........................
+
+  addRelationshipChangeFor: function(clientReference, childKey, parentReference, parentKey, change) {
+    var clientId = clientReference.clientId,
+        parentClientId = parentReference ? parentReference.clientId : parentReference;
+    var key = childKey + parentKey;
+    var changes = this.relationshipChanges;
+    if (!(clientId in changes)) {
+      changes[clientId] = {};
+    }
+    if (!(parentClientId in changes[clientId])) {
+      changes[clientId][parentClientId] = {};
+    }
+    if (!(key in changes[clientId][parentClientId])) {
+      changes[clientId][parentClientId][key] = {};
+    }
+    changes[clientId][parentClientId][key][change.changeType] = change;
+  },
+
+  removeRelationshipChangeFor: function(clientReference, childKey, parentReference, parentKey, type) {
+    var clientId = clientReference.clientId,
+        parentClientId = parentReference ? parentReference.clientId : parentReference;
+    var changes = this.relationshipChanges;
+    var key = childKey + parentKey;
+    if (!(clientId in changes) || !(parentClientId in changes[clientId]) || !(key in changes[clientId][parentClientId])){
+      return;
+    }
+    delete changes[clientId][parentClientId][key][type];
+  },
+
+  relationshipChangeFor: function(clientReference, childKey, parentReference, parentKey, type) {
+    var clientId = clientReference.clientId,
+        parentClientId = parentReference ? parentReference.clientId : parentReference;
+    var changes = this.relationshipChanges;
+    var key = childKey + parentKey;
+    if (!(clientId in changes) || !(parentClientId in changes[clientId])){
+      return;
+    }
+    if(type){
+      return changes[clientId][parentClientId][key][type];
+    }
+    else{
+      //TODO(Igor) what if both present
+      return changes[clientId][parentClientId][key]["add"] || changes[clientId][parentClientId][key]["remove"];
+    }
+  },
+
+  relationshipChangePairsFor: function(reference){
+    var toReturn = [];
+
+    if( !reference ) { return toReturn; }
+
+    //TODO(Igor) What about the other side
+    var changesObject = this.relationshipChanges[reference.clientId];
+    for (var objKey in changesObject){
+      if(changesObject.hasOwnProperty(objKey)){
+        for (var changeKey in changesObject[objKey]){
+          if(changesObject[objKey].hasOwnProperty(changeKey)){
+            toReturn.push(changesObject[objKey][changeKey]);
+          }
+        }
+      }
+    }
+    return toReturn;
+  },
+
+  relationshipChangesFor: function(reference) {
+    var toReturn = [];
+
+    if( !reference ) { return toReturn; }
+
+    var relationshipPairs = this.relationshipChangePairsFor(reference);
+    forEach(relationshipPairs, function(pair){
+      var addedChange = pair["add"];
+      var removedChange = pair["remove"];
+      if(addedChange){
+        toReturn.push(addedChange);
+      }
+      if(removedChange){
+        toReturn.push(removedChange);
+      }
+    });
+    return toReturn;
+  },
+  // ......................
+  // . PER-TYPE ADAPTERS
+  // ......................
+
+  adapterForType: function(type) {
+    this._adaptersMap = this.createInstanceMapFor('adapters');
+
+    var adapter = this._adaptersMap.get(type);
+    if (adapter) { return adapter; }
+
+    return this.get('_adapter');
+  },
+
+  // ..............................
+  // . RECORD CHANGE NOTIFICATION .
+  // ..............................
+
+  recordAttributeDidChange: function(reference, attributeName, newValue, oldValue) {
+    var record = reference.record,
+        dirtySet = new Ember.OrderedSet(),
+        adapter = this.adapterForType(record.constructor);
+
+    if (adapter.dirtyRecordsForAttributeChange) {
+      adapter.dirtyRecordsForAttributeChange(dirtySet, record, attributeName, newValue, oldValue);
+    }
+
+    dirtySet.forEach(function(record) {
+      record.adapterDidDirty();
+    });
+  },
+
+  recordBelongsToDidChange: function(dirtySet, child, relationship) {
+    var adapter = this.adapterForType(child.constructor);
+
+    if (adapter.dirtyRecordsForBelongsToChange) {
+      adapter.dirtyRecordsForBelongsToChange(dirtySet, child, relationship);
+    }
+
+    // adapterDidDirty is called by the RelationshipChange that created
+    // the dirtySet.
+  },
+
+  recordHasManyDidChange: function(dirtySet, parent, relationship) {
+    var adapter = this.adapterForType(parent.constructor);
+
+    if (adapter.dirtyRecordsForHasManyChange) {
+      adapter.dirtyRecordsForHasManyChange(dirtySet, parent, relationship);
+    }
+
+    // adapterDidDirty is called by the RelationshipChange that created
+    // the dirtySet.
+  },
+
+  /**
+    Returns an instance of the serializer for a given type. For
+    example, `serializerFor('person')` will return an instance of
+    `App.PersonSerializer`.
+
+    If no `App.PersonSerializer` is found, this method will look
+    for an `App.ApplicationSerializer` (the default serializer for
+    your entire application).
+
+    If no `App.ApplicationSerializer` is found, it will fall back
+    to an instance of `DS.JSONSerializer`.
+
+    @method serializerFor
+    @param {String} type the record to serialize
+  */
+  serializerFor: function(type) {
+    var container = this.container;
+
+    return container.lookup('serializer:'+type) ||
+           container.lookup('serializer:application') ||
+           container.lookup('serializer:_default');
+  }
+});
+
+DS.Store.reopenClass({
+  registerAdapter: DS._Mappable.generateMapFunctionFor('adapters', function(type, adapter, map) {
+    map.set(type, adapter);
+  }),
+
+  transformMapKey: function(key) {
+    if (typeof key === 'string') {
+      var transformedKey;
+      transformedKey = get(Ember.lookup, key);
+
+      return transformedKey;
+    } else {
+      return key;
+    }
+  },
+
+  transformMapValue: function(key, value) {
+    if (Ember.Object.detect(value)) {
+      return value.create();
+    }
+
+    return value;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set,
+    once = Ember.run.once, arrayMap = Ember.ArrayPolyfills.map;
+
+/*
+  WARNING: Much of these docs are inaccurate as of bf8497.
+
+  This file encapsulates the various states that a record can transition
+  through during its lifecycle.
+
+  ### State Manager
+
+  A record's state manager explicitly tracks what state a record is in
+  at any given time. For instance, if a record is newly created and has
+  not yet been sent to the adapter to be saved, it would be in the
+  `created.uncommitted` state.  If a record has had local modifications
+  made to it that are in the process of being saved, the record would be
+  in the `updated.inFlight` state. (These state paths will be explained
+  in more detail below.)
+
+  Events are sent by the record or its store to the record's state manager.
+  How the state manager reacts to these events is dependent on which state
+  it is in. In some states, certain events will be invalid and will cause
+  an exception to be raised.
+
+  States are hierarchical. For example, a record can be in the
+  `deleted.start` state, then transition into the `deleted.inFlight` state.
+  If a child state does not implement an event handler, the state manager
+  will attempt to invoke the event on all parent states until the root state is
+  reached. The state hierarchy of a record is described in terms of a path
+  string. You can determine a record's current state by getting its manager's
+  current state path:
+
+      record.get('stateManager.currentPath');
+      //=> "created.uncommitted"
+
+  The `DS.Model` states are themselves stateless. What we mean is that,
+  though each instance of a record also has a unique instance of a
+  `DS.StateManager`, the hierarchical states that each of *those* points
+  to is a shared data structure. For performance reasons, instead of each
+  record getting its own copy of the hierarchy of states, each state
+  manager points to this global, immutable shared instance. How does a
+  state know which record it should be acting on?  We pass a reference to
+  the current state manager as the first parameter to every method invoked
+  on a state.
+
+  The state manager passed as the first parameter is where you should stash
+  state about the record if needed; you should never store data on the state
+  object itself. If you need access to the record being acted on, you can
+  retrieve the state manager's `record` property. For example, if you had
+  an event handler `myEvent`:
+
+      myEvent: function(manager) {
+        var record = manager.get('record');
+        record.doSomething();
+      }
+
+  For more information about state managers in general, see the Ember.js
+  documentation on `Ember.StateManager`.
+
+  ### Events, Flags, and Transitions
+
+  A state may implement zero or more events, flags, or transitions.
+
+  #### Events
+
+  Events are named functions that are invoked when sent to a record. The
+  state manager will first look for a method with the given name on the
+  current state. If no method is found, it will search the current state's
+  parent, and then its grandparent, and so on until reaching the top of
+  the hierarchy. If the root is reached without an event handler being found,
+  an exception will be raised. This can be very helpful when debugging new
+  features.
+
+  Here's an example implementation of a state with a `myEvent` event handler:
+
+      aState: DS.State.create({
+        myEvent: function(manager, param) {
+          console.log("Received myEvent with "+param);
+        }
+      })
+
+  To trigger this event:
+
+      record.send('myEvent', 'foo');
+      //=> "Received myEvent with foo"
+
+  Note that an optional parameter can be sent to a record's `send()` method,
+  which will be passed as the second parameter to the event handler.
+
+  Events should transition to a different state if appropriate. This can be
+  done by calling the state manager's `transitionTo()` method with a path to the
+  desired state. The state manager will attempt to resolve the state path
+  relative to the current state. If no state is found at that path, it will
+  attempt to resolve it relative to the current state's parent, and then its
+  parent, and so on until the root is reached. For example, imagine a hierarchy
+  like this:
+
+      * created
+        * start <-- currentState
+        * inFlight
+      * updated
+        * inFlight
+
+  If we are currently in the `start` state, calling
+  `transitionTo('inFlight')` would transition to the `created.inFlight` state,
+  while calling `transitionTo('updated.inFlight')` would transition to
+  the `updated.inFlight` state.
+
+  Remember that *only events* should ever cause a state transition. You should
+  never call `transitionTo()` from outside a state's event handler. If you are
+  tempted to do so, create a new event and send that to the state manager.
+
+  #### Flags
+
+  Flags are Boolean values that can be used to introspect a record's current
+  state in a more user-friendly way than examining its state path. For example,
+  instead of doing this:
+
+      var statePath = record.get('stateManager.currentPath');
+      if (statePath === 'created.inFlight') {
+        doSomething();
+      }
+
+  You can say:
+
+      if (record.get('isNew') && record.get('isSaving')) {
+        doSomething();
+      }
+
+  If your state does not set a value for a given flag, the value will
+  be inherited from its parent (or the first place in the state hierarchy
+  where it is defined).
+
+  The current set of flags are defined below. If you want to add a new flag,
+  in addition to the area below, you will also need to declare it in the
+  `DS.Model` class.
+
+  #### Transitions
+
+  Transitions are like event handlers but are called automatically upon
+  entering or exiting a state. To implement a transition, just call a method
+  either `enter` or `exit`:
+
+      myState: DS.State.create({
+        // Gets called automatically when entering
+        // this state.
+        enter: function(manager) {
+          console.log("Entered myState");
+        }
+      })
+
+  Note that enter and exit events are called once per transition. If the
+  current state changes, but changes to another child state of the parent,
+  the transition event on the parent will not be triggered.
+*/
+
+var hasDefinedProperties = function(object) {
+  // Ignore internal property defined by simulated `Ember.create`.
+  var names = Ember.keys(object);
+  var i, l, name;
+  for (i = 0, l = names.length; i < l; i++ ) {
+    name = names[i];
+    if (object.hasOwnProperty(name) && object[name]) { return true; }
+  }
+
+  return false;
+};
+
+var didChangeData = function(record) {
+  record.materializeData();
+};
+
+var willSetProperty = function(record, context) {
+  context.oldValue = get(record, context.name);
+
+  var change = DS.AttributeChange.createChange(context);
+  record._changesToSync[context.name] = change;
+};
+
+var didSetProperty = function(record, context) {
+  var change = record._changesToSync[context.name];
+  change.value = get(record, context.name);
+  change.sync();
+};
+
+
+// Implementation notes:
+//
+// Each state has a boolean value for all of the following flags:
+//
+// * isLoaded: The record has a populated `data` property. When a
+//   record is loaded via `store.find`, `isLoaded` is false
+//   until the adapter sets it. When a record is created locally,
+//   its `isLoaded` property is always true.
+// * isDirty: The record has local changes that have not yet been
+//   saved by the adapter. This includes records that have been
+//   created (but not yet saved) or deleted.
+// * isSaving: The record's transaction has been committed, but
+//   the adapter has not yet acknowledged that the changes have
+//   been persisted to the backend.
+// * isDeleted: The record was marked for deletion. When `isDeleted`
+//   is true and `isDirty` is true, the record is deleted locally
+//   but the deletion was not yet persisted. When `isSaving` is
+//   true, the change is in-flight. When both `isDirty` and
+//   `isSaving` are false, the change has persisted.
+// * isError: The adapter reported that it was unable to save
+//   local changes to the backend. This may also result in the
+//   record having its `isValid` property become false if the
+//   adapter reported that server-side validations failed.
+// * isNew: The record was created on the client and the adapter
+//   did not yet report that it was successfully saved.
+// * isValid: No client-side validations have failed and the
+//   adapter did not report any server-side validation failures.
+
+// The dirty state is a abstract state whose functionality is
+// shared between the `created` and `updated` states.
+//
+// The deleted state shares the `isDirty` flag with the
+// subclasses of `DirtyState`, but with a very different
+// implementation.
+//
+// Dirty states have three child states:
+//
+// `uncommitted`: the store has not yet handed off the record
+//   to be saved.
+// `inFlight`: the store has handed off the record to be saved,
+//   but the adapter has not yet acknowledged success.
+// `invalid`: the record has invalid information and cannot be
+//   send to the adapter yet.
+var DirtyState = {
+  initialState: 'uncommitted',
+
+  // FLAGS
+  isDirty: true,
+
+  // SUBSTATES
+
+  // When a record first becomes dirty, it is `uncommitted`.
+  // This means that there are local pending changes, but they
+  // have not yet begun to be saved, and are not invalid.
+  uncommitted: {
+
+    // EVENTS
+    willSetProperty: willSetProperty,
+    didSetProperty: didSetProperty,
+
+    becomeDirty: Ember.K,
+
+    willCommit: function(record) {
+      record.transitionTo('inFlight');
+    },
+
+    becameClean: function(record) {
+      record.withTransaction(function(t) {
+        t.remove(record);
+      });
+
+      record.transitionTo('loaded.materializing');
+    },
+
+    becameInvalid: function(record) {
+      record.transitionTo('invalid');
+    },
+
+    rollback: function(record) {
+      record.rollback();
+    }
+  },
+
+  // Once a record has been handed off to the adapter to be
+  // saved, it is in the 'in flight' state. Changes to the
+  // record cannot be made during this window.
+  inFlight: {
+    // FLAGS
+    isSaving: true,
+
+    // TRANSITIONS
+    enter: function(record) {
+      record.becameInFlight();
+    },
+
+    // EVENTS
+
+    materializingData: function(record) {
+      set(record, 'lastDirtyType', get(this, 'dirtyType'));
+      record.transitionTo('materializing');
+    },
+
+    didCommit: function(record) {
+      var dirtyType = get(this, 'dirtyType');
+
+      record.withTransaction(function(t) {
+        t.remove(record);
+      });
+
+      record.transitionTo('saved');
+      record.send('invokeLifecycleCallbacks', dirtyType);
+    },
+
+    didChangeData: didChangeData,
+
+    becameInvalid: function(record, errors) {
+      set(record, 'errors', errors);
+
+      record.transitionTo('invalid');
+      record.send('invokeLifecycleCallbacks');
+    },
+
+    becameError: function(record) {
+      record.transitionTo('error');
+      record.send('invokeLifecycleCallbacks');
+    }
+  },
+
+  // A record is in the `invalid` state when its client-side
+  // invalidations have failed, or if the adapter has indicated
+  // the the record failed server-side invalidations.
+  invalid: {
+    // FLAGS
+    isValid: false,
+
+    exit: function(record) {
+       record.withTransaction(function (t) {
+         t.remove(record);
+       });
+     },
+
+    // EVENTS
+    deleteRecord: function(record) {
+      record.transitionTo('deleted.uncommitted');
+      record.clearRelationships();
+    },
+
+    willSetProperty: willSetProperty,
+
+    didSetProperty: function(record, context) {
+      var errors = get(record, 'errors'),
+          key = context.name;
+
+      set(errors, key, null);
+
+      if (!hasDefinedProperties(errors)) {
+        record.send('becameValid');
+      }
+
+      didSetProperty(record, context);
+    },
+
+    becomeDirty: Ember.K,
+
+    rollback: function(record) {
+      record.send('becameValid');
+      record.send('rollback');
+    },
+
+    becameValid: function(record) {
+      record.transitionTo('uncommitted');
+    },
+
+    invokeLifecycleCallbacks: function(record) {
+      record.trigger('becameInvalid', record);
+    }
+  }
+};
+
+// The created and updated states are created outside the state
+// chart so we can reopen their substates and add mixins as
+// necessary.
+
+function deepClone(object) {
+  var clone = {}, value;
+
+  for (var prop in object) {
+    value = object[prop];
+    if (value && typeof value === 'object') {
+      clone[prop] = deepClone(value);
+    } else {
+      clone[prop] = value;
+    }
+  }
+
+  return clone;
+}
+
+function mixin(original, hash) {
+  for (var prop in hash) {
+    original[prop] = hash[prop];
+  }
+
+  return original;
+}
+
+function dirtyState(options) {
+  var newState = deepClone(DirtyState);
+  return mixin(newState, options);
+}
+
+var createdState = dirtyState({
+  dirtyType: 'created',
+
+  // FLAGS
+  isNew: true
+});
+
+var updatedState = dirtyState({
+  dirtyType: 'updated'
+});
+
+createdState.uncommitted.deleteRecord = function(record) {
+  record.clearRelationships();
+  record.transitionTo('deleted.saved');
+};
+
+createdState.uncommitted.rollback = function(record) {
+  DirtyState.uncommitted.rollback.apply(this, arguments);
+  record.transitionTo('deleted.saved');
+};
+
+updatedState.uncommitted.deleteRecord = function(record) {
+  record.transitionTo('deleted.uncommitted');
+  record.clearRelationships();
+};
+
+var RootState = {
+  // FLAGS
+  isEmpty: false,
+  isLoading: false,
+  isLoaded: false,
+  isReloading: false,
+  isDirty: false,
+  isSaving: false,
+  isDeleted: false,
+  isError: false,
+  isNew: false,
+  isValid: true,
+
+  // SUBSTATES
+
+  // A record begins its lifecycle in the `empty` state.
+  // If its data will come from the adapter, it will
+  // transition into the `loading` state. Otherwise, if
+  // the record is being created on the client, it will
+  // transition into the `created` state.
+  empty: {
+    isEmpty: true,
+
+    // EVENTS
+    loadingData: function(record) {
+      record.transitionTo('loading');
+    },
+
+    loadedData: function(record) {
+      record.transitionTo('loaded.created.uncommitted');
+    },
+
+    pushedData: function(record) {
+      record.transitionTo('loaded.saved');
+    }
+  },
+
+  // A record enters this state when the store askes
+  // the adapter for its data. It remains in this state
+  // until the adapter provides the requested data.
+  //
+  // Usually, this process is asynchronous, using an
+  // XHR to retrieve the data.
+  loading: {
+    // FLAGS
+    isLoading: true,
+
+    // EVENTS
+    loadedData: didChangeData,
+
+    materializingData: function(record) {
+      record.transitionTo('loaded.materializing.firstTime');
+    },
+
+    becameError: function(record) {
+      record.transitionTo('error');
+      record.send('invokeLifecycleCallbacks');
+    }
+  },
+
+  // A record enters this state when its data is populated.
+  // Most of a record's lifecycle is spent inside substates
+  // of the `loaded` state.
+  loaded: {
+    initialState: 'saved',
+
+    // FLAGS
+    isLoaded: true,
+
+    // SUBSTATES
+
+    materializing: {
+      // EVENTS
+      willSetProperty: Ember.K,
+      didSetProperty: Ember.K,
+
+      didChangeData: didChangeData,
+
+      finishedMaterializing: function(record) {
+        record.transitionTo('loaded.saved');
+      },
+
+      // SUBSTATES
+      firstTime: {
+        // FLAGS
+        isLoaded: false,
+
+        exit: function(record) {
+          once(function() {
+            record.trigger('didLoad');
+          });
+        }
+      }
+    },
+
+    reloading: {
+      // FLAGS
+      isReloading: true,
+
+      // TRANSITIONS
+      enter: function(record) {
+        var store = get(record, 'store');
+        store.reloadRecord(record);
+      },
+
+      exit: function(record) {
+        once(record, 'trigger', 'didReload');
+      },
+
+      // EVENTS
+      loadedData: didChangeData,
+
+      materializingData: function(record) {
+        record.transitionTo('loaded.materializing');
+      }
+    },
+
+    // If there are no local changes to a record, it remains
+    // in the `saved` state.
+    saved: {
+      // EVENTS
+      willSetProperty: willSetProperty,
+      didSetProperty: didSetProperty,
+
+      didChangeData: didChangeData,
+      loadedData: didChangeData,
+
+      reloadRecord: function(record) {
+        record.transitionTo('loaded.reloading');
+      },
+
+      materializingData: function(record) {
+        record.transitionTo('loaded.materializing');
+      },
+
+      becomeDirty: function(record) {
+        record.transitionTo('updated.uncommitted');
+      },
+
+      deleteRecord: function(record) {
+        record.transitionTo('deleted.uncommitted');
+        record.clearRelationships();
+      },
+
+      unloadRecord: function(record) {
+        // clear relationships before moving to deleted state
+        // otherwise it fails
+        record.clearRelationships();
+        record.transitionTo('deleted.saved');
+      },
+
+      didCommit: function(record) {
+        record.withTransaction(function(t) {
+          t.remove(record);
+        });
+
+        record.send('invokeLifecycleCallbacks', get(record, 'lastDirtyType'));
+      },
+
+      invokeLifecycleCallbacks: function(record, dirtyType) {
+        if (dirtyType === 'created') {
+          record.trigger('didCreate', record);
+        } else {
+          record.trigger('didUpdate', record);
+        }
+
+        record.trigger('didCommit', record);
+      }
+    },
+
+    // A record is in this state after it has been locally
+    // created but before the adapter has indicated that
+    // it has been saved.
+    created: createdState,
+
+    // A record is in this state if it has already been
+    // saved to the server, but there are new local changes
+    // that have not yet been saved.
+    updated: updatedState
+  },
+
+  // A record is in this state if it was deleted from the store.
+  deleted: {
+    initialState: 'uncommitted',
+    dirtyType: 'deleted',
+
+    // FLAGS
+    isDeleted: true,
+    isLoaded: true,
+    isDirty: true,
+
+    // TRANSITIONS
+    setup: function(record) {
+      var store = get(record, 'store');
+
+      store.recordArrayManager.remove(record);
+    },
+
+    // SUBSTATES
+
+    // When a record is deleted, it enters the `start`
+    // state. It will exit this state when the record's
+    // transaction starts to commit.
+    uncommitted: {
+
+      // EVENTS
+      willCommit: function(record) {
+        record.transitionTo('inFlight');
+      },
+
+      rollback: function(record) {
+        record.rollback();
+      },
+
+      becomeDirty: Ember.K,
+
+      becameClean: function(record) {
+        record.withTransaction(function(t) {
+          t.remove(record);
+        });
+        record.transitionTo('loaded.materializing');
+      }
+    },
+
+    // After a record's transaction is committing, but
+    // before the adapter indicates that the deletion
+    // has saved to the server, a record is in the
+    // `inFlight` substate of `deleted`.
+    inFlight: {
+      // FLAGS
+      isSaving: true,
+
+      // TRANSITIONS
+      enter: function(record) {
+        record.becameInFlight();
+      },
+
+      // EVENTS
+      didCommit: function(record) {
+        record.withTransaction(function(t) {
+          t.remove(record);
+        });
+
+        record.transitionTo('saved');
+
+        record.send('invokeLifecycleCallbacks');
+      }
+    },
+
+    // Once the adapter indicates that the deletion has
+    // been saved, the record enters the `saved` substate
+    // of `deleted`.
+    saved: {
+      // FLAGS
+      isDirty: false,
+
+      setup: function(record) {
+        var store = get(record, 'store');
+        store.dematerializeRecord(record);
+      },
+
+      invokeLifecycleCallbacks: function(record) {
+        record.trigger('didDelete', record);
+        record.trigger('didCommit', record);
+      }
+    }
+  },
+
+  // If the adapter indicates that there was an unknown
+  // error saving a record, the record enters the `error`
+  // state.
+  error: {
+    isError: true,
+
+    // EVENTS
+
+    invokeLifecycleCallbacks: function(record) {
+      record.trigger('becameError', record);
+    }
+  }
+};
+
+var hasOwnProp = {}.hasOwnProperty;
+
+function wireState(object, parent, name) {
+  /*jshint proto:true*/
+  // TODO: Use Object.create and copy instead
+  object = mixin(parent ? Ember.create(parent) : {}, object);
+  object.parentState = parent;
+  object.stateName = name;
+
+  for (var prop in object) {
+    if (!object.hasOwnProperty(prop) || prop === 'parentState' || prop === 'stateName') { continue; }
+    if (typeof object[prop] === 'object') {
+      object[prop] = wireState(object[prop], object, name + "." + prop);
+    }
+  }
+
+  return object;
+}
+
+RootState = wireState(RootState, null, "root");
+
+DS.RootState = RootState;
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var LoadPromise = DS.LoadPromise; // system/mixins/load_promise
+
+var get = Ember.get, set = Ember.set, map = Ember.EnumerableUtils.map, merge = Ember.merge;
+
+var arrayMap = Ember.ArrayPolyfills.map;
+
+var retrieveFromCurrentState = Ember.computed(function(key, value) {
+  return get(get(this, 'currentState'), key);
+}).property('currentState').readOnly();
+
+/**
+
+  The model class that all Ember Data records descend from.
+
+  @class Model
+  @namespace DS
+  @extends Ember.Object
+  @uses Ember.Evented
+  @uses DS.LoadPromise
+*/
+DS.Model = Ember.Object.extend(Ember.Evented, LoadPromise, {
+  isEmpty: retrieveFromCurrentState,
+  isLoading: retrieveFromCurrentState,
+  isLoaded: retrieveFromCurrentState,
+  isReloading: retrieveFromCurrentState,
+  isDirty: retrieveFromCurrentState,
+  isSaving: retrieveFromCurrentState,
+  isDeleted: retrieveFromCurrentState,
+  isError: retrieveFromCurrentState,
+  isNew: retrieveFromCurrentState,
+  isValid: retrieveFromCurrentState,
+  dirtyType: retrieveFromCurrentState,
+
+  clientId: null,
+  id: null,
+  transaction: null,
+  currentState: null,
+  errors: null,
+
+  /**
+    Create a JSON representation of the record, using the serialization
+    strategy of the store's adapter.
+
+    @method serialize
+    @param {Object} options Available options:
+
+    * `includeId`: `true` if the record's ID should be included in the
+      JSON representation.
+
+    @returns {Object} an object whose values are primitive JSON values only
+  */
+  serialize: function(options) {
+    var store = get(this, 'store');
+    return store.serialize(this, options);
+  },
+
+  /**
+    Use {{#crossLink "DS.JSONSerializer"}}DS.JSONSerializer{{/crossLink}} to
+    get the JSON representation of a record.
+
+    @method toJSON
+    @param {Object} options Available options:
+
+    * `includeId`: `true` if the record's ID should be included in the
+      JSON representation.
+
+    @returns {Object} A JSON representation of the object.
+  */
+  toJSON: function(options) {
+    var serializer = DS.JSONSerializer.create();
+    return serializer.serialize(this, options);
+  },
+
+  /**
+    Fired when the record is loaded from the server.
+
+    @event didLoad
+  */
+  didLoad: Ember.K,
+
+  /**
+    Fired when the record is reloaded from the server.
+
+    @event didReload
+  */
+  didReload: Ember.K,
+
+  /**
+    Fired when the record is updated.
+
+    @event didUpdate
+  */
+  didUpdate: Ember.K,
+
+  /**
+    Fired when the record is created.
+
+    @event didCreate
+  */
+  didCreate: Ember.K,
+
+  /**
+    Fired when the record is deleted.
+
+    @event didDelete
+  */
+  didDelete: Ember.K,
+
+  /**
+    Fired when the record becomes invalid.
+
+    @event becameInvalid
+  */
+  becameInvalid: Ember.K,
+
+  /**
+    Fired when the record enters the error state.
+
+    @event becameError
+  */
+  becameError: Ember.K,
+
+  data: Ember.computed(function() {
+    if (!this._data) {
+      this.setupData();
+    }
+
+    return this._data;
+  }).property(),
+
+  materializeData: function() {
+    this.send('materializingData');
+
+    get(this, 'store').materializeData(this);
+
+    this.suspendRelationshipObservers(function() {
+      this.notifyPropertyChange('data');
+    });
+  },
+
+  _data: null,
+
+  init: function() {
+    set(this, 'currentState', DS.RootState.empty);
+    this._super();
+    this._setup();
+  },
+
+  _setup: function() {
+    this._changesToSync = {};
+  },
+
+  send: function(name, context) {
+    var currentState = get(this, 'currentState');
+
+    if (!currentState[name]) {
+      this._unhandledEvent(currentState, name, context);
+    }
+
+    return currentState[name](this, context);
+  },
+
+  transitionTo: function(name) {
+    // POSSIBLE TODO: Remove this code and replace with
+    // always having direct references to state objects
+
+    var pivotName = name.split(".", 1),
+        currentState = get(this, 'currentState'),
+        state = currentState;
+
+    do {
+      if (state.exit) { state.exit(this); }
+      state = state.parentState;
+    } while (!state.hasOwnProperty(pivotName));
+
+    var path = name.split(".");
+
+    var setups = [], enters = [], i, l;
+
+    for (i=0, l=path.length; i<l; i++) {
+      state = state[path[i]];
+
+      if (state.enter) { enters.push(state); }
+      if (state.setup) { setups.push(state); }
+    }
+
+    for (i=0, l=enters.length; i<l; i++) {
+      enters[i].enter(this);
+    }
+
+    set(this, 'currentState', state);
+
+    for (i=0, l=setups.length; i<l; i++) {
+      setups[i].setup(this);
+    }
+  },
+
+  _unhandledEvent: function(state, name, context) {
+    var errorMessage = "Attempted to handle event `" + name + "` ";
+    errorMessage    += "on " + String(this) + " while in state ";
+    errorMessage    += state.stateName + ". ";
+
+    if (context !== undefined) {
+      errorMessage  += "Called with " + Ember.inspect(context) + ".";
+    }
+
+    throw new Ember.Error(errorMessage);
+  },
+
+  withTransaction: function(fn) {
+    var transaction = get(this, 'transaction');
+    if (transaction) { fn(transaction); }
+  },
+
+  loadingData: function() {
+    this.send('loadingData');
+  },
+
+  loadedData: function() {
+    this.send('loadedData');
+  },
+
+  pushedData: function() {
+    this.send('pushedData');
+  },
+
+  didChangeData: function() {
+    this.send('didChangeData');
+  },
+
+  deleteRecord: function() {
+    this.send('deleteRecord');
+  },
+
+  unloadRecord: function() {
+
+
+    this.send('unloadRecord');
+  },
+
+  clearRelationships: function() {
+    this.eachRelationship(function(name, relationship) {
+      if (relationship.kind === 'belongsTo') {
+        set(this, name, null);
+      } else if (relationship.kind === 'hasMany') {
+        this.clearHasMany(relationship);
+      }
+    }, this);
+  },
+
+  updateRecordArrays: function() {
+    var store = get(this, 'store');
+    if (store) {
+      store.dataWasUpdated(this.constructor, get(this, '_reference'), this);
+    }
+  },
+
+  /**
+    If the adapter did not return a hash in response to a commit,
+    merge the changed attributes and relationships into the existing
+    saved data.
+
+    @method adapterDidCommit
+  */
+  adapterDidCommit: function() {
+    var attributes = get(this, 'data');
+
+    get(this.constructor, 'attributes').forEach(function(name, meta) {
+      attributes[name] = get(this, name);
+    }, this);
+
+    this.send('didCommit');
+    this.updateRecordArraysLater();
+  },
+
+  adapterDidDirty: function() {
+    this.send('becomeDirty');
+    this.updateRecordArraysLater();
+  },
+
+  dataDidChange: Ember.observer(function() {
+    this.reloadHasManys();
+    this.send('finishedMaterializing');
+  }, 'data'),
+
+  reloadHasManys: function() {
+    var relationships = get(this.constructor, 'relationshipsByName');
+    this.updateRecordArraysLater();
+    relationships.forEach(function(name, relationship) {
+      if (relationship.kind === 'hasMany') {
+        this.hasManyDidChange(relationship.key);
+      }
+    }, this);
+  },
+
+  hasManyDidChange: function(key) {
+    var cachedValue = this.cacheFor(key);
+
+    if (cachedValue) {
+      var type = get(this.constructor, 'relationshipsByName').get(key).type;
+      var store = get(this, 'store');
+      var ids = this._data[key] || [];
+
+      var references = map(ids, function(id) {
+        if (typeof id === 'object') {
+          if( id.clientId ) {
+            // if it was already a reference, return the reference
+            return id;
+          } else {
+            // <id, type> tuple for a polymorphic association.
+            return store.referenceForId(id.type, id.id);
+          }
+        }
+        return store.referenceForId(type, id);
+      });
+
+      set(cachedValue, 'content', Ember.A(references));
+    }
+  },
+
+  updateRecordArraysLater: function() {
+    Ember.run.once(this, this.updateRecordArrays);
+  },
+
+  setupData: function(data) {
+    this._data = data || { id: null };
+
+    if (data) { this.pushedData(); }
+  },
+
+  materializeId: function(id) {
+    set(this, 'id', id);
+  },
+
+  materializeAttributes: function(attributes) {
+
+    merge(this._data, attributes);
+  },
+
+  materializeAttribute: function(name, value) {
+    this._data[name] = value;
+  },
+
+  materializeHasMany: function(name, tuplesOrReferencesOrOpaque) {
+    var tuplesOrReferencesOrOpaqueType = typeof tuplesOrReferencesOrOpaque;
+
+    if (tuplesOrReferencesOrOpaque && tuplesOrReferencesOrOpaqueType !== 'string' && tuplesOrReferencesOrOpaque.length > 1) {
+
+    }
+
+    if( tuplesOrReferencesOrOpaqueType === "string" ) {
+      this._data[name] = tuplesOrReferencesOrOpaque;
+    } else {
+      var references = tuplesOrReferencesOrOpaque;
+
+      if (tuplesOrReferencesOrOpaque && Ember.isArray(tuplesOrReferencesOrOpaque)) {
+        references = this._convertTuplesToReferences(tuplesOrReferencesOrOpaque);
+      }
+
+      this._data[name] = references;
+    }
+  },
+
+  materializeBelongsTo: function(name, tupleOrReference) {
+    if (tupleOrReference) { Ember.assert('materializeBelongsTo expects a tuple or a reference, not a ' + tupleOrReference, !tupleOrReference || (tupleOrReference.hasOwnProperty('id') && tupleOrReference.hasOwnProperty('type'))); }
+
+    this._data[name] = tupleOrReference;
+  },
+
+  _convertTuplesToReferences: function(tuplesOrReferences) {
+    return map(tuplesOrReferences, function(tupleOrReference) {
+      return this._convertTupleToReference(tupleOrReference);
+    }, this);
+  },
+
+  _convertTupleToReference: function(tupleOrReference) {
+    var store = get(this, 'store');
+    if(tupleOrReference.clientId) {
+      return tupleOrReference;
+    } else {
+      return store.referenceForId(tupleOrReference.type, tupleOrReference.id);
+    }
+  },
+
+  rollback: function() {
+    this._setup();
+    this.send('becameClean');
+
+    this.suspendRelationshipObservers(function() {
+      this.notifyPropertyChange('data');
+    });
+  },
+
+  toStringExtension: function() {
+    return get(this, 'id');
+  },
+
+  /**
+    The goal of this method is to temporarily disable specific observers
+    that take action in response to application changes.
+
+    This allows the system to make changes (such as materialization and
+    rollback) that should not trigger secondary behavior (such as setting an
+    inverse relationship or marking records as dirty).
+
+    The specific implementation will likely change as Ember proper provides
+    better infrastructure for suspending groups of observers, and if Array
+    observation becomes more unified with regular observers.
+
+    @method suspendRelationshipObservers
+    @private
+    @param callback
+    @param binding
+  */
+  suspendRelationshipObservers: function(callback, binding) {
+    var observers = get(this.constructor, 'relationshipNames').belongsTo;
+    var self = this;
+
+    try {
+      this._suspendedRelationships = true;
+      Ember._suspendObservers(self, observers, null, 'belongsToDidChange', function() {
+        Ember._suspendBeforeObservers(self, observers, null, 'belongsToWillChange', function() {
+          callback.call(binding || self);
+        });
+      });
+    } finally {
+      this._suspendedRelationships = false;
+    }
+  },
+
+  becameInFlight: function() {
+  },
+
+  /**
+    @method resolveOn
+    @private
+    @param successEvent
+  */
+  resolveOn: function(successEvent) {
+    var model = this;
+
+    return new Ember.RSVP.Promise(function(resolve, reject) {
+      function success() {
+        this.off('becameError', error);
+        this.off('becameInvalid', error);
+        resolve(this);
+      }
+      function error() {
+        this.off(successEvent, success);
+        reject(this);
+      }
+
+      model.one(successEvent, success);
+      model.one('becameError', error);
+      model.one('becameInvalid', error);
+    });
+  },
+
+  /**
+    Save the record.
+
+    @method save
+  */
+  save: function() {
+    this.get('store').scheduleSave(this);
+
+    return this.resolveOn('didCommit');
+  },
+
+  /**
+    Reload the record from the adapter.
+
+    This will only work if the record has already finished loading
+    and has not yet been modified (`isLoaded` but not `isDirty`,
+    or `isSaving`).
+
+    @method reload
+  */
+  reload: function() {
+    this.send('reloadRecord');
+
+    return this.resolveOn('didReload');
+  },
+
+  // FOR USE DURING COMMIT PROCESS
+
+  adapterDidUpdateAttribute: function(attributeName, value) {
+
+    // If a value is passed in, update the internal attributes and clear
+    // the attribute cache so it picks up the new value. Otherwise,
+    // collapse the current value into the internal attributes because
+    // the adapter has acknowledged it.
+    if (value !== undefined) {
+      get(this, 'data')[attributeName] = value;
+      this.notifyPropertyChange(attributeName);
+    } else {
+      value = get(this, attributeName);
+      get(this, 'data')[attributeName] = value;
+    }
+
+    this.updateRecordArraysLater();
+  },
+
+  adapterDidInvalidate: function(errors) {
+    this.send('becameInvalid', errors);
+  },
+
+  adapterDidError: function() {
+    this.send('becameError');
+  },
+
+  /**
+    Override the default event firing from Ember.Evented to
+    also call methods with the given name.
+
+    @method trigger
+    @private
+    @param name
+  */
+  trigger: function(name) {
+    Ember.tryInvoke(this, name, [].slice.call(arguments, 1));
+    this._super.apply(this, arguments);
+  }
+});
+
+// Helper function to generate store aliases.
+// This returns a function that invokes the named alias
+// on the default store, but injects the class as the
+// first parameter.
+var storeAlias = function(methodName) {
+  return function() {
+    var store = get(DS, 'defaultStore'),
+        args = [].slice.call(arguments);
+
+    args.unshift(this);
+
+    return store[methodName].apply(store, args);
+  };
+};
+
+DS.Model.reopenClass({
+
+  /**
+    Alias DS.Model's `create` method to `_create`. This allows us to create DS.Model
+    instances from within the store, but if end users accidentally call `create()`
+    (instead of `createRecord()`), we can raise an error.
+
+    @method _create
+    @private
+    @static
+  */
+  _create: DS.Model.create,
+
+  /**
+    Override the class' `create()` method to raise an error. This prevents end users
+    from inadvertently calling `create()` instead of `createRecord()`. The store is
+    still able to create instances by calling the `_create()` method.
+
+    @method create
+    @private
+    @static
+  */
+  create: function() {
+    throw new Ember.Error("You should not call `create` on a model. Instead, call `createRecord` with the attributes you would like to set.");
+  },
+
+  /**
+    See `DS.Store.find()`.
+
+    @method find
+    @param {Object|String|Array|null} query A query to find records by.
+  */
+  find: storeAlias('find'),
+
+  /**
+    See `DS.Store.all()`.
+
+    @method all
+    @return {DS.RecordArray}
+  */
+  all: storeAlias('all'),
+
+  /**
+    See `DS.Store.findQuery()`.
+
+    @method query
+    @param {Object} query an opaque query to be used by the adapter
+    @return {DS.AdapterPopulatedRecordArray}
+  */
+  query: storeAlias('findQuery'),
+
+  /**
+    See `DS.Store.filter()`.
+
+    @method filter
+    @param {Function} filter
+    @return {DS.FilteredRecordArray}
+  */
+  filter: storeAlias('filter'),
+
+  /**
+    See `DS.Store.createRecord()`.
+
+    @method createRecord
+    @param {Object} properties a hash of properties to set on the
+      newly created record.
+    @return DS.Model
+  */
+  createRecord: storeAlias('createRecord')
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get;
+
+/**
+  @class Model
+  @namespace DS
+*/
+DS.Model.reopenClass({
+  attributes: Ember.computed(function() {
+    var map = Ember.Map.create();
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isAttribute) {
+
+
+        meta.name = name;
+        map.set(name, meta);
+      }
+    });
+
+    return map;
+  })
+});
+
+
+DS.Model.reopen({
+  eachAttribute: function(callback, binding) {
+    get(this.constructor, 'attributes').forEach(function(name, meta) {
+      callback.call(binding, name, meta);
+    }, binding);
+  },
+
+  attributeWillChange: Ember.beforeObserver(function(record, key) {
+    var reference = get(record, '_reference'),
+        store = get(record, 'store');
+
+    record.send('willSetProperty', { reference: reference, store: store, name: key });
+  }),
+
+  attributeDidChange: Ember.observer(function(record, key) {
+    record.send('didSetProperty', { name: key });
+  })
+});
+
+function getAttr(record, options, key) {
+  var attributes = get(record, 'data');
+  var value = attributes[key];
+
+  if (value === undefined) {
+    if (typeof options.defaultValue === "function") {
+      value = options.defaultValue();
+    } else {
+      value = options.defaultValue;
+    }
+  }
+
+  return value;
+}
+
+DS.attr = function(type, options) {
+  options = options || {};
+
+  var meta = {
+    type: type,
+    isAttribute: true,
+    options: options
+  };
+
+  return Ember.computed(function(key, value, oldValue) {
+    if (arguments.length > 1) {
+
+    } else {
+      value = getAttr(this, options, key);
+    }
+
+    return value;
+  // `data` is never set directly. However, it may be
+  // invalidated from the state manager's setData
+  // event.
+  }).property('data').meta(meta);
+};
+
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+/**
+  An AttributeChange object is created whenever a record's
+  attribute changes value. It is used to track changes to a
+  record between transaction commits.
+
+  @class AttributeChange
+  @namespace DS
+  @private
+  @constructor
+*/
+var AttributeChange = DS.AttributeChange = function(options) {
+  this.reference = options.reference;
+  this.store = options.store;
+  this.name = options.name;
+  this.oldValue = options.oldValue;
+};
+
+AttributeChange.createChange = function(options) {
+  return new AttributeChange(options);
+};
+
+AttributeChange.prototype = {
+  sync: function() {
+    this.store.recordAttributeDidChange(this.reference, this.name, this.value, this.oldValue);
+
+    // TODO: Use this object in the commit process
+    this.destroy();
+  },
+
+  /**
+    If the AttributeChange is destroyed (either by being rolled back
+    or being committed), remove it from the list of pending changes
+    on the record.
+
+    @method destroy
+  */
+  destroy: function() {
+    var record = this.reference.record;
+
+    delete record._changesToSync[this.name];
+  }
+};
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+var forEach = Ember.EnumerableUtils.forEach;
+
+/**
+  @class RelationshipChange
+  @namespace DS
+  @private
+  @construtor
+*/
+DS.RelationshipChange = function(options) {
+  this.parentReference = options.parentReference;
+  this.childReference = options.childReference;
+  this.firstRecordReference = options.firstRecordReference;
+  this.firstRecordKind = options.firstRecordKind;
+  this.firstRecordName = options.firstRecordName;
+  this.secondRecordReference = options.secondRecordReference;
+  this.secondRecordKind = options.secondRecordKind;
+  this.secondRecordName = options.secondRecordName;
+  this.changeType = options.changeType;
+  this.store = options.store;
+
+  this.committed = {};
+};
+
+/**
+  @class RelationshipChangeAdd
+  @namespace DS
+  @private
+  @construtor
+*/
+DS.RelationshipChangeAdd = function(options){
+  DS.RelationshipChange.call(this, options);
+};
+
+/**
+  @class RelationshipChangeRemove
+  @namespace DS
+  @private
+  @construtor
+*/
+DS.RelationshipChangeRemove = function(options){
+  DS.RelationshipChange.call(this, options);
+};
+
+DS.RelationshipChange.create = function(options) {
+  return new DS.RelationshipChange(options);
+};
+
+DS.RelationshipChangeAdd.create = function(options) {
+  return new DS.RelationshipChangeAdd(options);
+};
+
+DS.RelationshipChangeRemove.create = function(options) {
+  return new DS.RelationshipChangeRemove(options);
+};
+
+DS.OneToManyChange = {};
+DS.OneToNoneChange = {};
+DS.ManyToNoneChange = {};
+DS.OneToOneChange = {};
+DS.ManyToManyChange = {};
+
+DS.RelationshipChange._createChange = function(options){
+  if(options.changeType === "add"){
+    return DS.RelationshipChangeAdd.create(options);
+  }
+  if(options.changeType === "remove"){
+    return DS.RelationshipChangeRemove.create(options);
+  }
+};
+
+
+DS.RelationshipChange.determineRelationshipType = function(recordType, knownSide){
+  var knownKey = knownSide.key, key, otherKind;
+  var knownKind = knownSide.kind;
+
+  var inverse = recordType.inverseFor(knownKey);
+
+  if (inverse){
+    key = inverse.name;
+    otherKind = inverse.kind;
+  }
+
+  if (!inverse){
+    return knownKind === "belongsTo" ? "oneToNone" : "manyToNone";
+  }
+  else{
+    if(otherKind === "belongsTo"){
+      return knownKind === "belongsTo" ? "oneToOne" : "manyToOne";
+    }
+    else{
+      return knownKind === "belongsTo" ? "oneToMany" : "manyToMany";
+    }
+  }
+
+};
+
+DS.RelationshipChange.createChange = function(firstRecordReference, secondRecordReference, store, options){
+  // Get the type of the child based on the child's client ID
+  var firstRecordType = firstRecordReference.type, changeType;
+  changeType = DS.RelationshipChange.determineRelationshipType(firstRecordType, options);
+  if (changeType === "oneToMany"){
+    return DS.OneToManyChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+  else if (changeType === "manyToOne"){
+    return DS.OneToManyChange.createChange(secondRecordReference, firstRecordReference, store, options);
+  }
+  else if (changeType === "oneToNone"){
+    return DS.OneToNoneChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+  else if (changeType === "manyToNone"){
+    return DS.ManyToNoneChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+  else if (changeType === "oneToOne"){
+    return DS.OneToOneChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+  else if (changeType === "manyToMany"){
+    return DS.ManyToManyChange.createChange(firstRecordReference, secondRecordReference, store, options);
+  }
+};
+
+DS.OneToNoneChange.createChange = function(childReference, parentReference, store, options) {
+  var key = options.key;
+  var change = DS.RelationshipChange._createChange({
+      parentReference: parentReference,
+      childReference: childReference,
+      firstRecordReference: childReference,
+      store: store,
+      changeType: options.changeType,
+      firstRecordName: key,
+      firstRecordKind: "belongsTo"
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, null, change);
+
+  return change;
+};
+
+DS.ManyToNoneChange.createChange = function(childReference, parentReference, store, options) {
+  var key = options.key;
+  var change = DS.RelationshipChange._createChange({
+      parentReference: childReference,
+      childReference: parentReference,
+      secondRecordReference: childReference,
+      store: store,
+      changeType: options.changeType,
+      secondRecordName: options.key,
+      secondRecordKind: "hasMany"
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, null, change);
+  return change;
+};
+
+
+DS.ManyToManyChange.createChange = function(childReference, parentReference, store, options) {
+  // If the name of the belongsTo side of the relationship is specified,
+  // use that
+  // If the type of the parent is specified, look it up on the child's type
+  // definition.
+  var key = options.key;
+
+  var change = DS.RelationshipChange._createChange({
+      parentReference: parentReference,
+      childReference: childReference,
+      firstRecordReference: childReference,
+      secondRecordReference: parentReference,
+      firstRecordKind: "hasMany",
+      secondRecordKind: "hasMany",
+      store: store,
+      changeType: options.changeType,
+      firstRecordName:  key
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, null, change);
+
+
+  return change;
+};
+
+DS.OneToOneChange.createChange = function(childReference, parentReference, store, options) {
+  var key;
+
+  // If the name of the belongsTo side of the relationship is specified,
+  // use that
+  // If the type of the parent is specified, look it up on the child's type
+  // definition.
+  if (options.parentType) {
+    key = options.parentType.inverseFor(options.key).name;
+  } else if (options.key) {
+    key = options.key;
+  } else {
+
+  }
+
+  var change = DS.RelationshipChange._createChange({
+      parentReference: parentReference,
+      childReference: childReference,
+      firstRecordReference: childReference,
+      secondRecordReference: parentReference,
+      firstRecordKind: "belongsTo",
+      secondRecordKind: "belongsTo",
+      store: store,
+      changeType: options.changeType,
+      firstRecordName:  key
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, null, change);
+
+
+  return change;
+};
+
+DS.OneToOneChange.maintainInvariant = function(options, store, childReference, key){
+  if (options.changeType === "add" && store.recordIsMaterialized(childReference)) {
+    var child = store.recordForReference(childReference);
+    var oldParent = get(child, key);
+    if (oldParent){
+      var correspondingChange = DS.OneToOneChange.createChange(childReference, oldParent.get('_reference'), store, {
+          parentType: options.parentType,
+          hasManyName: options.hasManyName,
+          changeType: "remove",
+          key: options.key
+        });
+      store.addRelationshipChangeFor(childReference, key, options.parentReference , null, correspondingChange);
+     correspondingChange.sync();
+    }
+  }
+};
+
+DS.OneToManyChange.createChange = function(childReference, parentReference, store, options) {
+  var key;
+
+  // If the name of the belongsTo side of the relationship is specified,
+  // use that
+  // If the type of the parent is specified, look it up on the child's type
+  // definition.
+  if (options.parentType) {
+    key = options.parentType.inverseFor(options.key).name;
+    DS.OneToManyChange.maintainInvariant( options, store, childReference, key );
+  } else if (options.key) {
+    key = options.key;
+  } else {
+
+  }
+
+  var change = DS.RelationshipChange._createChange({
+      parentReference: parentReference,
+      childReference: childReference,
+      firstRecordReference: childReference,
+      secondRecordReference: parentReference,
+      firstRecordKind: "belongsTo",
+      secondRecordKind: "hasMany",
+      store: store,
+      changeType: options.changeType,
+      firstRecordName:  key
+  });
+
+  store.addRelationshipChangeFor(childReference, key, parentReference, change.getSecondRecordName(), change);
+
+
+  return change;
+};
+
+
+DS.OneToManyChange.maintainInvariant = function(options, store, childReference, key){
+  var child = childReference.record;
+
+  if (options.changeType === "add" && child) {
+    var oldParent = get(child, key);
+    if (oldParent){
+      var correspondingChange = DS.OneToManyChange.createChange(childReference, oldParent.get('_reference'), store, {
+          parentType: options.parentType,
+          hasManyName: options.hasManyName,
+          changeType: "remove",
+          key: options.key
+        });
+      store.addRelationshipChangeFor(childReference, key, options.parentReference, correspondingChange.getSecondRecordName(), correspondingChange);
+      correspondingChange.sync();
+    }
+  }
+};
+
+DS.OneToManyChange.ensureSameTransaction = function(changes){
+  var records = Ember.A();
+  forEach(changes, function(change){
+    records.addObject(change.getSecondRecord());
+    records.addObject(change.getFirstRecord());
+  });
+
+  return DS.Transaction.ensureSameTransaction(records);
+};
+
+/**
+  @class RelationshipChange
+  @namespace DS
+*/
+DS.RelationshipChange.prototype = {
+
+  getSecondRecordName: function() {
+    var name = this.secondRecordName, parent;
+
+    if (!name) {
+      parent = this.secondRecordReference;
+      if (!parent) { return; }
+
+      var childType = this.firstRecordReference.type;
+      var inverse = childType.inverseFor(this.firstRecordName);
+      this.secondRecordName = inverse.name;
+    }
+
+    return this.secondRecordName;
+  },
+
+  /**
+    Get the name of the relationship on the belongsTo side.
+
+    @method getFirstRecordName
+    @return {String}
+  */
+  getFirstRecordName: function() {
+    var name = this.firstRecordName;
+    return name;
+  },
+
+  /**
+    @method destroy
+    @private
+  */
+  destroy: function() {
+    var childReference = this.childReference,
+        belongsToName = this.getFirstRecordName(),
+        hasManyName = this.getSecondRecordName(),
+        store = this.store;
+
+    store.removeRelationshipChangeFor(childReference, belongsToName, this.parentReference, hasManyName, this.changeType);
+  },
+
+  /**
+    @method getByReference
+    @private
+    @param reference
+  */
+  getByReference: function(reference) {
+    // return null or undefined if the original reference was null or undefined
+    if (!reference) { return reference; }
+
+    if (reference.record) {
+      return reference.record;
+    }
+  },
+
+  getSecondRecord: function(){
+    return this.getByReference(this.secondRecordReference);
+  },
+
+  /**
+    @method getFirstRecord
+    @private
+  */
+  getFirstRecord: function() {
+    return this.getByReference(this.firstRecordReference);
+  },
+
+  /**
+    Make sure that all three parts of the relationship change are part of
+    the same transaction. If any of the three records is clean and in the
+    default transaction, and the rest are in a different transaction, move
+    them all into that transaction.
+
+    @method ensureSameTransaction
+    @private
+  */
+  ensureSameTransaction: function() {
+    var child = this.getFirstRecord(),
+      parentRecord = this.getSecondRecord();
+
+    var transaction = DS.Transaction.ensureSameTransaction([child, parentRecord]);
+
+    this.transaction = transaction;
+    return transaction;
+  },
+
+  callChangeEvents: function(){
+    var child = this.getFirstRecord(),
+        parentRecord = this.getSecondRecord();
+
+    var dirtySet = new Ember.OrderedSet();
+
+    // TODO: This implementation causes a race condition in key-value
+    // stores. The fix involves buffering changes that happen while
+    // a record is loading. A similar fix is required for other parts
+    // of ember-data, and should be done as new infrastructure, not
+    // a one-off hack. [tomhuda]
+    if (parentRecord && get(parentRecord, 'isLoaded')) {
+      this.store.recordHasManyDidChange(dirtySet, parentRecord, this);
+    }
+
+    if (child) {
+      this.store.recordBelongsToDidChange(dirtySet, child, this);
+    }
+
+    dirtySet.forEach(function(record) {
+      record.adapterDidDirty();
+    });
+  },
+
+  coalesce: function(){
+    var relationshipPairs = this.store.relationshipChangePairsFor(this.firstRecordReference);
+    forEach(relationshipPairs, function(pair){
+      var addedChange = pair["add"];
+      var removedChange = pair["remove"];
+      if(addedChange && removedChange) {
+        addedChange.destroy();
+        removedChange.destroy();
+      }
+    });
+  }
+};
+
+DS.RelationshipChangeAdd.prototype = Ember.create(DS.RelationshipChange.create({}));
+DS.RelationshipChangeRemove.prototype = Ember.create(DS.RelationshipChange.create({}));
+
+DS.RelationshipChangeAdd.prototype.changeType = "add";
+DS.RelationshipChangeAdd.prototype.sync = function() {
+  var secondRecordName = this.getSecondRecordName(),
+      firstRecordName = this.getFirstRecordName(),
+      firstRecord = this.getFirstRecord(),
+      secondRecord = this.getSecondRecord();
+
+  //Ember.assert("You specified a hasMany (" + hasManyName + ") on " + (!belongsToName && (newParent || oldParent || this.lastParent).constructor) + " but did not specify an inverse belongsTo on " + child.constructor, belongsToName);
+  //Ember.assert("You specified a belongsTo (" + belongsToName + ") on " + child.constructor + " but did not specify an inverse hasMany on " + (!hasManyName && (newParent || oldParent || this.lastParentRecord).constructor), hasManyName);
+
+  this.ensureSameTransaction();
+
+  this.callChangeEvents();
+
+  if (secondRecord && firstRecord) {
+    if(this.secondRecordKind === "belongsTo"){
+      secondRecord.suspendRelationshipObservers(function(){
+        set(secondRecord, secondRecordName, firstRecord);
+      });
+
+     }
+     else if(this.secondRecordKind === "hasMany"){
+      secondRecord.suspendRelationshipObservers(function(){
+        get(secondRecord, secondRecordName).addObject(firstRecord);
+      });
+    }
+  }
+
+  if (firstRecord && secondRecord && get(firstRecord, firstRecordName) !== secondRecord) {
+    if(this.firstRecordKind === "belongsTo"){
+      firstRecord.suspendRelationshipObservers(function(){
+        set(firstRecord, firstRecordName, secondRecord);
+      });
+    }
+    else if(this.firstRecordKind === "hasMany"){
+      firstRecord.suspendRelationshipObservers(function(){
+        get(firstRecord, firstRecordName).addObject(secondRecord);
+      });
+    }
+  }
+
+  this.coalesce();
+};
+
+DS.RelationshipChangeRemove.prototype.changeType = "remove";
+DS.RelationshipChangeRemove.prototype.sync = function() {
+  var secondRecordName = this.getSecondRecordName(),
+      firstRecordName = this.getFirstRecordName(),
+      firstRecord = this.getFirstRecord(),
+      secondRecord = this.getSecondRecord();
+
+  //Ember.assert("You specified a hasMany (" + hasManyName + ") on " + (!belongsToName && (newParent || oldParent || this.lastParent).constructor) + " but did not specify an inverse belongsTo on " + child.constructor, belongsToName);
+  //Ember.assert("You specified a belongsTo (" + belongsToName + ") on " + child.constructor + " but did not specify an inverse hasMany on " + (!hasManyName && (newParent || oldParent || this.lastParentRecord).constructor), hasManyName);
+
+  this.ensureSameTransaction(firstRecord, secondRecord, secondRecordName, firstRecordName);
+
+  this.callChangeEvents();
+
+  if (secondRecord && firstRecord) {
+    if(this.secondRecordKind === "belongsTo"){
+      secondRecord.suspendRelationshipObservers(function(){
+        set(secondRecord, secondRecordName, null);
+      });
+    }
+    else if(this.secondRecordKind === "hasMany"){
+      secondRecord.suspendRelationshipObservers(function(){
+        get(secondRecord, secondRecordName).removeObject(firstRecord);
+      });
+    }
+  }
+
+  if (firstRecord && get(firstRecord, firstRecordName)) {
+    if(this.firstRecordKind === "belongsTo"){
+      firstRecord.suspendRelationshipObservers(function(){
+        set(firstRecord, firstRecordName, null);
+      });
+     }
+     else if(this.firstRecordKind === "hasMany"){
+       firstRecord.suspendRelationshipObservers(function(){
+        get(firstRecord, firstRecordName).removeObject(secondRecord);
+      });
+    }
+  }
+
+  this.coalesce();
+};
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set,
+    isNone = Ember.isNone;
+
+/**
+  @module ember-data
+*/
+
+DS.belongsTo = function(type, options) {
+
+
+  options = options || {};
+
+  var meta = { type: type, isRelationship: true, options: options, kind: 'belongsTo' };
+
+  return Ember.computed(function(key, value) {
+    var data = get(this, 'data'),
+        store = get(this, 'store'), belongsTo;
+
+    if (typeof type === 'string') {
+      if (type.indexOf(".") === -1) {
+        type = store.modelFor(type);
+      } else {
+        type = get(Ember.lookup, type);
+      }
+    }
+
+    if (arguments.length === 2) {
+
+      return value === undefined ? null : value;
+    }
+
+    belongsTo = data[key];
+
+    if (belongsTo instanceof DS.Model) { return belongsTo; }
+
+    // TODO (tomdale) The value of the belongsTo in the data hash can be
+    // one of:
+    // 1. null/undefined
+    // 2. a record reference
+    // 3. a tuple returned by the serializer's polymorphism code
+    //
+    // We should really normalize #3 to be the same as #2 to reduce the
+    // complexity here.
+
+    if (isNone(belongsTo)) {
+      return null;
+    }
+
+    // The data has been normalized to a record reference, so
+    // just ask the store for the record for that reference,
+    // materializing it if necessary.
+    if (belongsTo.clientId) {
+      return store.recordForReference(belongsTo);
+    }
+
+    // The data has been normalized into a type/id pair by the
+    // serializer's polymorphism code.
+    return store.findById(belongsTo.type, belongsTo.id);
+  }).property('data').meta(meta);
+};
+
+/*
+  These observers observe all `belongsTo` relationships on the record. See
+  `relationships/ext` to see how these observers get their dependencies.
+
+  @class Model
+  @namespace DS
+*/
+DS.Model.reopen({
+
+  /**
+    @method belongsToWillChange
+    @private
+    @static
+    @param record
+    @param key
+  */
+  belongsToWillChange: Ember.beforeObserver(function(record, key) {
+    if (get(record, 'isLoaded')) {
+      var oldParent = get(record, key);
+
+      var childReference = get(record, '_reference'),
+          store = get(record, 'store');
+      if (oldParent){
+        var change = DS.RelationshipChange.createChange(childReference, get(oldParent, '_reference'), store, { key: key, kind:"belongsTo", changeType: "remove" });
+        change.sync();
+        this._changesToSync[key] = change;
+      }
+    }
+  }),
+
+  /**
+    @method belongsToDidChange
+    @private
+    @static
+    @param record
+    @param key
+  */
+  belongsToDidChange: Ember.immediateObserver(function(record, key) {
+    if (get(record, 'isLoaded')) {
+      var newParent = get(record, key);
+      if(newParent){
+        var childReference = get(record, '_reference'),
+            store = get(record, 'store');
+        var change = DS.RelationshipChange.createChange(childReference, get(newParent, '_reference'), store, { key: key, kind:"belongsTo", changeType: "add" });
+        change.sync();
+        if(this._changesToSync[key]){
+          DS.OneToManyChange.ensureSameTransaction([change, this._changesToSync[key]], store);
+        }
+      }
+    }
+    delete this._changesToSync[key];
+  })
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set, forEach = Ember.EnumerableUtils.forEach;
+
+var hasRelationship = function(type, options) {
+  options = options || {};
+
+  var meta = { type: type, isRelationship: true, options: options, kind: 'hasMany' };
+
+  return Ember.computed(function(key, value) {
+    var data = get(this, 'data'),
+        store = get(this, 'store'),
+        ids, relationship;
+
+    if (typeof type === 'string') {
+      if (type.indexOf(".") === -1) {
+        type = store.modelFor(type);
+      } else {
+        type = get(Ember.lookup, type);
+      }
+    }
+
+    //ids can be references or opaque token
+    //(e.g. `{url: '/relationship'}`) that will be passed to the adapter
+    ids = data[key];
+
+    relationship = store.findMany(type, ids, this, meta);
+    set(relationship, 'owner', this);
+    set(relationship, 'name', key);
+    set(relationship, 'isPolymorphic', options.polymorphic);
+
+    return relationship;
+  }).property().meta(meta);
+};
+
+DS.hasMany = function(type, options) {
+
+  return hasRelationship(type, options);
+};
+
+function clearUnmaterializedHasMany(record, relationship) {
+  var data = get(record, 'data');
+
+  var references = data[relationship.key];
+
+  if (!references) { return; }
+
+  var inverse = record.constructor.inverseFor(relationship.key);
+
+  if (inverse) {
+    forEach(references, function(reference) {
+      var childRecord;
+
+      if (childRecord = reference.record) {
+        record.suspendRelationshipObservers(function() {
+          set(childRecord, inverse.name, null);
+        });
+      }
+    });
+  }
+}
+
+DS.Model.reopen({
+  clearHasMany: function(relationship) {
+    var hasMany = this.cacheFor(relationship.name);
+
+    if (hasMany) {
+      hasMany.clear();
+    } else {
+      clearUnmaterializedHasMany(this, relationship);
+    }
+  }
+});
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set;
+
+/**
+  @module ember-data
+*/
+
+/*
+  This file defines several extensions to the base `DS.Model` class that
+  add support for one-to-many relationships.
+*/
+
+/**
+  @class Model
+  @namespace DS
+*/
+DS.Model.reopen({
+
+  /**
+    This Ember.js hook allows an object to be notified when a property
+    is defined.
+
+    In this case, we use it to be notified when an Ember Data user defines a
+    belongs-to relationship. In that case, we need to set up observers for
+    each one, allowing us to track relationship changes and automatically
+    reflect changes in the inverse has-many array.
+
+    This hook passes the class being set up, as well as the key and value
+    being defined. So, for example, when the user does this:
+
+      DS.Model.extend({
+        parent: DS.belongsTo(App.User)
+      });
+
+    This hook would be called with "parent" as the key and the computed
+    property returned by `DS.belongsTo` as the value.
+
+    @method didDefineProperty
+    @param proto
+    @param key
+    @param value
+  */
+  didDefineProperty: function(proto, key, value) {
+    // Check if the value being set is a computed property.
+    if (value instanceof Ember.Descriptor) {
+
+      // If it is, get the metadata for the relationship. This is
+      // populated by the `DS.belongsTo` helper when it is creating
+      // the computed property.
+      var meta = value.meta();
+
+      if (meta.isRelationship && meta.kind === 'belongsTo') {
+        Ember.addObserver(proto, key, null, 'belongsToDidChange');
+        Ember.addBeforeObserver(proto, key, null, 'belongsToWillChange');
+      }
+
+      if (meta.isAttribute) {
+        Ember.addObserver(proto, key, null, 'attributeDidChange');
+        Ember.addBeforeObserver(proto, key, null, 'attributeWillChange');
+      }
+
+      meta.parentType = proto.constructor;
+    }
+  }
+});
+
+/*
+  These DS.Model extensions add class methods that provide relationship
+  introspection abilities about relationships.
+
+  A note about the computed properties contained here:
+
+  **These properties are effectively sealed once called for the first time.**
+  To avoid repeatedly doing expensive iteration over a model's fields, these
+  values are computed once and then cached for the remainder of the runtime of
+  your application.
+
+  If your application needs to modify a class after its initial definition
+  (for example, using `reopen()` to add additional attributes), make sure you
+  do it before using your model with the store, which uses these properties
+  extensively.
+*/
+
+DS.Model.reopenClass({
+  /**
+    For a given relationship name, returns the model type of the relationship.
+
+    For example, if you define a model like this:
+
+        App.Post = DS.Model.extend({
+          comments: DS.hasMany(App.Comment)
+        });
+
+    Calling `App.Post.typeForRelationship('comments')` will return `App.Comment`.
+
+    @method typeForRelationship
+    @static
+    @param {String} name the name of the relationship
+    @return {subclass of DS.Model} the type of the relationship, or undefined
+  */
+  typeForRelationship: function(name) {
+    var relationship = get(this, 'relationshipsByName').get(name);
+    return relationship && relationship.type;
+  },
+
+  inverseFor: function(name) {
+    var inverseType = this.typeForRelationship(name);
+
+    if (!inverseType) { return null; }
+
+    var options = this.metaForProperty(name).options;
+
+    if (options.inverse === null) { return null; }
+    
+    var inverseName, inverseKind;
+
+    if (options.inverse) {
+      inverseName = options.inverse;
+      inverseKind = Ember.get(inverseType, 'relationshipsByName').get(inverseName).kind;
+    } else {
+      var possibleRelationships = findPossibleInverses(this, inverseType);
+
+      if (possibleRelationships.length === 0) { return null; }
+
+
+      inverseName = possibleRelationships[0].name;
+      inverseKind = possibleRelationships[0].kind;
+    }
+
+    function findPossibleInverses(type, inverseType, possibleRelationships) {
+      possibleRelationships = possibleRelationships || [];
+
+      var relationshipMap = get(inverseType, 'relationships');
+      if (!relationshipMap) { return; }
+
+      var relationships = relationshipMap.get(type);
+      if (relationships) {
+        possibleRelationships.push.apply(possibleRelationships, relationshipMap.get(type));
+      }
+
+      if (type.superclass) {
+        findPossibleInverses(type.superclass, inverseType, possibleRelationships);
+      }
+
+      return possibleRelationships;
+    }
+
+    return {
+      type: inverseType,
+      name: inverseName,
+      kind: inverseKind
+    };
+  },
+
+  /**
+    The model's relationships as a map, keyed on the type of the
+    relationship. The value of each entry is an array containing a descriptor
+    for each relationship with that type, describing the name of the relationship
+    as well as the type.
+
+    For example, given the following model definition:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+          posts: DS.hasMany(App.Post)
+        });
+
+    This computed property would return a map describing these
+    relationships, like this:
+
+        var relationships = Ember.get(App.Blog, 'relationships');
+        relationships.get(App.User);
+        //=> [ { name: 'users', kind: 'hasMany' },
+        //     { name: 'owner', kind: 'belongsTo' } ]
+        relationships.get(App.Post);
+        //=> [ { name: 'posts', kind: 'hasMany' } ]
+
+    @property relationships
+    @static
+    @type Ember.Map
+    @readOnly
+  */
+  relationships: Ember.computed(function() {
+    var map = new Ember.MapWithDefault({
+      defaultValue: function() { return []; }
+    });
+
+    // Loop through each computed property on the class
+    this.eachComputedProperty(function(name, meta) {
+
+      // If the computed property is a relationship, add
+      // it to the map.
+      if (meta.isRelationship) {
+        if (typeof meta.type === 'string') {
+          meta.type = Ember.get(Ember.lookup, meta.type);
+        }
+
+        var relationshipsForType = map.get(meta.type);
+
+        relationshipsForType.push({ name: name, kind: meta.kind });
+      }
+    });
+
+    return map;
+  }),
+
+  /**
+    A hash containing lists of the model's relationships, grouped
+    by the relationship kind. For example, given a model with this
+    definition:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+
+          posts: DS.hasMany(App.Post)
+        });
+
+    This property would contain the following:
+
+       var relationshipNames = Ember.get(App.Blog, 'relationshipNames');
+       relationshipNames.hasMany;
+       //=> ['users', 'posts']
+       relationshipNames.belongsTo;
+       //=> ['owner']
+
+    @property relationshipNames
+    @static
+    @type Object
+    @readOnly
+  */
+  relationshipNames: Ember.computed(function() {
+    var names = { hasMany: [], belongsTo: [] };
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isRelationship) {
+        names[meta.kind].push(name);
+      }
+    });
+
+    return names;
+  }),
+
+  /**
+    An array of types directly related to a model. Each type will be
+    included once, regardless of the number of relationships it has with
+    the model.
+
+    For example, given a model with this definition:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+          posts: DS.hasMany(App.Post)
+        });
+
+    This property would contain the following:
+
+       var relatedTypes = Ember.get(App.Blog, 'relatedTypes');
+       //=> [ App.User, App.Post ]
+
+    @property relatedTypes
+    @static
+    @type Ember.Array
+    @readOnly
+  */
+  relatedTypes: Ember.computed(function() {
+    var type,
+        types = Ember.A();
+
+    // Loop through each computed property on the class,
+    // and create an array of the unique types involved
+    // in relationships
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isRelationship) {
+        type = meta.type;
+
+        if (typeof type === 'string') {
+          type = get(this, type, false) || get(Ember.lookup, type);
+        }
+
+
+        if (!types.contains(type)) {
+
+          types.push(type);
+        }
+      }
+    });
+
+    return types;
+  }),
+
+  /**
+    A map whose keys are the relationships of a model and whose values are
+    relationship descriptors.
+
+    For example, given a model with this
+    definition:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+
+          posts: DS.hasMany(App.Post)
+        });
+
+    This property would contain the following:
+
+       var relationshipsByName = Ember.get(App.Blog, 'relationshipsByName');
+       relationshipsByName.get('users');
+       //=> { key: 'users', kind: 'hasMany', type: App.User }
+       relationshipsByName.get('owner');
+       //=> { key: 'owner', kind: 'belongsTo', type: App.User }
+
+    @property relationshipsByName
+    @static
+    @type Ember.Map
+    @readOnly
+  */
+  relationshipsByName: Ember.computed(function() {
+    var map = Ember.Map.create(), type;
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isRelationship) {
+        meta.key = name;
+        type = meta.type;
+
+        if (typeof type === 'string') {
+          if (type.match(/^[^A-Z]/)) {
+            type = this.store.modelFor(type);
+          } else {
+            type = get(this, type, false) || get(Ember.lookup, type);
+          }
+
+          meta.type = type;
+        }
+
+        map.set(name, meta);
+      }
+    });
+
+    return map;
+  }),
+
+  /**
+    A map whose keys are the fields of the model and whose values are strings
+    describing the kind of the field. A model's fields are the union of all of its
+    attributes and relationships.
+
+    For example:
+
+        App.Blog = DS.Model.extend({
+          users: DS.hasMany(App.User),
+          owner: DS.belongsTo(App.User),
+
+          posts: DS.hasMany(App.Post),
+
+          title: DS.attr('string')
+        });
+
+        var fields = Ember.get(App.Blog, 'fields');
+        fields.forEach(function(field, kind) {
+          console.log(field, kind);
+        });
+
+        // prints:
+        // users, hasMany
+        // owner, belongsTo
+        // posts, hasMany
+        // title, attribute
+
+    @property fields
+    @static
+    @type Ember.Map
+    @readOnly
+  */
+  fields: Ember.computed(function() {
+    var map = Ember.Map.create();
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isRelationship) {
+        map.set(name, meta.kind);
+      } else if (meta.isAttribute) {
+        map.set(name, 'attribute');
+      }
+    });
+
+    return map;
+  }),
+
+  /**
+    Given a callback, iterates over each of the relationships in the model,
+    invoking the callback with the name of each relationship and its relationship
+    descriptor.
+
+    @method eachRelationship
+    @static
+    @param {Function} callback the callback to invoke
+    @param {any} binding the value to which the callback's `this` should be bound
+  */
+  eachRelationship: function(callback, binding) {
+    get(this, 'relationshipsByName').forEach(function(name, relationship) {
+      callback.call(binding, name, relationship);
+    });
+  },
+
+  /**
+    Given a callback, iterates over each of the types related to a model,
+    invoking the callback with the related type's class. Each type will be
+    returned just once, regardless of how many different relationships it has
+    with a model.
+
+    @method eachRelatedType
+    @static
+    @param {Function} callback the callback to invoke
+    @param {any} binding the value to which the callback's `this` should be bound
+  */
+  eachRelatedType: function(callback, binding) {
+    get(this, 'relatedTypes').forEach(function(type) {
+      callback.call(binding, type);
+    });
+  }
+});
+
+DS.Model.reopen({
+  /**
+    Given a callback, iterates over each of the relationships in the model,
+    invoking the callback with the name of each relationship and its relationship
+    descriptor.
+
+    @method eachRelationship
+    @param {Function} callback the callback to invoke
+    @param {any} binding the value to which the callback's `this` should be bound
+  */
+  eachRelationship: function(callback, binding) {
+    this.constructor.eachRelationship(callback, binding);
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+var once = Ember.run.once;
+var forEach = Ember.EnumerableUtils.forEach;
+
+/**
+  @class RecordArrayManager
+  @namespace DS
+  @private
+  @extends Ember.Object
+*/
+DS.RecordArrayManager = Ember.Object.extend({
+  init: function() {
+    this.filteredRecordArrays = Ember.MapWithDefault.create({
+      defaultValue: function() { return []; }
+    });
+
+    this.changedReferences = [];
+  },
+
+  referenceDidChange: function(reference) {
+    this.changedReferences.push(reference);
+    once(this, this.updateRecordArrays);
+  },
+
+  recordArraysForReference: function(reference) {
+    reference.recordArrays = reference.recordArrays || Ember.OrderedSet.create();
+    return reference.recordArrays;
+  },
+
+  /**
+    This method is invoked whenever data is loaded into the store
+    by the adapter or updated by the adapter, or when an attribute
+    changes on a record.
+
+    It updates all filters that a record belongs to.
+
+    To avoid thrashing, it only runs once per run loop per record.
+
+    @method updateRecordArrays
+    @param {Class} type
+    @param {Number|String} clientId
+  */
+  updateRecordArrays: function() {
+    forEach(this.changedReferences, function(reference) {
+      var type = reference.type,
+          recordArrays = this.filteredRecordArrays.get(type),
+          filter;
+
+      forEach(recordArrays, function(array) {
+        filter = get(array, 'filterFunction');
+        this.updateRecordArray(array, filter, type, reference);
+      }, this);
+
+      // loop through all manyArrays containing an unloaded copy of this
+      // clientId and notify them that the record was loaded.
+      var manyArrays = reference.loadingRecordArrays;
+
+      if (manyArrays) {
+        for (var i=0, l=manyArrays.length; i<l; i++) {
+          manyArrays[i].loadedRecord();
+        }
+
+        reference.loadingRecordArrays = [];
+      }
+    }, this);
+
+    this.changedReferences = [];
+  },
+
+  /**
+    Update an individual filter.
+
+    @method updateRecordArray
+    @param {DS.FilteredRecordArray} array
+    @param {Function} filter
+    @param {Class} type
+    @param {Number|String} clientId
+  */
+  updateRecordArray: function(array, filter, type, reference) {
+    var shouldBeInArray, record;
+
+    if (!filter) {
+      shouldBeInArray = true;
+    } else {
+      record = this.store.recordForReference(reference);
+      shouldBeInArray = filter(record);
+    }
+
+    var recordArrays = this.recordArraysForReference(reference);
+
+    if (shouldBeInArray) {
+      recordArrays.add(array);
+      array.addReference(reference);
+    } else if (!shouldBeInArray) {
+      recordArrays.remove(array);
+      array.removeReference(reference);
+    }
+  },
+
+  /**
+    When a record is deleted, it is removed from all its
+    record arrays.
+
+    @method remove
+    @param {DS.Model} record
+  */
+  remove: function(record) {
+    var reference = get(record, '_reference');
+    var recordArrays = reference.recordArrays || [];
+
+    forEach(recordArrays, function(array) {
+      array.removeReference(reference);
+    });
+  },
+
+  /**
+    This method is invoked if the `filterFunction` property is
+    changed on a `DS.FilteredRecordArray`.
+
+    It essentially re-runs the filter from scratch. This same
+    method is invoked when the filter is created in th first place.
+
+    @method updateFilter
+    @param array
+    @param type
+    @param filter
+  */
+  updateFilter: function(array, type, filter) {
+    var typeMap = this.store.typeMapFor(type),
+        references = typeMap.references,
+        reference, data, shouldFilter, record;
+
+    for (var i=0, l=references.length; i<l; i++) {
+      reference = references[i];
+      shouldFilter = false;
+
+      data = reference.data;
+
+      if (typeof data === 'object') {
+        if (record = reference.record) {
+          if (!get(record, 'isDeleted')) { shouldFilter = true; }
+        } else {
+          shouldFilter = true;
+        }
+
+        if (shouldFilter) {
+          this.updateRecordArray(array, filter, type, reference);
+        }
+      }
+    }
+  },
+
+  /**
+    Create a `DS.ManyArray` for a type and list of record references, and index
+    the `ManyArray` under each reference. This allows us to efficiently remove
+    records from `ManyArray`s when they are deleted.
+
+    @method createManyArray
+    @param {Class} type
+    @param {Array} references
+    @return {DS.ManyArray}
+  */
+  createManyArray: function(type, references) {
+    var manyArray = DS.ManyArray.create({
+      type: type,
+      content: references,
+      store: this.store
+    });
+
+    forEach(references, function(reference) {
+      var arrays = this.recordArraysForReference(reference);
+      arrays.add(manyArray);
+    }, this);
+
+    return manyArray;
+  },
+
+  /**
+    Register a RecordArray for a given type to be backed by
+    a filter function. This will cause the array to update
+    automatically when records of that type change attribute
+    values or states.
+
+    @method registerFilteredRecordArray
+    @param {DS.RecordArray} array
+    @param {Class} type
+    @param {Function} filter
+  */
+  registerFilteredRecordArray: function(array, type, filter) {
+    var recordArrays = this.filteredRecordArrays.get(type);
+    recordArrays.push(array);
+
+    this.updateFilter(array, type, filter);
+  },
+
+  // Internally, we maintain a map of all unloaded IDs requested by
+  // a ManyArray. As the adapter loads data into the store, the
+  // store notifies any interested ManyArrays. When the ManyArray's
+  // total number of loading records drops to zero, it becomes
+  // `isLoaded` and fires a `didLoad` event.
+  registerWaitingRecordArray: function(array, reference) {
+    var loadingRecordArrays = reference.loadingRecordArrays || [];
+    loadingRecordArrays.push(array);
+    reference.loadingRecordArrays = loadingRecordArrays;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set, map = Ember.ArrayPolyfills.map, isNone = Ember.isNone;
+
+function mustImplement(name) {
+  return function() {
+    throw new Ember.Error("Your serializer " + this.toString() + " does not implement the required method " + name);
+  };
+}
+
+/**
+  A serializer is responsible for serializing and deserializing a group of
+  records.
+
+  `DS.Serializer` is an abstract base class designed to help you build a
+  serializer that can read to and write from any serialized form.  While most
+  applications will use `DS.JSONSerializer`, which reads and writes JSON, the
+  serializer architecture allows your adapter to transmit things like XML,
+  strings, or custom binary data.
+
+  Typically, your application's `DS.Adapter` is responsible for both creating a
+  serializer as well as calling the appropriate methods when it needs to
+  materialize data or serialize a record.
+
+  The serializer API is designed as a series of layered hooks that you can
+  override to customize any of the individual steps of serialization and
+  deserialization.
+
+  The hooks are organized by the three responsibilities of the serializer:
+
+  1. Determining naming conventions
+  2. Serializing records into a serialized form
+  3. Deserializing records from a serialized form
+
+  Because Ember Data lazily materializes records, the deserialization
+  step, and therefore the hooks you implement, are split into two phases:
+
+  1. Extraction, where the serialized forms for multiple records are
+     extracted from a single payload. The IDs of each record are also
+     extracted for indexing.
+  2. Materialization, where a newly-created record has its attributes
+     and relationships initialized based on the serialized form loaded
+     by the adapter.
+
+  Additionally, a serializer can convert values from their JavaScript
+  versions into their serialized versions via a declarative API.
+
+  ## Naming Conventions
+
+  One of the most common uses of the serializer is to map attribute names
+  from the serialized form to your `DS.Model`. For example, in your model,
+  you may have an attribute called `firstName`:
+
+  ```javascript
+  App.Person = DS.Model.extend({
+    firstName: DS.attr('string')
+  });
+  ```
+
+  However, because the web API your adapter is communicating with is
+  legacy, it calls this attribute `FIRST_NAME`.
+
+  You can determine the attribute name used in the serialized form
+  by implementing `keyForAttributeName`:
+
+  ```javascript
+  keyForAttributeName: function(type, name) {
+    return name.underscore.toUpperCase();
+  }
+  ```
+
+  If your attribute names are not predictable, you can re-map them
+  one-by-one using the adapter's `map` API:
+
+  ```javascript
+  App.Adapter.map('App.Person', {
+    firstName: { key: '*API_USER_FIRST_NAME*' }
+  });
+  ```
+
+  This API will also work for relationships and primary keys. For
+  example:
+
+  ```javascript
+  App.Adapter.map('App.Person', {
+    primaryKey: '_id'
+  });
+  ```
+
+  ## Serialization
+
+  During the serialization process, a record or records are converted
+  from Ember.js objects into their serialized form.
+
+  These methods are designed in layers, like a delicious 7-layer
+  cake (but with fewer layers).
+
+  The main entry point for serialization is the `serialize`
+  method, which takes the record and options.
+
+  The `serialize` method is responsible for:
+
+  * turning the record's attributes (`DS.attr`) into
+    attributes on the JSON object.
+  * optionally adding the record's ID onto the hash
+  * adding relationships (`DS.hasMany` and `DS.belongsTo`)
+    to the JSON object.
+
+  Depending on the backend, the serializer can choose
+  whether to include the `hasMany` or `belongsTo`
+  relationships on the JSON hash.
+
+  For very custom serialization, you can implement your
+  own `serialize` method. In general, however, you will want
+  to override the hooks described below.
+
+  ### Adding the ID
+
+  The default `serialize` will optionally call your serializer's
+  `addId` method with the JSON hash it is creating, the
+  record's type, and the record's ID. The `serialize` method
+  will not call `addId` if the record's ID is undefined.
+
+  Your adapter must specifically request ID inclusion by
+  passing `{ includeId: true }` as an option to `serialize`.
+
+  NOTE: You may not want to include the ID when updating an
+  existing record, because your server will likely disallow
+  changing an ID after it is created, and the PUT request
+  itself will include the record's identification.
+
+  By default, `addId` will:
+
+  1. Get the primary key name for the record by calling
+     the serializer's `primaryKey` with the record's type.
+     Unless you override the `primaryKey` method, this
+     will be `'id'`.
+  2. Assign the record's ID to the primary key in the
+     JSON hash being built.
+
+  If your backend expects a JSON object with the primary
+  key at the root, you can just override the `primaryKey`
+  method on your serializer subclass.
+
+  Otherwise, you can override the `addId` method for
+  more specialized handling.
+
+  ### Adding Attributes
+
+  By default, the serializer's `serialize` method will call
+  `addAttributes` with the JSON object it is creating
+  and the record to serialize.
+
+  The `addAttributes` method will then call `addAttribute`
+  in turn, with the JSON object, the record to serialize,
+  the attribute's name and its type.
+
+  Finally, the `addAttribute` method will serialize the
+  attribute:
+
+  1. It will call `keyForAttributeName` to determine
+     the key to use in the JSON hash.
+  2. It will get the value from the record.
+  3. It will call `serializeValue` with the attribute's
+     value and attribute type to convert it into a
+     JSON-compatible value. For example, it will convert a
+     Date into a String.
+
+  If your backend expects a JSON object with attributes as
+  keys at the root, you can just override the `serializeValue`
+  and `keyForAttributeName` methods in your serializer
+  subclass and let the base class do the heavy lifting.
+
+  If you need something more specialized, you can probably
+  override `addAttribute` and let the default `addAttributes`
+  handle the nitty gritty.
+
+  ### Adding Relationships
+
+  By default, `serialize` will call your serializer's
+  `addRelationships` method with the JSON object that is
+  being built and the record being serialized. The default
+  implementation of this method is to loop over all of the
+  relationships defined on your record type and:
+
+  * If the relationship is a `DS.hasMany` relationship,
+    call `addHasMany` with the JSON object, the record
+    and a description of the relationship.
+  * If the relationship is a `DS.belongsTo` relationship,
+    call `addBelongsTo` with the JSON object, the record
+    and a description of the relationship.
+
+  The relationship description has the following keys:
+
+  * `type`: the class of the associated information (the
+    first parameter to `DS.hasMany` or `DS.belongsTo`)
+  * `kind`: either `hasMany` or `belongsTo`
+
+  The relationship description may get additional
+  information in the future if more capabilities or
+  relationship types are added. However, it will
+  remain backwards-compatible, so the mere existence
+  of new features should not break existing adapters.
+
+  @class Serializer
+  @namespace DS
+  @extends Ember.Object
+*/
+
+DS.Serializer = Ember.Object.extend({
+  init: function() {
+    this.mappings = Ember.Map.create();
+    this.aliases = Ember.Map.create();
+    this.configurations = Ember.Map.create();
+    this.globalConfigurations = {};
+  },
+
+  extract: mustImplement('extract'),
+  extractMany: mustImplement('extractMany'),
+  extractId: mustImplement('extractId'),
+  extractAttribute: mustImplement('extractAttribute'),
+  extractHasMany: mustImplement('extractHasMany'),
+  extractBelongsTo: mustImplement('extractBelongsTo'),
+
+  extractRecordRepresentation: function(loader, type, data, shouldSideload) {
+    var prematerialized = {}, reference;
+
+    if (shouldSideload) {
+      reference = loader.sideload(type, data);
+    } else {
+      reference = loader.load(type, data);
+    }
+
+    this.eachEmbeddedHasMany(type, function(name, relationship) {
+      var embeddedData = this.extractEmbeddedData(data, this.keyFor(relationship));
+      if (!isNone(embeddedData)) {
+        this.extractEmbeddedHasMany(loader, relationship, embeddedData, reference, prematerialized);
+      }
+    }, this);
+
+    this.eachEmbeddedBelongsTo(type, function(name, relationship) {
+      var embeddedData = this.extractEmbeddedData(data, this.keyFor(relationship));
+      if (!isNone(embeddedData)) {
+        this.extractEmbeddedBelongsTo(loader, relationship, embeddedData, reference, prematerialized);
+      }
+    }, this);
+
+    loader.prematerialize(reference, prematerialized);
+
+    return reference;
+  },
+
+  extractEmbeddedHasMany: function(loader, relationship, array, parent, prematerialized) {
+    var references = map.call(array, function(item) {
+      if (!item) { return; }
+
+      var foundType = this.extractEmbeddedType(relationship, item),
+          reference = this.extractRecordRepresentation(loader, foundType, item, true);
+
+      // If the embedded record should also be saved back when serializing the parent,
+      // make sure we set its parent since it will not have an ID.
+      var embeddedType = this.embeddedType(parent.type, relationship.key);
+      if (embeddedType === 'always') {
+        reference.parent = parent;
+      }
+
+      // If the embedded children have an inverse belongs-to, set the
+      // inverse to the current record in their prematerialized data.
+      var parentType = relationship.parentType,
+          inverse = parentType.inverseFor(relationship.key);
+
+      if (inverse) {
+        var inverseName = inverse.name;
+        reference.prematerialized[inverseName] = parent;
+      }
+
+      return reference;
+    }, this);
+
+    prematerialized[relationship.key] = references;
+  },
+
+  extractEmbeddedBelongsTo: function(loader, relationship, data, parent, prematerialized) {
+    var foundType = this.extractEmbeddedType(relationship, data),
+        reference = this.extractRecordRepresentation(loader, foundType, data, true);
+    prematerialized[relationship.key] = reference;
+
+    // If the embedded record should also be saved back when serializing the parent,
+    // make sure we set its parent since it will not have an ID.
+    var embeddedType = this.embeddedType(parent.type, relationship.key);
+    if (embeddedType === 'always') {
+      reference.parent = parent;
+    }
+  },
+
+  /**
+    A hook you can use to customize how the record's type is extracted from
+    the serialized data.
+
+    The `extractEmbeddedType` hook is called with:
+
+    * the relationship
+    * the serialized representation of the record
+
+    By default, it returns the type of the relationship.
+
+    @method extractEmbeddedType
+    @param {Object} relationship an object representing the relationship
+    @param {any} data the serialized representation of the record
+  */
+  extractEmbeddedType: function(relationship, data) {
+    return relationship.type;
+  },
+
+  /**
+    A hook you need to implement in order to extract
+    the data associated with an embedded record.
+
+    @method extractEmbeddedData
+    @param {any} data the serialized representation of the record
+    @param {String} key the key that represents the embedded record
+   */
+  extractEmbeddedData: mustImplement(),
+
+  //.......................
+  //. SERIALIZATION HOOKS
+  //.......................
+
+  /**
+    The main entry point for serializing a record. While you can consider this
+    a hook that can be overridden in your serializer, you will have to manually
+    handle serialization. For most cases, there are more granular hooks that you
+    can override.
+
+    If overriding this method, these are the responsibilities that you will need
+    to implement yourself:
+
+    * If the option hash contains `includeId`, add the record's ID to the serialized form.
+      By default, `serialize` calls `addId` if appropriate.
+    * If the option hash contains `includeType`, add the record's type to the serialized form.
+    * Add the record's attributes to the serialized form. By default, `serialize` calls
+      `addAttributes`.
+    * Add the record's relationships to the serialized form. By default, `serialize` calls
+      `addRelationships`.
+
+    @method serialize
+    @param {DS.Model} record the record to serialize
+    @param {Object} [options] a hash of options
+    @returns {any} the serialized form of the record
+  */
+  serialize: function(record, options) {
+    options = options || {};
+
+    var serialized = this.createSerializedForm(), id;
+
+    if (options.includeId) {
+      if (id = get(record, 'id')) {
+        this._addId(serialized, record.constructor, id);
+      }
+    }
+
+    if (options.includeType) {
+      this.addType(serialized, record.constructor);
+    }
+
+    this.addAttributes(serialized, record);
+    this.addRelationships(serialized, record);
+
+    return serialized;
+  },
+
+  /**
+    Given an attribute type and value, convert the value into the
+    serialized form using the transform registered for that type.
+
+    @method serializeValue
+    @private
+    @param {any} value the value to convert to the serialized form
+    @param {String} attributeType the registered type (e.g. `string`
+      or `boolean`)
+    @returns {any} the serialized form of the value
+  */
+  serializeValue: function(value, attributeType) {
+    var transform = this.transforms ? this.transforms[attributeType] : null;
+
+    return transform.serialize(value);
+  },
+
+  /**
+    A hook you can use to normalize IDs before adding them to the
+    serialized representation.
+
+    Because the store coerces all IDs to strings for consistency,
+    this is the opportunity for the serializer to, for example,
+    convert numerical IDs back into number form.
+
+    Null or undefined ids will resolve to a null value.
+
+    @method serializeId
+    @param {String} id the id from the record
+    @returns {any} the serialized representation of the id
+  */
+  serializeId: function(id) {
+    if(Ember.isEmpty(id)) { return null; }
+    if(isNaN(+id)) { return id; }
+    return +id;
+  },
+
+  /**
+    A hook you can use to change how attributes are added to the serialized
+    representation of a record.
+
+    By default, `addAttributes` simply loops over all of the attributes of the
+    passed record, maps the attribute name to the key for the serialized form,
+    and invokes any registered transforms on the value. It then invokes the
+    more granular `addAttribute` with the key and transformed value.
+
+    Since you can override `keyForAttributeName`, `addAttribute`, and register
+    custom transforms, you should rarely need to override this hook.
+
+    @method addAttributes
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+  */
+  addAttributes: function(data, record) {
+    record.eachAttribute(function(name, attribute) {
+      this._addAttribute(data, record, name, attribute.type);
+    }, this);
+  },
+
+  /**
+    A hook you can use to customize how the key/value pair is added to
+    the serialized data.
+
+    @method addAttribute
+    @param {any} serialized the serialized form being built
+    @param {String} key the key to add to the serialized data
+    @param {any} value the value to add to the serialized data
+  */
+  addAttribute: mustImplement('addAttribute'),
+
+  /**
+    A hook you can use to customize how the record's id is added to
+    the serialized data.
+
+    The `addId` hook is called with:
+
+    * the serialized representation being built
+    * the resolved primary key (taking configurations and the
+      `primaryKey` hook into consideration)
+    * the serialized id (after calling the `serializeId` hook)
+
+    @method addId
+    @param {any} data the serialized representation that is being built
+    @param {String} key the resolved primary key
+    @param {id} id the serialized id
+  */
+  addId: mustImplement('addId'),
+
+  /**
+    A hook you can use to customize how the record's type is added to
+    the serialized data.
+
+    The `addType` hook is called with:
+
+    * the serialized representation being built
+    * the serialized id (after calling the `serializeId` hook)
+
+    @method addType
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model subclass} type the type of the record
+  */
+  addType: Ember.K,
+
+  /**
+    Creates an empty hash that will be filled in by the hooks called from the
+    `serialize()` method.
+
+    @method createSerializedForm
+    @return {Object}
+  */
+  createSerializedForm: function() {
+    return {};
+  },
+
+  /**
+    A hook you can use to change how relationships are added to the serialized
+    representation of a record.
+
+    By default, `addRelationships` loops over all of the relationships of the
+    passed record, maps the relationship names to the key for the serialized form,
+    and then invokes the public `addBelongsTo` and `addHasMany` hooks.
+
+    Since you can override `keyForBelongsTo`, `keyForHasMany`, `addBelongsTo`,
+    `addHasMany`, and register mappings, you should rarely need to override this
+    hook.
+
+    @method addRelationships
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+  */
+  addRelationships: function(data, record) {
+    record.eachRelationship(function(name, relationship) {
+      if (relationship.kind === 'belongsTo') {
+        this._addBelongsTo(data, record, name, relationship);
+      } else if (relationship.kind === 'hasMany') {
+        this._addHasMany(data, record, name, relationship);
+      }
+    }, this);
+  },
+
+  /**
+    A hook you can use to add a `belongsTo` relationship to the
+    serialized representation.
+
+    The specifics of this hook are very adapter-specific, so there
+    is no default implementation. You can see `DS.JSONSerializer`
+    for an example of an implementation of the `addBelongsTo` hook.
+
+    The `belongsTo` relationship object has the following properties:
+
+    * **type** a subclass of DS.Model that is the type of the
+      relationship. This is the first parameter to DS.belongsTo
+    * **options** the options passed to the call to DS.belongsTo
+    * **kind** always `belongsTo`
+
+    Additional properties may be added in the future.
+
+    @method addBelongsTo
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+    @param {String} key the key for the serialized object
+    @param {Object} relationship an object representing the relationship
+  */
+  addBelongsTo: mustImplement('addBelongsTo'),
+
+  /**
+    A hook you can use to add a `hasMany` relationship to the
+    serialized representation.
+
+    The specifics of this hook are very adapter-specific, so there
+    is no default implementation. You may not need to implement this,
+    for example, if your backend only expects relationships on the
+    child of a one to many relationship.
+
+    The `hasMany` relationship object has the following properties:
+
+    * **type** a subclass of DS.Model that is the type of the
+      relationship. This is the first parameter to DS.hasMany
+    * **options** the options passed to the call to DS.hasMany
+    * **kind** always `hasMany`
+
+    Additional properties may be added in the future.
+
+    @method addHasMany
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+    @param {String} key the key for the serialized object
+    @param {Object} relationship an object representing the relationship
+  */
+  addHasMany: mustImplement('addHasMany'),
+
+  /*
+    NAMING CONVENTIONS
+
+    The most commonly overridden APIs of the serializer are
+    the naming convention methods:
+
+    * `keyForAttributeName`: converts a camelized attribute name
+      into a key in the adapter-provided data hash. For example,
+      if the model's attribute name was `firstName`, and the
+      server used underscored names, you would return `first_name`.
+    * `primaryKey`: returns the key that should be used to
+      extract the id from the adapter-provided data hash. It is
+      also used when serializing a record.
+  */
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how an unmapped attribute name is converted into a key.
+
+    By default, this method returns the `name` parameter.
+
+    For example, if the attribute names in your JSON are underscored,
+    you will want to convert them into JavaScript conventional
+    camelcase:
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+
+      keyForAttributeName: function(type, name) {
+        return name.camelize();
+      }
+    });
+    ```
+
+    @method keyForAttributeName
+    @param {DS.Model subclass} type the type of the record with
+      the attribute name `name`
+    @param {String} name the attribute name to convert into a key
+
+    @returns {String} the key
+  */
+  keyForAttributeName: function(type, name) {
+    return name;
+  },
+
+  /**
+    A hook you can use in your serializer to specify a conventional
+    primary key.
+
+    By default, this method will return the string `id`.
+
+    In general, you should not override this hook to specify a special
+    primary key for an individual type; use `configure` instead.
+
+    For example, if your primary key is always `__id__`:
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+      primaryKey: function(type) {
+        return '__id__';
+      }
+    });
+    ```
+
+    In another example, if the primary key always includes the
+    underscored version of the type before the string `id`:
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+      primaryKey: function(type) {
+        // If the type is `BlogPost`, this will return
+        // `blog_post_id`.
+        var typeString = type.toString().split(".")[1].underscore();
+        return typeString + "_id";
+      }
+    });
+    ```
+
+    @method primaryKey
+    @param {DS.Model subclass} type
+    @returns {String} the primary key for the type
+  */
+  primaryKey: function(type) {
+    return "id";
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how an unmapped `belongsTo` relationship is converted into
+    a key.
+
+    By default, this method calls `keyForAttributeName`, so if
+    your naming convention is uniform across attributes and
+    relationships, you can use the default here and override
+    just `keyForAttributeName` as needed.
+
+    For example, if the `belongsTo` names in your JSON always
+    begin with `BT_` (e.g. `BT_posts`), you can strip out the
+    `BT_` prefix:"
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+      keyForBelongsTo: function(type, name) {
+        return name.match(/^BT_(.*)$/)[1].camelize();
+      }
+    });
+    ```
+
+    @method keyForBelongsTo
+    @param {DS.Model subclass} type the type of the record with
+      the `belongsTo` relationship.
+    @param {String} name the relationship name to convert into a key
+
+    @returns {String} the key
+  */
+  keyForBelongsTo: function(type, name) {
+    return this.keyForAttributeName(type, name);
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how an unmapped `hasMany` relationship is converted into
+    a key.
+
+    By default, this method calls `keyForAttributeName`, so if
+    your naming convention is uniform across attributes and
+    relationships, you can use the default here and override
+    just `keyForAttributeName` as needed.
+
+    For example, if the `hasMany` names in your JSON always
+    begin with the "table name" for the current type (e.g.
+    `post_comments`), you can strip out the prefix:"
+
+    ```javascript
+    App.MySerializer = DS.Serializer.extend({
+      // ...
+      keyForHasMany: function(type, name) {
+        // if your App.BlogPost has many App.BlogComment, the key from
+        // the server would look like: `blog_post_blog_comments`
+        //
+        // 1. Convert the type into a string and underscore the
+        //    second part (App.BlogPost -> blog_post)
+        // 2. Extract the part after `blog_post_` (`blog_comments`)
+        // 3. Underscore it, to become `blogComments`
+        var typeString = type.toString().split(".")[1].underscore();
+        return name.match(new RegExp("^" + typeString + "_(.*)$"))[1].camelize();
+      }
+    });
+    ```
+
+    @method keyForHasMany
+    @param {DS.Model subclass} type the type of the record with
+      the `belongsTo` relationship.
+    @param {String} name the relationship name to convert into a key
+
+    @returns {String} the key
+  */
+  keyForHasMany: function(type, name) {
+    return this.keyForAttributeName(type, name);
+  },
+
+  //.........................
+  //. MATERIALIZATION HOOKS
+  //.........................
+
+  materialize: function(record, serialized, prematerialized) {
+    var id;
+    if (Ember.isNone(get(record, 'id'))) {
+      if (prematerialized && prematerialized.hasOwnProperty('id')) {
+        id = prematerialized.id;
+      } else {
+        id = this.extractId(record.constructor, serialized);
+      }
+      record.materializeId(id);
+    }
+
+    this.materializeAttributes(record, serialized, prematerialized);
+    this.materializeRelationships(record, serialized, prematerialized);
+  },
+
+  deserializeValue: function(value, attributeType) {
+    var transform = this.transforms ? this.transforms[attributeType] : null;
+
+    return transform.deserialize(value);
+  },
+
+  materializeAttributes: function(record, serialized, prematerialized) {
+    record.eachAttribute(function(name, attribute) {
+      if (prematerialized && prematerialized.hasOwnProperty(name)) {
+        record.materializeAttribute(name, prematerialized[name]);
+      } else {
+        this.materializeAttribute(record, serialized, name, attribute.type);
+      }
+    }, this);
+  },
+
+  materializeAttribute: function(record, serialized, attributeName, attributeType) {
+    var value = this.extractAttribute(record.constructor, serialized, attributeName);
+    value = this.deserializeValue(value, attributeType);
+
+    record.materializeAttribute(attributeName, value);
+  },
+
+  materializeRelationships: function(record, serialized, prematerialized) {
+    record.eachRelationship(function(name, relationship) {
+      if (relationship.kind === 'hasMany') {
+        if (prematerialized && prematerialized.hasOwnProperty(name)) {
+          var tuplesOrReferencesOrOpaque = this._convertPrematerializedHasMany(relationship.type, prematerialized[name]);
+          record.materializeHasMany(name, tuplesOrReferencesOrOpaque);
+        } else {
+          this.materializeHasMany(name, record, serialized, relationship, prematerialized);
+        }
+      } else if (relationship.kind === 'belongsTo') {
+        if (prematerialized && prematerialized.hasOwnProperty(name)) {
+          var tupleOrReference = this._convertTuple(relationship.type, prematerialized[name]);
+          record.materializeBelongsTo(name, tupleOrReference);
+        } else {
+          this.materializeBelongsTo(name, record, serialized, relationship, prematerialized);
+        }
+      }
+    }, this);
+  },
+
+  materializeHasMany: function(name, record, hash, relationship) {
+    var type = record.constructor,
+        key = this._keyForHasMany(type, relationship.key),
+        idsOrTuples = this.extractHasMany(type, hash, key),
+        tuples = idsOrTuples;
+
+    if(idsOrTuples && Ember.isArray(idsOrTuples)) {
+      tuples = this._convertTuples(relationship.type, idsOrTuples);
+    }
+
+    record.materializeHasMany(name, tuples);
+  },
+
+  materializeBelongsTo: function(name, record, hash, relationship) {
+    var type = record.constructor,
+        key = this._keyForBelongsTo(type, relationship.key),
+        idOrTuple,
+        tuple = null;
+
+    if(relationship.options && relationship.options.polymorphic) {
+      idOrTuple = this.extractBelongsToPolymorphic(type, hash, key);
+    } else {
+      idOrTuple = this.extractBelongsTo(type, hash, key);
+    }
+
+    if(!isNone(idOrTuple)) {
+      tuple = this._convertTuple(relationship.type, idOrTuple);
+    }
+
+    record.materializeBelongsTo(name, tuple);
+  },
+
+  _convertPrematerializedHasMany: function(type, prematerializedHasMany) {
+    var tuplesOrReferencesOrOpaque;
+    if( typeof prematerializedHasMany === 'string' ) {
+      tuplesOrReferencesOrOpaque = prematerializedHasMany;
+    } else {
+      tuplesOrReferencesOrOpaque = this._convertTuples(type, prematerializedHasMany);
+    }
+    return tuplesOrReferencesOrOpaque;
+  },
+
+  _convertTuples: function(type, idsOrTuples) {
+    return map.call(idsOrTuples, function(idOrTuple) {
+      return this._convertTuple(type, idOrTuple);
+    }, this);
+  },
+
+  _convertTuple: function(type, idOrTuple) {
+    var foundType;
+
+    if (typeof idOrTuple === 'object') {
+      if (DS.Model.detect(idOrTuple.type)) {
+        return idOrTuple;
+      } else {
+        foundType = this.typeFromAlias(idOrTuple.type);
+
+
+        return {id: idOrTuple.id, type: foundType};
+      }
+    }
+    return {id: idOrTuple, type: type};
+  },
+
+  /**
+    This method is called to get the primary key for a given
+    type.
+
+    If a primary key configuration exists for this type, this
+    method will return the configured value. Otherwise, it will
+    call the public `primaryKey` hook.
+
+    @method _primaryKey
+    @private
+    @param {DS.Model subclass} type
+    @returns {String} the primary key for the type
+  */
+  _primaryKey: function(type) {
+    var config = this.configurationForType(type),
+        primaryKey = config && config.primaryKey;
+
+    if (primaryKey) {
+      return primaryKey;
+    } else {
+      return this.primaryKey(type);
+    }
+  },
+
+  /**
+    This method looks up the key for the attribute name and transforms the
+    attribute's value using registered transforms.
+
+    Specifically:
+
+    1. Look up the key for the attribute name. If available, this will use
+       any registered mappings. Otherwise, it will invoke the public
+       `keyForAttributeName` hook.
+    2. Get the value from the record using the `attributeName`.
+    3. Transform the value using registered transforms for the `attributeType`.
+    4. Invoke the public `addAttribute` hook with the hash, key, and
+       transformed value.
+
+    @method _addAttribute
+    @private
+    @param {any} data the serialized representation being built
+    @param {DS.Model} record the record to serialize
+    @param {String} attributeName the name of the attribute on the record
+    @param {String} attributeType the type of the attribute (e.g. `string`
+      or `boolean`)
+  */
+  _addAttribute: function(data, record, attributeName, attributeType) {
+    var key = this._keyForAttributeName(record.constructor, attributeName);
+    var value = get(record, attributeName);
+
+    this.addAttribute(data, key, this.serializeValue(value, attributeType));
+  },
+
+  /**
+    This method looks up the primary key for the `type` and invokes
+    `serializeId` on the `id`.
+
+    It then invokes the public `addId` hook with the primary key and
+    the serialized id.
+
+    @method _addId
+    @private
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model subclass} type
+    @param {any} id the materialized id from the record
+  */
+  _addId: function(hash, type, id) {
+    var primaryKey = this._primaryKey(type);
+
+    this.addId(hash, primaryKey, this.serializeId(id));
+  },
+
+  /**
+    This method is called to get a key used in the data from
+    an attribute name. It first checks for any mappings before
+    calling the public hook `keyForAttributeName`.
+
+    @method _keyForAttributeName
+    @private
+    @param {DS.Model subclass} type the type of the record with
+      the attribute name `name`
+    @param {String} name the attribute name to convert into a key
+
+    @returns {String} the key
+  */
+  _keyForAttributeName: function(type, name) {
+    return this._keyFromMappingOrHook('keyForAttributeName', type, name);
+  },
+
+  /**
+    This method is called to get a key used in the data from
+    a belongsTo relationship. It first checks for any mappings before
+    calling the public hook `keyForBelongsTo`.
+
+    @method _keyForBelongsTo
+    @private
+    @param {DS.Model subclass} type the type of the record with
+      the `belongsTo` relationship.
+    @param {String} name the relationship name to convert into a key
+
+    @returns {String} the key
+  */
+  _keyForBelongsTo: function(type, name) {
+    return this._keyFromMappingOrHook('keyForBelongsTo', type, name);
+  },
+
+  keyFor: function(description) {
+    var type = description.parentType,
+        name = description.key;
+
+    switch (description.kind) {
+      case 'belongsTo':
+        return this._keyForBelongsTo(type, name);
+      case 'hasMany':
+        return this._keyForHasMany(type, name);
+    }
+  },
+
+  /**
+    This method is called to get a key used in the data from
+    a hasMany relationship. It first checks for any mappings before
+    calling the public hook `keyForHasMany`.
+
+    @method _keyForHasMany
+    @private
+    @param {DS.Model subclass} type the type of the record with
+      the `hasMany` relationship.
+    @param {String} name the relationship name to convert into a key
+
+    @returns {String} the key
+  */
+  _keyForHasMany: function(type, name) {
+    return this._keyFromMappingOrHook('keyForHasMany', type, name);
+  },
+
+  /**
+    This method converts the relationship name to a key for serialization,
+    and then invokes the public `addBelongsTo` hook.
+
+    @method _addBelongsTo
+    @private
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+    @param {String} name the relationship name
+    @param {Object} relationship an object representing the relationship
+  */
+  _addBelongsTo: function(data, record, name, relationship) {
+    var key = this._keyForBelongsTo(record.constructor, name);
+    this.addBelongsTo(data, record, key, relationship);
+  },
+
+  /**
+    This method converts the relationship name to a key for serialization,
+    and then invokes the public `addHasMany` hook.
+
+    @method _addHasMany
+    @private
+    @param {any} data the serialized representation that is being built
+    @param {DS.Model} record the record to serialize
+    @param {String} name the relationship name
+    @param {Object} relationship an object representing the relationship
+  */
+  _addHasMany: function(data, record, name, relationship) {
+    var key = this._keyForHasMany(record.constructor, name);
+    this.addHasMany(data, record, key, relationship);
+  },
+
+  /**
+    An internal method that handles checking whether a mapping
+    exists for a particular attribute or relationship name before
+    calling the public hooks.
+
+    If a mapping is found, and the mapping has a key defined,
+    use that instead of invoking the hook.
+
+    @method _keyFromMappingOrHook
+    @private
+    @param {String} publicMethod the public hook to invoke if
+      a mapping is not found (e.g. `keyForAttributeName`)
+    @param {DS.Model subclass} type the type of the record with
+      the attribute or relationship name.
+    @param {String} name the attribute or relationship name to
+      convert into a key
+  */
+  _keyFromMappingOrHook: function(publicMethod, type, name) {
+    var key = this.mappingOption(type, name, 'key');
+
+    if (key) {
+      return key;
+    } else {
+      return this[publicMethod](type, name);
+    }
+  },
+
+  /* TRANSFORMS */
+
+  registerTransform: function(type, transform) {
+    this.transforms[type] = transform;
+  },
+
+  registerEnumTransform: function(type, objects) {
+    var transform = {
+      deserialize: function(serialized) {
+        return Ember.A(objects).objectAt(serialized);
+      },
+      serialize: function(deserialized) {
+        return Ember.EnumerableUtils.indexOf(objects, deserialized);
+      },
+      values: objects
+    };
+    this.registerTransform(type, transform);
+  },
+
+  /* MAPPING CONVENIENCE */
+
+  map: function(type, mappings) {
+    this.mappings.set(type, mappings);
+  },
+
+  configure: function(type, configuration) {
+    if (type && !configuration) {
+      Ember.merge(this.globalConfigurations, type);
+      return;
+    }
+
+    var config, alias;
+
+    if (configuration.alias) {
+      alias = configuration.alias;
+      this.aliases.set(alias, type);
+      delete configuration.alias;
+    }
+
+    config = Ember.create(this.globalConfigurations);
+    Ember.merge(config, configuration);
+
+    this.configurations.set(type, config);
+  },
+
+  typeFromAlias: function(alias) {
+    this._completeAliases();
+    return this.aliases.get(alias);
+  },
+
+  mappingForType: function(type) {
+    this._reifyMappings();
+    return this.mappings.get(type) || {};
+  },
+
+  configurationForType: function(type) {
+    this._reifyConfigurations();
+    return this.configurations.get(type) || this.globalConfigurations;
+  },
+
+  _completeAliases: function() {
+    this._pluralizeAliases();
+    this._reifyAliases();
+  },
+
+  _pluralizeAliases: function() {
+    if (this._didPluralizeAliases) { return; }
+
+    var aliases = this.aliases,
+        sideloadMapping = this.aliases.sideloadMapping,
+        plural,
+        self = this;
+
+    aliases.forEach(function(key, type) {
+      plural = self.pluralize(key);
+
+      aliases.set(plural, type);
+    });
+
+    // This map is only for backward compatibility with the `sideloadAs` option.
+    if (sideloadMapping) {
+      sideloadMapping.forEach(function(key, type) {
+
+        aliases.set(key, type);
+      });
+      delete this.aliases.sideloadMapping;
+    }
+
+    this._didPluralizeAliases = true;
+  },
+
+  _reifyAliases: function() {
+    if (this._didReifyAliases) { return; }
+
+    var aliases = this.aliases,
+        reifiedAliases = Ember.Map.create(),
+        foundType;
+
+    aliases.forEach(function(key, type) {
+      if (typeof type === 'string') {
+        foundType = Ember.get(Ember.lookup, type);
+
+
+        reifiedAliases.set(key, foundType);
+      } else {
+        reifiedAliases.set(key, type);
+      }
+    });
+
+    this.aliases = reifiedAliases;
+    this._didReifyAliases = true;
+  },
+
+  _reifyMappings: function() {
+    if (this._didReifyMappings) { return; }
+
+    var mappings = this.mappings,
+        reifiedMappings = Ember.Map.create();
+
+    mappings.forEach(function(key, mapping) {
+      if (typeof key === 'string') {
+        var type = Ember.get(Ember.lookup, key);
+
+
+        reifiedMappings.set(type, mapping);
+      } else {
+        reifiedMappings.set(key, mapping);
+      }
+    });
+
+    this.mappings = reifiedMappings;
+
+    this._didReifyMappings = true;
+  },
+
+  _reifyConfigurations: function() {
+    if (this._didReifyConfigurations) { return; }
+
+    var configurations = this.configurations,
+        reifiedConfigurations = Ember.Map.create();
+
+    configurations.forEach(function(key, mapping) {
+      if (typeof key === 'string' && key !== 'plurals') {
+        var type = Ember.get(Ember.lookup, key);
+
+
+        reifiedConfigurations.set(type, mapping);
+      } else {
+        reifiedConfigurations.set(key, mapping);
+      }
+    });
+
+    this.configurations = reifiedConfigurations;
+
+    this._didReifyConfigurations = true;
+  },
+
+  mappingOption: function(type, name, option) {
+    var mapping = this.mappingForType(type)[name];
+
+    return mapping && mapping[option];
+  },
+
+  configOption: function(type, option) {
+    var config = this.configurationForType(type);
+
+    return config[option];
+  },
+
+  // EMBEDDED HELPERS
+
+  embeddedType: function(type, name) {
+    return this.mappingOption(type, name, 'embedded');
+  },
+
+  eachEmbeddedRecord: function(record, callback, binding) {
+    this.eachEmbeddedBelongsToRecord(record, callback, binding);
+    this.eachEmbeddedHasManyRecord(record, callback, binding);
+  },
+
+  eachEmbeddedBelongsToRecord: function(record, callback, binding) {
+    this.eachEmbeddedBelongsTo(record.constructor, function(name, relationship, embeddedType) {
+      var embeddedRecord = get(record, name);
+      if (embeddedRecord) { callback.call(binding, embeddedRecord, embeddedType); }
+    });
+  },
+
+  eachEmbeddedHasManyRecord: function(record, callback, binding) {
+    this.eachEmbeddedHasMany(record.constructor, function(name, relationship, embeddedType) {
+      var array = get(record, name);
+      for (var i=0, l=get(array, 'length'); i<l; i++) {
+        callback.call(binding, array.objectAt(i), embeddedType);
+      }
+    });
+  },
+
+  eachEmbeddedHasMany: function(type, callback, binding) {
+    this.eachEmbeddedRelationship(type, 'hasMany', callback, binding);
+  },
+
+  eachEmbeddedBelongsTo: function(type, callback, binding) {
+    this.eachEmbeddedRelationship(type, 'belongsTo', callback, binding);
+  },
+
+  eachEmbeddedRelationship: function(type, kind, callback, binding) {
+    type.eachRelationship(function(name, relationship) {
+      var embeddedType = this.embeddedType(type, name);
+
+      if (embeddedType) {
+        if (relationship.kind === kind) {
+          callback.call(binding, name, relationship, embeddedType);
+        }
+      }
+    }, this);
+  },
+
+  // HELPERS
+
+  // define a plurals hash in your subclass to define
+  // special-case pluralization
+  pluralize: function(name) {
+    var plurals = this.configurations.get('plurals');
+    return (plurals && plurals[name]) || name + "s";
+  },
+
+  // use the same plurals hash to determine
+  // special-case singularization
+  singularize: function(name) {
+    var plurals = this.configurations.get('plurals');
+    if (plurals) {
+      for (var i in plurals) {
+        if (plurals[i] === name) {
+          return i;
+        }
+      }
+    }
+    if (name.lastIndexOf('s') === name.length - 1) {
+      return name.substring(0, name.length - 1);
+    } else {
+      return name;
+    }
+  }
+});
+
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var isNone = Ember.isNone, isEmpty = Ember.isEmpty;
+
+/**
+  DS.JSONTransforms is a hash of transforms used by DS.Serializer.
+
+  @class JSONTransforms
+  @static
+  @namespace DS
+*/
+DS.JSONTransforms = {
+  string: {
+    deserialize: function(serialized) {
+      return isNone(serialized) ? null : String(serialized);
+    },
+
+    serialize: function(deserialized) {
+      return isNone(deserialized) ? null : String(deserialized);
+    }
+  },
+
+  number: {
+    deserialize: function(serialized) {
+      return isEmpty(serialized) ? null : Number(serialized);
+    },
+
+    serialize: function(deserialized) {
+      return isEmpty(deserialized) ? null : Number(deserialized);
+    }
+  },
+
+  // Handles the following boolean inputs:
+  // "TrUe", "t", "f", "FALSE", 0, (non-zero), or boolean true/false
+  'boolean': {
+    deserialize: function(serialized) {
+      var type = typeof serialized;
+
+      if (type === "boolean") {
+        return serialized;
+      } else if (type === "string") {
+        return serialized.match(/^true$|^t$|^1$/i) !== null;
+      } else if (type === "number") {
+        return serialized === 1;
+      } else {
+        return false;
+      }
+    },
+
+    serialize: function(deserialized) {
+      return Boolean(deserialized);
+    }
+  },
+
+  date: {
+    deserialize: function(serialized) {
+      var type = typeof serialized;
+
+      if (type === "string") {
+        return new Date(Ember.Date.parse(serialized));
+      } else if (type === "number") {
+        return new Date(serialized);
+      } else if (serialized === null || serialized === undefined) {
+        // if the value is not present in the data,
+        // return undefined, not null.
+        return serialized;
+      } else {
+        return null;
+      }
+    },
+
+    serialize: function(date) {
+      if (date instanceof Date) {
+        var days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+        var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+
+        var pad = function(num) {
+          return num < 10 ? "0"+num : ""+num;
+        };
+
+        var utcYear = date.getUTCFullYear(),
+            utcMonth = date.getUTCMonth(),
+            utcDayOfMonth = date.getUTCDate(),
+            utcDay = date.getUTCDay(),
+            utcHours = date.getUTCHours(),
+            utcMinutes = date.getUTCMinutes(),
+            utcSeconds = date.getUTCSeconds();
+
+
+        var dayOfWeek = days[utcDay];
+        var dayOfMonth = pad(utcDayOfMonth);
+        var month = months[utcMonth];
+
+        return dayOfWeek + ", " + dayOfMonth + " " + month + " " + utcYear + " " +
+               pad(utcHours) + ":" + pad(utcMinutes) + ":" + pad(utcSeconds) + " GMT";
+      } else {
+        return null;
+      }
+    }
+  }
+};
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+/**
+  @class JSONSerializer
+  @namespace DS
+  @extends DS.Serializer
+*/
+DS.JSONSerializer = DS.Serializer.extend({
+  init: function() {
+    this._super();
+
+    if (!get(this, 'transforms')) {
+      this.set('transforms', DS.JSONTransforms);
+    }
+
+    this.sideloadMapping = Ember.Map.create();
+    this.metadataMapping = Ember.Map.create();
+
+    this.configure({
+      meta: 'meta',
+      since: 'since'
+    });
+  },
+
+  /**
+    @method configure
+    @param  type
+    @param  configuration
+  */
+  configure: function(type, configuration) {
+    var key;
+
+    if (type && !configuration) {
+      for(key in type){
+        this.metadataMapping.set(get(type, key), key);
+      }
+
+      return this._super(type);
+    }
+
+    var sideloadAs = configuration.sideloadAs,
+        sideloadMapping;
+
+    if (sideloadAs) {
+      sideloadMapping = this.aliases.sideloadMapping || Ember.Map.create();
+      sideloadMapping.set(sideloadAs, type);
+      this.aliases.sideloadMapping = sideloadMapping;
+      delete configuration.sideloadAs;
+    }
+
+    this._super.apply(this, arguments);
+  },
+
+  /**
+    @method addId
+    @param data
+    @param key
+    @param id
+  */
+  addId: function(data, key, id) {
+    data[key] = id;
+  },
+
+  /**
+    A hook you can use to customize how the key/value pair is added to
+    the serialized data.
+
+    @method addAttribute
+    @param {any} hash the JSON hash being built
+    @param {String} key the key to add to the serialized data
+    @param {any} value the value to add to the serialized data
+  */
+  addAttribute: function(hash, key, value) {
+    hash[key] = value;
+  },
+
+  /**
+    @method extractAttribute
+    @param type
+    @param hash
+    @param attributeName
+  */
+  extractAttribute: function(type, hash, attributeName) {
+    var key = this._keyForAttributeName(type, attributeName);
+    return hash[key];
+  },
+
+  /**
+    @method extractId
+    @param type
+    @param hash
+  */
+  extractId: function(type, hash) {
+    var primaryKey = this._primaryKey(type);
+
+    if (hash.hasOwnProperty(primaryKey)) {
+      // Ensure that we coerce IDs to strings so that record
+      // IDs remain consistent between application runs; especially
+      // if the ID is serialized and later deserialized from the URL,
+      // when type information will have been lost.
+      return hash[primaryKey]+'';
+    } else {
+      return null;
+    }
+  },
+
+  /**
+    @method extractEmbeddedData
+    @param hash
+    @param key
+  */
+  extractEmbeddedData: function(hash, key) {
+    return hash[key];
+  },
+
+  /**
+    @method extractHasMany
+    @param type
+    @param hash
+    @param key
+  */
+  extractHasMany: function(type, hash, key) {
+    return hash[key];
+  },
+
+  /**
+    @method extractBelongsTo
+    @param type
+    @param hash
+    @param key
+  */
+  extractBelongsTo: function(type, hash, key) {
+    return hash[key];
+  },
+
+  /**
+    @method extractBelongsToPolymorphic
+    @param type
+    @param hash
+    @param key
+  */
+  extractBelongsToPolymorphic: function(type, hash, key) {
+    var keyForId = this.keyForPolymorphicId(key),
+        keyForType,
+        id = hash[keyForId];
+
+    if (id) {
+      keyForType = this.keyForPolymorphicType(key);
+      return {id: id, type: hash[keyForType]};
+    }
+
+    return null;
+  },
+
+  /**
+    @method addBelongsTo
+    @param hash
+    @param record
+    @param key
+    @param relationship
+  */
+  addBelongsTo: function(hash, record, key, relationship) {
+    var type = record.constructor,
+        name = relationship.key,
+        value = null,
+        includeType = (relationship.options && relationship.options.polymorphic),
+        embeddedChild,
+        child,
+        id;
+
+    if (this.embeddedType(type, name)) {
+      if (embeddedChild = get(record, name)) {
+        value = this.serialize(embeddedChild, { includeId: true, includeType: includeType });
+      }
+
+      hash[key] = value;
+    } else {
+      child = get(record, relationship.key);
+      id = get(child, 'id');
+
+      if (relationship.options && relationship.options.polymorphic && !Ember.isNone(id)) {
+        this.addBelongsToPolymorphic(hash, key, id, child.constructor);
+      } else {
+        hash[key] = this.serializeId(id);
+      }
+    }
+  },
+
+  /**
+    @method addBelongsToPolymorphic
+    @param hash
+    @param key
+    @param id
+    @param type
+  */
+  addBelongsToPolymorphic: function(hash, key, id, type) {
+    var keyForId = this.keyForPolymorphicId(key),
+        keyForType = this.keyForPolymorphicType(key);
+    hash[keyForId] = id;
+    hash[keyForType] = this.rootForType(type);
+  },
+
+  /**
+    Adds a has-many relationship to the JSON hash being built.
+
+    The default REST semantics are to only add a has-many relationship if it
+    is embedded. If the relationship was initially loaded by ID, we assume that
+    that was done as a performance optimization, and that changes to the
+    has-many should be saved as foreign key changes on the child's belongs-to
+    relationship.
+
+    @method addHasMany
+    @param {Object} hash the JSON being built
+    @param {DS.Model} record the record being serialized
+    @param {String} key the JSON key into which the serialized relationship
+      should be saved
+    @param {Object} relationship metadata about the relationship being serialized
+  */
+
+  addHasMany: function(hash, record, key, relationship) {
+    var type = record.constructor,
+        name = relationship.key,
+        serializedHasMany = [],
+        includeType = (relationship.options && relationship.options.polymorphic),
+        manyArray, embeddedType;
+
+    // If the has-many is not embedded, there is nothing to do.
+    embeddedType = this.embeddedType(type, name);
+    if (embeddedType !== 'always') { return; }
+
+    // Get the DS.ManyArray for the relationship off the record
+    manyArray = get(record, name);
+
+    // Build up the array of serialized records
+    manyArray.forEach(function (record) {
+      serializedHasMany.push(this.serialize(record, { includeId: true, includeType: includeType }));
+    }, this);
+
+    // Set the appropriate property of the serialized JSON to the
+    // array of serialized embedded records
+    hash[key] = serializedHasMany;
+  },
+
+  /**
+    @method addType
+    @param hash
+    @param type
+  */
+  addType: function(hash, type) {
+    var keyForType = this.keyForEmbeddedType();
+    hash[keyForType] = this.rootForType(type);
+  },
+
+  // EXTRACTION
+
+  /**
+    @method extract
+    @param loader
+    @param json
+    @param type
+    @param record
+  */
+  extract: function(loader, json, type, record) {
+    var root = this.rootForType(type);
+
+    this.sideload(loader, type, json, root);
+    this.extractMeta(loader, type, json);
+
+    if (json[root]) {
+      if (record) { loader.updateId(record, json[root]); }
+      this.extractRecordRepresentation(loader, type, json[root]);
+    } else {
+      Ember.Logger.warn("Extract requested, but no data given for " + type + ". This may cause weird problems.");
+    }
+  },
+
+  /**
+    @method extractMany
+    @param loader
+    @param json
+    @param type
+    @param records
+  */
+  extractMany: function(loader, json, type, records) {
+    var root = this.rootForType(type);
+    root = this.pluralize(root);
+
+    this.sideload(loader, type, json, root);
+    this.extractMeta(loader, type, json);
+
+    if (json[root]) {
+      var objects = json[root], references = [];
+      if (records) { records = records.toArray(); }
+
+      for (var i = 0; i < objects.length; i++) {
+        if (records) { loader.updateId(records[i], objects[i]); }
+        var reference = this.extractRecordRepresentation(loader, type, objects[i]);
+        references.push(reference);
+      }
+
+      loader.populateArray(references);
+    }
+  },
+
+  /**
+    @method extractMeta
+    @param loader
+    @param type
+    @param json
+  */
+  extractMeta: function(loader, type, json) {
+    var meta = this.configOption(type, 'meta'),
+        data = json, value;
+
+    if(meta && json[meta]){
+      data = json[meta];
+    }
+
+    this.metadataMapping.forEach(function(property, key){
+      value = data[property];
+      if(!Ember.isNone(value)){
+        loader.metaForType(type, key, value);
+      }
+    });
+  },
+
+  /**
+    @method extractEmbeddedType
+    @param relationship
+    @param data
+  */
+  extractEmbeddedType: function(relationship, data) {
+    var foundType = relationship.type;
+    if(relationship.options && relationship.options.polymorphic) {
+      var key = this.keyFor(relationship),
+          keyForEmbeddedType = this.keyForEmbeddedType(key);
+
+      foundType = this.typeFromAlias(data[keyForEmbeddedType]);
+      delete data[keyForEmbeddedType];
+    }
+
+    return foundType;
+  },
+
+  /**
+    Iterates over the `json` payload and attempts to load any data
+    included alongside `root`.
+
+    The keys expected for sideloaded data are based upon the types related
+    to the root model. Recursion is used to ensure that types related to
+    related types can be loaded as well. Any custom keys specified by
+    `sideloadAs` mappings will also be respected.
+
+    @method sideload
+    @private
+    @param {DS.Store subclass} loader
+    @param {DS.Model subclass} type
+    @param {Object} json
+    @param {String} root
+  */
+  sideload: function(loader, type, json, root) {
+    var sideloadedType;
+
+    this.configureSideloadMappingForType(type);
+
+    for (var prop in json) {
+      if (!json.hasOwnProperty(prop) ||
+          prop === root ||
+          !!this.metadataMapping.get(prop)) {
+        continue;
+      }
+
+      sideloadedType = this.typeFromAlias(prop);
+
+
+      this.loadValue(loader, sideloadedType, json[prop]);
+    }
+  },
+
+  /**
+    Configures possible sideload mappings for the types related to a
+    particular model. This recursive method ensures that sideloading
+    works for related models as well.
+
+    @method configureSideloadMappingForType
+    @private
+    @param {DS.Model subclass} type
+    @param {Ember.A} configured an array of types that have already been configured
+  */
+  configureSideloadMappingForType: function(type, configured) {
+    if (!configured) {configured = Ember.A();}
+    configured.pushObject(type);
+
+    type.eachRelatedType(function(relatedType) {
+      if (!configured.contains(relatedType)) {
+        var root = this.defaultSideloadRootForType(relatedType);
+        this.aliases.set(root, relatedType);
+
+        this.configureSideloadMappingForType(relatedType, configured);
+      }
+    }, this);
+  },
+
+  /**
+    @method loadValue
+    @param loader
+    @param type
+    @param value
+  */
+  loadValue: function(loader, type, value) {
+    if (value instanceof Array) {
+      for (var i=0; i < value.length; i++) {
+        loader.sideload(type, value[i]);
+      }
+    } else {
+      loader.sideload(type, value);
+    }
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how a polymorphic association's name is converted into a key for the id.
+
+    @method keyForPolymorphicId
+    @param {String} name the association name to convert into a key
+    @return {String} the key
+  */
+  keyForPolymorphicId: function(key){
+    return key;
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    how a polymorphic association's name is converted into a key for the type.
+
+    @method keyForPolymorphicType
+    @param {String} name the association name to convert into a key
+    @return {String} the key
+  */
+  keyForPolymorphicType: function(key){
+    return this.keyForPolymorphicId(key) + '_type';
+  },
+
+  /**
+    A hook you can use in your serializer subclass to customize
+    the key used to store the type of a record of an embedded polymorphic association.
+
+    By default, this method return 'type'.
+
+    @method keyForEmbeddedType
+    @return {String} the key
+  */
+  keyForEmbeddedType: function() {
+    return 'type';
+  },
+
+  // HELPERS
+
+  /**
+    Determines the singular root name for a particular type.
+
+    This is an underscored, lowercase version of the model name.
+    For example, the type `App.UserGroup` will have the root
+    `user_group`.
+
+    @method rootForType
+    @private
+    @param {DS.Model subclass} type
+    @return {String} name of the root element
+  */
+  rootForType: function(type) {
+    var typeString = type.toString();
+
+
+    // use the last part of the name as the URL
+    var parts = typeString.split(".");
+    var name = parts[parts.length - 1];
+    return name.replace(/([A-Z])/g, '_$1').toLowerCase().slice(1);
+  },
+
+  /**
+    The default root name for a particular sideloaded type.
+
+    @method defaultSideloadRootForType
+    @private
+    @param {DS.Model subclass} type
+    @return {String} name of the root element
+  */
+  defaultSideloadRootForType: function(type) {
+    return this.pluralize(this.rootForType(type));
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set, merge = Ember.merge;
+var forEach = Ember.EnumerableUtils.forEach;
+
+function loaderFor(store) {
+  return {
+    load: function(type, data, prematerialized) {
+      return store.load(type, data, prematerialized);
+    },
+
+    loadMany: function(type, array) {
+      return store.loadMany(type, array);
+    },
+
+    updateId: function(record, data) {
+      return store.updateId(record, data);
+    },
+
+    populateArray: Ember.K,
+
+    sideload: function(type, data) {
+      return store.adapterForType(type).load(store, type, data);
+    },
+
+    sideloadMany: function(type, array) {
+      return store.loadMany(type, array);
+    },
+
+    prematerialize: function(reference, prematerialized) {
+      reference.prematerialized = prematerialized;
+    },
+
+    metaForType: function(type, property, data) {
+      store.metaForType(type, property, data);
+    }
+  };
+}
+
+DS.loaderFor = loaderFor;
+
+/**
+  An adapter is an object that receives requests from a store and
+  translates them into the appropriate action to take against your
+  persistence layer. The persistence layer is usually an HTTP API, but may
+  be anything, such as the browser's local storage.
+
+  ### Creating an Adapter
+
+  First, create a new subclass of `DS.Adapter`:
+
+      App.MyAdapter = DS.Adapter.extend({
+        // ...your code here
+      });
+
+  To tell your store which adapter to use, set its `adapter` property:
+
+      App.store = DS.Store.create({
+        adapter: App.MyAdapter.create()
+      });
+
+  `DS.Adapter` is an abstract base class that you should override in your
+  application to customize it for your backend. The minimum set of methods
+  that you should implement is:
+
+    * `find()`
+    * `createRecord()`
+    * `updateRecord()`
+    * `deleteRecord()`
+
+  To improve the network performance of your application, you can optimize
+  your adapter by overriding these lower-level methods:
+
+    * `findMany()`
+    * `createRecords()`
+    * `updateRecords()`
+    * `deleteRecords()`
+    * `commit()`
+
+  For an example implementation, see `DS.RestAdapter`, the
+  included REST adapter.
+
+  @class Adapter
+  @namespace DS
+  @extends Ember.Object
+  @uses DS._Mappable
+*/
+
+DS.Adapter = Ember.Object.extend(DS._Mappable, {
+
+  init: function() {
+    var serializer = get(this, 'serializer');
+
+    if (Ember.Object.detect(serializer)) {
+      serializer = serializer.create();
+      set(this, 'serializer', serializer);
+    }
+
+    this._attributesMap = this.createInstanceMapFor('attributes');
+    this._configurationsMap = this.createInstanceMapFor('configurations');
+
+    this._outstandingOperations = new Ember.MapWithDefault({
+      defaultValue: function() { return 0; }
+    });
+
+    this._dependencies = new Ember.MapWithDefault({
+      defaultValue: function() { return new Ember.OrderedSet(); }
+    });
+
+    this.registerSerializerTransforms(this.constructor, serializer, {});
+    this.registerSerializerMappings(serializer);
+  },
+
+  /**
+    Loads a payload for a record into the store.
+
+    This method asks the serializer to break the payload into
+    constituent parts, and then loads them into the store. For example,
+    if you have a payload that contains embedded records, they will be
+    extracted by the serializer and loaded into the store.
+
+    For example:
+
+        adapter.load(store, App.Person, {
+          id: 123,
+          firstName: "Yehuda",
+          lastName: "Katz",
+          occupations: [{
+            id: 345,
+            title: "Tricycle Mechanic"
+          }]
+        });
+
+    This will load the payload for the `App.Person` with ID `123` and
+    the embedded `App.Occupation` with ID `345`.
+
+    @method load
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+  */
+  load: function(store, type, payload) {
+    var loader = loaderFor(store);
+    return get(this, 'serializer').extractRecordRepresentation(loader, type, payload);
+  },
+
+  /**
+    Acknowledges that the adapter has finished creating a record.
+
+    Your adapter should call this method from `createRecord` when
+    it has saved a new record to its persistent storage and received
+    an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    creation, and you want to update the existing record with the
+    new information, pass the payload as the fourth parameter.
+
+    For example, the `RESTAdapter` saves newly created records by
+    making an Ajax request. When the server returns, the adapter
+    calls didCreateRecord. If the server returns a response body,
+    it is passed as the payload.
+
+    @method didCreateRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didCreateRecord: function(store, type, record, payload) {
+    store.didSaveRecord(record);
+
+    if (payload) {
+      var loader = DS.loaderFor(store);
+
+      loader.load = function(type, data, prematerialized) {
+        store.updateId(record, data);
+        return store.load(type, data, prematerialized);
+      };
+
+      get(this, 'serializer').extract(loader, payload, type);
+    }
+  },
+
+  /**
+    Acknowledges that the adapter has finished creating several records.
+
+    Your adapter should call this method from `createRecords` when it
+    has saved multiple created records to its persistent storage
+    received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    creation, and you want to update the existing record with the
+    new information, pass the payload as the fourth parameter.
+
+    @method didCreateRecords
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didCreateRecords: function(store, type, records, payload) {
+    records.forEach(function(record) {
+      store.didSaveRecord(record);
+    }, this);
+
+    if (payload) {
+      var loader = DS.loaderFor(store);
+      get(this, 'serializer').extractMany(loader, payload, type, records);
+    }
+  },
+
+  /**
+    @private
+
+    Acknowledges that the adapter has finished updating or deleting a record.
+
+    Your adapter should call this method from `updateRecord` or `deleteRecord`
+    when it has updated or deleted a record to its persistent storage and
+    received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    update or delete, and you want to update the existing record with the
+    new information, pass the payload as the fourth parameter.
+
+    @method didSaveRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didSaveRecord: function(store, type, record, payload) {
+    store.didSaveRecord(record);
+
+    var serializer = get(this, 'serializer');
+
+    serializer.eachEmbeddedRecord(record, function(embeddedRecord, embeddedType) {
+      if (embeddedType === 'load') { return; }
+
+      this.didSaveRecord(store, embeddedRecord.constructor, embeddedRecord);
+    }, this);
+
+    if (payload) {
+      var loader = DS.loaderFor(store);
+      serializer.extract(loader, payload, type);
+    }
+  },
+
+  /**
+    Acknowledges that the adapter has finished updating a record.
+
+    Your adapter should call this method from `updateRecord` when it
+    has updated a record to its persistent storage and received an
+    acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    update, pass the payload as the fourth parameter.
+
+    @method didUpdateRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didUpdateRecord: function() {
+    this.didSaveRecord.apply(this, arguments);
+  },
+
+  /**
+    Acknowledges that the adapter has finished deleting a record.
+
+    Your adapter should call this method from `deleteRecord` when it
+    has deleted a record from its persistent storage and received an
+    acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    deletion, pass the payload as the fourth parameter.
+
+    @method didDeleteRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+    @param {any} payload
+  */
+  didDeleteRecord: function() {
+    this.didSaveRecord.apply(this, arguments);
+  },
+
+  /**
+    Acknowledges that the adapter has finished updating or deleting
+    multiple records.
+
+    Your adapter should call this method from its `updateRecords` or
+    `deleteRecords` when it has updated or deleted multiple records
+    to its persistent storage and received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    creation, pass the payload as the fourth parameter.
+
+    @method didSaveRecords
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} records
+    @param {any} payload
+  */
+  didSaveRecords: function(store, type, records, payload) {
+    records.forEach(function(record) {
+      store.didSaveRecord(record);
+    }, this);
+
+    if (payload) {
+      var loader = DS.loaderFor(store);
+      get(this, 'serializer').extractMany(loader, payload, type);
+    }
+  },
+
+  /**
+    Acknowledges that the adapter has finished updating multiple records.
+
+    Your adapter should call this method from its `updateRecords` when
+    it has updated multiple records to its persistent storage and
+    received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    update, pass the payload as the fourth parameter.
+
+    @method didUpdateRecords
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} records
+    @param {any} payload
+  */
+  didUpdateRecords: function() {
+    this.didSaveRecords.apply(this, arguments);
+  },
+
+  /**
+    Acknowledges that the adapter has finished updating multiple records.
+
+    Your adapter should call this method from its `deleteRecords` when
+    it has deleted multiple records to its persistent storage and
+    received an acknowledgement.
+
+    If the persistent storage returns a new payload in response to the
+    deletion, pass the payload as the fourth parameter.
+
+    @method didDeleteRecords
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} records
+    @param {any} payload
+  */
+  didDeleteRecords: function() {
+    this.didSaveRecords.apply(this, arguments);
+  },
+
+  /**
+    Loads the response to a request for a record by ID.
+
+    Your adapter should call this method from its `find` method
+    with the response from the backend.
+
+    You should pass the same ID to this method that was given
+    to your find method so that the store knows which record
+    to associate the new data with.
+
+    @method didFindRecord
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+    @param {String} id
+  */
+  didFindRecord: function(store, type, payload, id) {
+    var loader = DS.loaderFor(store);
+
+    loader.load = function(type, data, prematerialized) {
+      prematerialized = prematerialized || {};
+      prematerialized.id = id;
+
+      return store.load(type, data, prematerialized);
+    };
+
+    get(this, 'serializer').extract(loader, payload, type);
+  },
+
+  /**
+    Loads the response to a request for all records by type.
+
+    You adapter should call this method from its `findAll`
+    method with the response from the backend.
+
+    @method didFindAll
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+  */
+  didFindAll: function(store, type, payload) {
+    var loader = DS.loaderFor(store),
+        serializer = get(this, 'serializer');
+
+    store.didUpdateAll(type);
+
+    serializer.extractMany(loader, payload, type);
+  },
+
+  /**
+    Loads the response to a request for records by query.
+
+    Your adapter should call this method from its `findQuery`
+    method with the response from the backend.
+
+    @method didFindQuery
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+    @param {DS.AdapterPopulatedRecordArray} recordArray
+  */
+  didFindQuery: function(store, type, payload, recordArray) {
+    var loader = DS.loaderFor(store);
+
+    loader.populateArray = function(data) {
+      recordArray.load(data);
+    };
+
+    get(this, 'serializer').extractMany(loader, payload, type);
+  },
+
+  /**
+    Loads the response to a request for many records by ID.
+
+    You adapter should call this method from its `findMany`
+    method with the response from the backend.
+
+    @method didFindMany
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {any} payload
+  */
+  didFindMany: function(store, type, payload) {
+    var loader = DS.loaderFor(store);
+
+    get(this, 'serializer').extractMany(loader, payload, type);
+  },
+
+  /**
+    Notifies the store that a request to the backend returned
+    an error.
+
+    Your adapter should call this method to indicate that the
+    backend returned an error for a request.
+
+    @method didError
+    @param {DS.Store} store
+    @param {subclass of DS.Model} type
+    @param {DS.Model} record
+  */
+  didError: function(store, type, record) {
+    store.recordWasError(record);
+  },
+
+  /**
+    @method dirtyRecordsForAttributeChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+    @param {String} attributeName
+    @param {any} newValue
+    @param {any} oldValue
+  */
+  dirtyRecordsForAttributeChange: function(dirtySet, record, attributeName, newValue, oldValue) {
+    if (newValue !== oldValue) {
+      // If this record is embedded, add its parent
+      // to the dirty set.
+      this.dirtyRecordsForRecordChange(dirtySet, record);
+    }
+  },
+
+  /**
+    @method dirtyRecordsForRecordChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+  */
+  dirtyRecordsForRecordChange: function(dirtySet, record) {
+    dirtySet.add(record);
+  },
+
+  /**
+    @method dirtyRecordsForBelongsToChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} child
+    @param {DS.RelationshipChange} relationship
+  */
+  dirtyRecordsForBelongsToChange: function(dirtySet, child) {
+    this.dirtyRecordsForRecordChange(dirtySet, child);
+  },
+
+  /**
+    @method dirtyRecordsForHasManyChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} parent
+    @param {DS.RelationshipChange} relationship
+  */
+  dirtyRecordsForHasManyChange: function(dirtySet, parent, relationship) {
+    this.dirtyRecordsForRecordChange(dirtySet, parent);
+  },
+
+  /**
+    @private
+
+    This method recursively climbs the superclass hierarchy and
+    registers any class-registered transforms on the adapter's
+    serializer.
+
+    Once it registers a transform for a given type, it ignores
+    subsequent transforms for the same attribute type.
+
+    @method registerSerializerTransforms
+    @param {Class} klass the DS.Adapter subclass to extract the
+      transforms from
+    @param {DS.Serializer} serializer the serializer to register
+      the transforms onto
+    @param {Object} seen a hash of attributes already seen
+  */
+  registerSerializerTransforms: function(klass, serializer, seen) {
+    var transforms = klass._registeredTransforms, superclass, prop;
+    var enumTransforms = klass._registeredEnumTransforms;
+
+    for (prop in transforms) {
+      if (!transforms.hasOwnProperty(prop) || prop in seen) { continue; }
+      seen[prop] = true;
+
+      serializer.registerTransform(prop, transforms[prop]);
+    }
+
+    for (prop in enumTransforms) {
+      if (!enumTransforms.hasOwnProperty(prop) || prop in seen) { continue; }
+      seen[prop] = true;
+
+      serializer.registerEnumTransform(prop, enumTransforms[prop]);
+    }
+
+    if (superclass = klass.superclass) {
+      this.registerSerializerTransforms(superclass, serializer, seen);
+    }
+  },
+
+  /**
+    @private
+
+    This method recursively climbs the superclass hierarchy and
+    registers any class-registered mappings on the adapter's
+    serializer.
+
+    @method registerSerializerMappings
+    @param {Class} klass the DS.Adapter subclass to extract the
+      transforms from
+    @param {DS.Serializer} serializer the serializer to register the
+      mappings onto
+  */
+  registerSerializerMappings: function(serializer) {
+    var mappings = this._attributesMap,
+        configurations = this._configurationsMap;
+
+    mappings.forEach(serializer.map, serializer);
+    configurations.forEach(serializer.configure, serializer);
+  },
+
+  /**
+    The `find()` method is invoked when the store is asked for a record that
+    has not previously been loaded. In response to `find()` being called, you
+    should query your persistence layer for a record with the given ID. Once
+    found, you can asynchronously call the store's `load()` method to load
+    the record.
+
+    Here is an example `find` implementation:
+
+        find: function(store, type, id) {
+          var url = type.url;
+          url = url.fmt(id);
+
+          jQuery.getJSON(url, function(data) {
+              // data is a hash of key/value pairs. If your server returns a
+              // root, simply do something like:
+              // store.load(type, id, data.person)
+              store.load(type, id, data);
+          });
+        }
+
+    @method find
+  */
+  find: Ember.required(Function),
+
+  /**
+    Optional
+
+    @method findAll
+    @param  store
+    @param  type
+    @param  since
+  */
+  findAll: null,
+
+  /**
+    Optional
+
+    @method findQuery
+    @param  store
+    @param  type
+    @param  query
+    @param  recordArray
+  */
+  findQuery: null,
+
+  /**
+    The class of the serializer to be used by this adapter.
+
+    @property serializer
+    @type     DS.Serializer
+    @default  DS.JSONSerializer
+  */
+  serializer: DS.JSONSerializer,
+
+  registerTransform: function(attributeType, transform) {
+    get(this, 'serializer').registerTransform(attributeType, transform);
+  },
+
+  /**
+    A public method that allows you to register an enumerated
+    type on your adapter.  This is useful if you want to utilize
+    a text representation of an integer value.
+
+    Eg: Say you want to utilize "low","medium","high" text strings
+    in your app, but you want to persist those as 0,1,2 in your backend.
+    You would first register the transform on your adapter instance:
+
+        adapter.registerEnumTransform('priority', ['low', 'medium', 'high']);
+
+    You would then refer to the 'priority' DS.attr in your model:
+
+        App.Task = DS.Model.extend({
+          priority: DS.attr('priority')
+        });
+
+    And lastly, you would set/get the text representation on your model instance,
+    but the transformed result will be the index number of the type.
+
+        App:   myTask.get('priority') => 'low'
+        Server Response / Load:  { myTask: {priority: 0} }
+
+    @method registerEnumTransform
+    @param {String} type of the transform
+    @param {Array} array of String objects to use for the enumerated values.
+      This is an ordered list and the index values will be used for the transform.
+  */
+  registerEnumTransform: function(attributeType, objects) {
+    get(this, 'serializer').registerEnumTransform(attributeType, objects);
+  },
+
+  /**
+    If the globally unique IDs for your records should be generated on the client,
+    implement the `generateIdForRecord()` method. This method will be invoked
+    each time you create a new record, and the value returned from it will be
+    assigned to the record's `primaryKey`.
+
+    Most traditional REST-like HTTP APIs will not use this method. Instead, the ID
+    of the record will be set by the server, and your adapter will update the store
+    with the new ID when it calls `didCreateRecord()`. Only implement this method if
+    you intend to generate record IDs on the client-side.
+
+    The `generateIdForRecord()` method will be invoked with the requesting store as
+    the first parameter and the newly created record as the second parameter:
+
+        generateIdForRecord: function(store, record) {
+          var uuid = App.generateUUIDWithStatisticallyLowOddsOfCollision();
+          return uuid;
+        }
+
+    @method generateIdForRecord
+    @param {DS.Store} store
+    @param {DS.Model} record
+  */
+  generateIdForRecord: null,
+
+  /**
+    Proxies to the serializer's `materialize` method.
+
+    @method materialize
+    @param {DS.Model} record
+    @param {Object}   data
+    @param {Object}   prematerialized
+  */
+  materialize: function(record, data, prematerialized) {
+    get(this, 'serializer').materialize(record, data, prematerialized);
+  },
+
+  /**
+    Proxies to the serializer's `serialize` method.
+
+    @method serialize
+    @param {DS.Model} record
+    @param {Object}   options
+  */
+  serialize: function(record, options) {
+    return get(this, 'serializer').serialize(record, options);
+  },
+
+  /**
+    Proxies to the serializer's `extractId` method.
+
+    @method extractId
+    @param {DS.Model} type  the model class
+    @param {Object}   data
+  */
+  extractId: function(type, data) {
+    return get(this, 'serializer').extractId(type, data);
+  },
+
+  /**
+    @method groupByType
+    @private
+    @param  enumerable
+  */
+  groupByType: function(enumerable) {
+    var map = Ember.MapWithDefault.create({
+      defaultValue: function() { return Ember.OrderedSet.create(); }
+    });
+
+    forEach(enumerable, function(item) {
+      map.get(item.constructor).add(item);
+    });
+
+    return map;
+  },
+
+  /**
+    The commit method is called when a transaction is being committed.
+    The `commitDetails` is a map with each record type and a list of
+    committed, updated and deleted records.
+
+    By default, this just calls the adapter's `save` method.
+    If you need more advanced handling of commits, e.g., only sending
+    certain records to the server, you can overwrite this method.
+
+    @method commit
+    @params {DS.Store}  store
+    @params {Ember.Map} commitDetails   see `DS.Transaction#commitDetails`.
+  */
+  commit: function(store, commitDetails) {
+    this.save(store, commitDetails);
+  },
+
+  /**
+    Iterates over each set of records provided in the commit details and
+    filters with `DS.Adapter#shouldSave` and then calls `createRecords`,
+    `updateRecords`, and `deleteRecords` for each set as approriate.
+
+    @method save
+    @params {DS.Store}  store
+    @params {Ember.Map} commitDetails   see `DS.Transaction#commitDetails`.
+  */
+  save: function(store, commitDetails) {
+    var adapter = this;
+
+    function filter(records) {
+      var filteredSet = Ember.OrderedSet.create();
+
+      records.forEach(function(record) {
+        if (adapter.shouldSave(record)) {
+          filteredSet.add(record);
+        }
+      });
+
+      return filteredSet;
+    }
+
+    this.groupByType(commitDetails.created).forEach(function(type, set) {
+      this.createRecords(store, type, filter(set));
+    }, this);
+
+    this.groupByType(commitDetails.updated).forEach(function(type, set) {
+      this.updateRecords(store, type, filter(set));
+    }, this);
+
+    this.groupByType(commitDetails.deleted).forEach(function(type, set) {
+      this.deleteRecords(store, type, filter(set));
+    }, this);
+  },
+
+  /**
+    Called on each record before saving. If false is returned, the record
+    will not be saved.
+
+    @method   shouldSave
+    @property {DS.Model} record
+    @return   {Boolean}  `true` to save, `false` to not. Defaults to true.
+  */
+  shouldSave: function(record) {
+    return true;
+  },
+
+  /**
+    Implement this method in a subclass to handle the creation of
+    new records.
+
+    Serializes the record and send it to the server.
+
+    This implementation should call the adapter's `didCreateRecord`
+    method on success or `didError` method on failure.
+
+    @method createRecord
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the record
+    @property {DS.Model} record
+  */
+  createRecord: Ember.required(Function),
+
+  /**
+    Creates multiple records at once.
+
+    By default, it loops over the supplied array and calls `createRecord`
+    on each. May be overwritten to improve performance and reduce the number
+    of server requests.
+
+    @method createRecords
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the records
+    @property {Array[DS.Model]} records
+  */
+  createRecords: function(store, type, records) {
+    records.forEach(function(record) {
+      this.createRecord(store, type, record);
+    }, this);
+  },
+
+  /**
+    Implement this method in a subclass to handle the updating of
+    a record.
+
+    Serializes the record update and send it to the server.
+
+    @method updateRecord
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the record
+    @property {DS.Model} record
+  */
+  updateRecord: Ember.required(Function),
+
+  /**
+    Updates multiple records at once.
+
+    By default, it loops over the supplied array and calls `updateRecord`
+    on each. May be overwritten to improve performance and reduce the number
+    of server requests.
+
+    @method updateRecords
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the records
+    @property {Array[DS.Model]} records
+  */
+  updateRecords: function(store, type, records) {
+    records.forEach(function(record) {
+      this.updateRecord(store, type, record);
+    }, this);
+  },
+
+  /**
+    Implement this method in a subclass to handle the deletion of
+    a record.
+
+    Sends a delete request for the record to the server.
+
+    @method deleteRecord
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the record
+    @property {DS.Model} record
+  */
+  deleteRecord: Ember.required(Function),
+
+  /**
+    Delete multiple records at once.
+
+    By default, it loops over the supplied array and calls `deleteRecord`
+    on each. May be overwritten to improve performance and reduce the number
+    of server requests.
+
+    @method deleteRecords
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the records
+    @property {Array[DS.Model]} records
+  */
+  deleteRecords: function(store, type, records) {
+    records.forEach(function(record) {
+      this.deleteRecord(store, type, record);
+    }, this);
+  },
+
+  /**
+    Find multiple records at once.
+
+    By default, it loops over the provided ids and calls `find` on each.
+    May be overwritten to improve performance and reduce the number of
+    server requests.
+
+    @method findMany
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the records
+    @property {Array}    ids
+  */
+  findMany: function(store, type, ids) {
+    ids.forEach(function(id) {
+      this.find(store, type, id);
+    }, this);
+  }
+});
+
+DS.Adapter.reopenClass({
+
+  /**
+    Registers a custom attribute transform for the adapter class
+
+    The `transform` property is an object with a `serialize` and
+    `deserialize` property. These are each functions that respectively
+    serialize the data to send to the backend or deserialize it for
+    use on the client.
+
+    @method registerTransform
+    @static
+    @property {DS.String} attributeType
+    @property {Object}    transform
+  */
+  registerTransform: function(attributeType, transform) {
+    var registeredTransforms = this._registeredTransforms || {};
+
+    registeredTransforms[attributeType] = transform;
+
+    this._registeredTransforms = registeredTransforms;
+  },
+
+  /**
+    Registers a custom enumerable transform for the adapter class
+
+    @method registerEnumTransform
+    @static
+    @property {DS.String} attributeType
+    @property objects
+  */
+  registerEnumTransform: function(attributeType, objects) {
+    var registeredEnumTransforms = this._registeredEnumTransforms || {};
+
+    registeredEnumTransforms[attributeType] = objects;
+
+    this._registeredEnumTransforms = registeredEnumTransforms;
+  },
+
+  /**
+    Set adapter attributes for a DS.Model class.
+
+    @method map
+    @static
+    @property {DS.Model} type   the DS.Model class
+    @property {Object}   attributes
+  */
+  map: DS._Mappable.generateMapFunctionFor('attributes', function(key, newValue, map) {
+    var existingValue = map.get(key);
+
+    merge(existingValue, newValue);
+  }),
+
+  /**
+    Set configuration options for a DS.Model class.
+
+    @method configure
+    @static
+    @property {DS.Model} type   the DS.Model class
+    @property {Object}   configuration
+  */
+  configure: DS._Mappable.generateMapFunctionFor('configurations', function(key, newValue, map) {
+    var existingValue = map.get(key);
+
+    // If a mapping configuration is provided, peel it off and apply it
+    // using the DS.Adapter.map API.
+    var mappings = newValue && newValue.mappings;
+    if (mappings) {
+      this.map(key, mappings);
+      delete newValue.mappings;
+    }
+
+    merge(existingValue, newValue);
+  }),
+
+  /**
+    Resolved conflicts in configuration settings.
+
+    Calls `Ember.merge` by default.
+
+    @method resolveMapConflict
+    @static
+    @property oldValue
+    @property newValue
+  */
+  resolveMapConflict: function(oldValue, newValue) {
+    merge(newValue, oldValue);
+
+    return newValue;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+/**
+  @class FixtureSerializer
+  @namespace DS
+  @extends DS.Serializer
+*/
+DS.FixtureSerializer = DS.Serializer.extend({
+
+  /**
+    @method deserializeValue
+    @param  value
+    @param  attributeType
+  */
+  deserializeValue: function(value, attributeType) {
+    return value;
+  },
+
+  /**
+    @method serializeValue
+    @param  value
+    @param  attributeType
+  */
+  serializeValue: function(value, attributeType) {
+    return value;
+  },
+
+  /**
+    @method addId
+    @param  data
+    @param  key
+    @param  id
+  */
+  addId: function(data, key, id) {
+    data[key] = id;
+  },
+
+  /**
+    @method addAttribute
+    @param hash
+    @param key
+    @param value
+  */
+  addAttribute: function(hash, key, value) {
+    hash[key] = value;
+  },
+
+  /**
+    @method addBelongsTo
+    @param hash
+    @param record
+    @param key
+    @param relationship
+  */
+  addBelongsTo: function(hash, record, key, relationship) {
+    var id = get(record, relationship.key+'.id');
+    if (!Ember.isNone(id)) { hash[key] = id; }
+  },
+
+  /**
+    @method addHasMany
+    @param hash
+    @param record
+    @param key
+    @param relationship
+  */
+  addHasMany: function(hash, record, key, relationship) {
+    var ids = get(record, relationship.key).map(function(item) {
+      return item.get('id');
+    });
+
+    hash[relationship.key] = ids;
+  },
+
+  /**
+    @method extract
+    @param loader
+    @param fixture
+    @param type
+    @param record
+  */
+  extract: function(loader, fixture, type, record) {
+    if (record) { loader.updateId(record, fixture); }
+    this.extractRecordRepresentation(loader, type, fixture);
+  },
+
+  /**
+    @method extractMany
+    @param loader
+    @param fixtures
+    @param type
+    @param records
+  */
+  extractMany: function(loader, fixtures, type, records) {
+    var objects = fixtures, references = [];
+    if (records) { records = records.toArray(); }
+
+    for (var i = 0; i < objects.length; i++) {
+      if (records) { loader.updateId(records[i], objects[i]); }
+      var reference = this.extractRecordRepresentation(loader, type, objects[i]);
+      references.push(reference);
+    }
+
+    loader.populateArray(references);
+  },
+
+  /**
+    @method extractId
+    @param type
+    @param hash
+  */
+  extractId: function(type, hash) {
+    var primaryKey = this._primaryKey(type);
+
+    if (hash.hasOwnProperty(primaryKey)) {
+      // Ensure that we coerce IDs to strings so that record
+      // IDs remain consistent between application runs; especially
+      // if the ID is serialized and later deserialized from the URL,
+      // when type information will have been lost.
+      return hash[primaryKey]+'';
+    } else {
+      return null;
+    }
+  },
+
+  /**
+    @method extractAttribute
+    @param type
+    @param hash
+    @param attributeName
+  */
+  extractAttribute: function(type, hash, attributeName) {
+    var key = this._keyForAttributeName(type, attributeName);
+    return hash[key];
+  },
+
+  /**
+    @method extractHasMany
+    @param type
+    @param hash
+    @param key
+  */
+  extractHasMany: function(type, hash, key) {
+    return hash[key];
+  },
+
+  /**
+    @method extractBelongsTo
+    @param type
+    @param hash
+    @param key
+  */
+  extractBelongsTo: function(type, hash, key) {
+    var val = hash[key];
+    if (val != null) {
+      val = val + '';
+    }
+    return val;
+  },
+
+  /**
+    @method extractBelongsToPolymorphic
+    @method type
+    @method hash
+    @method key
+  */
+  extractBelongsToPolymorphic: function(type, hash, key) {
+    var keyForId = this.keyForPolymorphicId(key),
+        keyForType,
+        id = hash[keyForId];
+
+    if (id) {
+      keyForType = this.keyForPolymorphicType(key);
+      return {id: id, type: hash[keyForType]};
+    }
+
+    return null;
+  },
+
+  /**
+    @method keyForPolymorphicId
+    @param key
+  */
+  keyForPolymorphicId: function(key) {
+    return key;
+  },
+
+  /**
+    @method keyForPolymorphicType
+    @param key
+  */
+  keyForPolymorphicType: function(key) {
+    return key + '_type';
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, fmt = Ember.String.fmt,
+    indexOf = Ember.EnumerableUtils.indexOf;
+
+/**
+  `DS.FixtureAdapter` is an adapter that loads records from memory.
+  Its primarily used for development and testing. You can also use
+  `DS.FixtureAdapter` while working on the API but are not ready to
+  integrate yet. It is a fully functioning adapter. All CRUD methods
+  are implemented. You can also implement query logic that a remote
+  system would do. Its possible to do develop your entire application
+  with `DS.FixtureAdapter`.
+
+  @class FixtureAdapter
+  @namespace DS
+  @extends DS.Adapter
+*/
+DS.FixtureAdapter = DS.Adapter.extend({
+
+  simulateRemoteResponse: true,
+
+  latency: 50,
+
+  serializer: DS.FixtureSerializer,
+
+  /**
+    Implement this method in order to provide data associated with a type
+
+    @method fixturesForType
+    @param  type
+  */
+  fixturesForType: function(type) {
+    if (type.FIXTURES) {
+      var fixtures = Ember.A(type.FIXTURES);
+      return fixtures.map(function(fixture){
+        var fixtureIdType = typeof fixture.id;
+        if(fixtureIdType !== "number" && fixtureIdType !== "string"){
+          throw new Error(fmt('the id property must be defined as a number or string for fixture %@', [fixture]));
+        }
+        fixture.id = fixture.id + '';
+        return fixture;
+      });
+    }
+    return null;
+  },
+
+  /**
+    Implement this method in order to query fixtures data
+
+    @method queryFixtures
+    @param  fixture
+    @param  query
+    @param  type
+  */
+  queryFixtures: function(fixtures, query, type) {
+
+  },
+
+  /**
+    @method updateFixtures
+    @param  type
+    @param  fixture
+  */
+  updateFixtures: function(type, fixture) {
+    if(!type.FIXTURES) {
+      type.FIXTURES = [];
+    }
+
+    var fixtures = type.FIXTURES;
+
+    this.deleteLoadedFixture(type, fixture);
+
+    fixtures.push(fixture);
+  },
+
+  /**
+    Implement this method in order to provide provide json for CRUD methods
+
+    @method mockJSON
+    @param  type
+    @param  record
+  */
+  mockJSON: function(type, record) {
+    return this.serialize(record, { includeId: true });
+  },
+
+  /**
+    @method generateIdForRecord
+    @param  store
+    @param  record
+  */
+  generateIdForRecord: function(store, record) {
+    return Ember.guidFor(record);
+  },
+
+  /**
+    @method find
+    @param  store
+    @param  type
+    @param  id
+  */
+  find: function(store, type, id) {
+    var fixtures = this.fixturesForType(type),
+        fixture;
+
+
+    if (fixtures) {
+      fixture = Ember.A(fixtures).findProperty('id', id);
+    }
+
+    if (fixture) {
+      this.simulateRemoteCall(function() {
+        this.didFindRecord(store, type, fixture, id);
+      }, this);
+    }
+  },
+
+  /**
+    @method findMany
+    @param  store
+    @param  type
+    @param  ids
+  */
+  findMany: function(store, type, ids) {
+    var fixtures = this.fixturesForType(type);
+
+
+    if (fixtures) {
+      fixtures = fixtures.filter(function(item) {
+        return indexOf(ids, item.id) !== -1;
+      });
+    }
+
+    if (fixtures) {
+      this.simulateRemoteCall(function() {
+        this.didFindMany(store, type, fixtures);
+      }, this);
+    }
+  },
+
+  /**
+    @method findAll
+    @param  store
+    @param  type
+  */
+  findAll: function(store, type) {
+    var fixtures = this.fixturesForType(type);
+
+
+    this.simulateRemoteCall(function() {
+      this.didFindAll(store, type, fixtures);
+    }, this);
+  },
+
+  /**
+    @method findQuery
+    @param  store
+    @param  type
+    @param  query
+    @param  array
+  */
+  findQuery: function(store, type, query, array) {
+    var fixtures = this.fixturesForType(type);
+
+
+    fixtures = this.queryFixtures(fixtures, query, type);
+
+    if (fixtures) {
+      this.simulateRemoteCall(function() {
+        this.didFindQuery(store, type, fixtures, array);
+      }, this);
+    }
+  },
+
+  /**
+    @method createRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  createRecord: function(store, type, record) {
+    var fixture = this.mockJSON(type, record);
+
+    this.updateFixtures(type, fixture);
+
+    this.simulateRemoteCall(function() {
+      this.didCreateRecord(store, type, record, fixture);
+    }, this);
+  },
+
+  /**
+    @method updateRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  updateRecord: function(store, type, record) {
+    var fixture = this.mockJSON(type, record);
+
+    this.updateFixtures(type, fixture);
+
+    this.simulateRemoteCall(function() {
+      this.didUpdateRecord(store, type, record, fixture);
+    }, this);
+  },
+
+  /**
+    @method deleteRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  deleteRecord: function(store, type, record) {
+    var fixture = this.mockJSON(type, record);
+
+    this.deleteLoadedFixture(type, fixture);
+
+    this.simulateRemoteCall(function() {
+      this.didDeleteRecord(store, type, record);
+    }, this);
+  },
+
+  /*
+    @method deleteLoadedFixture
+    @private
+    @param type
+    @param record
+  */
+  deleteLoadedFixture: function(type, record) {
+    var existingFixture = this.findExistingFixture(type, record);
+
+    if(existingFixture) {
+      var index = indexOf(type.FIXTURES, existingFixture);
+      type.FIXTURES.splice(index, 1);
+      return true;
+    }
+  },
+
+  /*
+    @method findExistingFixture
+    @private
+    @param type
+    @param record
+  */
+  findExistingFixture: function(type, record) {
+    var fixtures = this.fixturesForType(type);
+    var id = this.extractId(type, record);
+
+    return this.findFixtureById(fixtures, id);
+  },
+
+  /*
+    @method findFixtureById
+    @private
+    @param type
+    @param record
+  */
+  findFixtureById: function(fixtures, id) {
+    return Ember.A(fixtures).find(function(r) {
+      if(''+get(r, 'id') === ''+id) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+  },
+
+  /*
+    @method simulateRemoteCall
+    @private
+    @param callback
+    @param context
+  */
+  simulateRemoteCall: function(callback, context) {
+    if (get(this, 'simulateRemoteResponse')) {
+      // Schedule with setTimeout
+      Ember.run.later(context, callback, get(this, 'latency'));
+    } else {
+      // Asynchronous, but at the of the runloop with zero latency
+      Ember.run.once(context, callback);
+    }
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get;
+
+/**
+  @class RESTSerializer
+  @namespace DS
+  @extends DS.Serializer
+*/
+DS.RESTSerializer = DS.JSONSerializer.extend({
+
+  /**
+    @method keyForAttributeName
+    @param type
+    @param name
+  */
+  keyForAttributeName: function(type, name) {
+    return Ember.String.decamelize(name);
+  },
+
+  /**
+    @method keyForBelongsTo
+    @param type
+    @param name
+  */
+  keyForBelongsTo: function(type, name) {
+    var key = this.keyForAttributeName(type, name);
+
+    if (this.embeddedType(type, name)) {
+      return key;
+    }
+
+    return key + "_id";
+  },
+
+  /**
+    @method keyForHasMany
+    @param type
+    @param name
+  */
+  keyForHasMany: function(type, name) {
+    var key = this.keyForAttributeName(type, name);
+
+    if (this.embeddedType(type, name)) {
+      return key;
+    }
+
+    return this.singularize(key) + "_ids";
+  },
+
+  /**
+    @method keyForPolymorphicId
+    @param key
+  */
+  keyForPolymorphicId: function(key) {
+    return key;
+  },
+
+  /**
+    @method keyForPolymorphicType
+    @param key
+  */
+  keyForPolymorphicType: function(key) {
+    return key.replace(/_id$/, '_type');
+  },
+
+  /**
+    @method extractValidationErrors
+    @param type
+    @param json
+  */
+  extractValidationErrors: function(type, json) {
+    var errors = {};
+
+    get(type, 'attributes').forEach(function(name) {
+      var key = this._keyForAttributeName(type, name);
+      if (json['errors'].hasOwnProperty(key)) {
+        errors[name] = json['errors'][key];
+      }
+    }, this);
+
+    return errors;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+var get = Ember.get, set = Ember.set;
+
+DS.rejectionHandler = function(reason) {
+  Ember.Logger.assert([reason, reason.message, reason.stack]);
+
+  throw reason;
+};
+
+/**
+  The REST adapter allows your store to communicate with an HTTP server by
+  transmitting JSON via XHR. Most Ember.js apps that consume a JSON API
+  should use the REST adapter.
+
+  This adapter is designed around the idea that the JSON exchanged with
+  the server should be conventional.
+
+  ## JSON Structure
+
+  The REST adapter expects the JSON returned from your server to follow
+  these conventions.
+
+  ### Object Root
+
+  The JSON payload should be an object that contains the record inside a
+  root property. For example, in response to a `GET` request for
+  `/posts/1`, the JSON should look like this:
+
+  ```js
+  {
+    "post": {
+      title: "I'm Running to Reform the W3C's Tag",
+      author: "Yehuda Katz"
+    }
+  }
+  ```
+
+  ### Conventional Names
+
+  Attribute names in your JSON payload should be the underscored versions of
+  the attributes in your Ember.js models.
+
+  For example, if you have a `Person` model:
+
+  ```js
+  App.Person = DS.Model.extend({
+    firstName: DS.attr('string'),
+    lastName: DS.attr('string'),
+    occupation: DS.attr('string')
+  });
+  ```
+
+  The JSON returned should look like this:
+
+  ```js
+  {
+    "person": {
+      "first_name": "Barack",
+      "last_name": "Obama",
+      "occupation": "President"
+    }
+  }
+  ```
+
+  ## Customization
+
+  ### Endpoint path customization
+
+  Endpoint paths can be prefixed with a `namespace` by setting the namespace
+  property on the adapter:
+
+  ```js
+  DS.RESTAdapter.reopen({
+    namespace: 'api/1'
+  });
+  ```
+  Requests for `App.Person` would now target `/api/1/people/1`.
+
+  ### Host customization
+
+  An adapter can target other hosts by setting the `url` property.
+
+  ```js
+  DS.RESTAdapter.reopen({
+    url: 'https://api.example.com'
+  });
+  ```
+
+  ### Headers customization
+
+  Some APIs require HTTP headers, eg to provide an API key. An array of
+  headers can be added to the adapter which are passed with every request:
+
+  ```js
+  DS.RESTAdapter.reopen({
+    headers: {
+      "API_KEY": "secret key",
+      "ANOTHER_HEADER": "asdsada"
+    }
+  });
+  ```
+
+  @class RESTAdapter
+  @constructor
+  @namespace DS
+  @extends DS.Adapter
+*/
+DS.RESTAdapter = DS.Adapter.extend({
+  namespace: null,
+  bulkCommit: false,
+  since: 'since',
+
+  serializer: DS.RESTSerializer,
+
+  /**
+    Called on each record before saving. If false is returned, the record
+    will not be saved.
+
+    By default, this method returns `true` except when the record is embedded.
+
+    @method   shouldSave
+    @property {DS.Model} record
+    @return   {Boolean}  `true` to save, `false` to not. Defaults to true.
+  */
+  shouldSave: function(record) {
+    var reference = get(record, '_reference');
+
+    return !reference.parent;
+  },
+
+  /**
+    @method dirtyRecordsForRecordChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+  */
+  dirtyRecordsForRecordChange: function(dirtySet, record) {
+    this._dirtyTree(dirtySet, record);
+  },
+
+  /**
+    @method dirtyRecordsForHasManyChange
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+    @param {DS.RelationshipChange} relationship
+  */
+  dirtyRecordsForHasManyChange: function(dirtySet, record, relationship) {
+    var embeddedType = get(this, 'serializer').embeddedType(record.constructor, relationship.secondRecordName);
+
+    if (embeddedType === 'always') {
+      relationship.childReference.parent = relationship.parentReference;
+      this._dirtyTree(dirtySet, record);
+    }
+  },
+
+  /**
+    @method _dirtyTree
+    @private
+    @param {Ember.OrderedSet} dirtySet
+    @param {DS.Model} record
+  */
+  _dirtyTree: function(dirtySet, record) {
+    dirtySet.add(record);
+
+    get(this, 'serializer').eachEmbeddedRecord(record, function(embeddedRecord, embeddedType) {
+      if (embeddedType !== 'always') { return; }
+      if (dirtySet.has(embeddedRecord)) { return; }
+      this._dirtyTree(dirtySet, embeddedRecord);
+    }, this);
+
+    var reference = record.get('_reference');
+
+    if (reference.parent) {
+      var store = get(record, 'store');
+      var parent = store.recordForReference(reference.parent);
+      this._dirtyTree(dirtySet, parent);
+    }
+  },
+
+  /**
+    Serializes the record and sends it to the server.
+
+    By default, the record is serialized with the adapter's `serialize`
+    method and assigned to a root obtained by the `rootForType` method.
+
+    The url is created with `buildURL` and then called as a 'POST' request
+    with the adapter's `ajax` method.
+
+    If successful, the adapter's `didCreateRecord` method is called,
+    otherwise `didError`
+
+    @method createRecord
+    @property {DS.Store} store
+    @property {DS.Model} type   the DS.Model class of the record
+    @property {DS.Model} record
+  */
+  createRecord: function(store, type, record) {
+    var root = this.rootForType(type);
+    var adapter = this;
+    var data = {};
+
+    data[root] = this.serialize(record, { includeId: true });
+
+    return this.ajax(this.buildURL(root), "POST", {
+      data: data
+    }).then(function(json){
+      adapter.didCreateRecord(store, type, record, json);
+    }, function(xhr) {
+      adapter.didError(store, type, record, xhr);
+      throw xhr;
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method createRecords
+    @param  store
+    @param  type
+    @param  records
+  */
+  createRecords: function(store, type, records) {
+    var adapter = this;
+
+    if (get(this, 'bulkCommit') === false) {
+      return this._super(store, type, records);
+    }
+
+    var root = this.rootForType(type),
+        plural = this.pluralize(root);
+
+    var data = {};
+    data[plural] = [];
+    records.forEach(function(record) {
+      data[plural].push(this.serialize(record, { includeId: true }));
+    }, this);
+
+    return this.ajax(this.buildURL(root), "POST", {
+      data: data
+    }).then(function(json) {
+      adapter.didCreateRecords(store, type, records, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method updateRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  updateRecord: function(store, type, record) {
+    var id, root, adapter, data;
+
+    id = get(record, 'id');
+    root = this.rootForType(type);
+    adapter = this;
+
+    data = {};
+    data[root] = this.serialize(record);
+
+    return this.ajax(this.buildURL(root, id, record), "PUT",{
+      data: data
+    }).then(function(json){
+      adapter.didUpdateRecord(store, type, record, json);
+    }, function(xhr) {
+      adapter.didError(store, type, record, xhr);
+      throw xhr;
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method updateRecords
+    @param  store
+    @param  type
+    @param  records
+  */
+  updateRecords: function(store, type, records) {
+    var root, plural, adapter, data;
+
+    if (get(this, 'bulkCommit') === false) {
+      return this._super(store, type, records);
+    }
+
+    root = this.rootForType(type);
+    plural = this.pluralize(root);
+    adapter = this;
+
+    data = {};
+
+    data[plural] = [];
+
+    records.forEach(function(record) {
+      data[plural].push(this.serialize(record, { includeId: true }));
+    }, this);
+
+    return this.ajax(this.buildURL(root, "bulk"), "PUT", {
+      data: data
+    }).then(function(json) {
+      adapter.didUpdateRecords(store, type, records, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method deleteRecord
+    @param  store
+    @param  type
+    @param  record
+  */
+  deleteRecord: function(store, type, record) {
+    var id, root, adapter;
+
+    id = get(record, 'id');
+    root = this.rootForType(type);
+    adapter = this;
+
+    return this.ajax(this.buildURL(root, id, record), "DELETE").then(function(json){
+      adapter.didDeleteRecord(store, type, record, json);
+    }, function(xhr){
+      adapter.didError(store, type, record, xhr);
+      throw xhr;
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method deleteRecords
+    @param  store
+    @param  type
+    @param  records
+  */
+  deleteRecords: function(store, type, records) {
+    var root, plural, serializer, adapter, data;
+
+    if (get(this, 'bulkCommit') === false) {
+      return this._super(store, type, records);
+    }
+
+    root = this.rootForType(type);
+    plural = this.pluralize(root);
+    serializer = get(this, 'serializer');
+    adapter = this;
+
+    data = {};
+
+    data[plural] = [];
+    records.forEach(function(record) {
+      data[plural].push(serializer.serializeId( get(record, 'id') ));
+    });
+
+    return this.ajax(this.buildURL(root, 'bulk'), "DELETE", {
+      data: data
+    }).then(function(json){
+      adapter.didDeleteRecords(store, type, records, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method find
+    @param  store
+    @param  type
+    @param  id
+  */
+  find: function(store, type, id) {
+    var root = this.rootForType(type), adapter = this;
+
+    return this.ajax(this.buildURL(root, id), "GET").
+      then(function(json){
+        adapter.didFindRecord(store, type, json, id);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method findAll
+    @param  store
+    @param  type
+    @param  since
+  */
+  findAll: function(store, type, since) {
+    var root, adapter;
+
+    root = this.rootForType(type);
+    adapter = this;
+
+    return this.ajax(this.buildURL(root), "GET",{
+      data: this.sinceQuery(since)
+    }).then(function(json) {
+      adapter.didFindAll(store, type, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method findQuery
+    @param  store
+    @param  type
+    @param  query
+    @param  recordArray
+  */
+  findQuery: function(store, type, query, recordArray) {
+    var root = this.rootForType(type),
+        adapter = this;
+
+    return this.ajax(this.buildURL(root), "GET", {
+      data: query
+    }).then(function(json){
+      adapter.didFindQuery(store, type, json, recordArray);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    @method findMany
+    @param  store
+    @param  type
+    @param  ids
+    @param  owner
+  */
+  findMany: function(store, type, ids, owner) {
+    var root = this.rootForType(type),
+    adapter = this;
+
+    ids = this.serializeIds(ids);
+
+    return this.ajax(this.buildURL(root), "GET", {
+      data: {ids: ids}
+    }).then(function(json) {
+      adapter.didFindMany(store, type, json);
+    }).then(null, DS.rejectionHandler);
+  },
+
+  /**
+    This method serializes a list of IDs using `serializeId`
+
+    @method serializeIds
+    @private
+    @param  ids
+    @return {Array} an array of serialized IDs
+  */
+  serializeIds: function(ids) {
+    var serializer = get(this, 'serializer');
+
+    return Ember.EnumerableUtils.map(ids, function(id) {
+      return serializer.serializeId(id);
+    });
+  },
+
+  /**
+    @method didError
+    @private
+    @param  store
+    @param  type
+    @param  record
+    @param  xhr
+  */
+  didError: function(store, type, record, xhr) {
+    if (xhr.status === 422) {
+      var json = JSON.parse(xhr.responseText),
+          serializer = get(this, 'serializer'),
+          errors = serializer.extractValidationErrors(type, json);
+
+      store.recordWasInvalid(record, errors);
+    } else {
+      this._super.apply(this, arguments);
+    }
+  },
+
+  /**
+    @method ajax
+    @private
+    @param  url
+    @param  type
+    @param  hash
+  */
+  ajax: function(url, type, hash) {
+    var adapter = this;
+
+    return new Ember.RSVP.Promise(function(resolve, reject) {
+      hash = hash || {};
+      hash.url = url;
+      hash.type = type;
+      hash.dataType = 'json';
+      hash.context = adapter;
+
+      if (hash.data && type !== 'GET') {
+        hash.contentType = 'application/json; charset=utf-8';
+        hash.data = JSON.stringify(hash.data);
+      }
+
+      if (adapter.headers !== undefined) {
+        var headers = adapter.headers;
+        hash.beforeSend = function (xhr) {
+          Ember.keys(headers).forEach(function(key) {
+            xhr.setRequestHeader(key, headers[key]);
+          });
+        };
+      }
+
+      hash.success = function(json) {
+        Ember.run(null, resolve, json);
+      };
+
+      hash.error = function(jqXHR, textStatus, errorThrown) {
+        if (jqXHR) {
+          jqXHR.then = null;
+        }
+
+        Ember.run(null, reject, jqXHR);
+      };
+
+      Ember.$.ajax(hash);
+    });
+  },
+
+  /**
+    @property url
+    @default ''
+  */
+  url: "",
+
+  /**
+    @method rootForType
+    @private
+    @param type
+  */
+  rootForType: function(type) {
+    var serializer = get(this, 'serializer');
+    return serializer.rootForType(type);
+  },
+
+  /**
+    @method pluralize
+    @private
+    @param string
+  */
+  pluralize: function(string) {
+    var serializer = get(this, 'serializer');
+    return serializer.pluralize(string);
+  },
+
+  /**
+    @method buildURL
+    @private
+    @param root
+    @param suffix
+    @param record
+  */
+  buildURL: function(root, suffix, record) {
+    var url = [this.url];
+
+
+
+
+    if (!Ember.isNone(this.namespace)) {
+      url.push(this.namespace);
+    }
+
+    url.push(this.pluralize(root));
+    if (suffix !== undefined) {
+      url.push(suffix);
+    }
+
+    return url.join("/");
+  },
+
+  /**
+    @method sinceQuery
+    @private
+    @param since
+  */
+  sinceQuery: function(since) {
+    var query = {};
+    query[get(this, 'since')] = since;
+    return since ? query : null;
+  }
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+DS.Model.reopen({
+
+  /**
+   Provides info about the model for debugging purposes
+   by grouping the properties into more semantic groups.
+
+   Meant to be used by debugging tools such as the Chrome Ember Extension.
+
+   - Groups all attributes in "Attributes" group.
+   - Groups all belongsTo relationships in "Belongs To" group.
+   - Groups all hasMany relationships in "Has Many" group.
+   - Groups all flags in "Flags" group.
+   - Flags relationship CPs as expensive properties.
+  */
+  _debugInfo: function() {
+    var attributes = ['id'],
+        relationships = { belongsTo: [], hasMany: [] },
+        expensiveProperties = [];
+
+    this.eachAttribute(function(name, meta) {
+      attributes.push(name);
+    }, this);
+
+    this.eachRelationship(function(name, relationship) {
+      relationships[relationship.kind].push(name);
+      expensiveProperties.push(name);
+    });
+
+    var groups = [
+      {
+        name: 'Attributes',
+        properties: attributes,
+        expand: true,
+      },
+      {
+        name: 'Belongs To',
+        properties: relationships.belongsTo,
+        expand: true
+      },
+      {
+        name: 'Has Many',
+        properties: relationships.hasMany,
+        expand: true
+      },
+      {
+        name: 'Flags',
+        properties: ['isLoaded', 'isDirty', 'isSaving', 'isDeleted', 'isError', 'isNew', 'isValid']
+      }
+    ];
+
+    return {
+      propertyInfo: {
+        // include all other mixins / properties (not just the grouped ones)
+        includeOtherProperties: true,
+        groups: groups,
+        // don't pre-calculate unless cached
+        expensiveProperties: expensiveProperties
+      }
+    };
+  }
+
+});
+
+})();
+
+
+
+(function() {
+/**
+  @module ember-data
+*/
+
+})();
+
+
+
+(function() {
+//Copyright (C) 2011 by Living Social, Inc.
+
+//Permission is hereby granted, free of charge, to any person obtaining a copy of
+//this software and associated documentation files (the "Software"), to deal in
+//the Software without restriction, including without limitation the rights to
+//use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+//of the Software, and to permit persons to whom the Software is furnished to do
+//so, subject to the following conditions:
+
+//The above copyright notice and this permission notice shall be included in all
+//copies or substantial portions of the Software.
+
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//SOFTWARE.
+
+/**
+  Ember Data
+
+  @module ember-data
+  @main ember-data
+*/
+
+})();
+
+
+})();
+
+
+if (typeof location !== 'undefined' && (location.hostname === 'localhost' || location.hostname === '127.0.0.1')) {
+  Ember.Logger.warn("You are running a production build of Ember on localhost and won't receive detailed error messages. "+
+               "If you want full error messages please use the non-minified build provided on the Ember website.");
+}
diff --git a/vendor/assets/ember/production/ember-template-compiler.js b/vendor/assets/ember/production/ember-template-compiler.js
new file mode 100644
index 000000000..f634bfa55
--- /dev/null
+++ b/vendor/assets/ember/production/ember-template-compiler.js
@@ -0,0 +1,338 @@
+// Fetched from channel: tags/v1.6.1, with url http://builds.emberjs.com/tags/v1.6.1/ember-template-compiler.js
+// Fetched on: 2024-01-19T09:48:25Z
+/*!
+ * @overview  Ember - JavaScript Application Framework
+ * @copyright Copyright 2011-2014 Tilde Inc. and contributors
+ *            Portions Copyright 2006-2011 Strobe Inc.
+ *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
+ * @license   Licensed under MIT license
+ *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
+ * @version   1.6.1
+ */
+
+
+(function() {
+var Ember = { assert: function() {}, FEATURES: { isEnabled: function() {} } };
+/**
+@module ember
+@submodule ember-handlebars-compiler
+*/
+
+
+
+// ES6Todo: you'll need to import debugger once debugger is es6'd.
+if (typeof Ember.assert === 'undefined')   { Ember.assert = function(){}; };
+if (typeof Ember.FEATURES === 'undefined') { Ember.FEATURES = { isEnabled: function(){} }; };
+
+var objectCreate = Object.create || function(parent) {
+  function F() {}
+  F.prototype = parent;
+  return new F();
+};
+
+// set up for circular references later
+var View, Component;
+
+// ES6Todo: when ember-debug is es6'ed import this.
+// var emberAssert = Ember.assert;
+var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
+if (!Handlebars && typeof require === 'function') {
+  Handlebars = require('handlebars');
+}
+
+Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include " +
+             "a SCRIPT tag in the HTML HEAD linking to the Handlebars file " +
+             "before you link to Ember.", Handlebars);
+
+Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1, " +
+             "COMPILER_REVISION expected: 4, got: " +  Handlebars.COMPILER_REVISION +
+             " - Please note: Builds of master may have other COMPILER_REVISION values.",
+             Handlebars.COMPILER_REVISION === 4);
+
+/**
+  Prepares the Handlebars templating library for use inside Ember's view
+  system.
+
+  The `Ember.Handlebars` object is the standard Handlebars library, extended to
+  use Ember's `get()` method instead of direct property access, which allows
+  computed properties to be used inside templates.
+
+  To create an `Ember.Handlebars` template, call `Ember.Handlebars.compile()`.
+  This will return a function that can be used by `Ember.View` for rendering.
+
+  @class Handlebars
+  @namespace Ember
+*/
+var EmberHandlebars = Ember.Handlebars = objectCreate(Handlebars);
+
+/**
+  Register a bound helper or custom view helper.
+
+  ## Simple bound helper example
+
+  ```javascript
+  Ember.Handlebars.helper('capitalize', function(value) {
+    return value.toUpperCase();
+  });
+  ```
+
+  The above bound helper can be used inside of templates as follows:
+
+  ```handlebars
+  {{capitalize name}}
+  ```
+
+  In this case, when the `name` property of the template's context changes,
+  the rendered value of the helper will update to reflect this change.
+
+  For more examples of bound helpers, see documentation for
+  `Ember.Handlebars.registerBoundHelper`.
+
+  ## Custom view helper example
+
+  Assuming a view subclass named `App.CalendarView` were defined, a helper
+  for rendering instances of this view could be registered as follows:
+
+  ```javascript
+  Ember.Handlebars.helper('calendar', App.CalendarView):
+  ```
+
+  The above bound helper can be used inside of templates as follows:
+
+  ```handlebars
+  {{calendar}}
+  ```
+
+  Which is functionally equivalent to:
+
+  ```handlebars
+  {{view App.CalendarView}}
+  ```
+
+  Options in the helper will be passed to the view in exactly the same
+  manner as with the `view` helper.
+
+  @method helper
+  @for Ember.Handlebars
+  @param {String} name
+  @param {Function|Ember.View} function or view class constructor
+  @param {String} dependentKeys*
+*/
+EmberHandlebars.helper = function(name, value) {
+  if (!View) { View = requireModule('ember-views/views/view')['View']; } // ES6TODO: stupid circular dep
+  if (!Component) { Component = requireModule('ember-views/views/component')['default']; } // ES6TODO: stupid circular dep
+
+  Ember.assert("You tried to register a component named '" + name + "', but component names must include a '-'", !Component.detect(value) || name.match(/-/));
+
+  if (View.detect(value)) {
+    EmberHandlebars.registerHelper(name, EmberHandlebars.makeViewHelper(value));
+  } else {
+    EmberHandlebars.registerBoundHelper.apply(null, arguments);
+  }
+};
+
+/**
+  Returns a helper function that renders the provided ViewClass.
+
+  Used internally by Ember.Handlebars.helper and other methods
+  involving helper/component registration.
+
+  @private
+  @method makeViewHelper
+  @for Ember.Handlebars
+  @param {Function} ViewClass view class constructor
+  @since 1.2.0
+*/
+EmberHandlebars.makeViewHelper = function(ViewClass) {
+  return function(options) {
+    Ember.assert("You can only pass attributes (such as name=value) not bare values to a helper for a View found in '" + ViewClass.toString() + "'", arguments.length < 2);
+    return EmberHandlebars.helpers.view.call(this, ViewClass, options);
+  };
+};
+
+/**
+@class helpers
+@namespace Ember.Handlebars
+*/
+EmberHandlebars.helpers = objectCreate(Handlebars.helpers);
+
+/**
+  Override the the opcode compiler and JavaScript compiler for Handlebars.
+
+  @class Compiler
+  @namespace Ember.Handlebars
+  @private
+  @constructor
+*/
+EmberHandlebars.Compiler = function() {};
+
+// Handlebars.Compiler doesn't exist in runtime-only
+if (Handlebars.Compiler) {
+  EmberHandlebars.Compiler.prototype = objectCreate(Handlebars.Compiler.prototype);
+}
+
+EmberHandlebars.Compiler.prototype.compiler = EmberHandlebars.Compiler;
+
+/**
+  @class JavaScriptCompiler
+  @namespace Ember.Handlebars
+  @private
+  @constructor
+*/
+EmberHandlebars.JavaScriptCompiler = function() {};
+
+// Handlebars.JavaScriptCompiler doesn't exist in runtime-only
+if (Handlebars.JavaScriptCompiler) {
+  EmberHandlebars.JavaScriptCompiler.prototype = objectCreate(Handlebars.JavaScriptCompiler.prototype);
+  EmberHandlebars.JavaScriptCompiler.prototype.compiler = EmberHandlebars.JavaScriptCompiler;
+}
+
+
+EmberHandlebars.JavaScriptCompiler.prototype.namespace = "Ember.Handlebars";
+
+EmberHandlebars.JavaScriptCompiler.prototype.initializeBuffer = function() {
+  return "''";
+};
+
+/**
+  Override the default buffer for Ember Handlebars. By default, Handlebars
+  creates an empty String at the beginning of each invocation and appends to
+  it. Ember's Handlebars overrides this to append to a single shared buffer.
+
+  @private
+  @method appendToBuffer
+  @param string {String}
+*/
+EmberHandlebars.JavaScriptCompiler.prototype.appendToBuffer = function(string) {
+  return "data.buffer.push("+string+");";
+};
+
+// Hacks ahead:
+// Handlebars presently has a bug where the `blockHelperMissing` hook
+// doesn't get passed the name of the missing helper name, but rather
+// gets passed the value of that missing helper evaluated on the current
+// context, which is most likely `undefined` and totally useless.
+//
+// So we alter the compiled template function to pass the name of the helper
+// instead, as expected.
+//
+// This can go away once the following is closed:
+// https://github.com/wycats/handlebars.js/issues/634
+
+var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
+    BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
+    INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+
+EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
+  var helperInvocation = source[source.length - 1],
+      helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
+      matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+
+  source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
+};
+
+var stringifyBlockHelperMissing = EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation;
+
+var originalBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.blockValue;
+EmberHandlebars.JavaScriptCompiler.prototype.blockValue = function() {
+  originalBlockValue.apply(this, arguments);
+  stringifyBlockHelperMissing(this.source);
+};
+
+var originalAmbiguousBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue;
+EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue = function() {
+  originalAmbiguousBlockValue.apply(this, arguments);
+  stringifyBlockHelperMissing(this.source);
+};
+
+/**
+  Rewrite simple mustaches from `{{foo}}` to `{{bind "foo"}}`. This means that
+  all simple mustaches in Ember's Handlebars will also set up an observer to
+  keep the DOM up to date when the underlying property changes.
+
+  @private
+  @method mustache
+  @for Ember.Handlebars.Compiler
+  @param mustache
+*/
+EmberHandlebars.Compiler.prototype.mustache = function(mustache) {
+  if (!(mustache.params.length || mustache.hash)) {
+    var id = new Handlebars.AST.IdNode([{ part: '_triageMustache' }]);
+
+    // Update the mustache node to include a hash value indicating whether the original node
+    // was escaped. This will allow us to properly escape values when the underlying value
+    // changes and we need to re-render the value.
+    if (!mustache.escaped) {
+      mustache.hash = mustache.hash || new Handlebars.AST.HashNode([]);
+      mustache.hash.pairs.push(["unescaped", new Handlebars.AST.StringNode("true")]);
+    }
+    mustache = new Handlebars.AST.MustacheNode([id].concat([mustache.id]), mustache.hash, !mustache.escaped);
+  }
+
+  return Handlebars.Compiler.prototype.mustache.call(this, mustache);
+};
+
+/**
+  Used for precompilation of Ember Handlebars templates. This will not be used
+  during normal app execution.
+
+  @method precompile
+  @for Ember.Handlebars
+  @static
+  @param {String} string The template to precompile
+  @param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
+                            compiled template should be returned as an Object or a String
+*/
+EmberHandlebars.precompile = function(string, asObject) {
+  var ast = Handlebars.parse(string);
+
+  var options = {
+    knownHelpers: {
+      action: true,
+      unbound: true,
+      'bind-attr': true,
+      template: true,
+      view: true,
+      _triageMustache: true
+    },
+    data: true,
+    stringParams: true
+  };
+
+  asObject = asObject === undefined ? true : asObject;
+
+  var environment = new EmberHandlebars.Compiler().compile(ast, options);
+  return new EmberHandlebars.JavaScriptCompiler().compile(environment, options, undefined, asObject);
+};
+
+// We don't support this for Handlebars runtime-only
+if (Handlebars.compile) {
+  /**
+    The entry point for Ember Handlebars. This replaces the default
+    `Handlebars.compile` and turns on template-local data and String
+    parameters.
+
+    @method compile
+    @for Ember.Handlebars
+    @static
+    @param {String} string The template to compile
+    @return {Function}
+  */
+  EmberHandlebars.compile = function(string) {
+    var ast = Handlebars.parse(string);
+    var options = { data: true, stringParams: true };
+    var environment = new EmberHandlebars.Compiler().compile(ast, options);
+    var templateSpec = new EmberHandlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
+
+    var template = EmberHandlebars.template(templateSpec);
+    template.isMethod = false; //Make sure we don't wrap templates with ._super
+
+    return template;
+  };
+}
+
+
+
+exports.precompile = EmberHandlebars.precompile;
+exports.EmberHandlebars = EmberHandlebars;
+})();
diff --git a/vendor/assets/ember/production/ember.js b/vendor/assets/ember/production/ember.js
new file mode 100644
index 000000000..cdb55eb90
--- /dev/null
+++ b/vendor/assets/ember/production/ember.js
@@ -0,0 +1,46321 @@
+// Fetched from channel: tags/v1.6.1, with url http://builds.emberjs.com/tags/v1.6.1/ember.prod.js
+// Fetched on: 2024-01-19T09:48:21Z
+/*!
+ * @overview  Ember - JavaScript Application Framework
+ * @copyright Copyright 2011-2014 Tilde Inc. and contributors
+ *            Portions Copyright 2006-2011 Strobe Inc.
+ *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
+ * @license   Licensed under MIT license
+ *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
+ * @version   1.6.1
+ */
+
+
+(function() {
+var define, requireModule, require, requirejs, Ember;
+
+(function() {
+  Ember = this.Ember = this.Ember || {};
+  if (typeof Ember === 'undefined') { Ember = {} };
+
+  if (typeof Ember.__loader === 'undefined') {
+    var registry = {}, seen = {};
+
+    define = function(name, deps, callback) {
+      registry[name] = { deps: deps, callback: callback };
+    };
+
+    requirejs = require = requireModule = function(name) {
+      if (seen.hasOwnProperty(name)) { return seen[name]; }
+      seen[name] = {};
+
+      if (!registry[name]) {
+        throw new Error("Could not find module " + name);
+      }
+
+      var mod = registry[name],
+      deps = mod.deps,
+      callback = mod.callback,
+      reified = [],
+      exports;
+
+      for (var i=0, l=deps.length; i<l; i++) {
+        if (deps[i] === 'exports') {
+          reified.push(exports = {});
+        } else {
+          reified.push(requireModule(resolve(deps[i])));
+        }
+      }
+
+      var value = callback.apply(this, reified);
+      return seen[name] = exports || value;
+
+      function resolve(child) {
+        if (child.charAt(0) !== '.') { return child; }
+        var parts = child.split("/");
+        var parentBase = name.split("/").slice(0, -1);
+
+        for (var i=0, l=parts.length; i<l; i++) {
+          var part = parts[i];
+
+          if (part === '..') { parentBase.pop(); }
+          else if (part === '.') { continue; }
+          else { parentBase.push(part); }
+        }
+
+        return parentBase.join("/");
+      }
+    };
+    requirejs._eak_seen = registry;
+
+    Ember.__loader = {define: define, require: require, registry: registry};
+  } else {
+    define = Ember.__loader.define;
+    requirejs = require = requireModule = Ember.__loader.require;
+  }
+})();
+(function() {
+define("ember-metal/array",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /*jshint newcap:false*/
+    /**
+    @module ember-metal
+    */
+
+    var ArrayPrototype = Array.prototype;
+
+    // NOTE: There is a bug in jshint that doesn't recognize `Object()` without `new`
+    // as being ok unless both `newcap:false` and not `use strict`.
+    // https://github.com/jshint/jshint/issues/392
+
+    // Testing this is not ideal, but we want to use native functions
+    // if available, but not to use versions created by libraries like Prototype
+    var isNativeFunc = function(func) {
+      // This should probably work in all browsers likely to have ES5 array methods
+      return func && Function.prototype.toString.call(func).indexOf('[native code]') > -1;
+    };
+
+    // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/map
+    var map = isNativeFunc(ArrayPrototype.map) ? ArrayPrototype.map : function(fun /*, thisp */) {
+      //"use strict";
+
+      if (this === void 0 || this === null) {
+        throw new TypeError();
+      }
+
+      var t = Object(this);
+      var len = t.length >>> 0;
+      if (typeof fun !== "function") {
+        throw new TypeError();
+      }
+
+      var res = new Array(len);
+      var thisp = arguments[1];
+      for (var i = 0; i < len; i++) {
+        if (i in t) {
+          res[i] = fun.call(thisp, t[i], i, t);
+        }
+      }
+
+      return res;
+    };
+
+    // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
+    var forEach = isNativeFunc(ArrayPrototype.forEach) ? ArrayPrototype.forEach : function(fun /*, thisp */) {
+      //"use strict";
+
+      if (this === void 0 || this === null) {
+        throw new TypeError();
+      }
+
+      var t = Object(this);
+      var len = t.length >>> 0;
+      if (typeof fun !== "function") {
+        throw new TypeError();
+      }
+
+      var thisp = arguments[1];
+      for (var i = 0; i < len; i++) {
+        if (i in t) {
+          fun.call(thisp, t[i], i, t);
+        }
+      }
+    };
+
+    var indexOf = isNativeFunc(ArrayPrototype.indexOf) ? ArrayPrototype.indexOf : function (obj, fromIndex) {
+      if (fromIndex === null || fromIndex === undefined) { fromIndex = 0; }
+      else if (fromIndex < 0) { fromIndex = Math.max(0, this.length + fromIndex); }
+      for (var i = fromIndex, j = this.length; i < j; i++) {
+        if (this[i] === obj) { return i; }
+      }
+      return -1;
+    };
+
+    var filter = isNativeFunc(ArrayPrototype.filter) ? ArrayPrototype.filter : function (fn, context) {
+      var i,
+      value,
+      result = [],
+      length = this.length;
+
+      for (i = 0; i < length; i++) {
+        if (this.hasOwnProperty(i)) {
+          value = this[i];
+          if (fn.call(context, value, i, this)) {
+            result.push(value);
+          }
+        }
+      }
+      return result;
+    };
+
+
+    if (Ember.SHIM_ES5) {
+      if (!ArrayPrototype.map) {
+        ArrayPrototype.map = map;
+      }
+
+      if (!ArrayPrototype.forEach) {
+        ArrayPrototype.forEach = forEach;
+      }
+
+      if (!ArrayPrototype.filter) {
+        ArrayPrototype.filter = filter;
+      }
+
+      if (!ArrayPrototype.indexOf) {
+        ArrayPrototype.indexOf = indexOf;
+      }
+    }
+
+    /**
+      Array polyfills to support ES5 features in older browsers.
+
+      @namespace Ember
+      @property ArrayPolyfills
+    */
+    __exports__.map = map;
+    __exports__.forEach = forEach;
+    __exports__.filter = filter;
+    __exports__.indexOf = indexOf;
+  });
+define("ember-metal/binding",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/map","ember-metal/observer","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.Logger, Ember.LOG_BINDINGS, assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var trySet = __dependency3__.trySet;
+    var guidFor = __dependency4__.guidFor;
+    var Map = __dependency5__.Map;
+    var addObserver = __dependency6__.addObserver;
+    var removeObserver = __dependency6__.removeObserver;
+    var _suspendObserver = __dependency6__._suspendObserver;
+    var run = __dependency7__["default"];
+
+    // ES6TODO: where is Ember.lookup defined?
+    /**
+    @module ember-metal
+    */
+
+    // ..........................................................
+    // CONSTANTS
+    //
+
+    /**
+      Debug parameter you can turn on. This will log all bindings that fire to
+      the console. This should be disabled in production code. Note that you
+      can also enable this from the console or temporarily.
+
+      @property LOG_BINDINGS
+      @for Ember
+      @type Boolean
+      @default false
+    */
+    Ember.LOG_BINDINGS = false || !!Ember.ENV.LOG_BINDINGS;
+
+    var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
+
+    /**
+      Returns true if the provided path is global (e.g., `MyApp.fooController.bar`)
+      instead of local (`foo.bar.baz`).
+
+      @method isGlobalPath
+      @for Ember
+      @private
+      @param {String} path
+      @return Boolean
+    */
+    function isGlobalPath(path) {
+      return IS_GLOBAL.test(path);
+    };
+
+    function getWithGlobals(obj, path) {
+      return get(isGlobalPath(path) ? Ember.lookup : obj, path);
+    }
+
+    // ..........................................................
+    // BINDING
+    //
+
+    var Binding = function(toPath, fromPath) {
+      this._direction = 'fwd';
+      this._from = fromPath;
+      this._to   = toPath;
+      this._directionMap = Map.create();
+    };
+
+    /**
+    @class Binding
+    @namespace Ember
+    */
+
+    Binding.prototype = {
+      /**
+        This copies the Binding so it can be connected to another object.
+
+        @method copy
+        @return {Ember.Binding} `this`
+      */
+      copy: function () {
+        var copy = new Binding(this._to, this._from);
+        if (this._oneWay) { copy._oneWay = true; }
+        return copy;
+      },
+
+      // ..........................................................
+      // CONFIG
+      //
+
+      /**
+        This will set `from` property path to the specified value. It will not
+        attempt to resolve this property path to an actual object until you
+        connect the binding.
+
+        The binding will search for the property path starting at the root object
+        you pass when you `connect()` the binding. It follows the same rules as
+        `get()` - see that method for more information.
+
+        @method from
+        @param {String} path the property path to connect to
+        @return {Ember.Binding} `this`
+      */
+      from: function(path) {
+        this._from = path;
+        return this;
+      },
+
+      /**
+        This will set the `to` property path to the specified value. It will not
+        attempt to resolve this property path to an actual object until you
+        connect the binding.
+
+        The binding will search for the property path starting at the root object
+        you pass when you `connect()` the binding. It follows the same rules as
+        `get()` - see that method for more information.
+
+        @method to
+        @param {String|Tuple} path A property path or tuple
+        @return {Ember.Binding} `this`
+      */
+      to: function(path) {
+        this._to = path;
+        return this;
+      },
+
+      /**
+        Configures the binding as one way. A one-way binding will relay changes
+        on the `from` side to the `to` side, but not the other way around. This
+        means that if you change the `to` side directly, the `from` side may have
+        a different value.
+
+        @method oneWay
+        @return {Ember.Binding} `this`
+      */
+      oneWay: function() {
+        this._oneWay = true;
+        return this;
+      },
+
+      /**
+        @method toString
+        @return {String} string representation of binding
+      */
+      toString: function() {
+        var oneWay = this._oneWay ? '[oneWay]' : '';
+        return "Ember.Binding<" + guidFor(this) + ">(" + this._from + " -> " + this._to + ")" + oneWay;
+      },
+
+      // ..........................................................
+      // CONNECT AND SYNC
+      //
+
+      /**
+        Attempts to connect this binding instance so that it can receive and relay
+        changes. This method will raise an exception if you have not set the
+        from/to properties yet.
+
+        @method connect
+        @param {Object} obj The root object for this binding.
+        @return {Ember.Binding} `this`
+      */
+      connect: function(obj) {
+        
+        var fromPath = this._from, toPath = this._to;
+        trySet(obj, toPath, getWithGlobals(obj, fromPath));
+
+        // add an observer on the object to be notified when the binding should be updated
+        addObserver(obj, fromPath, this, this.fromDidChange);
+
+        // if the binding is a two-way binding, also set up an observer on the target
+        if (!this._oneWay) { addObserver(obj, toPath, this, this.toDidChange); }
+
+        this._readyToSync = true;
+
+        return this;
+      },
+
+      /**
+        Disconnects the binding instance. Changes will no longer be relayed. You
+        will not usually need to call this method.
+
+        @method disconnect
+        @param {Object} obj The root object you passed when connecting the binding.
+        @return {Ember.Binding} `this`
+      */
+      disconnect: function(obj) {
+        
+        var twoWay = !this._oneWay;
+
+        // remove an observer on the object so we're no longer notified of
+        // changes that should update bindings.
+        removeObserver(obj, this._from, this, this.fromDidChange);
+
+        // if the binding is two-way, remove the observer from the target as well
+        if (twoWay) { removeObserver(obj, this._to, this, this.toDidChange); }
+
+        this._readyToSync = false; // disable scheduled syncs...
+        return this;
+      },
+
+      // ..........................................................
+      // PRIVATE
+      //
+
+      /* called when the from side changes */
+      fromDidChange: function(target) {
+        this._scheduleSync(target, 'fwd');
+      },
+
+      /* called when the to side changes */
+      toDidChange: function(target) {
+        this._scheduleSync(target, 'back');
+      },
+
+      _scheduleSync: function(obj, dir) {
+        var directionMap = this._directionMap;
+        var existingDir = directionMap.get(obj);
+
+        // if we haven't scheduled the binding yet, schedule it
+        if (!existingDir) {
+          run.schedule('sync', this, this._sync, obj);
+          directionMap.set(obj, dir);
+        }
+
+        // If both a 'back' and 'fwd' sync have been scheduled on the same object,
+        // default to a 'fwd' sync so that it remains deterministic.
+        if (existingDir === 'back' && dir === 'fwd') {
+          directionMap.set(obj, 'fwd');
+        }
+      },
+
+      _sync: function(obj) {
+        var log = Ember.LOG_BINDINGS;
+
+        // don't synchronize destroyed objects or disconnected bindings
+        if (obj.isDestroyed || !this._readyToSync) { return; }
+
+        // get the direction of the binding for the object we are
+        // synchronizing from
+        var directionMap = this._directionMap;
+        var direction = directionMap.get(obj);
+
+        var fromPath = this._from, toPath = this._to;
+
+        directionMap.remove(obj);
+
+        // if we're synchronizing from the remote object...
+        if (direction === 'fwd') {
+          var fromValue = getWithGlobals(obj, this._from);
+          if (log) {
+            Ember.Logger.log(' ', this.toString(), '->', fromValue, obj);
+          }
+          if (this._oneWay) {
+            trySet(obj, toPath, fromValue);
+          } else {
+            _suspendObserver(obj, toPath, this, this.toDidChange, function () {
+              trySet(obj, toPath, fromValue);
+            });
+          }
+        // if we're synchronizing *to* the remote object
+        } else if (direction === 'back') {
+          var toValue = get(obj, this._to);
+          if (log) {
+            Ember.Logger.log(' ', this.toString(), '<-', toValue, obj);
+          }
+          _suspendObserver(obj, fromPath, this, this.fromDidChange, function () {
+            trySet(isGlobalPath(fromPath) ? Ember.lookup : obj, fromPath, toValue);
+          });
+        }
+      }
+
+    };
+
+    function mixinProperties(to, from) {
+      for (var key in from) {
+        if (from.hasOwnProperty(key)) {
+          to[key] = from[key];
+        }
+      }
+    }
+
+    mixinProperties(Binding, {
+
+      /*
+        See `Ember.Binding.from`.
+
+        @method from
+        @static
+      */
+      from: function() {
+        var C = this, binding = new C();
+        return binding.from.apply(binding, arguments);
+      },
+
+      /*
+        See `Ember.Binding.to`.
+
+        @method to
+        @static
+      */
+      to: function() {
+        var C = this, binding = new C();
+        return binding.to.apply(binding, arguments);
+      },
+
+      /**
+        Creates a new Binding instance and makes it apply in a single direction.
+        A one-way binding will relay changes on the `from` side object (supplied
+        as the `from` argument) the `to` side, but not the other way around.
+        This means that if you change the "to" side directly, the "from" side may have
+        a different value.
+
+        See `Binding.oneWay`.
+
+        @method oneWay
+        @param {String} from from path.
+        @param {Boolean} [flag] (Optional) passing nothing here will make the
+          binding `oneWay`. You can instead pass `false` to disable `oneWay`, making the
+          binding two way again.
+        @return {Ember.Binding} `this`
+      */
+      oneWay: function(from, flag) {
+        var C = this, binding = new C(null, from);
+        return binding.oneWay(flag);
+      }
+
+    });
+
+    /**
+      An `Ember.Binding` connects the properties of two objects so that whenever
+      the value of one property changes, the other property will be changed also.
+
+      ## Automatic Creation of Bindings with `/^*Binding/`-named Properties
+
+      You do not usually create Binding objects directly but instead describe
+      bindings in your class or object definition using automatic binding
+      detection.
+
+      Properties ending in a `Binding` suffix will be converted to `Ember.Binding`
+      instances. The value of this property should be a string representing a path
+      to another object or a custom binding instanced created using Binding helpers
+      (see "One Way Bindings"):
+
+      ```
+      valueBinding: "MyApp.someController.title"
+      ```
+
+      This will create a binding from `MyApp.someController.title` to the `value`
+      property of your object instance automatically. Now the two values will be
+      kept in sync.
+
+      ## One Way Bindings
+
+      One especially useful binding customization you can use is the `oneWay()`
+      helper. This helper tells Ember that you are only interested in
+      receiving changes on the object you are binding from. For example, if you
+      are binding to a preference and you want to be notified if the preference
+      has changed, but your object will not be changing the preference itself, you
+      could do:
+
+      ```
+      bigTitlesBinding: Ember.Binding.oneWay("MyApp.preferencesController.bigTitles")
+      ```
+
+      This way if the value of `MyApp.preferencesController.bigTitles` changes the
+      `bigTitles` property of your object will change also. However, if you
+      change the value of your `bigTitles` property, it will not update the
+      `preferencesController`.
+
+      One way bindings are almost twice as fast to setup and twice as fast to
+      execute because the binding only has to worry about changes to one side.
+
+      You should consider using one way bindings anytime you have an object that
+      may be created frequently and you do not intend to change a property; only
+      to monitor it for changes (such as in the example above).
+
+      ## Adding Bindings Manually
+
+      All of the examples above show you how to configure a custom binding, but the
+      result of these customizations will be a binding template, not a fully active
+      Binding instance. The binding will actually become active only when you
+      instantiate the object the binding belongs to. It is useful however, to
+      understand what actually happens when the binding is activated.
+
+      For a binding to function it must have at least a `from` property and a `to`
+      property. The `from` property path points to the object/key that you want to
+      bind from while the `to` path points to the object/key you want to bind to.
+
+      When you define a custom binding, you are usually describing the property
+      you want to bind from (such as `MyApp.someController.value` in the examples
+      above). When your object is created, it will automatically assign the value
+      you want to bind `to` based on the name of your binding key. In the
+      examples above, during init, Ember objects will effectively call
+      something like this on your binding:
+
+      ```javascript
+      binding = Ember.Binding.from(this.valueBinding).to("value");
+      ```
+
+      This creates a new binding instance based on the template you provide, and
+      sets the to path to the `value` property of the new object. Now that the
+      binding is fully configured with a `from` and a `to`, it simply needs to be
+      connected to become active. This is done through the `connect()` method:
+
+      ```javascript
+      binding.connect(this);
+      ```
+
+      Note that when you connect a binding you pass the object you want it to be
+      connected to. This object will be used as the root for both the from and
+      to side of the binding when inspecting relative paths. This allows the
+      binding to be automatically inherited by subclassed objects as well.
+
+      Now that the binding is connected, it will observe both the from and to side
+      and relay changes.
+
+      If you ever needed to do so (you almost never will, but it is useful to
+      understand this anyway), you could manually create an active binding by
+      using the `Ember.bind()` helper method. (This is the same method used by
+      to setup your bindings on objects):
+
+      ```javascript
+      Ember.bind(MyApp.anotherObject, "value", "MyApp.someController.value");
+      ```
+
+      Both of these code fragments have the same effect as doing the most friendly
+      form of binding creation like so:
+
+      ```javascript
+      MyApp.anotherObject = Ember.Object.create({
+        valueBinding: "MyApp.someController.value",
+
+        // OTHER CODE FOR THIS OBJECT...
+      });
+      ```
+
+      Ember's built in binding creation method makes it easy to automatically
+      create bindings for you. You should always use the highest-level APIs
+      available, even if you understand how it works underneath.
+
+      @class Binding
+      @namespace Ember
+      @since Ember 0.9
+    */
+    // Ember.Binding = Binding; ES6TODO: where to put this?
+
+
+    /**
+      Global helper method to create a new binding. Just pass the root object
+      along with a `to` and `from` path to create and connect the binding.
+
+      @method bind
+      @for Ember
+      @param {Object} obj The root object of the transform.
+      @param {String} to The path to the 'to' side of the binding.
+        Must be relative to obj.
+      @param {String} from The path to the 'from' side of the binding.
+        Must be relative to obj or a global path.
+      @return {Ember.Binding} binding instance
+    */
+    function bind(obj, to, from) {
+      return new Binding(to, from).connect(obj);
+    };
+
+    /**
+      @method oneWay
+      @for Ember
+      @param {Object} obj The root object of the transform.
+      @param {String} to The path to the 'to' side of the binding.
+        Must be relative to obj.
+      @param {String} from The path to the 'from' side of the binding.
+        Must be relative to obj or a global path.
+      @return {Ember.Binding} binding instance
+    */
+    function oneWay(obj, to, from) {
+      return new Binding(to, from).oneWay().connect(obj);
+    };
+
+    __exports__.Binding = Binding;
+    __exports__.bind = bind;
+    __exports__.oneWay = oneWay;
+    __exports__.isGlobalPath = isGlobalPath;
+  });
+define("ember-metal/chains",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/array","ember-metal/watch_key","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // warn, assert, etc;
+    var get = __dependency2__.get;
+    var normalizeTuple = __dependency2__.normalizeTuple;
+    var meta = __dependency3__.meta;
+    var META_KEY = __dependency3__.META_KEY;
+    var forEach = __dependency4__.forEach;
+    var watchKey = __dependency5__.watchKey;
+    var unwatchKey = __dependency5__.unwatchKey;
+
+    var metaFor = meta,
+        warn = Ember.warn,
+        FIRST_KEY = /^([^\.]+)/;
+
+    function firstKey(path) {
+      return path.match(FIRST_KEY)[0];
+    }
+
+    var pendingQueue = [];
+
+    // attempts to add the pendingQueue chains again. If some of them end up
+    // back in the queue and reschedule is true, schedules a timeout to try
+    // again.
+    function flushPendingChains() {
+      if (pendingQueue.length === 0) { return; } // nothing to do
+
+      var queue = pendingQueue;
+      pendingQueue = [];
+
+      forEach.call(queue, function(q) { q[0].add(q[1]); });
+
+      warn('Watching an undefined global, Ember expects watched globals to be setup by the time the run loop is flushed, check for typos', pendingQueue.length === 0);
+    };
+
+
+    function addChainWatcher(obj, keyName, node) {
+      if (!obj || ('object' !== typeof obj)) { return; } // nothing to do
+
+      var m = metaFor(obj), nodes = m.chainWatchers;
+
+      if (!m.hasOwnProperty('chainWatchers')) {
+        nodes = m.chainWatchers = {};
+      }
+
+      if (!nodes[keyName]) { nodes[keyName] = []; }
+      nodes[keyName].push(node);
+      watchKey(obj, keyName, m);
+    }
+
+    function removeChainWatcher(obj, keyName, node) {
+      if (!obj || 'object' !== typeof obj) { return; } // nothing to do
+
+      var m = obj[META_KEY];
+      if (m && !m.hasOwnProperty('chainWatchers')) { return; } // nothing to do
+
+      var nodes = m && m.chainWatchers;
+
+      if (nodes && nodes[keyName]) {
+        nodes = nodes[keyName];
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          if (nodes[i] === node) { nodes.splice(i, 1); }
+        }
+      }
+      unwatchKey(obj, keyName, m);
+    };
+
+    // A ChainNode watches a single key on an object. If you provide a starting
+    // value for the key then the node won't actually watch it. For a root node
+    // pass null for parent and key and object for value.
+    function ChainNode(parent, key, value) {
+      this._parent = parent;
+      this._key    = key;
+
+      // _watching is true when calling get(this._parent, this._key) will
+      // return the value of this node.
+      //
+      // It is false for the root of a chain (because we have no parent)
+      // and for global paths (because the parent node is the object with
+      // the observer on it)
+      this._watching = value===undefined;
+
+      this._value  = value;
+      this._paths = {};
+      if (this._watching) {
+        this._object = parent.value();
+        if (this._object) { addChainWatcher(this._object, this._key, this); }
+      }
+
+      // Special-case: the EachProxy relies on immediate evaluation to
+      // establish its observers.
+      //
+      // TODO: Replace this with an efficient callback that the EachProxy
+      // can implement.
+      if (this._parent && this._parent._key === '@each') {
+        this.value();
+      }
+    };
+
+    var ChainNodePrototype = ChainNode.prototype;
+
+    function lazyGet(obj, key) {
+      if (!obj) return undefined;
+
+      var meta = obj[META_KEY];
+      // check if object meant only to be a prototype
+      if (meta && meta.proto === obj) return undefined;
+
+      if (key === "@each") return get(obj, key);
+
+      // if a CP only return cached value
+      var desc = meta && meta.descs[key];
+      if (desc && desc._cacheable) {
+        if (key in meta.cache) {
+          return meta.cache[key];
+        } else {
+          return undefined;
+        }
+      }
+
+      return get(obj, key);
+    }
+
+    ChainNodePrototype.value = function() {
+      if (this._value === undefined && this._watching) {
+        var obj = this._parent.value();
+        this._value = lazyGet(obj, this._key);
+      }
+      return this._value;
+    };
+
+    ChainNodePrototype.destroy = function() {
+      if (this._watching) {
+        var obj = this._object;
+        if (obj) { removeChainWatcher(obj, this._key, this); }
+        this._watching = false; // so future calls do nothing
+      }
+    };
+
+    // copies a top level object only
+    ChainNodePrototype.copy = function(obj) {
+      var ret = new ChainNode(null, null, obj),
+          paths = this._paths, path;
+      for (path in paths) {
+        if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
+        ret.add(path);
+      }
+      return ret;
+    };
+
+    // called on the root node of a chain to setup watchers on the specified
+    // path.
+    ChainNodePrototype.add = function(path) {
+      var obj, tuple, key, src, paths;
+
+      paths = this._paths;
+      paths[path] = (paths[path] || 0) + 1;
+
+      obj = this.value();
+      tuple = normalizeTuple(obj, path);
+
+      // the path was a local path
+      if (tuple[0] && tuple[0] === obj) {
+        path = tuple[1];
+        key  = firstKey(path);
+        path = path.slice(key.length+1);
+
+      // global path, but object does not exist yet.
+      // put into a queue and try to connect later.
+      } else if (!tuple[0]) {
+        pendingQueue.push([this, path]);
+        tuple.length = 0;
+        return;
+
+      // global path, and object already exists
+      } else {
+        src  = tuple[0];
+        key  = path.slice(0, 0-(tuple[1].length+1));
+        path = tuple[1];
+      }
+
+      tuple.length = 0;
+      this.chain(key, path, src);
+    };
+
+    // called on the root node of a chain to teardown watcher on the specified
+    // path
+    ChainNodePrototype.remove = function(path) {
+      var obj, tuple, key, src, paths;
+
+      paths = this._paths;
+      if (paths[path] > 0) { paths[path]--; }
+
+      obj = this.value();
+      tuple = normalizeTuple(obj, path);
+      if (tuple[0] === obj) {
+        path = tuple[1];
+        key  = firstKey(path);
+        path = path.slice(key.length+1);
+      } else {
+        src  = tuple[0];
+        key  = path.slice(0, 0-(tuple[1].length+1));
+        path = tuple[1];
+      }
+
+      tuple.length = 0;
+      this.unchain(key, path);
+    };
+
+    ChainNodePrototype.count = 0;
+
+    ChainNodePrototype.chain = function(key, path, src) {
+      var chains = this._chains, node;
+      if (!chains) { chains = this._chains = {}; }
+
+      node = chains[key];
+      if (!node) { node = chains[key] = new ChainNode(this, key, src); }
+      node.count++; // count chains...
+
+      // chain rest of path if there is one
+      if (path && path.length>0) {
+        key = firstKey(path);
+        path = path.slice(key.length+1);
+        node.chain(key, path); // NOTE: no src means it will observe changes...
+      }
+    };
+
+    ChainNodePrototype.unchain = function(key, path) {
+      var chains = this._chains, node = chains[key];
+
+      // unchain rest of path first...
+      if (path && path.length>1) {
+        key  = firstKey(path);
+        path = path.slice(key.length+1);
+        node.unchain(key, path);
+      }
+
+      // delete node if needed.
+      node.count--;
+      if (node.count<=0) {
+        delete chains[node._key];
+        node.destroy();
+      }
+
+    };
+
+    ChainNodePrototype.willChange = function(events) {
+      var chains = this._chains;
+      if (chains) {
+        for(var key in chains) {
+          if (!chains.hasOwnProperty(key)) { continue; }
+          chains[key].willChange(events);
+        }
+      }
+
+      if (this._parent) { this._parent.chainWillChange(this, this._key, 1, events); }
+    };
+
+    ChainNodePrototype.chainWillChange = function(chain, path, depth, events) {
+      if (this._key) { path = this._key + '.' + path; }
+
+      if (this._parent) {
+        this._parent.chainWillChange(this, path, depth+1, events);
+      } else {
+        if (depth > 1) {
+          events.push(this.value(), path);
+        }
+        path = 'this.' + path;
+        if (this._paths[path] > 0) {
+          events.push(this.value(), path);
+        }
+      }
+    };
+
+    ChainNodePrototype.chainDidChange = function(chain, path, depth, events) {
+      if (this._key) { path = this._key + '.' + path; }
+      if (this._parent) {
+        this._parent.chainDidChange(this, path, depth+1, events);
+      } else {
+        if (depth > 1) {
+          events.push(this.value(), path);
+        }
+        path = 'this.' + path;
+        if (this._paths[path] > 0) {
+          events.push(this.value(), path);
+        }
+      }
+    };
+
+    ChainNodePrototype.didChange = function(events) {
+      // invalidate my own value first.
+      if (this._watching) {
+        var obj = this._parent.value();
+        if (obj !== this._object) {
+          removeChainWatcher(this._object, this._key, this);
+          this._object = obj;
+          addChainWatcher(obj, this._key, this);
+        }
+        this._value  = undefined;
+
+        // Special-case: the EachProxy relies on immediate evaluation to
+        // establish its observers.
+        if (this._parent && this._parent._key === '@each')
+          this.value();
+      }
+
+      // then notify chains...
+      var chains = this._chains;
+      if (chains) {
+        for(var key in chains) {
+          if (!chains.hasOwnProperty(key)) { continue; }
+          chains[key].didChange(events);
+        }
+      }
+
+      // if no events are passed in then we only care about the above wiring update
+      if (events === null) { return; }
+
+      // and finally tell parent about my path changing...
+      if (this._parent) { this._parent.chainDidChange(this, this._key, 1, events); }
+    };
+
+    function finishChains(obj) {
+      // We only create meta if we really have to
+      var m = obj[META_KEY], chains = m && m.chains;
+      if (chains) {
+        if (chains.value() !== obj) {
+          metaFor(obj).chains = chains = chains.copy(obj);
+        } else {
+          chains.didChange(null);
+        }
+      }
+    };
+
+    __exports__.flushPendingChains = flushPendingChains;
+    __exports__.removeChainWatcher = removeChainWatcher;
+    __exports__.ChainNode = ChainNode;
+    __exports__.finishChains = finishChains;
+  });
+define("ember-metal/computed",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/watching","ember-metal/expand_properties","ember-metal/error","ember-metal/properties","ember-metal/property_events","ember-metal/is_empty","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var meta = __dependency4__.meta;
+    var META_KEY = __dependency4__.META_KEY;
+    var guidFor = __dependency4__.guidFor;
+    var typeOf = __dependency4__.typeOf;
+    var inspect = __dependency4__.inspect;
+    var EnumerableUtils = __dependency5__["default"];
+    var create = __dependency6__.create;
+    var watch = __dependency7__.watch;
+    var unwatch = __dependency7__.unwatch;
+    var expandProperties = __dependency8__["default"];
+    var EmberError = __dependency9__["default"];
+    var Descriptor = __dependency10__.Descriptor;
+    var defineProperty = __dependency10__.defineProperty;
+    var propertyWillChange = __dependency11__.propertyWillChange;
+    var propertyDidChange = __dependency11__.propertyDidChange;
+    var isEmpty = __dependency12__["default"];
+    var isNone = __dependency13__.isNone;
+
+    /**
+    @module ember-metal
+    */
+
+    
+
+    var metaFor = meta,
+        a_slice = [].slice,
+        o_create = create;
+
+    function UNDEFINED() { }
+
+    var lengthPattern = /\.(length|\[\])$/;
+
+    // ..........................................................
+    // DEPENDENT KEYS
+    //
+
+    // data structure:
+    //  meta.deps = {
+    //    'depKey': {
+    //      'keyName': count,
+    //    }
+    //  }
+
+    /*
+      This function returns a map of unique dependencies for a
+      given object and key.
+    */
+    function keysForDep(depsMeta, depKey) {
+      var keys = depsMeta[depKey];
+      if (!keys) {
+        // if there are no dependencies yet for a the given key
+        // create a new empty list of dependencies for the key
+        keys = depsMeta[depKey] = {};
+      } else if (!depsMeta.hasOwnProperty(depKey)) {
+        // otherwise if the dependency list is inherited from
+        // a superclass, clone the hash
+        keys = depsMeta[depKey] = o_create(keys);
+      }
+      return keys;
+    }
+
+    function metaForDeps(meta) {
+      return keysForDep(meta, 'deps');
+    }
+
+    function addDependentKeys(desc, obj, keyName, meta) {
+      // the descriptor has a list of dependent keys, so
+      // add all of its dependent keys.
+      var depKeys = desc._dependentKeys, depsMeta, idx, len, depKey, keys;
+      if (!depKeys) return;
+
+      depsMeta = metaForDeps(meta);
+
+      for(idx = 0, len = depKeys.length; idx < len; idx++) {
+        depKey = depKeys[idx];
+        // Lookup keys meta for depKey
+        keys = keysForDep(depsMeta, depKey);
+        // Increment the number of times depKey depends on keyName.
+        keys[keyName] = (keys[keyName] || 0) + 1;
+        // Watch the depKey
+        watch(obj, depKey, meta);
+      }
+    }
+
+    function removeDependentKeys(desc, obj, keyName, meta) {
+      // the descriptor has a list of dependent keys, so
+      // add all of its dependent keys.
+      var depKeys = desc._dependentKeys, depsMeta, idx, len, depKey, keys;
+      if (!depKeys) return;
+
+      depsMeta = metaForDeps(meta);
+
+      for(idx = 0, len = depKeys.length; idx < len; idx++) {
+        depKey = depKeys[idx];
+        // Lookup keys meta for depKey
+        keys = keysForDep(depsMeta, depKey);
+        // Increment the number of times depKey depends on keyName.
+        keys[keyName] = (keys[keyName] || 0) - 1;
+        // Watch the depKey
+        unwatch(obj, depKey, meta);
+      }
+    }
+
+    // ..........................................................
+    // COMPUTED PROPERTY
+    //
+
+    /**
+      A computed property transforms an objects function into a property.
+
+      By default the function backing the computed property will only be called
+      once and the result will be cached. You can specify various properties
+      that your computed property is dependent on. This will force the cached
+      result to be recomputed if the dependencies are modified.
+
+      In the following example we declare a computed property (by calling
+      `.property()` on the fullName function) and setup the properties
+      dependencies (depending on firstName and lastName). The fullName function
+      will be called once (regardless of how many times it is accessed) as long
+      as it's dependencies have not been changed. Once firstName or lastName are updated
+      any future calls (or anything bound) to fullName will incorporate the new
+      values.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        // these will be supplied by `create`
+        firstName: null,
+        lastName: null,
+
+        fullName: function() {
+          var firstName = this.get('firstName');
+          var lastName = this.get('lastName');
+
+         return firstName + ' ' + lastName;
+        }.property('firstName', 'lastName')
+      });
+
+      var tom = Person.create({
+        firstName: 'Tom',
+        lastName: 'Dale'
+      });
+
+      tom.get('fullName') // 'Tom Dale'
+      ```
+
+      You can also define what Ember should do when setting a computed property.
+      If you try to set a computed property, it will be invoked with the key and
+      value you want to set it to. You can also accept the previous value as the
+      third parameter.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        // these will be supplied by `create`
+        firstName: null,
+        lastName: null,
+
+        fullName: function(key, value, oldValue) {
+          // getter
+          if (arguments.length === 1) {
+            var firstName = this.get('firstName');
+            var lastName = this.get('lastName');
+
+            return firstName + ' ' + lastName;
+
+          // setter
+          } else {
+            var name = value.split(' ');
+
+            this.set('firstName', name[0]);
+            this.set('lastName', name[1]);
+
+            return value;
+          }
+        }.property('firstName', 'lastName')
+      });
+
+      var person = Person.create();
+
+      person.set('fullName', 'Peter Wagenet');
+      person.get('firstName'); // 'Peter'
+      person.get('lastName');  // 'Wagenet'
+      ```
+
+      @class ComputedProperty
+      @namespace Ember
+      @extends Ember.Descriptor
+      @constructor
+    */
+    function ComputedProperty(func, opts) {
+      func.__ember_arity__ = func.length;
+      this.func = func;
+
+      this._cacheable = (opts && opts.cacheable !== undefined) ? opts.cacheable : true;
+      this._dependentKeys = opts && opts.dependentKeys;
+      this._readOnly = opts && (opts.readOnly !== undefined || !!opts.readOnly) || false;
+    }
+
+    ComputedProperty.prototype = new Descriptor();
+
+    var ComputedPropertyPrototype = ComputedProperty.prototype;
+    ComputedPropertyPrototype._dependentKeys = undefined;
+    ComputedPropertyPrototype._suspended = undefined;
+    ComputedPropertyPrototype._meta = undefined;
+
+    /**
+      Properties are cacheable by default. Computed property will automatically
+      cache the return value of your function until one of the dependent keys changes.
+
+      Call `volatile()` to set it into non-cached mode. When in this mode
+      the computed property will not automatically cache the return value.
+
+      However, if a property is properly observable, there is no reason to disable
+      caching.
+
+      @method cacheable
+      @param {Boolean} aFlag optional set to `false` to disable caching
+      @return {Ember.ComputedProperty} this
+      @chainable
+    */
+    ComputedPropertyPrototype.cacheable = function(aFlag) {
+      this._cacheable = aFlag !== false;
+      return this;
+    };
+
+    /**
+      Call on a computed property to set it into non-cached mode. When in this
+      mode the computed property will not automatically cache the return value.
+
+      ```javascript
+      var outsideService = Ember.Object.extend({
+        value: function() {
+          return OutsideService.getValue();
+        }.property().volatile()
+      }).create();
+      ```
+
+      @method volatile
+      @return {Ember.ComputedProperty} this
+      @chainable
+    */
+    ComputedPropertyPrototype.volatile = function() {
+      return this.cacheable(false);
+    };
+
+    /**
+      Call on a computed property to set it into read-only mode. When in this
+      mode the computed property will throw an error when set.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        guid: function() {
+          return 'guid-guid-guid';
+        }.property().readOnly()
+      });
+
+      var person = Person.create();
+
+      person.set('guid', 'new-guid'); // will throw an exception
+      ```
+
+      @method readOnly
+      @return {Ember.ComputedProperty} this
+      @chainable
+    */
+    ComputedPropertyPrototype.readOnly = function(readOnly) {
+      this._readOnly = readOnly === undefined || !!readOnly;
+      return this;
+    };
+
+    /**
+      Sets the dependent keys on this computed property. Pass any number of
+      arguments containing key paths that this computed property depends on.
+
+      ```javascript
+      var President = Ember.Object.extend({
+        fullName: computed(function() {
+          return this.get('firstName') + ' ' + this.get('lastName');
+
+          // Tell Ember that this computed property depends on firstName
+          // and lastName
+        }).property('firstName', 'lastName')
+      });
+
+      var president = President.create({
+        firstName: 'Barack',
+        lastName: 'Obama',
+      });
+
+      president.get('fullName'); // 'Barack Obama'
+      ```
+
+      @method property
+      @param {String} path* zero or more property paths
+      @return {Ember.ComputedProperty} this
+      @chainable
+    */
+    ComputedPropertyPrototype.property = function() {
+      var args;
+
+      var addArg = function (property) {
+        args.push(property);
+      };
+
+      args = [];
+      for (var i = 0, l = arguments.length; i < l; i++) {
+        expandProperties(arguments[i], addArg);
+      }
+
+      this._dependentKeys = args;
+      return this;
+    };
+
+    /**
+      In some cases, you may want to annotate computed properties with additional
+      metadata about how they function or what values they operate on. For example,
+      computed property functions may close over variables that are then no longer
+      available for introspection.
+
+      You can pass a hash of these values to a computed property like this:
+
+      ```
+      person: function() {
+        var personId = this.get('personId');
+        return App.Person.create({ id: personId });
+      }.property().meta({ type: App.Person })
+      ```
+
+      The hash that you pass to the `meta()` function will be saved on the
+      computed property descriptor under the `_meta` key. Ember runtime
+      exposes a public API for retrieving these values from classes,
+      via the `metaForProperty()` function.
+
+      @method meta
+      @param {Hash} meta
+      @chainable
+    */
+
+    ComputedPropertyPrototype.meta = function(meta) {
+      if (arguments.length === 0) {
+        return this._meta || {};
+      } else {
+        this._meta = meta;
+        return this;
+      }
+    };
+
+    /* impl descriptor API */
+    ComputedPropertyPrototype.didChange = function(obj, keyName) {
+      // _suspended is set via a CP.set to ensure we don't clear
+      // the cached value set by the setter
+      if (this._cacheable && this._suspended !== obj) {
+        var meta = metaFor(obj);
+        if (meta.cache[keyName] !== undefined) {
+          meta.cache[keyName] = undefined;
+          removeDependentKeys(this, obj, keyName, meta);
+        }
+      }
+    };
+
+    function finishChains(chainNodes)
+    {
+      for (var i=0, l=chainNodes.length; i<l; i++) {
+        chainNodes[i].didChange(null);
+      }
+    }
+
+    /**
+      Access the value of the function backing the computed property.
+      If this property has already been cached, return the cached result.
+      Otherwise, call the function passing the property name as an argument.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        fullName: function(keyName) {
+          // the keyName parameter is 'fullName' in this case.
+          return this.get('firstName') + ' ' + this.get('lastName');
+        }.property('firstName', 'lastName')
+      });
+
+
+      var tom = Person.create({
+        firstName: 'Tom',
+        lastName: 'Dale'
+      });
+
+      tom.get('fullName') // 'Tom Dale'
+      ```
+
+      @method get
+      @param {String} keyName The key being accessed.
+      @return {Object} The return value of the function backing the CP.
+    */
+    ComputedPropertyPrototype.get = function(obj, keyName) {
+      var ret, cache, meta, chainNodes;
+      if (this._cacheable) {
+        meta = metaFor(obj);
+        cache = meta.cache;
+
+        var result = cache[keyName];
+
+        if (result === UNDEFINED) {
+          return undefined;
+        }  else if (result !== undefined) {
+          return result;
+        }
+
+        ret = this.func.call(obj, keyName);
+        if (ret === undefined) {
+          cache[keyName] = UNDEFINED;
+        } else {
+          cache[keyName] = ret;
+        }
+
+        chainNodes = meta.chainWatchers && meta.chainWatchers[keyName];
+        if (chainNodes) { finishChains(chainNodes); }
+        addDependentKeys(this, obj, keyName, meta);
+      } else {
+        ret = this.func.call(obj, keyName);
+      }
+      return ret;
+    };
+
+    /**
+      Set the value of a computed property. If the function that backs your
+      computed property does not accept arguments then the default action for
+      setting would be to define the property on the current object, and set
+      the value of the property to the value being set.
+
+      Generally speaking if you intend for your computed property to be set
+      your backing function should accept either two or three arguments.
+
+      @method set
+      @param {String} keyName The key being accessed.
+      @param {Object} newValue The new value being assigned.
+      @param {String} oldValue The old value being replaced.
+      @return {Object} The return value of the function backing the CP.
+    */
+    ComputedPropertyPrototype.set = function(obj, keyName, value) {
+      var cacheable = this._cacheable,
+          func = this.func,
+          meta = metaFor(obj, cacheable),
+          oldSuspended = this._suspended,
+          hadCachedValue = false,
+          cache = meta.cache,
+          funcArgLength, cachedValue, ret;
+
+      if (this._readOnly) {
+        throw new EmberError('Cannot set read-only property "' + keyName + '" on object: ' + inspect(obj));
+      }
+
+      this._suspended = obj;
+
+      try {
+
+        if (cacheable && cache[keyName] !== undefined) {
+          cachedValue = cache[keyName];
+          hadCachedValue = true;
+        }
+
+        // Check if the CP has been wrapped. If it has, use the
+        // length from the wrapped function.
+
+        funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
+
+        // For backwards-compatibility with computed properties
+        // that check for arguments.length === 2 to determine if
+        // they are being get or set, only pass the old cached
+        // value if the computed property opts into a third
+        // argument.
+        if (funcArgLength === 3) {
+          ret = func.call(obj, keyName, value, cachedValue);
+        } else if (funcArgLength === 2) {
+          ret = func.call(obj, keyName, value);
+        } else {
+          defineProperty(obj, keyName, null, cachedValue);
+          set(obj, keyName, value);
+          return;
+        }
+
+        if (hadCachedValue && cachedValue === ret) { return; }
+
+        var watched = meta.watching[keyName];
+        if (watched) { propertyWillChange(obj, keyName); }
+
+        if (hadCachedValue) {
+          cache[keyName] = undefined;
+        }
+
+        if (cacheable) {
+          if (!hadCachedValue) {
+            addDependentKeys(this, obj, keyName, meta);
+          }
+          if (ret === undefined) {
+            cache[keyName] = UNDEFINED;
+          } else {
+            cache[keyName] = ret;
+          }
+        }
+
+        if (watched) { propertyDidChange(obj, keyName); }
+      } finally {
+        this._suspended = oldSuspended;
+      }
+      return ret;
+    };
+
+    /* called before property is overridden */
+    ComputedPropertyPrototype.teardown = function(obj, keyName) {
+      var meta = metaFor(obj);
+
+      if (keyName in meta.cache) {
+        removeDependentKeys(this, obj, keyName, meta);
+      }
+
+      if (this._cacheable) { delete meta.cache[keyName]; }
+
+      return null; // no value to restore
+    };
+
+
+    /**
+      This helper returns a new property descriptor that wraps the passed
+      computed property function. You can use this helper to define properties
+      with mixins or via `Ember.defineProperty()`.
+
+      The function you pass will be used to both get and set property values.
+      The function should accept two parameters, key and value. If value is not
+      undefined you should set the value first. In either case return the
+      current value of the property.
+
+      @method computed
+      @for Ember
+      @param {Function} func The computed property function.
+      @return {Ember.ComputedProperty} property descriptor instance
+    */
+    function computed(func) {
+      var args;
+
+      if (arguments.length > 1) {
+        args = a_slice.call(arguments, 0, -1);
+        func = a_slice.call(arguments, -1)[0];
+      }
+
+      if (typeof func !== "function") {
+        throw new EmberError("Computed Property declared without a property function");
+      }
+
+      var cp = new ComputedProperty(func);
+
+      if (args) {
+        cp.property.apply(cp, args);
+      }
+
+      return cp;
+    };
+
+    /**
+      Returns the cached value for a property, if one exists.
+      This can be useful for peeking at the value of a computed
+      property that is generated lazily, without accidentally causing
+      it to be created.
+
+      @method cacheFor
+      @for Ember
+      @param {Object} obj the object whose property you want to check
+      @param {String} key the name of the property whose cached value you want
+        to return
+      @return {Object} the cached value
+    */
+    function cacheFor(obj, key) {
+      var meta = obj[META_KEY],
+          cache = meta && meta.cache,
+          ret = cache && cache[key];
+
+      if (ret === UNDEFINED) { return undefined; }
+      return ret;
+    };
+
+    cacheFor.set = function(cache, key, value) {
+      if (value === undefined) {
+        cache[key] = UNDEFINED;
+      } else {
+        cache[key] = value;
+      }
+    };
+
+    cacheFor.get = function(cache, key) {
+      var ret = cache[key];
+      if (ret === UNDEFINED) { return undefined; }
+      return ret;
+    };
+
+    cacheFor.remove = function(cache, key) {
+      cache[key] = undefined;
+    };
+
+    function getProperties(self, propertyNames) {
+      var ret = {};
+      for(var i = 0; i < propertyNames.length; i++) {
+        ret[propertyNames[i]] = get(self, propertyNames[i]);
+      }
+      return ret;
+    }
+
+    function registerComputed(name, macro) {
+      computed[name] = function(dependentKey) {
+        var args = a_slice.call(arguments);
+        return computed(dependentKey, function() {
+          return macro.apply(this, args);
+        });
+      };
+    };
+
+    function registerComputedWithProperties(name, macro) {
+      computed[name] = function() {
+        var properties = a_slice.call(arguments);
+
+        var computedFunc = computed(function() {
+          return macro.apply(this, [getProperties(this, properties)]);
+        });
+
+        return computedFunc.property.apply(computedFunc, properties);
+      };
+    };
+
+    /**
+      A computed property that returns true if the value of the dependent
+      property is null, an empty string, empty array, or empty function.
+
+      Example
+
+      ```javascript
+      var ToDoList = Ember.Object.extend({
+        done: Ember.computed.empty('todos')
+      });
+
+      var todoList = ToDoList.create({
+        todos: ['Unit Test', 'Documentation', 'Release']
+      });
+
+      todoList.get('done'); // false
+      todoList.get('todos').clear();
+      todoList.get('done'); // true
+      ```
+
+      @since 1.6.0
+      @method computed.empty
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which negate
+      the original value for property
+    */
+    computed.empty = function (dependentKey) {
+      return computed(dependentKey + '.length', function () {
+        return isEmpty(get(this, dependentKey));
+      });
+    };
+
+    /**
+      A computed property that returns true if the value of the dependent
+      property is NOT null, an empty string, empty array, or empty function.
+
+      Note: When using `computed.notEmpty` to watch an array make sure to
+      use the `array.[]` syntax so the computed can subscribe to transitions
+      from empty to non-empty states.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasStuff: Ember.computed.notEmpty('backpack.[]')
+      });
+
+      var hamster = Hamster.create({ backpack: ['Food', 'Sleeping Bag', 'Tent'] });
+
+      hamster.get('hasStuff');         // true
+      hamster.get('backpack').clear(); // []
+      hamster.get('hasStuff');         // false
+      ```
+
+      @method computed.notEmpty
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which returns true if
+      original value for property is not empty.
+    */
+    registerComputed('notEmpty', function(dependentKey) {
+      return !isEmpty(get(this, dependentKey));
+    });
+
+    /**
+      A computed property that returns true if the value of the dependent
+      property is null or undefined. This avoids errors from JSLint complaining
+      about use of ==, which can be technically confusing.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        isHungry: Ember.computed.none('food')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('isHungry'); // true
+      hamster.set('food', 'Banana');
+      hamster.get('isHungry'); // false
+      hamster.set('food', null);
+      hamster.get('isHungry'); // true
+      ```
+
+      @method computed.none
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which
+      returns true if original value for property is null or undefined.
+    */
+    registerComputed('none', function(dependentKey) {
+      return isNone(get(this, dependentKey));
+    });
+
+    /**
+      A computed property that returns the inverse boolean value
+      of the original value for the dependent property.
+
+      Example
+
+      ```javascript
+      var User = Ember.Object.extend({
+        isAnonymous: Ember.computed.not('loggedIn')
+      });
+
+      var user = User.create({loggedIn: false});
+
+      user.get('isAnonymous'); // true
+      user.set('loggedIn', true);
+      user.get('isAnonymous'); // false
+      ```
+
+      @method computed.not
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which returns
+      inverse of the original value for property
+    */
+    registerComputed('not', function(dependentKey) {
+      return !get(this, dependentKey);
+    });
+
+    /**
+      A computed property that converts the provided dependent property
+      into a boolean value.
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasBananas: Ember.computed.bool('numBananas')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('hasBananas'); // false
+      hamster.set('numBananas', 0);
+      hamster.get('hasBananas'); // false
+      hamster.set('numBananas', 1);
+      hamster.get('hasBananas'); // true
+      hamster.set('numBananas', null);
+      hamster.get('hasBananas'); // false
+      ```
+
+      @method computed.bool
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which converts
+      to boolean the original value for property
+    */
+    registerComputed('bool', function(dependentKey) {
+      return !!get(this, dependentKey);
+    });
+
+    /**
+      A computed property which matches the original value for the
+      dependent property against a given RegExp, returning `true`
+      if they values matches the RegExp and `false` if it does not.
+
+      Example
+
+      ```javascript
+      var User = Ember.Object.extend({
+        hasValidEmail: Ember.computed.match('email', /^.+@.+\..+$/)
+      });
+
+      var user = User.create({loggedIn: false});
+
+      user.get('hasValidEmail'); // false
+      user.set('email', '');
+      user.get('hasValidEmail'); // false
+      user.set('email', 'ember_hamster@example.com');
+      user.get('hasValidEmail'); // true
+      ```
+
+      @method computed.match
+      @for Ember
+      @param {String} dependentKey
+      @param {RegExp} regexp
+      @return {Ember.ComputedProperty} computed property which match
+      the original value for property against a given RegExp
+    */
+    registerComputed('match', function(dependentKey, regexp) {
+      var value = get(this, dependentKey);
+      return typeof value === 'string' ? regexp.test(value) : false;
+    });
+
+    /**
+      A computed property that returns true if the provided dependent property
+      is equal to the given value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        napTime: Ember.computed.equal('state', 'sleepy')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('napTime'); // false
+      hamster.set('state', 'sleepy');
+      hamster.get('napTime'); // true
+      hamster.set('state', 'hungry');
+      hamster.get('napTime'); // false
+      ```
+
+      @method computed.equal
+      @for Ember
+      @param {String} dependentKey
+      @param {String|Number|Object} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is equal to the given value.
+    */
+    registerComputed('equal', function(dependentKey, value) {
+      return get(this, dependentKey) === value;
+    });
+
+    /**
+      A computed property that returns true if the provied dependent property
+      is greater than the provided value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasTooManyBananas: Ember.computed.gt('numBananas', 10)
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('hasTooManyBananas'); // false
+      hamster.set('numBananas', 3);
+      hamster.get('hasTooManyBananas'); // false
+      hamster.set('numBananas', 11);
+      hamster.get('hasTooManyBananas'); // true
+      ```
+
+      @method computed.gt
+      @for Ember
+      @param {String} dependentKey
+      @param {Number} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is greater then given value.
+    */
+    registerComputed('gt', function(dependentKey, value) {
+      return get(this, dependentKey) > value;
+    });
+
+    /**
+      A computed property that returns true if the provided dependent property
+      is greater than or equal to the provided value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasTooManyBananas: Ember.computed.gte('numBananas', 10)
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('hasTooManyBananas'); // false
+      hamster.set('numBananas', 3);
+      hamster.get('hasTooManyBananas'); // false
+      hamster.set('numBananas', 10);
+      hamster.get('hasTooManyBananas'); // true
+      ```
+
+      @method computed.gte
+      @for Ember
+      @param {String} dependentKey
+      @param {Number} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is greater or equal then given value.
+    */
+    registerComputed('gte', function(dependentKey, value) {
+      return get(this, dependentKey) >= value;
+    });
+
+    /**
+      A computed property that returns true if the provided dependent property
+      is less than the provided value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        needsMoreBananas: Ember.computed.lt('numBananas', 3)
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('needsMoreBananas'); // true
+      hamster.set('numBananas', 3);
+      hamster.get('needsMoreBananas'); // false
+      hamster.set('numBananas', 2);
+      hamster.get('needsMoreBananas'); // true
+      ```
+
+      @method computed.lt
+      @for Ember
+      @param {String} dependentKey
+      @param {Number} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is less then given value.
+    */
+    registerComputed('lt', function(dependentKey, value) {
+      return get(this, dependentKey) < value;
+    });
+
+    /**
+      A computed property that returns true if the provided dependent property
+      is less than or equal to the provided value.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        needsMoreBananas: Ember.computed.lte('numBananas', 3)
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('needsMoreBananas'); // true
+      hamster.set('numBananas', 5);
+      hamster.get('needsMoreBananas'); // false
+      hamster.set('numBananas', 3);
+      hamster.get('needsMoreBananas'); // true
+      ```
+
+      @method computed.lte
+      @for Ember
+      @param {String} dependentKey
+      @param {Number} value
+      @return {Ember.ComputedProperty} computed property which returns true if
+      the original value for property is less or equal then given value.
+    */
+    registerComputed('lte', function(dependentKey, value) {
+      return get(this, dependentKey) <= value;
+    });
+
+    /**
+      A computed property that performs a logical `and` on the
+      original values for the provided dependent properties.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        readyForCamp: Ember.computed.and('hasTent', 'hasBackpack')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('readyForCamp'); // false
+      hamster.set('hasTent', true);
+      hamster.get('readyForCamp'); // false
+      hamster.set('hasBackpack', true);
+      hamster.get('readyForCamp'); // true
+      ```
+
+      @method computed.and
+      @for Ember
+      @param {String} dependentKey*
+      @return {Ember.ComputedProperty} computed property which performs
+      a logical `and` on the values of all the original values for properties.
+    */
+    registerComputedWithProperties('and', function(properties) {
+      for (var key in properties) {
+        if (properties.hasOwnProperty(key) && !properties[key]) {
+          return false;
+        }
+      }
+      return true;
+    });
+
+    /**
+      A computed property which performs a logical `or` on the
+      original values for the provided dependent properties.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        readyForRain: Ember.computed.or('hasJacket', 'hasUmbrella')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('readyForRain'); // false
+      hamster.set('hasJacket', true);
+      hamster.get('readyForRain'); // true
+      ```
+
+      @method computed.or
+      @for Ember
+      @param {String} dependentKey*
+      @return {Ember.ComputedProperty} computed property which performs
+      a logical `or` on the values of all the original values for properties.
+    */
+    registerComputedWithProperties('or', function(properties) {
+      for (var key in properties) {
+        if (properties.hasOwnProperty(key) && properties[key]) {
+          return true;
+        }
+      }
+      return false;
+    });
+
+    /**
+      A computed property that returns the first truthy value
+      from a list of dependent properties.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        hasClothes: Ember.computed.any('hat', 'shirt')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('hasClothes'); // null
+      hamster.set('shirt', 'Hawaiian Shirt');
+      hamster.get('hasClothes'); // 'Hawaiian Shirt'
+      ```
+
+      @method computed.any
+      @for Ember
+      @param {String} dependentKey*
+      @return {Ember.ComputedProperty} computed property which returns
+      the first truthy value of given list of properties.
+    */
+    registerComputedWithProperties('any', function(properties) {
+      for (var key in properties) {
+        if (properties.hasOwnProperty(key) && properties[key]) {
+          return properties[key];
+        }
+      }
+      return null;
+    });
+
+    /**
+      A computed property that returns the array of values
+      for the provided dependent properties.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        clothes: Ember.computed.collect('hat', 'shirt')
+      });
+
+      var hamster = Hamster.create();
+
+      hamster.get('clothes'); // [null, null]
+      hamster.set('hat', 'Camp Hat');
+      hamster.set('shirt', 'Camp Shirt');
+      hamster.get('clothes'); // ['Camp Hat', 'Camp Shirt']
+      ```
+
+      @method computed.collect
+      @for Ember
+      @param {String} dependentKey*
+      @return {Ember.ComputedProperty} computed property which maps
+      values of all passed properties in to an array.
+    */
+    registerComputedWithProperties('collect', function(properties) {
+      var res = [];
+      for (var key in properties) {
+        if (properties.hasOwnProperty(key)) {
+          if (isNone(properties[key])) {
+            res.push(null);
+          } else {
+            res.push(properties[key]);
+          }
+        }
+      }
+      return res;
+    });
+
+    /**
+      Creates a new property that is an alias for another property
+      on an object. Calls to `get` or `set` this property behave as
+      though they were called on the original property.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        name: 'Alex Matchneer',
+        nomen: Ember.computed.alias('name')
+      });
+
+      var alex = Person.create();
+
+      alex.get('nomen'); // 'Alex Matchneer'
+      alex.get('name');  // 'Alex Matchneer'
+
+      alex.set('nomen', '@machty');
+      alex.get('name');  // '@machty'
+      ```
+
+      @method computed.alias
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which creates an
+      alias to the original value for property.
+    */
+    computed.alias = function(dependentKey) {
+      return computed(dependentKey, function(key, value) {
+        if (arguments.length > 1) {
+          set(this, dependentKey, value);
+          return get(this, dependentKey);
+        } else {
+          return get(this, dependentKey);
+        }
+      });
+    };
+
+    /**
+      Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
+      data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
+      not mutate the upstream property, rather causes the current property to
+      become the value set. This causes the downstream property to permanently
+      diverge from the upstream property.
+
+      Example
+
+      ```javascript
+      var User = Ember.Object.extend({
+        firstName: null,
+        lastName: null,
+        nickName: Ember.computed.oneWay('firstName')
+      });
+
+      var teddy = User.create({
+        firstName: 'Teddy',
+        lastName:  'Zeenny'
+      });
+
+      teddy.get('nickName');              // 'Teddy'
+      teddy.set('nickName', 'TeddyBear'); // 'TeddyBear'
+      teddy.get('firstName');             // 'Teddy'
+      ```
+
+      @method computed.oneWay
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which creates a
+      one way computed property to the original value for property.
+    */
+    computed.oneWay = function(dependentKey) {
+      return computed(dependentKey, function() {
+        return get(this, dependentKey);
+      });
+    };
+
+    
+    /**
+      Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
+      a readOnly one way binding. Very often when using `computed.oneWay` one does
+      not also want changes to propogate back up, as they will replace the value.
+
+      This prevents the reverse flow, and also throws an exception when it occurs.
+
+      Example
+
+      ```javascript
+      var User = Ember.Object.extend({
+        firstName: null,
+        lastName: null,
+        nickName: Ember.computed.readOnly('firstName')
+      });
+
+      var teddy = User.create({
+        firstName: 'Teddy',
+        lastName:  'Zeenny'
+      });
+
+      teddy.get('nickName');              // 'Teddy'
+      teddy.set('nickName', 'TeddyBear'); // throws Exception
+      // throw new Ember.Error('Cannot Set: nickName on: <User:ember27288>' );`
+      teddy.get('firstName');             // 'Teddy'
+      ```
+
+      @method computed.readOnly
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which creates a
+      one way computed property to the original value for property.
+      @since 1.5.0
+    */
+    computed.readOnly = function(dependentKey) {
+      return computed(dependentKey, function() {
+        return get(this, dependentKey);
+      }).readOnly();
+    };
+    /**
+      A computed property that acts like a standard getter and setter,
+      but returns the value at the provided `defaultPath` if the
+      property itself has not been set to a value
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        wishList: Ember.computed.defaultTo('favoriteFood')
+      });
+
+      var hamster = Hamster.create({ favoriteFood: 'Banana' });
+
+      hamster.get('wishList');                     // 'Banana'
+      hamster.set('wishList', 'More Unit Tests');
+      hamster.get('wishList');                     // 'More Unit Tests'
+      hamster.get('favoriteFood');                 // 'Banana'
+      ```
+
+      @method computed.defaultTo
+      @for Ember
+      @param {String} defaultPath
+      @return {Ember.ComputedProperty} computed property which acts like
+      a standard getter and setter, but defaults to the value from `defaultPath`.
+    */
+    // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
+    computed.defaultTo = function(defaultPath) {
+      return computed(function(key, newValue, cachedValue) {
+        if (arguments.length === 1) {
+          return get(this, defaultPath);
+        }
+        return newValue != null ? newValue : get(this, defaultPath);
+      });
+    };
+
+    __exports__.ComputedProperty = ComputedProperty;
+    __exports__.computed = computed;
+    __exports__.cacheFor = cacheFor;
+  });
+define("ember-metal/core",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /*globals Em:true ENV EmberENV MetamorphENV:true */
+
+    /**
+    @module ember
+    @submodule ember-metal
+    */
+
+    /**
+      All Ember methods and functions are defined inside of this namespace. You
+      generally should not add new properties to this namespace as it may be
+      overwritten by future versions of Ember.
+
+      You can also use the shorthand `Em` instead of `Ember`.
+
+      Ember-Runtime is a framework that provides core functions for Ember including
+      cross-platform functions, support for property observing and objects. Its
+      focus is on small size and performance. You can use this in place of or
+      along-side other cross-platform libraries such as jQuery.
+
+      The core Runtime framework is based on the jQuery API with a number of
+      performance optimizations.
+
+      @class Ember
+      @static
+      @version 1.6.1
+    */
+
+    if ('undefined' === typeof Ember) {
+      // Create core object. Make it act like an instance of Ember.Namespace so that
+      // objects assigned to it are given a sane string representation.
+      Ember = {};
+    }
+
+    // Default imports, exports and lookup to the global object;
+    var imports = Ember.imports = Ember.imports || this;
+    var exports = Ember.exports = Ember.exports || this;
+    var lookup  = Ember.lookup  = Ember.lookup  || this;
+
+    // aliases needed to keep minifiers from removing the global context
+    exports.Em = exports.Ember = Ember;
+
+    // Make sure these are set whether Ember was already defined or not
+
+    Ember.isNamespace = true;
+
+    Ember.toString = function() { return "Ember"; };
+
+
+    /**
+      @property VERSION
+      @type String
+      @default '1.6.1'
+      @static
+    */
+    Ember.VERSION = '1.6.1';
+
+    /**
+      Standard environmental variables. You can define these in a global `EmberENV`
+      variable before loading Ember to control various configuration settings.
+
+      For backwards compatibility with earlier versions of Ember the global `ENV`
+      variable will be used if `EmberENV` is not defined.
+
+      @property ENV
+      @type Hash
+    */
+
+    if (Ember.ENV) {
+      // do nothing if Ember.ENV is already setup
+    } else if ('undefined' !== typeof EmberENV) {
+      Ember.ENV = EmberENV;
+    } else if('undefined' !== typeof ENV) {
+      Ember.ENV = ENV;
+    } else {
+      Ember.ENV = {};
+    }
+
+    Ember.config = Ember.config || {};
+
+    // We disable the RANGE API by default for performance reasons
+    if ('undefined' === typeof Ember.ENV.DISABLE_RANGE_API) {
+      Ember.ENV.DISABLE_RANGE_API = true;
+    }
+
+    if ("undefined" === typeof MetamorphENV) {
+      exports.MetamorphENV = {};
+    }
+
+    MetamorphENV.DISABLE_RANGE_API = Ember.ENV.DISABLE_RANGE_API;
+
+    /**
+      Hash of enabled Canary features. Add to before creating your application.
+
+      You can also define `ENV.FEATURES` if you need to enable features flagged at runtime.
+
+      @class FEATURES
+      @namespace Ember
+      @static
+      @since 1.1.0
+    */
+
+    Ember.FEATURES = Ember.ENV.FEATURES || {};
+
+    /**
+      Test that a feature is enabled. Parsed by Ember's build tools to leave
+      experimental features out of beta/stable builds.
+
+      You can define the following configuration options:
+
+      * `ENV.ENABLE_ALL_FEATURES` - force all features to be enabled.
+      * `ENV.ENABLE_OPTIONAL_FEATURES` - enable any features that have not been explicitly
+        enabled/disabled.
+
+      @method isEnabled
+      @param {String} feature
+      @return {Boolean}
+      @for Ember.FEATURES
+      @since 1.1.0
+    */
+
+    Ember.FEATURES.isEnabled = function(feature) {
+      var featureValue = Ember.FEATURES[feature];
+
+      if (Ember.ENV.ENABLE_ALL_FEATURES) {
+        return true;
+      } else if (featureValue === true || featureValue === false || featureValue === undefined) {
+        return featureValue;
+      } else if (Ember.ENV.ENABLE_OPTIONAL_FEATURES) {
+        return true;
+      } else {
+        return false;
+      }
+    };
+
+    // ..........................................................
+    // BOOTSTRAP
+    //
+
+    /**
+      Determines whether Ember should enhance some built-in object prototypes to
+      provide a more friendly API. If enabled, a few methods will be added to
+      `Function`, `String`, and `Array`. `Object.prototype` will not be enhanced,
+      which is the one that causes most trouble for people.
+
+      In general we recommend leaving this option set to true since it rarely
+      conflicts with other code. If you need to turn it off however, you can
+      define an `ENV.EXTEND_PROTOTYPES` config to disable it.
+
+      @property EXTEND_PROTOTYPES
+      @type Boolean
+      @default true
+      @for Ember
+    */
+    Ember.EXTEND_PROTOTYPES = Ember.ENV.EXTEND_PROTOTYPES;
+
+    if (typeof Ember.EXTEND_PROTOTYPES === 'undefined') {
+      Ember.EXTEND_PROTOTYPES = true;
+    }
+
+    /**
+      Determines whether Ember logs a full stack trace during deprecation warnings
+
+      @property LOG_STACKTRACE_ON_DEPRECATION
+      @type Boolean
+      @default true
+    */
+    Ember.LOG_STACKTRACE_ON_DEPRECATION = (Ember.ENV.LOG_STACKTRACE_ON_DEPRECATION !== false);
+
+    /**
+      Determines whether Ember should add ECMAScript 5 shims to older browsers.
+
+      @property SHIM_ES5
+      @type Boolean
+      @default Ember.EXTEND_PROTOTYPES
+    */
+    Ember.SHIM_ES5 = (Ember.ENV.SHIM_ES5 === false) ? false : Ember.EXTEND_PROTOTYPES;
+
+    /**
+      Determines whether Ember logs info about version of used libraries
+
+      @property LOG_VERSION
+      @type Boolean
+      @default true
+    */
+    Ember.LOG_VERSION = (Ember.ENV.LOG_VERSION === false) ? false : true;
+
+    /**
+      Empty function. Useful for some operations. Always returns `this`.
+
+      @method K
+      @private
+      @return {Object}
+    */
+    Ember.K = function() { return this; };
+
+
+    // Stub out the methods defined by the ember-debug package in case it's not loaded
+
+    if ('undefined' === typeof Ember.assert) { Ember.assert = Ember.K; }
+    if ('undefined' === typeof Ember.warn) { Ember.warn = Ember.K; }
+    if ('undefined' === typeof Ember.debug) { Ember.debug = Ember.K; }
+    if ('undefined' === typeof Ember.runInDebug) { Ember.runInDebug = Ember.K; }
+    if ('undefined' === typeof Ember.deprecate) { Ember.deprecate = Ember.K; }
+    if ('undefined' === typeof Ember.deprecateFunc) {
+      Ember.deprecateFunc = function(_, func) { return func; };
+    }
+
+    /**
+      Previously we used `Ember.$.uuid`, however `$.uuid` has been removed from
+      jQuery master. We'll just bootstrap our own uuid now.
+
+      @property uuid
+      @type Number
+      @private
+    */
+    Ember.uuid = 0;
+
+    __exports__["default"] = Ember;
+  });
+define("ember-metal/enumerable_utils",
+  ["ember-metal/array","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var map, forEach, indexOf, splice, filter;
+
+    var map = __dependency1__.map;
+    var forEach = __dependency1__.forEach;
+    var indexOf = __dependency1__.indexOf;
+    var filter = __dependency1__.filter;
+
+    // ES6TODO: doesn't array polyfills already do this?
+    map     = Array.prototype.map     || map;
+    forEach = Array.prototype.forEach || forEach;
+    indexOf = Array.prototype.indexOf || indexOf;
+    filter  = Array.prototype.filter   || filter;
+    splice  = Array.prototype.splice;
+
+    /**
+     * Defines some convenience methods for working with Enumerables.
+     * `Ember.EnumerableUtils` uses `Ember.ArrayPolyfills` when necessary.
+     *
+     * @class EnumerableUtils
+     * @namespace Ember
+     * @static
+     * */
+    var utils = {
+      /**
+       * Calls the map function on the passed object with a specified callback. This
+       * uses `Ember.ArrayPolyfill`'s-map method when necessary.
+       *
+       * @method map
+       * @param {Object} obj The object that should be mapped
+       * @param {Function} callback The callback to execute
+       * @param {Object} thisArg Value to use as this when executing *callback*
+       *
+       * @return {Array} An array of mapped values.
+       */
+      map: function(obj, callback, thisArg) {
+        return obj.map ? obj.map.call(obj, callback, thisArg) : map.call(obj, callback, thisArg);
+      },
+
+      /**
+       * Calls the forEach function on the passed object with a specified callback. This
+       * uses `Ember.ArrayPolyfill`'s-forEach method when necessary.
+       *
+       * @method forEach
+       * @param {Object} obj The object to call forEach on
+       * @param {Function} callback The callback to execute
+       * @param {Object} thisArg Value to use as this when executing *callback*
+       *
+       */
+      forEach: function(obj, callback, thisArg) {
+        return obj.forEach ? obj.forEach.call(obj, callback, thisArg) : forEach.call(obj, callback, thisArg);
+      },
+
+      /**
+       * Calls the filter function on the passed object with a specified callback. This
+       * uses `Ember.ArrayPolyfill`'s-filter method when necessary.
+       *
+       * @method filter
+       * @param {Object} obj The object to call filter on
+       * @param {Function} callback The callback to execute
+       * @param {Object} thisArg Value to use as this when executing *callback*
+       *
+       * @return {Array} An array containing the filtered values
+       * @since 1.4.0
+       */
+      filter: function(obj, callback, thisArg) {
+        return obj.filter ? obj.filter.call(obj, callback, thisArg) : filter.call(obj, callback, thisArg);
+      },
+
+      /**
+       * Calls the indexOf function on the passed object with a specified callback. This
+       * uses `Ember.ArrayPolyfill`'s-indexOf method when necessary.
+       *
+       * @method indexOf
+       * @param {Object} obj The object to call indexOn on
+       * @param {Function} callback The callback to execute
+       * @param {Object} index The index to start searching from
+       *
+       */
+      indexOf: function(obj, element, index) {
+        return obj.indexOf ? obj.indexOf.call(obj, element, index) : indexOf.call(obj, element, index);
+      },
+
+      /**
+       * Returns an array of indexes of the first occurrences of the passed elements
+       * on the passed object.
+       *
+       * ```javascript
+       *  var array = [1, 2, 3, 4, 5];
+       *  Ember.EnumerableUtils.indexesOf(array, [2, 5]); // [1, 4]
+       *
+       *  var fubar = "Fubarr";
+       *  Ember.EnumerableUtils.indexesOf(fubar, ['b', 'r']); // [2, 4]
+       * ```
+       *
+       * @method indexesOf
+       * @param {Object} obj The object to check for element indexes
+       * @param {Array} elements The elements to search for on *obj*
+       *
+       * @return {Array} An array of indexes.
+       *
+       */
+      indexesOf: function(obj, elements) {
+        return elements === undefined ? [] : utils.map(elements, function(item) {
+          return utils.indexOf(obj, item);
+        });
+      },
+
+      /**
+       * Adds an object to an array. If the array already includes the object this
+       * method has no effect.
+       *
+       * @method addObject
+       * @param {Array} array The array the passed item should be added to
+       * @param {Object} item The item to add to the passed array
+       *
+       * @return 'undefined'
+       */
+      addObject: function(array, item) {
+        var index = utils.indexOf(array, item);
+        if (index === -1) { array.push(item); }
+      },
+
+      /**
+       * Removes an object from an array. If the array does not contain the passed
+       * object this method has no effect.
+       *
+       * @method removeObject
+       * @param {Array} array The array to remove the item from.
+       * @param {Object} item The item to remove from the passed array.
+       *
+       * @return 'undefined'
+       */
+      removeObject: function(array, item) {
+        var index = utils.indexOf(array, item);
+        if (index !== -1) { array.splice(index, 1); }
+      },
+
+      _replace: function(array, idx, amt, objects) {
+        var args = [].concat(objects), chunk, ret = [],
+            // https://code.google.com/p/chromium/issues/detail?id=56588
+            size = 60000, start = idx, ends = amt, count;
+
+        while (args.length) {
+          count = ends > size ? size : ends;
+          if (count <= 0) { count = 0; }
+
+          chunk = args.splice(0, size);
+          chunk = [start, count].concat(chunk);
+
+          start += size;
+          ends -= count;
+
+          ret = ret.concat(splice.apply(array, chunk));
+        }
+        return ret;
+      },
+
+      /**
+       * Replaces objects in an array with the passed objects.
+       *
+       * ```javascript
+       *   var array = [1,2,3];
+       *   Ember.EnumerableUtils.replace(array, 1, 2, [4, 5]); // [1, 4, 5]
+       *
+       *   var array = [1,2,3];
+       *   Ember.EnumerableUtils.replace(array, 1, 1, [4, 5]); // [1, 4, 5, 3]
+       *
+       *   var array = [1,2,3];
+       *   Ember.EnumerableUtils.replace(array, 10, 1, [4, 5]); // [1, 2, 3, 4, 5]
+       * ```
+       *
+       * @method replace
+       * @param {Array} array The array the objects should be inserted into.
+       * @param {Number} idx Starting index in the array to replace. If *idx* >=
+       * length, then append to the end of the array.
+       * @param {Number} amt Number of elements that should be removed from the array,
+       * starting at *idx*
+       * @param {Array} objects An array of zero or more objects that should be
+       * inserted into the array at *idx*
+       *
+       * @return {Array} The modified array.
+       */
+      replace: function(array, idx, amt, objects) {
+        if (array.replace) {
+          return array.replace(idx, amt, objects);
+        } else {
+          return utils._replace(array, idx, amt, objects);
+        }
+      },
+
+      /**
+       * Calculates the intersection of two arrays. This method returns a new array
+       * filled with the records that the two passed arrays share with each other.
+       * If there is no intersection, an empty array will be returned.
+       *
+       * ```javascript
+       * var array1 = [1, 2, 3, 4, 5];
+       * var array2 = [1, 3, 5, 6, 7];
+       *
+       * Ember.EnumerableUtils.intersection(array1, array2); // [1, 3, 5]
+       *
+       * var array1 = [1, 2, 3];
+       * var array2 = [4, 5, 6];
+       *
+       * Ember.EnumerableUtils.intersection(array1, array2); // []
+       * ```
+       *
+       * @method intersection
+       * @param {Array} array1 The first array
+       * @param {Array} array2 The second array
+       *
+       * @return {Array} The intersection of the two passed arrays.
+       */
+      intersection: function(array1, array2) {
+        var intersection = [];
+
+        utils.forEach(array1, function(element) {
+          if (utils.indexOf(array2, element) >= 0) {
+            intersection.push(element);
+          }
+        });
+
+        return intersection;
+      }
+    };
+
+    __exports__["default"] = utils;
+  });
+define("ember-metal/error",
+  ["ember-metal/platform","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+
+    var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
+
+    /**
+      A subclass of the JavaScript Error object for use in Ember.
+
+      @class Error
+      @namespace Ember
+      @extends Error
+      @constructor
+    */
+    var EmberError = function() {
+      var tmp = Error.apply(this, arguments);
+
+      // Adds a `stack` property to the given error object that will yield the
+      // stack trace at the time captureStackTrace was called.
+      // When collecting the stack trace all frames above the topmost call
+      // to this function, including that call, will be left out of the
+      // stack trace.
+      // This is useful because we can hide Ember implementation details
+      // that are not very helpful for the user.
+      if (Error.captureStackTrace) {
+        Error.captureStackTrace(this, Ember.Error);
+      }
+      // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
+      for (var idx = 0; idx < errorProps.length; idx++) {
+        this[errorProps[idx]] = tmp[errorProps[idx]];
+      }
+    };
+
+    EmberError.prototype = create(Error.prototype);
+
+    __exports__["default"] = EmberError;
+  });
+define("ember-metal/events",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+    var Ember = __dependency1__["default"];
+    var meta = __dependency2__.meta;
+    var META_KEY = __dependency2__.META_KEY;
+    var tryFinally = __dependency2__.tryFinally;
+    var apply = __dependency2__.apply;
+    var applyStr = __dependency2__.applyStr;
+    var create = __dependency3__.create;
+
+    var a_slice = [].slice,
+        metaFor = meta,
+        /* listener flags */
+        ONCE = 1, SUSPENDED = 2;
+
+
+    /*
+      The event system uses a series of nested hashes to store listeners on an
+      object. When a listener is registered, or when an event arrives, these
+      hashes are consulted to determine which target and action pair to invoke.
+
+      The hashes are stored in the object's meta hash, and look like this:
+
+          // Object's meta hash
+          {
+            listeners: {       // variable name: `listenerSet`
+              "foo:changed": [ // variable name: `actions`
+                target, method, flags
+              ]
+            }
+          }
+
+    */
+
+    function indexOf(array, target, method) {
+      var index = -1;
+      // hashes are added to the end of the event array
+      // so it makes sense to start searching at the end
+      // of the array and search in reverse
+      for (var i = array.length - 3 ; i >=0; i -= 3) {
+        if (target === array[i] && method === array[i + 1]) {
+             index = i; break;
+        }
+      }
+      return index;
+    }
+
+    function actionsFor(obj, eventName) {
+      var meta = metaFor(obj, true),
+          actions;
+
+      if (!meta.listeners) { meta.listeners = {}; }
+
+      if (!meta.hasOwnProperty('listeners')) {
+        // setup inherited copy of the listeners object
+        meta.listeners = create(meta.listeners);
+      }
+
+      actions = meta.listeners[eventName];
+
+      // if there are actions, but the eventName doesn't exist in our listeners, then copy them from the prototype
+      if (actions && !meta.listeners.hasOwnProperty(eventName)) {
+        actions = meta.listeners[eventName] = meta.listeners[eventName].slice();
+      } else if (!actions) {
+        actions = meta.listeners[eventName] = [];
+      }
+
+      return actions;
+    }
+
+    function listenersUnion(obj, eventName, otherActions) {
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
+
+      if (!actions) { return; }
+      for (var i = actions.length - 3; i >= 0; i -= 3) {
+        var target = actions[i],
+            method = actions[i+1],
+            flags = actions[i+2],
+            actionIndex = indexOf(otherActions, target, method);
+
+        if (actionIndex === -1) {
+          otherActions.push(target, method, flags);
+        }
+      }
+    }
+
+    function listenersDiff(obj, eventName, otherActions) {
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName],
+          diffActions = [];
+
+      if (!actions) { return; }
+      for (var i = actions.length - 3; i >= 0; i -= 3) {
+        var target = actions[i],
+            method = actions[i+1],
+            flags = actions[i+2],
+            actionIndex = indexOf(otherActions, target, method);
+
+        if (actionIndex !== -1) { continue; }
+
+        otherActions.push(target, method, flags);
+        diffActions.push(target, method, flags);
+      }
+
+      return diffActions;
+    }
+
+    /**
+      Add an event listener
+
+      @method addListener
+      @for Ember
+      @param obj
+      @param {String} eventName
+      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Function|String} method A function or the name of a function to be called on `target`
+      @param {Boolean} once A flag whether a function should only be called once
+    */
+    function addListener(obj, eventName, target, method, once) {
+      
+      if (!method && 'function' === typeof target) {
+        method = target;
+        target = null;
+      }
+
+      var actions = actionsFor(obj, eventName),
+          actionIndex = indexOf(actions, target, method),
+          flags = 0;
+
+      if (once) flags |= ONCE;
+
+      if (actionIndex !== -1) { return; }
+
+      actions.push(target, method, flags);
+
+      if ('function' === typeof obj.didAddListener) {
+        obj.didAddListener(eventName, target, method);
+      }
+    }
+
+    /**
+      Remove an event listener
+
+      Arguments should match those passed to `Ember.addListener`.
+
+      @method removeListener
+      @for Ember
+      @param obj
+      @param {String} eventName
+      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Function|String} method A function or the name of a function to be called on `target`
+    */
+    function removeListener(obj, eventName, target, method) {
+      
+      if (!method && 'function' === typeof target) {
+        method = target;
+        target = null;
+      }
+
+      function _removeListener(target, method) {
+        var actions = actionsFor(obj, eventName),
+            actionIndex = indexOf(actions, target, method);
+
+        // action doesn't exist, give up silently
+        if (actionIndex === -1) { return; }
+
+        actions.splice(actionIndex, 3);
+
+        if ('function' === typeof obj.didRemoveListener) {
+          obj.didRemoveListener(eventName, target, method);
+        }
+      }
+
+      if (method) {
+        _removeListener(target, method);
+      } else {
+        var meta = obj[META_KEY],
+            actions = meta && meta.listeners && meta.listeners[eventName];
+
+        if (!actions) { return; }
+        for (var i = actions.length - 3; i >= 0; i -= 3) {
+          _removeListener(actions[i], actions[i+1]);
+        }
+      }
+    }
+
+    /**
+      Suspend listener during callback.
+
+      This should only be used by the target of the event listener
+      when it is taking an action that would cause the event, e.g.
+      an object might suspend its property change listener while it is
+      setting that property.
+
+      @method suspendListener
+      @for Ember
+
+      @private
+      @param obj
+      @param {String} eventName
+      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Function|String} method A function or the name of a function to be called on `target`
+      @param {Function} callback
+    */
+    function suspendListener(obj, eventName, target, method, callback) {
+      if (!method && 'function' === typeof target) {
+        method = target;
+        target = null;
+      }
+
+      var actions = actionsFor(obj, eventName),
+          actionIndex = indexOf(actions, target, method);
+
+      if (actionIndex !== -1) {
+        actions[actionIndex+2] |= SUSPENDED; // mark the action as suspended
+      }
+
+      function tryable()   { return callback.call(target); }
+      function finalizer() { if (actionIndex !== -1) { actions[actionIndex+2] &= ~SUSPENDED; } }
+
+      return tryFinally(tryable, finalizer);
+    }
+
+    /**
+      Suspends multiple listeners during a callback.
+
+      @method suspendListeners
+      @for Ember
+
+      @private
+      @param obj
+      @param {Array} eventName Array of event names
+      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Function|String} method A function or the name of a function to be called on `target`
+      @param {Function} callback
+    */
+    function suspendListeners(obj, eventNames, target, method, callback) {
+      if (!method && 'function' === typeof target) {
+        method = target;
+        target = null;
+      }
+
+      var suspendedActions = [],
+          actionsList = [],
+          eventName, actions, i, l;
+
+      for (i=0, l=eventNames.length; i<l; i++) {
+        eventName = eventNames[i];
+        actions = actionsFor(obj, eventName);
+        var actionIndex = indexOf(actions, target, method);
+
+        if (actionIndex !== -1) {
+          actions[actionIndex+2] |= SUSPENDED;
+          suspendedActions.push(actionIndex);
+          actionsList.push(actions);
+        }
+      }
+
+      function tryable() { return callback.call(target); }
+
+      function finalizer() {
+        for (var i = 0, l = suspendedActions.length; i < l; i++) {
+          var actionIndex = suspendedActions[i];
+          actionsList[i][actionIndex+2] &= ~SUSPENDED;
+        }
+      }
+
+      return tryFinally(tryable, finalizer);
+    }
+
+    /**
+      Return a list of currently watched events
+
+      @private
+      @method watchedEvents
+      @for Ember
+      @param obj
+    */
+    function watchedEvents(obj) {
+      var listeners = obj[META_KEY].listeners, ret = [];
+
+      if (listeners) {
+        for(var eventName in listeners) {
+          if (listeners[eventName]) { ret.push(eventName); }
+        }
+      }
+      return ret;
+    }
+
+    /**
+      Send an event. The execution of suspended listeners
+      is skipped, and once listeners are removed. A listener without
+      a target is executed on the passed object. If an array of actions
+      is not passed, the actions stored on the passed object are invoked.
+
+      @method sendEvent
+      @for Ember
+      @param obj
+      @param {String} eventName
+      @param {Array} params Optional parameters for each listener.
+      @param {Array} actions Optional array of actions (listeners).
+      @return true
+    */
+    function sendEvent(obj, eventName, params, actions) {
+      // first give object a chance to handle it
+      if (obj !== Ember && 'function' === typeof obj.sendEvent) {
+        obj.sendEvent(eventName, params);
+      }
+
+      if (!actions) {
+        var meta = obj[META_KEY];
+        actions = meta && meta.listeners && meta.listeners[eventName];
+      }
+
+      if (!actions) { return; }
+
+      for (var i = actions.length - 3; i >= 0; i -= 3) { // looping in reverse for once listeners
+        var target = actions[i], method = actions[i+1], flags = actions[i+2];
+        if (!method) { continue; }
+        if (flags & SUSPENDED) { continue; }
+        if (flags & ONCE) { removeListener(obj, eventName, target, method); }
+        if (!target) { target = obj; }
+        if ('string' === typeof method) {
+          if (params) {
+            applyStr(target, method, params);
+          } else {
+            target[method]();
+          }
+        } else {
+          if (params) {
+            apply(target, method, params);
+          } else {
+            method.call(target);
+          }
+        }
+      }
+      return true;
+    }
+
+    /**
+      @private
+      @method hasListeners
+      @for Ember
+      @param obj
+      @param {String} eventName
+    */
+    function hasListeners(obj, eventName) {
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
+
+      return !!(actions && actions.length);
+    }
+
+    /**
+      @private
+      @method listenersFor
+      @for Ember
+      @param obj
+      @param {String} eventName
+    */
+    function listenersFor(obj, eventName) {
+      var ret = [];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
+
+      if (!actions) { return ret; }
+
+      for (var i = 0, l = actions.length; i < l; i += 3) {
+        var target = actions[i],
+            method = actions[i+1];
+        ret.push([target, method]);
+      }
+
+      return ret;
+    }
+
+    /**
+      Define a property as a function that should be executed when
+      a specified event or events are triggered.
+
+
+      ``` javascript
+      var Job = Ember.Object.extend({
+        logCompleted: Ember.on('completed', function() {
+          console.log('Job completed!');
+        })
+      });
+
+      var job = Job.create();
+
+      Ember.sendEvent(job, 'completed'); // Logs 'Job completed!'
+     ```
+
+      @method on
+      @for Ember
+      @param {String} eventNames*
+      @param {Function} func
+      @return func
+    */
+    function on(){
+      var func = a_slice.call(arguments, -1)[0],
+          events = a_slice.call(arguments, 0, -1);
+      func.__ember_listens__ = events;
+      return func;
+    };
+
+    __exports__.on = on;
+    __exports__.addListener = addListener;
+    __exports__.removeListener = removeListener;
+    __exports__.suspendListener = suspendListener;
+    __exports__.suspendListeners = suspendListeners;
+    __exports__.sendEvent = sendEvent;
+    __exports__.hasListeners = hasListeners;
+    __exports__.watchedEvents = watchedEvents;
+    __exports__.listenersFor = listenersFor;
+    __exports__.listenersDiff = listenersDiff;
+    __exports__.listenersUnion = listenersUnion;
+  });
+define("ember-metal/expand_properties",
+  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var EmberError = __dependency1__["default"];
+    var EnumerableUtils = __dependency2__["default"];
+
+    /**
+      @module ember-metal
+      */
+
+    var forEach = EnumerableUtils.forEach,
+      BRACE_EXPANSION = /^((?:[^\.]*\.)*)\{(.*)\}$/;
+
+    /**
+      Expands `pattern`, invoking `callback` for each expansion.
+
+      The only pattern supported is brace-expansion, anything else will be passed
+      once to `callback` directly. Brace expansion can only appear at the end of a
+      pattern, for an example see the last call below.
+
+      Example
+      ```js
+      function echo(arg){ console.log(arg); }
+
+      Ember.expandProperties('foo.bar', echo);        //=> 'foo.bar'
+      Ember.expandProperties('{foo,bar}', echo);      //=> 'foo', 'bar'
+      Ember.expandProperties('foo.{bar,baz}', echo);  //=> 'foo.bar', 'foo.baz'
+      Ember.expandProperties('{foo,bar}.baz', echo);  //=> '{foo,bar}.baz'
+      ```
+
+      @method
+      @private
+      @param {string} pattern The property pattern to expand.
+      @param {function} callback The callback to invoke.  It is invoked once per
+      expansion, and is passed the expansion.
+      */
+    function expandProperties(pattern, callback) {
+      var match, prefix, list;
+
+      if (pattern.indexOf(' ') > -1) {
+        throw new EmberError('Brace expanded properties cannot contain spaces, ' + 
+          'e.g. `user.{firstName, lastName}` should be `user.{firstName,lastName}`');
+      }
+
+      if (match = BRACE_EXPANSION.exec(pattern)) {
+        prefix = match[1];
+        list = match[2];
+
+        forEach(list.split(','), function (suffix) {
+            callback(prefix + suffix);
+        });
+      } else {
+        callback(pattern);
+      }
+    };
+
+    __exports__["default"] = expandProperties;
+  });
+define("ember-metal/get_properties",
+  ["ember-metal/property_get","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var typeOf = __dependency2__.typeOf;
+
+    /**
+      To get multiple properties at once, call `Ember.getProperties`
+      with an object followed by a list of strings or an array:
+
+      ```javascript
+      Ember.getProperties(record, 'firstName', 'lastName', 'zipCode');
+      // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+      ```
+
+      is equivalent to:
+
+      ```javascript
+      Ember.getProperties(record, ['firstName', 'lastName', 'zipCode']);
+      // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+      ```
+
+      @method getProperties
+      @param obj
+      @param {String...|Array} list of keys to get
+      @return {Hash}
+    */
+    function getProperties(obj) {
+      var ret = {},
+          propertyNames = arguments,
+          i = 1;
+
+      if (arguments.length === 2 && typeOf(arguments[1]) === 'array') {
+        i = 0;
+        propertyNames = arguments[1];
+      }
+      for(var len = propertyNames.length; i < len; i++) {
+        ret[propertyNames[i]] = get(obj, propertyNames[i]);
+      }
+      return ret;
+    };
+
+    __exports__["default"] = getProperties;
+  });
+define("ember-metal/instrumentation",
+  ["ember-metal/core","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var tryCatchFinally = __dependency2__.tryCatchFinally;
+
+    /**
+      The purpose of the Ember Instrumentation module is
+      to provide efficient, general-purpose instrumentation
+      for Ember.
+
+      Subscribe to a listener by using `Ember.subscribe`:
+
+      ```javascript
+      Ember.subscribe("render", {
+        before: function(name, timestamp, payload) {
+
+        },
+
+        after: function(name, timestamp, payload) {
+
+        }
+      });
+      ```
+
+      If you return a value from the `before` callback, that same
+      value will be passed as a fourth parameter to the `after`
+      callback.
+
+      Instrument a block of code by using `Ember.instrument`:
+
+      ```javascript
+      Ember.instrument("render.handlebars", payload, function() {
+        // rendering logic
+      }, binding);
+      ```
+
+      Event names passed to `Ember.instrument` are namespaced
+      by periods, from more general to more specific. Subscribers
+      can listen for events by whatever level of granularity they
+      are interested in.
+
+      In the above example, the event is `render.handlebars`,
+      and the subscriber listened for all events beginning with
+      `render`. It would receive callbacks for events named
+      `render`, `render.handlebars`, `render.container`, or
+      even `render.handlebars.layout`.
+
+      @class Instrumentation
+      @namespace Ember
+      @static
+    */
+    var subscribers = [], cache = {};
+
+    var populateListeners = function(name) {
+      var listeners = [], subscriber;
+
+      for (var i=0, l=subscribers.length; i<l; i++) {
+        subscriber = subscribers[i];
+        if (subscriber.regex.test(name)) {
+          listeners.push(subscriber.object);
+        }
+      }
+
+      cache[name] = listeners;
+      return listeners;
+    };
+
+    var time = (function() {
+      var perf = 'undefined' !== typeof window ? window.performance || {} : {};
+      var fn = perf.now || perf.mozNow || perf.webkitNow || perf.msNow || perf.oNow;
+      // fn.bind will be available in all the browsers that support the advanced window.performance... ;-)
+      return fn ? fn.bind(perf) : function() { return +new Date(); };
+    })();
+
+    /**
+      Notifies event's subscribers, calls `before` and `after` hooks.
+
+      @method instrument
+      @namespace Ember.Instrumentation
+
+      @param {String} [name] Namespaced event name.
+      @param {Object} payload
+      @param {Function} callback Function that you're instrumenting.
+      @param {Object} binding Context that instrument function is called with.
+    */
+    function instrument(name, payload, callback, binding) {
+      var listeners = cache[name], timeName, ret;
+
+      // ES6TODO: Docs. What is this?
+      if (Ember.STRUCTURED_PROFILE) {
+        timeName = name + ": " + payload.object;
+        console.time(timeName);
+      }
+
+      if (!listeners) {
+        listeners = populateListeners(name);
+      }
+
+      if (listeners.length === 0) {
+        ret = callback.call(binding);
+        if (Ember.STRUCTURED_PROFILE) { console.timeEnd(timeName); }
+        return ret;
+      }
+
+      var beforeValues = [], listener, i, l;
+
+      function tryable() {
+        for (i=0, l=listeners.length; i<l; i++) {
+          listener = listeners[i];
+          beforeValues[i] = listener.before(name, time(), payload);
+        }
+
+        return callback.call(binding);
+      }
+
+      function catchable(e) {
+        payload = payload || {};
+        payload.exception = e;
+      }
+
+      function finalizer() {
+        for (i=0, l=listeners.length; i<l; i++) {
+          listener = listeners[i];
+          listener.after(name, time(), payload, beforeValues[i]);
+        }
+
+        if (Ember.STRUCTURED_PROFILE) {
+          console.timeEnd(timeName);
+        }
+      }
+
+      return tryCatchFinally(tryable, catchable, finalizer);
+    };
+
+    /**
+      Subscribes to a particular event or instrumented block of code.
+
+      @method subscribe
+      @namespace Ember.Instrumentation
+
+      @param {String} [pattern] Namespaced event name.
+      @param {Object} [object] Before and After hooks.
+
+      @return {Subscriber}
+    */
+    function subscribe(pattern, object) {
+      var paths = pattern.split("."), path, regex = [];
+
+      for (var i=0, l=paths.length; i<l; i++) {
+        path = paths[i];
+        if (path === "*") {
+          regex.push("[^\\.]*");
+        } else {
+          regex.push(path);
+        }
+      }
+
+      regex = regex.join("\\.");
+      regex = regex + "(\\..*)?";
+
+      var subscriber = {
+        pattern: pattern,
+        regex: new RegExp("^" + regex + "$"),
+        object: object
+      };
+
+      subscribers.push(subscriber);
+      cache = {};
+
+      return subscriber;
+    };
+
+    /**
+      Unsubscribes from a particular event or instrumented block of code.
+
+      @method unsubscribe
+      @namespace Ember.Instrumentation
+
+      @param {Object} [subscriber]
+    */
+    function unsubscribe(subscriber) {
+      var index;
+
+      for (var i=0, l=subscribers.length; i<l; i++) {
+        if (subscribers[i] === subscriber) {
+          index = i;
+        }
+      }
+
+      subscribers.splice(index, 1);
+      cache = {};
+    };
+
+    /**
+      Resets `Ember.Instrumentation` by flushing list of subscribers.
+
+      @method reset
+      @namespace Ember.Instrumentation
+    */
+    function reset() {
+      subscribers = [];
+      cache = {};
+    };
+
+    __exports__.instrument = instrument;
+    __exports__.subscribe = subscribe;
+    __exports__.unsubscribe = unsubscribe;
+    __exports__.reset = reset;
+  });
+define("ember-metal/is_blank",
+  ["ember-metal/core","ember-metal/is_empty","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // deprecateFunc
+    var isEmpty = __dependency2__["default"];
+
+    /**
+      A value is blank if it is empty or a whitespace string.
+
+      ```javascript
+      Ember.isBlank();                // true
+      Ember.isBlank(null);            // true
+      Ember.isBlank(undefined);       // true
+      Ember.isBlank('');              // true
+      Ember.isBlank([]);              // true
+      Ember.isBlank('\n\t');          // true
+      Ember.isBlank('  ');            // true
+      Ember.isBlank({});              // false
+      Ember.isBlank('\n\t Hello');    // false
+      Ember.isBlank('Hello world');   // false
+      Ember.isBlank([1,2,3]);         // false
+      ```
+
+      @method isBlank
+      @for Ember
+      @param {Object} obj Value to test
+      @return {Boolean}
+      @since 1.5.0
+      */
+    function isBlank(obj) {
+      return isEmpty(obj) || (typeof obj === 'string' && obj.match(/\S/) === null);
+    };
+
+    __exports__["default"] = isBlank;
+  });
+define("ember-metal/is_empty",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // deprecateFunc
+    var get = __dependency2__.get;
+    var isNone = __dependency3__["default"];
+
+    /**
+      Verifies that a value is `null` or an empty string, empty array,
+      or empty function.
+
+      Constrains the rules on `Ember.isNone` by returning false for empty
+      string and empty arrays.
+
+      ```javascript
+      Ember.isEmpty();                // true
+      Ember.isEmpty(null);            // true
+      Ember.isEmpty(undefined);       // true
+      Ember.isEmpty('');              // true
+      Ember.isEmpty([]);              // true
+      Ember.isEmpty('Adam Hawkins');  // false
+      Ember.isEmpty([0,1,2]);         // false
+      ```
+
+      @method isEmpty
+      @for Ember
+      @param {Object} obj Value to test
+      @return {Boolean}
+    */
+    var isEmpty = function(obj) {
+      return isNone(obj) || (obj.length === 0 && typeof obj !== 'function') || (typeof obj === 'object' && get(obj, 'length') === 0);
+    };
+    var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
+
+    __exports__["default"] = isEmpty;
+    __exports__.isEmpty = isEmpty;
+    __exports__.empty = empty;
+  });
+define("ember-metal/is_none",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // deprecateFunc
+
+    /**
+      Returns true if the passed value is null or undefined. This avoids errors
+      from JSLint complaining about use of ==, which can be technically
+      confusing.
+
+      ```javascript
+      Ember.isNone();              // true
+      Ember.isNone(null);          // true
+      Ember.isNone(undefined);     // true
+      Ember.isNone('');            // false
+      Ember.isNone([]);            // false
+      Ember.isNone(function() {});  // false
+      ```
+
+      @method isNone
+      @for Ember
+      @param {Object} obj Value to test
+      @return {Boolean}
+    */
+    var isNone = function(obj) {
+      return obj === null || obj === undefined;
+    };
+    var none = Ember.deprecateFunc("Ember.none is deprecated. Please use Ember.isNone instead.", isNone);
+
+    __exports__["default"] = isNone;
+    __exports__.isNone = isNone;
+    __exports__.none = none;
+  });
+define("ember-metal/libraries",
+  ["ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    // Provides a way to register library versions with ember.
+    var EnumerableUtils = __dependency1__["default"];
+
+    var forEach = EnumerableUtils.forEach,
+        indexOf = EnumerableUtils.indexOf;
+
+    var libraries = function() {
+      var _libraries   = [];
+      var coreLibIndex = 0;
+
+      var getLibrary = function(name) {
+        for (var i = 0; i < _libraries.length; i++) {
+          if (_libraries[i].name === name) {
+            return _libraries[i];
+          }
+        }
+      };
+
+      _libraries.register = function(name, version) {
+        if (!getLibrary(name)) {
+          _libraries.push({name: name, version: version});
+        }
+      };
+
+      _libraries.registerCoreLibrary = function(name, version) {
+        if (!getLibrary(name)) {
+          _libraries.splice(coreLibIndex++, 0, {name: name, version: version});
+        }
+      };
+
+      _libraries.deRegister = function(name) {
+        var lib = getLibrary(name);
+        if (lib) _libraries.splice(indexOf(_libraries, lib), 1);
+      };
+
+      _libraries.each = function (callback) {
+        forEach(_libraries, function(lib) {
+          callback(lib.name, lib.version);
+        });
+      };
+
+      return _libraries;
+    }();
+
+    __exports__["default"] = libraries;
+  });
+define("ember-metal/logger",
+  ["ember-metal/core","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var EmberError = __dependency2__["default"];
+
+    function consoleMethod(name) {
+      var consoleObj, logToConsole;
+      if (Ember.imports.console) {
+        consoleObj = Ember.imports.console;
+      } else if (typeof console !== 'undefined') {
+        consoleObj = console;
+      }
+
+      var method = typeof consoleObj === 'object' ? consoleObj[name] : null;
+
+      if (method) {
+        // Older IE doesn't support apply, but Chrome needs it
+        if (typeof method.apply === 'function') {
+          logToConsole = function() {
+            method.apply(consoleObj, arguments);
+          };
+          logToConsole.displayName = 'console.' + name;
+          return logToConsole;
+        } else {
+          return function() {
+            var message = Array.prototype.join.call(arguments, ', ');
+            method(message);
+          };
+        }
+      }
+    }
+
+    function assertPolyfill(test, message) {
+      if (!test) {
+        try {
+          // attempt to preserve the stack
+          throw new EmberError("assertion failed: " + message);
+        } catch(error) {
+          setTimeout(function() {
+            throw error;
+          }, 0);
+        }
+      }
+    }
+
+    /**
+      Inside Ember-Metal, simply uses the methods from `imports.console`.
+      Override this to provide more robust logging functionality.
+
+      @class Logger
+      @namespace Ember
+    */
+    var Logger = {
+      /**
+       Logs the arguments to the console.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        var foo = 1;
+        Ember.Logger.log('log value of foo:', foo);
+        // "log value of foo: 1" will be printed to the console
+        ```
+
+       @method log
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      log:   consoleMethod('log')   || Ember.K,
+
+      /**
+       Prints the arguments to the console with a warning icon.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        Ember.Logger.warn('Something happened!');
+        // "Something happened!" will be printed to the console with a warning icon.
+        ```
+
+       @method warn
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      warn:  consoleMethod('warn')  || Ember.K,
+
+      /**
+       Prints the arguments to the console with an error icon, red text and a stack trace.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        Ember.Logger.error('Danger! Danger!');
+        // "Danger! Danger!" will be printed to the console in red text.
+        ```
+
+       @method error
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      error: consoleMethod('error') || Ember.K,
+
+      /**
+       Logs the arguments to the console.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        var foo = 1;
+        Ember.Logger.info('log value of foo:', foo);
+        // "log value of foo: 1" will be printed to the console
+        ```
+
+       @method info
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      info:  consoleMethod('info')  || Ember.K,
+
+      /**
+       Logs the arguments to the console in blue text.
+       You can pass as many arguments as you want and they will be joined together with a space.
+
+        ```javascript
+        var foo = 1;
+        Ember.Logger.debug('log value of foo:', foo);
+        // "log value of foo: 1" will be printed to the console
+        ```
+
+       @method debug
+       @for Ember.Logger
+       @param {*} arguments
+      */
+      debug: consoleMethod('debug') || consoleMethod('info') || Ember.K,
+
+      /**
+       If the value passed into `Ember.Logger.assert` is not truthy it will throw an error with a stack trace.
+
+        ```javascript
+        Ember.Logger.assert(true); // undefined
+        Ember.Logger.assert(true === false); // Throws an Assertion failed error.
+        ```
+
+       @method assert
+       @for Ember.Logger
+       @param {Boolean} bool Value to test
+      */
+      assert: consoleMethod('assert') || assertPolyfill
+    };
+
+    __exports__["default"] = Logger;
+  });
+define("ember-metal",
+  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __exports__) {
+    "use strict";
+    /**
+    Ember Metal
+
+    @module ember
+    @submodule ember-metal
+    */
+
+    // BEGIN EXPORTS
+    var EmberInstrumentation = Ember.Instrumentation = {};
+    EmberInstrumentation.instrument = __dependency3__.instrument;
+    EmberInstrumentation.subscribe = __dependency3__.subscribe;
+    EmberInstrumentation.unsubscribe = __dependency3__.unsubscribe;
+    EmberInstrumentation.reset  = __dependency3__.reset;
+
+    Ember.instrument = __dependency3__.instrument;
+    Ember.subscribe = __dependency3__.subscribe;
+
+    Ember.generateGuid    = __dependency4__.generateGuid;
+    Ember.GUID_KEY        = __dependency4__.GUID_KEY;
+    Ember.GUID_PREFIX     = __dependency4__.GUID_PREFIX;
+    Ember.create          = __dependency7__.create;
+    Ember.platform        = __dependency7__.platform;
+
+    var EmberArrayPolyfills = Ember.ArrayPolyfills = {};
+
+    EmberArrayPolyfills.map = __dependency8__.map;
+    EmberArrayPolyfills.forEach = __dependency8__.forEach;
+    EmberArrayPolyfills.filter = __dependency8__.filter;
+    EmberArrayPolyfills.indexOf = __dependency8__.indexOf;
+
+    Ember.Error           = __dependency5__["default"];
+    Ember.guidFor         = __dependency4__.guidFor;
+    Ember.META_DESC       = __dependency4__.META_DESC;
+    Ember.EMPTY_META      = __dependency4__.EMPTY_META;
+    Ember.meta            = __dependency4__.meta;
+    Ember.getMeta         = __dependency4__.getMeta;
+    Ember.setMeta         = __dependency4__.setMeta;
+    Ember.metaPath        = __dependency4__.metaPath;
+    Ember.inspect         = __dependency4__.inspect;
+    Ember.typeOf          = __dependency4__.typeOf;
+    Ember.tryCatchFinally = __dependency4__.tryCatchFinally;
+    Ember.isArray         = __dependency4__.isArray;
+    Ember.makeArray       = __dependency4__.makeArray;
+    Ember.canInvoke       = __dependency4__.canInvoke;
+    Ember.tryInvoke       = __dependency4__.tryInvoke;
+    Ember.tryFinally      = __dependency4__.tryFinally;
+    Ember.wrap            = __dependency4__.wrap;
+    Ember.apply           = __dependency4__.apply;
+    Ember.applyStr        = __dependency4__.applyStr;
+
+    Ember.Logger = __dependency9__["default"];
+
+    Ember.get            = __dependency10__.get;
+    Ember.getWithDefault = __dependency10__.getWithDefault;
+    Ember.normalizeTuple = __dependency10__.normalizeTuple;
+    Ember._getPath       = __dependency10__._getPath;
+
+    Ember.EnumerableUtils = __dependency6__["default"];
+
+    Ember.on                = __dependency11__.on;
+    Ember.addListener       = __dependency11__.addListener;
+    Ember.removeListener    = __dependency11__.removeListener;
+    Ember._suspendListener  = __dependency11__.suspendListener;
+    Ember._suspendListeners = __dependency11__.suspendListeners;
+    Ember.sendEvent         = __dependency11__.sendEvent;
+    Ember.hasListeners      = __dependency11__.hasListeners;
+    Ember.watchedEvents     = __dependency11__.watchedEvents;
+    Ember.listenersFor      = __dependency11__.listenersFor;
+    Ember.listenersDiff     = __dependency11__.listenersDiff;
+    Ember.listenersUnion    = __dependency11__.listenersUnion;
+
+    Ember._ObserverSet = __dependency12__["default"];
+
+    Ember.propertyWillChange = __dependency13__.propertyWillChange;
+    Ember.propertyDidChange = __dependency13__.propertyDidChange;
+    Ember.overrideChains = __dependency13__.overrideChains;
+    Ember.beginPropertyChanges = __dependency13__.beginPropertyChanges;
+    Ember.endPropertyChanges = __dependency13__.endPropertyChanges;
+    Ember.changeProperties = __dependency13__.changeProperties;
+
+    Ember.Descriptor     = __dependency14__.Descriptor;
+    Ember.defineProperty = __dependency14__.defineProperty;
+
+    Ember.set    = __dependency15__.set;
+    Ember.trySet = __dependency15__.trySet;
+
+    Ember.OrderedSet = __dependency16__.OrderedSet;
+    Ember.Map = __dependency16__.Map;
+    Ember.MapWithDefault = __dependency16__.MapWithDefault;
+
+    Ember.getProperties = __dependency17__["default"];
+    Ember.setProperties = __dependency18__["default"];
+
+    Ember.watchKey   = __dependency19__.watchKey;
+    Ember.unwatchKey = __dependency19__.unwatchKey;
+
+    Ember.flushPendingChains = __dependency20__.flushPendingChains;
+    Ember.removeChainWatcher = __dependency20__.removeChainWatcher;
+    Ember._ChainNode = __dependency20__.ChainNode;
+    Ember.finishChains = __dependency20__.finishChains;
+
+    Ember.watchPath = __dependency21__.watchPath;
+    Ember.unwatchPath = __dependency21__.unwatchPath;
+
+    Ember.watch = __dependency22__.watch;
+    Ember.isWatching = __dependency22__.isWatching;
+    Ember.unwatch = __dependency22__.unwatch;
+    Ember.rewatch = __dependency22__.rewatch;
+    Ember.destroy = __dependency22__.destroy;
+
+    Ember.expandProperties = __dependency23__["default"];
+
+    Ember.ComputedProperty = __dependency24__.ComputedProperty;
+    Ember.computed = __dependency24__.computed;
+    Ember.cacheFor = __dependency24__.cacheFor;
+
+    Ember.addObserver = __dependency25__.addObserver;
+    Ember.observersFor = __dependency25__.observersFor;
+    Ember.removeObserver = __dependency25__.removeObserver;
+    Ember.addBeforeObserver = __dependency25__.addBeforeObserver;
+    Ember._suspendBeforeObserver = __dependency25__._suspendBeforeObserver;
+    Ember._suspendBeforeObservers = __dependency25__._suspendBeforeObservers;
+    Ember._suspendObserver = __dependency25__._suspendObserver;
+    Ember._suspendObservers = __dependency25__._suspendObservers;
+    Ember.beforeObserversFor = __dependency25__.beforeObserversFor;
+    Ember.removeBeforeObserver = __dependency25__.removeBeforeObserver;
+
+    Ember.IS_BINDING = __dependency26__.IS_BINDING;
+    Ember.required = __dependency26__.required;
+    Ember.aliasMethod = __dependency26__.aliasMethod;
+    Ember.observer = __dependency26__.observer;
+    Ember.immediateObserver = __dependency26__.immediateObserver;
+    Ember.beforeObserver = __dependency26__.beforeObserver;
+    Ember.mixin = __dependency26__.mixin;
+    Ember.Mixin = __dependency26__.Mixin;
+
+    Ember.oneWay = __dependency27__.oneWay;
+    Ember.bind = __dependency27__.bind;
+    Ember.Binding = __dependency27__.Binding;
+    Ember.isGlobalPath = __dependency27__.isGlobalPath;
+
+    Ember.run = __dependency28__["default"];
+
+    Ember.libraries = __dependency29__["default"];
+    Ember.libraries.registerCoreLibrary('Ember', Ember.VERSION);
+
+    Ember.isNone = __dependency30__.isNone;
+    Ember.none = __dependency30__.none;
+
+    Ember.isEmpty = __dependency31__.isEmpty;
+    Ember.empty = __dependency31__.empty;
+
+    Ember.isBlank = __dependency32__["default"];
+
+    Ember.merge = __dependency2__["default"];
+
+    /**
+      A function may be assigned to `Ember.onerror` to be called when Ember
+      internals encounter an error. This is useful for specialized error handling
+      and reporting code.
+
+      ```javascript
+      Ember.onerror = function(error) {
+        Em.$.ajax('/report-error', 'POST', {
+          stack: error.stack,
+          otherInformation: 'whatever app state you want to provide'
+        });
+      };
+      ```
+
+      Internally, `Ember.onerror` is used as Backburner's error handler.
+
+      @event onerror
+      @for Ember
+      @param {Exception} error the error object
+    */
+    Ember.onerror = null;
+    // END EXPORTS
+
+    // do this for side-effects of updating Ember.assert, warn, etc when
+    // ember-debug is present
+    if (Ember.__loader.registry['ember-debug']) {
+      requireModule('ember-debug');
+    }
+
+    __exports__["default"] = Ember;
+  });
+define("ember-metal/map",
+  ["ember-metal/property_set","ember-metal/utils","ember-metal/array","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    /*
+      JavaScript (before ES6) does not have a Map implementation. Objects,
+      which are often used as dictionaries, may only have Strings as keys.
+
+      Because Ember has a way to get a unique identifier for every object
+      via `Ember.guidFor`, we can implement a performant Map with arbitrary
+      keys. Because it is commonly used in low-level bookkeeping, Map is
+      implemented as a pure JavaScript object for performance.
+
+      This implementation follows the current iteration of the ES6 proposal for
+      maps (http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets),
+      with two exceptions. First, because we need our implementation to be pleasant
+      on older browsers, we do not use the `delete` name (using `remove` instead).
+      Second, as we do not have the luxury of in-VM iteration, we implement a
+      forEach method for iteration.
+
+      Map is mocked out to look like an Ember object, so you can do
+      `Ember.Map.create()` for symmetry with other Ember classes.
+    */
+
+    var set = __dependency1__.set;
+    var guidFor = __dependency2__.guidFor;
+    var indexOf = __dependency3__.indexOf;var create = __dependency4__.create;
+
+    var copy = function(obj) {
+      var output = {};
+
+      for (var prop in obj) {
+        if (obj.hasOwnProperty(prop)) { output[prop] = obj[prop]; }
+      }
+
+      return output;
+    };
+
+    var copyMap = function(original, newObject) {
+      var keys = original.keys.copy(),
+          values = copy(original.values);
+
+      newObject.keys = keys;
+      newObject.values = values;
+      newObject.length = original.length;
+
+      return newObject;
+    };
+
+    /**
+      This class is used internally by Ember and Ember Data.
+      Please do not use it at this time. We plan to clean it up
+      and add many tests soon.
+
+      @class OrderedSet
+      @namespace Ember
+      @constructor
+      @private
+    */
+    function OrderedSet() {
+      this.clear();
+    };
+
+    /**
+      @method create
+      @static
+      @return {Ember.OrderedSet}
+    */
+    OrderedSet.create = function() {
+      return new OrderedSet();
+    };
+
+
+    OrderedSet.prototype = {
+      /**
+        @method clear
+      */
+      clear: function() {
+        this.presenceSet = {};
+        this.list = [];
+      },
+
+      /**
+        @method add
+        @param obj
+      */
+      add: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet,
+            list = this.list;
+
+        if (guid in presenceSet) { return; }
+
+        presenceSet[guid] = true;
+        list.push(obj);
+      },
+
+      /**
+        @method remove
+        @param obj
+      */
+      remove: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet,
+            list = this.list;
+
+        delete presenceSet[guid];
+
+        var index = indexOf.call(list, obj);
+        if (index > -1) {
+          list.splice(index, 1);
+        }
+      },
+
+      /**
+        @method isEmpty
+        @return {Boolean}
+      */
+      isEmpty: function() {
+        return this.list.length === 0;
+      },
+
+      /**
+        @method has
+        @param obj
+        @return {Boolean}
+      */
+      has: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet;
+
+        return guid in presenceSet;
+      },
+
+      /**
+        @method forEach
+        @param {Function} fn
+        @param self
+      */
+      forEach: function(fn, self) {
+        // allow mutation during iteration
+        var list = this.toArray();
+
+        for (var i = 0, j = list.length; i < j; i++) {
+          fn.call(self, list[i]);
+        }
+      },
+
+      /**
+        @method toArray
+        @return {Array}
+      */
+      toArray: function() {
+        return this.list.slice();
+      },
+
+      /**
+        @method copy
+        @return {Ember.OrderedSet}
+      */
+      copy: function() {
+        var set = new OrderedSet();
+
+        set.presenceSet = copy(this.presenceSet);
+        set.list = this.toArray();
+
+        return set;
+      }
+    };
+
+    /**
+      A Map stores values indexed by keys. Unlike JavaScript's
+      default Objects, the keys of a Map can be any JavaScript
+      object.
+
+      Internally, a Map has two data structures:
+
+      1. `keys`: an OrderedSet of all of the existing keys
+      2. `values`: a JavaScript Object indexed by the `Ember.guidFor(key)`
+
+      When a key/value pair is added for the first time, we
+      add the key to the `keys` OrderedSet, and create or
+      replace an entry in `values`. When an entry is deleted,
+      we delete its entry in `keys` and `values`.
+
+      @class Map
+      @namespace Ember
+      @private
+      @constructor
+    */
+    var Map = Ember.Map = function() {
+      this.keys = OrderedSet.create();
+      this.values = {};
+    };
+
+    /**
+      @method create
+      @static
+    */
+    Map.create = function() {
+      return new Map();
+    };
+
+    Map.prototype = {
+      /**
+        This property will change as the number of objects in the map changes.
+
+        @property length
+        @type number
+        @default 0
+      */
+      length: 0,
+
+
+      /**
+        Retrieve the value associated with a given key.
+
+        @method get
+        @param {*} key
+        @return {*} the value associated with the key, or `undefined`
+      */
+      get: function(key) {
+        var values = this.values,
+            guid = guidFor(key);
+
+        return values[guid];
+      },
+
+      /**
+        Adds a value to the map. If a value for the given key has already been
+        provided, the new value will replace the old value.
+
+        @method set
+        @param {*} key
+        @param {*} value
+      */
+      set: function(key, value) {
+        var keys = this.keys,
+            values = this.values,
+            guid = guidFor(key);
+
+        keys.add(key);
+        values[guid] = value;
+        set(this, 'length', keys.list.length);
+      },
+
+      /**
+        Removes a value from the map for an associated key.
+
+        @method remove
+        @param {*} key
+        @return {Boolean} true if an item was removed, false otherwise
+      */
+      remove: function(key) {
+        // don't use ES6 "delete" because it will be annoying
+        // to use in browsers that are not ES6 friendly;
+        var keys = this.keys,
+            values = this.values,
+            guid = guidFor(key);
+
+        if (values.hasOwnProperty(guid)) {
+          keys.remove(key);
+          delete values[guid];
+          set(this, 'length', keys.list.length);
+          return true;
+        } else {
+          return false;
+        }
+      },
+
+      /**
+        Check whether a key is present.
+
+        @method has
+        @param {*} key
+        @return {Boolean} true if the item was present, false otherwise
+      */
+      has: function(key) {
+        var values = this.values,
+            guid = guidFor(key);
+
+        return values.hasOwnProperty(guid);
+      },
+
+      /**
+        Iterate over all the keys and values. Calls the function once
+        for each key, passing in the key and value, in that order.
+
+        The keys are guaranteed to be iterated over in insertion order.
+
+        @method forEach
+        @param {Function} callback
+        @param {*} self if passed, the `this` value inside the
+          callback. By default, `this` is the map.
+      */
+      forEach: function(callback, self) {
+        var keys = this.keys,
+            values = this.values;
+
+        keys.forEach(function(key) {
+          var guid = guidFor(key);
+          callback.call(self, key, values[guid]);
+        });
+      },
+
+      /**
+        @method copy
+        @return {Ember.Map}
+      */
+      copy: function() {
+        return copyMap(this, new Map());
+      }
+    };
+
+    /**
+      @class MapWithDefault
+      @namespace Ember
+      @extends Ember.Map
+      @private
+      @constructor
+      @param [options]
+        @param {*} [options.defaultValue]
+    */
+    function MapWithDefault(options) {
+      Map.call(this);
+      this.defaultValue = options.defaultValue;
+    };
+
+    /**
+      @method create
+      @static
+      @param [options]
+        @param {*} [options.defaultValue]
+      @return {Ember.MapWithDefault|Ember.Map} If options are passed, returns
+        `Ember.MapWithDefault` otherwise returns `Ember.Map`
+    */
+    MapWithDefault.create = function(options) {
+      if (options) {
+        return new MapWithDefault(options);
+      } else {
+        return new Map();
+      }
+    };
+
+    MapWithDefault.prototype = create(Map.prototype);
+
+    /**
+      Retrieve the value associated with a given key.
+
+      @method get
+      @param {*} key
+      @return {*} the value associated with the key, or the default value
+    */
+    MapWithDefault.prototype.get = function(key) {
+      var hasValue = this.has(key);
+
+      if (hasValue) {
+        return Map.prototype.get.call(this, key);
+      } else {
+        var defaultValue = this.defaultValue(key);
+        this.set(key, defaultValue);
+        return defaultValue;
+      }
+    };
+
+    /**
+      @method copy
+      @return {Ember.MapWithDefault}
+    */
+    MapWithDefault.prototype.copy = function() {
+      return copyMap(this, new MapWithDefault({
+        defaultValue: this.defaultValue
+      }));
+    };
+
+    __exports__.OrderedSet = OrderedSet;
+    __exports__.Map = Map;
+    __exports__.MapWithDefault = MapWithDefault;
+  });
+define("ember-metal/merge",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      Merge the contents of two objects together into the first object.
+
+      ```javascript
+      Ember.merge({first: 'Tom'}, {last: 'Dale'}); // {first: 'Tom', last: 'Dale'}
+      var a = {first: 'Yehuda'}, b = {last: 'Katz'};
+      Ember.merge(a, b); // a == {first: 'Yehuda', last: 'Katz'}, b == {last: 'Katz'}
+      ```
+
+      @method merge
+      @for Ember
+      @param {Object} original The object to merge into
+      @param {Object} updates The object to copy properties from
+      @return {Object}
+    */
+    function merge(original, updates) {
+      for (var prop in updates) {
+        if (!updates.hasOwnProperty(prop)) { continue; }
+        original[prop] = updates[prop];
+      }
+      return original;
+    };
+
+    __exports__["default"] = merge;
+  });
+define("ember-metal/mixin",
+  ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/utils","ember-metal/expand_properties","ember-metal/properties","ember-metal/computed","ember-metal/binding","ember-metal/observer","ember-metal/events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-metal
+    */
+
+    var Ember = __dependency1__["default"];
+    // warn, assert, wrap, et;
+    var merge = __dependency2__["default"];
+    var map = __dependency3__.map;
+    var indexOf = __dependency3__.indexOf;
+    var forEach = __dependency3__.forEach;
+    var create = __dependency4__.create;
+    var guidFor = __dependency5__.guidFor;
+    var meta = __dependency5__.meta;
+    var META_KEY = __dependency5__.META_KEY;
+    var wrap = __dependency5__.wrap;
+    var makeArray = __dependency5__.makeArray;
+    var apply = __dependency5__.apply;
+    var expandProperties = __dependency6__["default"];
+    var Descriptor = __dependency7__.Descriptor;
+    var defineProperty = __dependency7__.defineProperty;
+    var ComputedProperty = __dependency8__.ComputedProperty;
+    var Binding = __dependency9__.Binding;
+    var addObserver = __dependency10__.addObserver;
+    var removeObserver = __dependency10__.removeObserver;
+    var addBeforeObserver = __dependency10__.addBeforeObserver;
+    var removeBeforeObserver = __dependency10__.removeBeforeObserver;
+    var addListener = __dependency11__.addListener;
+    var removeListener = __dependency11__.removeListener;
+
+    var REQUIRED, Alias,
+        a_map = map,
+        a_indexOf = indexOf,
+        a_forEach = forEach,
+        a_slice = [].slice,
+        o_create = create,
+        defineProperty = defineProperty,
+        metaFor = meta;
+
+    function superFunction(){
+      var ret, func = this.__nextSuper;
+      if (func) {
+        this.__nextSuper = null;
+        ret = apply(this, func, arguments);
+        this.__nextSuper = func;
+      }
+      return ret;
+    }
+
+    function mixinsMeta(obj) {
+      var m = metaFor(obj, true), ret = m.mixins;
+      if (!ret) {
+        ret = m.mixins = {};
+      } else if (!m.hasOwnProperty('mixins')) {
+        ret = m.mixins = o_create(ret);
+      }
+      return ret;
+    }
+
+    function initMixin(mixin, args) {
+      if (args && args.length > 0) {
+        mixin.mixins = a_map.call(args, function(x) {
+          if (x instanceof Mixin) { return x; }
+
+          // Note: Manually setup a primitive mixin here. This is the only
+          // way to actually get a primitive mixin. This way normal creation
+          // of mixins will give you combined mixins...
+          var mixin = new Mixin();
+          mixin.properties = x;
+          return mixin;
+        });
+      }
+      return mixin;
+    }
+
+    function isMethod(obj) {
+      return 'function' === typeof obj &&
+             obj.isMethod !== false &&
+             obj !== Boolean && obj !== Object && obj !== Number && obj !== Array && obj !== Date && obj !== String;
+    }
+
+    var CONTINUE = {};
+
+    function mixinProperties(mixinsMeta, mixin) {
+      var guid;
+
+      if (mixin instanceof Mixin) {
+        guid = guidFor(mixin);
+        if (mixinsMeta[guid]) { return CONTINUE; }
+        mixinsMeta[guid] = mixin;
+        return mixin.properties;
+      } else {
+        return mixin; // apply anonymous mixin properties
+      }
+    }
+
+    function concatenatedMixinProperties(concatProp, props, values, base) {
+      var concats;
+
+      // reset before adding each new mixin to pickup concats from previous
+      concats = values[concatProp] || base[concatProp];
+      if (props[concatProp]) {
+        concats = concats ? concats.concat(props[concatProp]) : props[concatProp];
+      }
+
+      return concats;
+    }
+
+    function giveDescriptorSuper(meta, key, property, values, descs) {
+      var superProperty;
+
+      // Computed properties override methods, and do not call super to them
+      if (values[key] === undefined) {
+        // Find the original descriptor in a parent mixin
+        superProperty = descs[key];
+      }
+
+      // If we didn't find the original descriptor in a parent mixin, find
+      // it on the original object.
+      superProperty = superProperty || meta.descs[key];
+
+      if (!superProperty || !(superProperty instanceof ComputedProperty)) {
+        return property;
+      }
+
+      // Since multiple mixins may inherit from the same parent, we need
+      // to clone the computed property so that other mixins do not receive
+      // the wrapped version.
+      property = o_create(property);
+      property.func = wrap(property.func, superProperty.func);
+
+      return property;
+    }
+
+    function giveMethodSuper(obj, key, method, values, descs) {
+      var superMethod;
+
+      // Methods overwrite computed properties, and do not call super to them.
+      if (descs[key] === undefined) {
+        // Find the original method in a parent mixin
+        superMethod = values[key];
+      }
+
+      // If we didn't find the original value in a parent mixin, find it in
+      // the original object
+      superMethod = superMethod || obj[key];
+
+      // Only wrap the new method if the original method was a function
+      if ('function' !== typeof superMethod) {
+        return method;
+      }
+
+      return wrap(method, superMethod);
+    }
+
+    function applyConcatenatedProperties(obj, key, value, values) {
+      var baseValue = values[key] || obj[key];
+
+      if (baseValue) {
+        if ('function' === typeof baseValue.concat) {
+          return baseValue.concat(value);
+        } else {
+          return makeArray(baseValue).concat(value);
+        }
+      } else {
+        return makeArray(value);
+      }
+    }
+
+    function applyMergedProperties(obj, key, value, values) {
+      var baseValue = values[key] || obj[key];
+
+      if (!baseValue) { return value; }
+
+      var newBase = merge({}, baseValue),
+          hasFunction = false;
+
+      for (var prop in value) {
+        if (!value.hasOwnProperty(prop)) { continue; }
+
+        var propValue = value[prop];
+        if (isMethod(propValue)) {
+          // TODO: support for Computed Properties, etc?
+          hasFunction = true;
+          newBase[prop] = giveMethodSuper(obj, prop, propValue, baseValue, {});
+        } else {
+          newBase[prop] = propValue;
+        }
+      }
+
+      if (hasFunction) {
+        newBase._super = superFunction;
+      }
+
+      return newBase;
+    }
+
+    function addNormalizedProperty(base, key, value, meta, descs, values, concats, mergings) {
+      if (value instanceof Descriptor) {
+        if (value === REQUIRED && descs[key]) { return CONTINUE; }
+
+        // Wrap descriptor function to implement
+        // __nextSuper() if needed
+        if (value.func) {
+          value = giveDescriptorSuper(meta, key, value, values, descs);
+        }
+
+        descs[key]  = value;
+        values[key] = undefined;
+      } else {
+        if ((concats && a_indexOf.call(concats, key) >= 0) ||
+                    key === 'concatenatedProperties' ||
+                    key === 'mergedProperties') {
+          value = applyConcatenatedProperties(base, key, value, values);
+        } else if ((mergings && a_indexOf.call(mergings, key) >= 0)) {
+          value = applyMergedProperties(base, key, value, values);
+        } else if (isMethod(value)) {
+          value = giveMethodSuper(base, key, value, values, descs);
+        }
+
+        descs[key] = undefined;
+        values[key] = value;
+      }
+    }
+
+    function mergeMixins(mixins, m, descs, values, base, keys) {
+      var mixin, props, key, concats, mergings, meta;
+
+      function removeKeys(keyName) {
+        delete descs[keyName];
+        delete values[keyName];
+      }
+
+      for(var i=0, l=mixins.length; i<l; i++) {
+        mixin = mixins[i];
+        
+        props = mixinProperties(m, mixin);
+        if (props === CONTINUE) { continue; }
+
+        if (props) {
+          meta = metaFor(base);
+          if (base.willMergeMixin) { base.willMergeMixin(props); }
+          concats = concatenatedMixinProperties('concatenatedProperties', props, values, base);
+          mergings = concatenatedMixinProperties('mergedProperties', props, values, base);
+
+          for (key in props) {
+            if (!props.hasOwnProperty(key)) { continue; }
+            keys.push(key);
+            addNormalizedProperty(base, key, props[key], meta, descs, values, concats, mergings);
+          }
+
+          // manually copy toString() because some JS engines do not enumerate it
+          if (props.hasOwnProperty('toString')) { base.toString = props.toString; }
+        } else if (mixin.mixins) {
+          mergeMixins(mixin.mixins, m, descs, values, base, keys);
+          if (mixin._without) { a_forEach.call(mixin._without, removeKeys); }
+        }
+      }
+    }
+
+    var IS_BINDING = /^.+Binding$/;
+
+    function detectBinding(obj, key, value, m) {
+      if (IS_BINDING.test(key)) {
+        var bindings = m.bindings;
+        if (!bindings) {
+          bindings = m.bindings = {};
+        } else if (!m.hasOwnProperty('bindings')) {
+          bindings = m.bindings = o_create(m.bindings);
+        }
+        bindings[key] = value;
+      }
+    }
+
+    function connectBindings(obj, m) {
+      // TODO Mixin.apply(instance) should disconnect binding if exists
+      var bindings = m.bindings, key, binding, to;
+      if (bindings) {
+        for (key in bindings) {
+          binding = bindings[key];
+          if (binding) {
+            to = key.slice(0, -7); // strip Binding off end
+            if (binding instanceof Binding) {
+              binding = binding.copy(); // copy prototypes' instance
+              binding.to(to);
+            } else { // binding is string path
+              binding = new Binding(to, binding);
+            }
+            binding.connect(obj);
+            obj[key] = binding;
+          }
+        }
+        // mark as applied
+        m.bindings = {};
+      }
+    }
+
+    function finishPartial(obj, m) {
+      connectBindings(obj, m || metaFor(obj));
+      return obj;
+    }
+
+    function followAlias(obj, desc, m, descs, values) {
+      var altKey = desc.methodName, value;
+      if (descs[altKey] || values[altKey]) {
+        value = values[altKey];
+        desc  = descs[altKey];
+      } else if (m.descs[altKey]) {
+        desc  = m.descs[altKey];
+        value = undefined;
+      } else {
+        desc = undefined;
+        value = obj[altKey];
+      }
+
+      return { desc: desc, value: value };
+    }
+
+    function updateObserversAndListeners(obj, key, observerOrListener, pathsKey, updateMethod) {
+      var paths = observerOrListener[pathsKey];
+
+      if (paths) {
+        for (var i=0, l=paths.length; i<l; i++) {
+          updateMethod(obj, paths[i], null, key);
+        }
+      }
+    }
+
+    function replaceObserversAndListeners(obj, key, observerOrListener) {
+      var prev = obj[key];
+
+      if ('function' === typeof prev) {
+        updateObserversAndListeners(obj, key, prev, '__ember_observesBefore__', removeBeforeObserver);
+        updateObserversAndListeners(obj, key, prev, '__ember_observes__', removeObserver);
+        updateObserversAndListeners(obj, key, prev, '__ember_listens__', removeListener);
+      }
+
+      if ('function' === typeof observerOrListener) {
+        updateObserversAndListeners(obj, key, observerOrListener, '__ember_observesBefore__', addBeforeObserver);
+        updateObserversAndListeners(obj, key, observerOrListener, '__ember_observes__', addObserver);
+        updateObserversAndListeners(obj, key, observerOrListener, '__ember_listens__', addListener);
+      }
+    }
+
+    function applyMixin(obj, mixins, partial) {
+      var descs = {}, values = {}, m = metaFor(obj),
+          key, value, desc, keys = [];
+
+      obj._super = superFunction;
+
+      // Go through all mixins and hashes passed in, and:
+      //
+      // * Handle concatenated properties
+      // * Handle merged properties
+      // * Set up _super wrapping if necessary
+      // * Set up computed property descriptors
+      // * Copying `toString` in broken browsers
+      mergeMixins(mixins, mixinsMeta(obj), descs, values, obj, keys);
+
+      for(var i = 0, l = keys.length; i < l; i++) {
+        key = keys[i];
+        if (key === 'constructor' || !values.hasOwnProperty(key)) { continue; }
+
+        desc = descs[key];
+        value = values[key];
+
+        if (desc === REQUIRED) { continue; }
+
+        while (desc && desc instanceof Alias) {
+          var followed = followAlias(obj, desc, m, descs, values);
+          desc = followed.desc;
+          value = followed.value;
+        }
+
+        if (desc === undefined && value === undefined) { continue; }
+
+        replaceObserversAndListeners(obj, key, value);
+        detectBinding(obj, key, value, m);
+        defineProperty(obj, key, desc, value, m);
+      }
+
+      if (!partial) { // don't apply to prototype
+        finishPartial(obj, m);
+      }
+
+      return obj;
+    }
+
+    /**
+      @method mixin
+      @for Ember
+      @param obj
+      @param mixins*
+      @return obj
+    */
+    function mixin(obj) {
+      var args = a_slice.call(arguments, 1);
+      applyMixin(obj, args, false);
+      return obj;
+    };
+
+    /**
+      The `Ember.Mixin` class allows you to create mixins, whose properties can be
+      added to other classes. For instance,
+
+      ```javascript
+      App.Editable = Ember.Mixin.create({
+        edit: function() {
+          console.log('starting to edit');
+          this.set('isEditing', true);
+        },
+        isEditing: false
+      });
+
+      // Mix mixins into classes by passing them as the first arguments to
+      // .extend.
+      App.CommentView = Ember.View.extend(App.Editable, {
+        template: Ember.Handlebars.compile('{{#if view.isEditing}}...{{else}}...{{/if}}')
+      });
+
+      commentView = App.CommentView.create();
+      commentView.edit(); // outputs 'starting to edit'
+      ```
+
+      Note that Mixins are created with `Ember.Mixin.create`, not
+      `Ember.Mixin.extend`.
+
+      Note that mixins extend a constructor's prototype so arrays and object literals
+      defined as properties will be shared amongst objects that implement the mixin.
+      If you want to define a property in a mixin that is not shared, you can define
+      it either as a computed property or have it be created on initialization of the object.
+
+      ```javascript
+      //filters array will be shared amongst any object implementing mixin
+      App.Filterable = Ember.Mixin.create({
+        filters: Ember.A()
+      });
+
+      //filters will be a separate  array for every object implementing the mixin
+      App.Filterable = Ember.Mixin.create({
+        filters: Ember.computed(function(){return Ember.A();})
+      });
+
+      //filters will be created as a separate array during the object's initialization
+      App.Filterable = Ember.Mixin.create({
+        init: function() {
+          this._super();
+          this.set("filters", Ember.A());
+        }
+      });
+      ```
+
+      @class Mixin
+      @namespace Ember
+    */
+    function Mixin() { return initMixin(this, arguments); };
+
+    Mixin.prototype = {
+      properties: null,
+      mixins: null,
+      ownerConstructor: null
+    };
+
+    Mixin._apply = applyMixin;
+
+    Mixin.applyPartial = function(obj) {
+      var args = a_slice.call(arguments, 1);
+      return applyMixin(obj, args, true);
+    };
+
+    Mixin.finishPartial = finishPartial;
+
+    // ES6TODO: this relies on a global state?
+    Ember.anyUnprocessedMixins = false;
+
+    /**
+      @method create
+      @static
+      @param arguments*
+    */
+    Mixin.create = function() {
+      // ES6TODO: this relies on a global state?
+      Ember.anyUnprocessedMixins = true;
+      var M = this;
+      return initMixin(new M(), arguments);
+    };
+
+    var MixinPrototype = Mixin.prototype;
+
+    /**
+      @method reopen
+      @param arguments*
+    */
+    MixinPrototype.reopen = function() {
+      var mixin, tmp;
+
+      if (this.properties) {
+        mixin = Mixin.create();
+        mixin.properties = this.properties;
+        delete this.properties;
+        this.mixins = [mixin];
+      } else if (!this.mixins) {
+        this.mixins = [];
+      }
+
+      var len = arguments.length, mixins = this.mixins, idx;
+
+      for(idx=0; idx < len; idx++) {
+        mixin = arguments[idx];
+        
+        if (mixin instanceof Mixin) {
+          mixins.push(mixin);
+        } else {
+          tmp = Mixin.create();
+          tmp.properties = mixin;
+          mixins.push(tmp);
+        }
+      }
+
+      return this;
+    };
+
+    /**
+      @method apply
+      @param obj
+      @return applied object
+    */
+    MixinPrototype.apply = function(obj) {
+      return applyMixin(obj, [this], false);
+    };
+
+    MixinPrototype.applyPartial = function(obj) {
+      return applyMixin(obj, [this], true);
+    };
+
+    function _detect(curMixin, targetMixin, seen) {
+      var guid = guidFor(curMixin);
+
+      if (seen[guid]) { return false; }
+      seen[guid] = true;
+
+      if (curMixin === targetMixin) { return true; }
+      var mixins = curMixin.mixins, loc = mixins ? mixins.length : 0;
+      while (--loc >= 0) {
+        if (_detect(mixins[loc], targetMixin, seen)) { return true; }
+      }
+      return false;
+    }
+
+    /**
+      @method detect
+      @param obj
+      @return {Boolean}
+    */
+    MixinPrototype.detect = function(obj) {
+      if (!obj) { return false; }
+      if (obj instanceof Mixin) { return _detect(obj, this, {}); }
+      var m = obj[META_KEY],
+          mixins = m && m.mixins;
+      if (mixins) {
+        return !!mixins[guidFor(this)];
+      }
+      return false;
+    };
+
+    MixinPrototype.without = function() {
+      var ret = new Mixin(this);
+      ret._without = a_slice.call(arguments);
+      return ret;
+    };
+
+    function _keys(ret, mixin, seen) {
+      if (seen[guidFor(mixin)]) { return; }
+      seen[guidFor(mixin)] = true;
+
+      if (mixin.properties) {
+        var props = mixin.properties;
+        for (var key in props) {
+          if (props.hasOwnProperty(key)) { ret[key] = true; }
+        }
+      } else if (mixin.mixins) {
+        a_forEach.call(mixin.mixins, function(x) { _keys(ret, x, seen); });
+      }
+    }
+
+    MixinPrototype.keys = function() {
+      var keys = {}, seen = {}, ret = [];
+      _keys(keys, this, seen);
+      for(var key in keys) {
+        if (keys.hasOwnProperty(key)) { ret.push(key); }
+      }
+      return ret;
+    };
+
+    // returns the mixins currently applied to the specified object
+    // TODO: Make Ember.mixin
+    Mixin.mixins = function(obj) {
+      var m = obj[META_KEY],
+          mixins = m && m.mixins, ret = [];
+
+      if (!mixins) { return ret; }
+
+      for (var key in mixins) {
+        var mixin = mixins[key];
+
+        // skip primitive mixins since these are always anonymous
+        if (!mixin.properties) { ret.push(mixin); }
+      }
+
+      return ret;
+    };
+
+    REQUIRED = new Descriptor();
+    REQUIRED.toString = function() { return '(Required Property)'; };
+
+    /**
+      Denotes a required property for a mixin
+
+      @method required
+      @for Ember
+    */
+    function required() {
+      return REQUIRED;
+    };
+
+    Alias = function(methodName) {
+      this.methodName = methodName;
+    };
+    Alias.prototype = new Descriptor();
+
+    /**
+      Makes a method available via an additional name.
+
+      ```javascript
+      App.Person = Ember.Object.extend({
+        name: function() {
+          return 'Tomhuda Katzdale';
+        },
+        moniker: Ember.aliasMethod('name')
+      });
+
+      var goodGuy = App.Person.create();
+      
+      goodGuy.name();    // 'Tomhuda Katzdale'
+      goodGuy.moniker(); // 'Tomhuda Katzdale'
+      ```
+
+      @method aliasMethod
+      @for Ember
+      @param {String} methodName name of the method to alias
+      @return {Ember.Descriptor}
+    */
+    function aliasMethod(methodName) {
+      return new Alias(methodName);
+    };
+
+    // ..........................................................
+    // OBSERVER HELPER
+    //
+
+    /**
+      Specify a method that observes property changes.
+
+      ```javascript
+      Ember.Object.extend({
+        valueObserver: Ember.observer('value', function() {
+          // Executes whenever the "value" property changes
+        })
+      });
+      ```
+
+      In the future this method may become asynchronous. If you want to ensure
+      synchronous behavior, use `immediateObserver`.
+
+      Also available as `Function.prototype.observes` if prototype extensions are
+      enabled.
+
+      @method observer
+      @for Ember
+      @param {String} propertyNames*
+      @param {Function} func
+      @return func
+    */
+    function observer() {
+      var func  = a_slice.call(arguments, -1)[0];
+      var paths;
+
+      var addWatchedProperty = function (path) { paths.push(path); };
+      var _paths = a_slice.call(arguments, 0, -1);
+
+      if (typeof func !== "function") {
+        // revert to old, soft-deprecated argument ordering
+
+        func  = arguments[0];
+        _paths = a_slice.call(arguments, 1);
+      }
+
+      paths = [];
+
+      for (var i=0; i<_paths.length; ++i) {
+        expandProperties(_paths[i], addWatchedProperty);
+      }
+
+      if (typeof func !== "function") {
+        throw new Ember.Error("Ember.observer called without a function");
+      }
+
+      func.__ember_observes__ = paths;
+      return func;
+    };
+
+    /**
+      Specify a method that observes property changes.
+
+      ```javascript
+      Ember.Object.extend({
+        valueObserver: Ember.immediateObserver('value', function() {
+          // Executes whenever the "value" property changes
+        })
+      });
+      ```
+
+      In the future, `Ember.observer` may become asynchronous. In this event,
+      `Ember.immediateObserver` will maintain the synchronous behavior.
+
+      Also available as `Function.prototype.observesImmediately` if prototype extensions are
+      enabled.
+
+      @method immediateObserver
+      @for Ember
+      @param {String} propertyNames*
+      @param {Function} func
+      @return func
+    */
+    function immediateObserver() {
+      for (var i=0, l=arguments.length; i<l; i++) {
+        var arg = arguments[i];
+              }
+
+      return observer.apply(this, arguments);
+    };
+
+    /**
+      When observers fire, they are called with the arguments `obj`, `keyName`.
+
+      Note, `@each.property` observer is called per each add or replace of an element
+      and it's not called with a specific enumeration item.
+
+      A `beforeObserver` fires before a property changes.
+
+      A `beforeObserver` is an alternative form of `.observesBefore()`.
+
+      ```javascript
+      App.PersonView = Ember.View.extend({
+        friends: [{ name: 'Tom' }, { name: 'Stefan' }, { name: 'Kris' }],
+
+        valueWillChange: Ember.beforeObserver('content.value', function(obj, keyName) {
+          this.changingFrom = obj.get(keyName);
+        }),
+
+        valueDidChange: Ember.observer('content.value', function(obj, keyName) {
+            // only run if updating a value already in the DOM
+            if (this.get('state') === 'inDOM') {
+              var color = obj.get(keyName) > this.changingFrom ? 'green' : 'red';
+              // logic
+            }
+        }),
+
+        friendsDidChange: Ember.observer('friends.@each.name', function(obj, keyName) {
+          // some logic
+          // obj.get(keyName) returns friends array
+        })
+      });
+      ```
+
+      Also available as `Function.prototype.observesBefore` if prototype extensions are
+      enabled.
+
+      @method beforeObserver
+      @for Ember
+      @param {String} propertyNames*
+      @param {Function} func
+      @return func
+    */
+    function beforeObserver() {
+      var func  = a_slice.call(arguments, -1)[0];
+      var paths;
+
+      var addWatchedProperty = function(path) { paths.push(path); };
+
+      var _paths = a_slice.call(arguments, 0, -1);
+
+      if (typeof func !== "function") {
+        // revert to old, soft-deprecated argument ordering
+
+        func  = arguments[0];
+        _paths = a_slice.call(arguments, 1);
+      }
+
+      paths = [];
+
+      for (var i=0; i<_paths.length; ++i) {
+        expandProperties(_paths[i], addWatchedProperty);
+      }
+
+      if (typeof func !== "function") {
+        throw new Ember.Error("Ember.beforeObserver called without a function");
+      }
+
+      func.__ember_observesBefore__ = paths;
+      return func;
+    };
+
+    __exports__.IS_BINDING = IS_BINDING;
+    __exports__.mixin = mixin;
+    __exports__.Mixin = Mixin;
+    __exports__.required = required;
+    __exports__.aliasMethod = aliasMethod;
+    __exports__.observer = observer;
+    __exports__.immediateObserver = immediateObserver;
+    __exports__.beforeObserver = beforeObserver;
+  });
+define("ember-metal/observer",
+  ["ember-metal/watching","ember-metal/array","ember-metal/events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var watch = __dependency1__.watch;
+    var unwatch = __dependency1__.unwatch;
+    var map = __dependency2__.map;
+    var listenersFor = __dependency3__.listenersFor;
+    var addListener = __dependency3__.addListener;
+    var removeListener = __dependency3__.removeListener;
+    var suspendListeners = __dependency3__.suspendListeners;
+    var suspendListener = __dependency3__.suspendListener;
+    /**
+    @module ember-metal
+    */
+
+    var AFTER_OBSERVERS = ':change',
+        BEFORE_OBSERVERS = ':before';
+
+    function changeEvent(keyName) {
+      return keyName+AFTER_OBSERVERS;
+    }
+
+    function beforeEvent(keyName) {
+      return keyName+BEFORE_OBSERVERS;
+    }
+
+    /**
+      @method addObserver
+      @for Ember
+      @param obj
+      @param {String} path
+      @param {Object|Function} targetOrMethod
+      @param {Function|String} [method]
+    */
+    function addObserver(obj, _path, target, method) {
+      addListener(obj, changeEvent(_path), target, method);
+      watch(obj, _path);
+
+      return this;
+    };
+
+    function observersFor(obj, path) {
+      return listenersFor(obj, changeEvent(path));
+    };
+
+    /**
+      @method removeObserver
+      @for Ember
+      @param obj
+      @param {String} path
+      @param {Object|Function} targetOrMethod
+      @param {Function|String} [method]
+    */
+    function removeObserver(obj, _path, target, method) {
+      unwatch(obj, _path);
+      removeListener(obj, changeEvent(_path), target, method);
+
+      return this;
+    };
+
+    /**
+      @method addBeforeObserver
+      @for Ember
+      @param obj
+      @param {String} path
+      @param {Object|Function} targetOrMethod
+      @param {Function|String} [method]
+    */
+    function addBeforeObserver(obj, _path, target, method) {
+      addListener(obj, beforeEvent(_path), target, method);
+      watch(obj, _path);
+
+      return this;
+    };
+
+    // Suspend observer during callback.
+    //
+    // This should only be used by the target of the observer
+    // while it is setting the observed path.
+    function _suspendBeforeObserver(obj, path, target, method, callback) {
+      return suspendListener(obj, beforeEvent(path), target, method, callback);
+    };
+
+    function _suspendObserver(obj, path, target, method, callback) {
+      return suspendListener(obj, changeEvent(path), target, method, callback);
+    };
+
+    function _suspendBeforeObservers(obj, paths, target, method, callback) {
+      var events = map.call(paths, beforeEvent);
+      return suspendListeners(obj, events, target, method, callback);
+    };
+
+    function _suspendObservers(obj, paths, target, method, callback) {
+      var events = map.call(paths, changeEvent);
+      return suspendListeners(obj, events, target, method, callback);
+    };
+
+    function beforeObserversFor(obj, path) {
+      return listenersFor(obj, beforeEvent(path));
+    };
+
+    /**
+      @method removeBeforeObserver
+      @for Ember
+      @param obj
+      @param {String} path
+      @param {Object|Function} targetOrMethod
+      @param {Function|String} [method]
+    */
+    function removeBeforeObserver(obj, _path, target, method) {
+      unwatch(obj, _path);
+      removeListener(obj, beforeEvent(_path), target, method);
+
+      return this;
+    };
+
+    __exports__.addObserver = addObserver;
+    __exports__.observersFor = observersFor;
+    __exports__.removeObserver = removeObserver;
+    __exports__.addBeforeObserver = addBeforeObserver;
+    __exports__._suspendBeforeObserver = _suspendBeforeObserver;
+    __exports__._suspendObserver = _suspendObserver;
+    __exports__._suspendBeforeObservers = _suspendBeforeObservers;
+    __exports__._suspendObservers = _suspendObservers;
+    __exports__.beforeObserversFor = beforeObserversFor;
+    __exports__.removeBeforeObserver = removeBeforeObserver;
+  });
+define("ember-metal/observer_set",
+  ["ember-metal/utils","ember-metal/events","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var guidFor = __dependency1__.guidFor;
+    var sendEvent = __dependency2__.sendEvent;
+
+    /*
+      this.observerSet = {
+        [senderGuid]: { // variable name: `keySet`
+          [keyName]: listIndex
+        }
+      },
+      this.observers = [
+        {
+          sender: obj,
+          keyName: keyName,
+          eventName: eventName,
+          listeners: [
+            [target, method, flags]
+          ]
+        },
+        ...
+      ]
+    */
+    function ObserverSet() {
+      this.clear();
+    };
+
+    ObserverSet.prototype.add = function(sender, keyName, eventName) {
+      var observerSet = this.observerSet,
+          observers = this.observers,
+          senderGuid = guidFor(sender),
+          keySet = observerSet[senderGuid],
+          index;
+
+      if (!keySet) {
+        observerSet[senderGuid] = keySet = {};
+      }
+      index = keySet[keyName];
+      if (index === undefined) {
+        index = observers.push({
+          sender: sender,
+          keyName: keyName,
+          eventName: eventName,
+          listeners: []
+        }) - 1;
+        keySet[keyName] = index;
+      }
+      return observers[index].listeners;
+    };
+
+    ObserverSet.prototype.flush = function() {
+      var observers = this.observers, i, len, observer, sender;
+      this.clear();
+      for (i=0, len=observers.length; i < len; ++i) {
+        observer = observers[i];
+        sender = observer.sender;
+        if (sender.isDestroying || sender.isDestroyed) { continue; }
+        sendEvent(sender, observer.eventName, [sender, observer.keyName], observer.listeners);
+      }
+    };
+
+    ObserverSet.prototype.clear = function() {
+      this.observerSet = {};
+      this.observers = [];
+    };
+
+    __exports__["default"] = ObserverSet;
+  });
+define("ember-metal/platform",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    /*globals Node */
+
+    var Ember = __dependency1__["default"];
+
+    /**
+    @module ember-metal
+    */
+
+    /**
+      Platform specific methods and feature detectors needed by the framework.
+
+      @class platform
+      @namespace Ember
+      @static
+    */
+    // TODO remove this
+    var platform = {};
+
+    /**
+      Identical to `Object.create()`. Implements if not available natively.
+
+      @method create
+      @for Ember
+    */
+    var create = Object.create;
+
+    // IE8 has Object.create but it couldn't treat property descriptors.
+    if (create) {
+      if (create({a: 1}, {a: {value: 2}}).a !== 2) {
+        create = null;
+      }
+    }
+
+    // STUB_OBJECT_CREATE allows us to override other libraries that stub
+    // Object.create different than we would prefer
+    if (!create || Ember.ENV.STUB_OBJECT_CREATE) {
+      var K = function() {};
+
+      create = function(obj, props) {
+        K.prototype = obj;
+        obj = new K();
+        if (props) {
+          K.prototype = obj;
+          for (var prop in props) {
+            K.prototype[prop] = props[prop].value;
+          }
+          obj = new K();
+        }
+        K.prototype = null;
+
+        return obj;
+      };
+
+      create.isSimulated = true;
+    }
+
+    var defineProperty = Object.defineProperty;
+    var canRedefineProperties, canDefinePropertyOnDOM;
+
+    // Catch IE8 where Object.defineProperty exists but only works on DOM elements
+    if (defineProperty) {
+      try {
+        defineProperty({}, 'a',{get:function() {}});
+      } catch (e) {
+        defineProperty = null;
+      }
+    }
+
+    if (defineProperty) {
+      // Detects a bug in Android <3.2 where you cannot redefine a property using
+      // Object.defineProperty once accessors have already been set.
+      canRedefineProperties = (function() {
+        var obj = {};
+
+        defineProperty(obj, 'a', {
+          configurable: true,
+          enumerable: true,
+          get: function() { },
+          set: function() { }
+        });
+
+        defineProperty(obj, 'a', {
+          configurable: true,
+          enumerable: true,
+          writable: true,
+          value: true
+        });
+
+        return obj.a === true;
+      })();
+
+      // This is for Safari 5.0, which supports Object.defineProperty, but not
+      // on DOM nodes.
+      canDefinePropertyOnDOM = (function() {
+        try {
+          defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
+          return true;
+        } catch(e) { }
+
+        return false;
+      })();
+
+      if (!canRedefineProperties) {
+        defineProperty = null;
+      } else if (!canDefinePropertyOnDOM) {
+        defineProperty = function(obj, keyName, desc) {
+          var isNode;
+
+          if (typeof Node === "object") {
+            isNode = obj instanceof Node;
+          } else {
+            isNode = typeof obj === "object" && typeof obj.nodeType === "number" && typeof obj.nodeName === "string";
+          }
+
+          if (isNode) {
+            // TODO: Should we have a warning here?
+            return (obj[keyName] = desc.value);
+          } else {
+            return Object.defineProperty(obj, keyName, desc);
+          }
+        };
+      }
+    }
+
+    /**
+    @class platform
+    @namespace Ember
+    */
+
+    /**
+      Identical to `Object.defineProperty()`. Implements as much functionality
+      as possible if not available natively.
+
+      @method defineProperty
+      @param {Object} obj The object to modify
+      @param {String} keyName property name to modify
+      @param {Object} desc descriptor hash
+      @return {void}
+    */
+    platform.defineProperty = defineProperty;
+
+    /**
+      Set to true if the platform supports native getters and setters.
+
+      @property hasPropertyAccessors
+      @final
+    */
+    platform.hasPropertyAccessors = true;
+
+    if (!platform.defineProperty) {
+      platform.hasPropertyAccessors = false;
+
+      platform.defineProperty = function(obj, keyName, desc) {
+        if (!desc.get) { obj[keyName] = desc.value; }
+      };
+
+      platform.defineProperty.isSimulated = true;
+    }
+
+    if (Ember.ENV.MANDATORY_SETTER && !platform.hasPropertyAccessors) {
+      Ember.ENV.MANDATORY_SETTER = false;
+    }
+
+    __exports__.create = create;
+    __exports__.platform = platform;
+  });
+define("ember-metal/properties",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    var Ember = __dependency1__["default"];
+    var META_KEY = __dependency2__.META_KEY;
+    var meta = __dependency2__.meta;
+    var platform = __dependency3__.platform;
+    var overrideChains = __dependency4__.overrideChains;
+    var metaFor = meta,
+        objectDefineProperty = platform.defineProperty;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    // ..........................................................
+    // DESCRIPTOR
+    //
+
+    /**
+      Objects of this type can implement an interface to respond to requests to
+      get and set. The default implementation handles simple properties.
+
+      You generally won't need to create or subclass this directly.
+
+      @class Descriptor
+      @namespace Ember
+      @private
+      @constructor
+    */
+    function Descriptor() {};
+
+    // ..........................................................
+    // DEFINING PROPERTIES API
+    //
+
+    var MANDATORY_SETTER_FUNCTION = Ember.MANDATORY_SETTER_FUNCTION = function(value) {
+          };
+
+    var DEFAULT_GETTER_FUNCTION = Ember.DEFAULT_GETTER_FUNCTION = function(name) {
+      return function() {
+        var meta = this[META_KEY];
+        return meta && meta.values[name];
+      };
+    };
+
+    /**
+      NOTE: This is a low-level method used by other parts of the API. You almost
+      never want to call this method directly. Instead you should use
+      `Ember.mixin()` to define new properties.
+
+      Defines a property on an object. This method works much like the ES5
+      `Object.defineProperty()` method except that it can also accept computed
+      properties and other special descriptors.
+
+      Normally this method takes only three parameters. However if you pass an
+      instance of `Ember.Descriptor` as the third param then you can pass an
+      optional value as the fourth parameter. This is often more efficient than
+      creating new descriptor hashes for each property.
+
+      ## Examples
+
+      ```javascript
+      // ES5 compatible mode
+      Ember.defineProperty(contact, 'firstName', {
+        writable: true,
+        configurable: false,
+        enumerable: true,
+        value: 'Charles'
+      });
+
+      // define a simple property
+      Ember.defineProperty(contact, 'lastName', undefined, 'Jolley');
+
+      // define a computed property
+      Ember.defineProperty(contact, 'fullName', Ember.computed(function() {
+        return this.firstName+' '+this.lastName;
+      }).property('firstName', 'lastName'));
+      ```
+
+      @private
+      @method defineProperty
+      @for Ember
+      @param {Object} obj the object to define this property on. This may be a prototype.
+      @param {String} keyName the name of the property
+      @param {Ember.Descriptor} [desc] an instance of `Ember.Descriptor` (typically a
+        computed property) or an ES5 descriptor.
+        You must provide this or `data` but not both.
+      @param {*} [data] something other than a descriptor, that will
+        become the explicit value of this property.
+    */
+    function defineProperty(obj, keyName, desc, data, meta) {
+      var descs, existingDesc, watching, value;
+
+      if (!meta) meta = metaFor(obj);
+      descs = meta.descs;
+      existingDesc = meta.descs[keyName];
+      watching = meta.watching[keyName] > 0;
+
+      if (existingDesc instanceof Descriptor) {
+        existingDesc.teardown(obj, keyName);
+      }
+
+      if (desc instanceof Descriptor) {
+        value = desc;
+
+        descs[keyName] = desc;
+        if (MANDATORY_SETTER && watching) {
+          objectDefineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: true,
+            writable: true,
+            value: undefined // make enumerable
+          });
+        } else {
+          obj[keyName] = undefined; // make enumerable
+        }
+      } else {
+        descs[keyName] = undefined; // shadow descriptor in proto
+        if (desc == null) {
+          value = data;
+
+          if (MANDATORY_SETTER && watching) {
+            meta.values[keyName] = data;
+            objectDefineProperty(obj, keyName, {
+              configurable: true,
+              enumerable: true,
+              set: MANDATORY_SETTER_FUNCTION,
+              get: DEFAULT_GETTER_FUNCTION(keyName)
+            });
+          } else {
+            obj[keyName] = data;
+          }
+        } else {
+          value = desc;
+
+          // compatibility with ES5
+          objectDefineProperty(obj, keyName, desc);
+        }
+      }
+
+      // if key is being watched, override chains that
+      // were initialized with the prototype
+      if (watching) { overrideChains(obj, keyName, meta); }
+
+      // The `value` passed to the `didDefineProperty` hook is
+      // either the descriptor or data, whichever was passed.
+      if (obj.didDefineProperty) { obj.didDefineProperty(obj, keyName, value); }
+
+      return this;
+    };
+
+    __exports__.Descriptor = Descriptor;
+    __exports__.defineProperty = defineProperty;
+  });
+define("ember-metal/property_events",
+  ["ember-metal/utils","ember-metal/events","ember-metal/observer_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var META_KEY = __dependency1__.META_KEY;
+    var guidFor = __dependency1__.guidFor;
+    var tryFinally = __dependency1__.tryFinally;
+    var sendEvent = __dependency2__.sendEvent;
+    var listenersUnion = __dependency2__.listenersUnion;
+    var listenersDiff = __dependency2__.listenersDiff;
+    var ObserverSet = __dependency3__["default"];
+
+    var beforeObserverSet = new ObserverSet(),
+        observerSet = new ObserverSet(),
+        deferred = 0;
+
+    // ..........................................................
+    // PROPERTY CHANGES
+    //
+
+    /**
+      This function is called just before an object property is about to change.
+      It will notify any before observers and prepare caches among other things.
+
+      Normally you will not need to call this method directly but if for some
+      reason you can't directly watch a property you can invoke this method
+      manually along with `Ember.propertyDidChange()` which you should call just
+      after the property value changes.
+
+      @method propertyWillChange
+      @for Ember
+      @param {Object} obj The object with the property that will change
+      @param {String} keyName The property key (or path) that will change.
+      @return {void}
+    */
+    function propertyWillChange(obj, keyName) {
+      var m = obj[META_KEY],
+          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
+          proto = m && m.proto,
+          desc = m && m.descs[keyName];
+
+      if (!watching) { return; }
+      if (proto === obj) { return; }
+      if (desc && desc.willChange) { desc.willChange(obj, keyName); }
+      dependentKeysWillChange(obj, keyName, m);
+      chainsWillChange(obj, keyName, m);
+      notifyBeforeObservers(obj, keyName);
+    }
+
+    /**
+      This function is called just after an object property has changed.
+      It will notify any observers and clear caches among other things.
+
+      Normally you will not need to call this method directly but if for some
+      reason you can't directly watch a property you can invoke this method
+      manually along with `Ember.propertyWillChange()` which you should call just
+      before the property value changes.
+
+      @method propertyDidChange
+      @for Ember
+      @param {Object} obj The object with the property that will change
+      @param {String} keyName The property key (or path) that will change.
+      @return {void}
+    */
+    function propertyDidChange(obj, keyName) {
+      var m = obj[META_KEY],
+          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
+          proto = m && m.proto,
+          desc = m && m.descs[keyName];
+
+      if (proto === obj) { return; }
+
+      // shouldn't this mean that we're watching this key?
+      if (desc && desc.didChange) { desc.didChange(obj, keyName); }
+      if (!watching && keyName !== 'length') { return; }
+
+      dependentKeysDidChange(obj, keyName, m);
+      chainsDidChange(obj, keyName, m, false);
+      notifyObservers(obj, keyName);
+    }
+
+    var WILL_SEEN, DID_SEEN;
+
+    // called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
+    function dependentKeysWillChange(obj, depKey, meta) {
+      if (obj.isDestroying) { return; }
+
+      var seen = WILL_SEEN, top = !seen;
+      if (top) { seen = WILL_SEEN = {}; }
+      iterDeps(propertyWillChange, obj, depKey, seen, meta);
+      if (top) { WILL_SEEN = null; }
+    }
+
+    // called whenever a property has just changed to update dependent keys
+    function dependentKeysDidChange(obj, depKey, meta) {
+      if (obj.isDestroying) { return; }
+
+      var seen = DID_SEEN, top = !seen;
+      if (top) { seen = DID_SEEN = {}; }
+      iterDeps(propertyDidChange, obj, depKey, seen, meta);
+      if (top) { DID_SEEN = null; }
+    }
+
+    function iterDeps(method, obj, depKey, seen, meta) {
+      var guid = guidFor(obj);
+      if (!seen[guid]) seen[guid] = {};
+      if (seen[guid][depKey]) return;
+      seen[guid][depKey] = true;
+
+      var deps = meta.deps;
+      deps = deps && deps[depKey];
+      if (deps) {
+        for(var key in deps) {
+          var desc = meta.descs[key];
+          if (desc && desc._suspended === obj) continue;
+          method(obj, key);
+        }
+      }
+    }
+
+    function chainsWillChange(obj, keyName, m) {
+      if (!(m.hasOwnProperty('chainWatchers') &&
+            m.chainWatchers[keyName])) {
+        return;
+      }
+
+      var nodes = m.chainWatchers[keyName],
+          events = [],
+          i, l;
+
+      for(i = 0, l = nodes.length; i < l; i++) {
+        nodes[i].willChange(events);
+      }
+
+      for (i = 0, l = events.length; i < l; i += 2) {
+        propertyWillChange(events[i], events[i+1]);
+      }
+    }
+
+    function chainsDidChange(obj, keyName, m, suppressEvents) {
+      if (!(m && m.hasOwnProperty('chainWatchers') &&
+            m.chainWatchers[keyName])) {
+        return;
+      }
+
+      var nodes = m.chainWatchers[keyName],
+          events = suppressEvents ? null : [],
+          i, l;
+
+      for(i = 0, l = nodes.length; i < l; i++) {
+        nodes[i].didChange(events);
+      }
+
+      if (suppressEvents) {
+        return;
+      }
+
+      for (i = 0, l = events.length; i < l; i += 2) {
+        propertyDidChange(events[i], events[i+1]);
+      }
+    }
+
+    function overrideChains(obj, keyName, m) {
+      chainsDidChange(obj, keyName, m, true);
+    };
+
+    /**
+      @method beginPropertyChanges
+      @chainable
+      @private
+    */
+    function beginPropertyChanges() {
+      deferred++;
+    }
+
+    /**
+      @method endPropertyChanges
+      @private
+    */
+    function endPropertyChanges() {
+      deferred--;
+      if (deferred<=0) {
+        beforeObserverSet.clear();
+        observerSet.flush();
+      }
+    }
+
+    /**
+      Make a series of property changes together in an
+      exception-safe way.
+
+      ```javascript
+      Ember.changeProperties(function() {
+        obj1.set('foo', mayBlowUpWhenSet);
+        obj2.set('bar', baz);
+      });
+      ```
+
+      @method changeProperties
+      @param {Function} callback
+      @param [binding]
+    */
+    function changeProperties(cb, binding) {
+      beginPropertyChanges();
+      tryFinally(cb, endPropertyChanges, binding);
+    };
+
+    function notifyBeforeObservers(obj, keyName) {
+      if (obj.isDestroying) { return; }
+
+      var eventName = keyName + ':before', listeners, diff;
+      if (deferred) {
+        listeners = beforeObserverSet.add(obj, keyName, eventName);
+        diff = listenersDiff(obj, eventName, listeners);
+        sendEvent(obj, eventName, [obj, keyName], diff);
+      } else {
+        sendEvent(obj, eventName, [obj, keyName]);
+      }
+    }
+
+    function notifyObservers(obj, keyName) {
+      if (obj.isDestroying) { return; }
+
+      var eventName = keyName + ':change', listeners;
+      if (deferred) {
+        listeners = observerSet.add(obj, keyName, eventName);
+        listenersUnion(obj, eventName, listeners);
+      } else {
+        sendEvent(obj, eventName, [obj, keyName]);
+      }
+    }
+
+    __exports__.propertyWillChange = propertyWillChange;
+    __exports__.propertyDidChange = propertyDidChange;
+    __exports__.overrideChains = overrideChains;
+    __exports__.beginPropertyChanges = beginPropertyChanges;
+    __exports__.endPropertyChanges = endPropertyChanges;
+    __exports__.changeProperties = changeProperties;
+  });
+define("ember-metal/property_get",
+  ["ember-metal/core","ember-metal/utils","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    var Ember = __dependency1__["default"];
+    var META_KEY = __dependency2__.META_KEY;
+    var EmberError = __dependency3__["default"];
+
+    var get;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
+    var HAS_THIS  = 'this.';
+    var FIRST_KEY = /^([^\.]+)/;
+
+    // ..........................................................
+    // GET AND SET
+    //
+    // If we are on a platform that supports accessors we can use those.
+    // Otherwise simulate accessors by looking up the property directly on the
+    // object.
+
+    /**
+      Gets the value of a property on an object. If the property is computed,
+      the function will be invoked. If the property is not defined but the
+      object implements the `unknownProperty` method then that will be invoked.
+
+      If you plan to run on IE8 and older browsers then you should use this
+      method anytime you want to retrieve a property on an object that you don't
+      know for sure is private. (Properties beginning with an underscore '_'
+      are considered private.)
+
+      On all newer browsers, you only need to use this method to retrieve
+      properties if the property might not be defined on the object and you want
+      to respect the `unknownProperty` handler. Otherwise you can ignore this
+      method.
+
+      Note that if the object itself is `undefined`, this method will throw
+      an error.
+
+      @method get
+      @for Ember
+      @param {Object} obj The object to retrieve from.
+      @param {String} keyName The property key to retrieve
+      @return {Object} the property value or `null`.
+    */
+    get = function get(obj, keyName) {
+      // Helpers that operate with 'this' within an #each
+      if (keyName === '') {
+        return obj;
+      }
+
+      if (!keyName && 'string'===typeof obj) {
+        keyName = obj;
+        obj = null;
+      }
+
+            
+      if (obj === null) { return _getPath(obj, keyName);  }
+
+      var meta = obj[META_KEY], desc = meta && meta.descs[keyName], ret;
+
+      if (desc === undefined && keyName.indexOf('.') !== -1) {
+        return _getPath(obj, keyName);
+      }
+
+      if (desc) {
+        return desc.get(obj, keyName);
+      } else {
+        if (MANDATORY_SETTER && meta && meta.watching[keyName] > 0) {
+          ret = meta.values[keyName];
+        } else {
+          ret = obj[keyName];
+        }
+
+        if (ret === undefined &&
+            'object' === typeof obj && !(keyName in obj) && 'function' === typeof obj.unknownProperty) {
+          return obj.unknownProperty(keyName);
+        }
+
+        return ret;
+      }
+    };
+
+    // Currently used only by Ember Data tests
+    if (Ember.config.overrideAccessors) {
+      Ember.get = get;
+      Ember.config.overrideAccessors();
+      get = Ember.get;
+    }
+
+    /**
+      Normalizes a target/path pair to reflect that actual target/path that should
+      be observed, etc. This takes into account passing in global property
+      paths (i.e. a path beginning with a captial letter not defined on the
+      target).
+
+      @private
+      @method normalizeTuple
+      @for Ember
+      @param {Object} target The current target. May be `null`.
+      @param {String} path A path on the target or a global property path.
+      @return {Array} a temporary array with the normalized target/path pair.
+    */
+    function normalizeTuple(target, path) {
+      var hasThis  = path.indexOf(HAS_THIS) === 0,
+          isGlobal = !hasThis && IS_GLOBAL_PATH.test(path),
+          key;
+
+      if (!target || isGlobal) target = Ember.lookup;
+      if (hasThis) path = path.slice(5);
+
+      if (target === Ember.lookup) {
+        key = path.match(FIRST_KEY)[0];
+        target = get(target, key);
+        path   = path.slice(key.length+1);
+      }
+
+      // must return some kind of path to be valid else other things will break.
+      if (!path || path.length===0) throw new EmberError('Path cannot be empty');
+
+      return [ target, path ];
+    };
+
+    function _getPath(root, path) {
+      var hasThis, parts, tuple, idx, len;
+
+      // If there is no root and path is a key name, return that
+      // property from the global object.
+      // E.g. get('Ember') -> Ember
+      if (root === null && path.indexOf('.') === -1) { return get(Ember.lookup, path); }
+
+      // detect complicated paths and normalize them
+      hasThis = path.indexOf(HAS_THIS) === 0;
+
+      if (!root || hasThis) {
+        tuple = normalizeTuple(root, path);
+        root = tuple[0];
+        path = tuple[1];
+        tuple.length = 0;
+      }
+
+      parts = path.split(".");
+      len = parts.length;
+      for (idx = 0; root != null && idx < len; idx++) {
+        root = get(root, parts[idx], true);
+        if (root && root.isDestroyed) { return undefined; }
+      }
+      return root;
+    };
+
+    function getWithDefault(root, key, defaultValue) {
+      var value = get(root, key);
+
+      if (value === undefined) { return defaultValue; }
+      return value;
+    };
+
+    __exports__["default"] = get;
+    __exports__.get = get;
+    __exports__.getWithDefault = getWithDefault;
+    __exports__.normalizeTuple = normalizeTuple;
+    __exports__._getPath = _getPath;
+  });
+define("ember-metal/property_set",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/property_events","ember-metal/properties","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var getPath = __dependency2__._getPath;
+    var META_KEY = __dependency3__.META_KEY;
+    var propertyWillChange = __dependency4__.propertyWillChange;
+    var propertyDidChange = __dependency4__.propertyDidChange;
+    var defineProperty = __dependency5__.defineProperty;
+    var EmberError = __dependency6__["default"];
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER,
+        IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
+
+    /**
+      Sets the value of a property on an object, respecting computed properties
+      and notifying observers and other listeners of the change. If the
+      property is not defined but the object implements the `setUnknownProperty`
+      method then that will be invoked as well.
+
+      @method set
+      @for Ember
+      @param {Object} obj The object to modify.
+      @param {String} keyName The property key to set
+      @param {Object} value The value to set
+      @return {Object} the passed value.
+    */
+    var set = function set(obj, keyName, value, tolerant) {
+      if (typeof obj === 'string') {
+                value = keyName;
+        keyName = obj;
+        obj = null;
+      }
+
+      
+      if (!obj) {
+        return setPath(obj, keyName, value, tolerant);
+      }
+
+      var meta = obj[META_KEY], desc = meta && meta.descs[keyName],
+          isUnknown, currentValue;
+
+      if (desc === undefined && keyName.indexOf('.') !== -1) {
+        return setPath(obj, keyName, value, tolerant);
+      }
+
+            
+      if (desc !== undefined) {
+        desc.set(obj, keyName, value);
+      } else {
+
+        if (typeof obj === 'object' && obj !== null && value !== undefined && obj[keyName] === value) {
+          return value;
+        }
+
+        isUnknown = 'object' === typeof obj && !(keyName in obj);
+
+        // setUnknownProperty is called if `obj` is an object,
+        // the property does not already exist, and the
+        // `setUnknownProperty` method exists on the object
+        if (isUnknown && 'function' === typeof obj.setUnknownProperty) {
+          obj.setUnknownProperty(keyName, value);
+        } else if (meta && meta.watching[keyName] > 0) {
+          if (MANDATORY_SETTER) {
+            currentValue = meta.values[keyName];
+          } else {
+            currentValue = obj[keyName];
+          }
+          // only trigger a change if the value has changed
+          if (value !== currentValue) {
+            propertyWillChange(obj, keyName);
+            if (MANDATORY_SETTER) {
+              if ((currentValue === undefined && !(keyName in obj)) || !obj.propertyIsEnumerable(keyName)) {
+                defineProperty(obj, keyName, null, value); // setup mandatory setter
+              } else {
+                meta.values[keyName] = value;
+              }
+            } else {
+              obj[keyName] = value;
+            }
+            propertyDidChange(obj, keyName);
+          }
+        } else {
+          obj[keyName] = value;
+        }
+      }
+      return value;
+    };
+
+    // Currently used only by Ember Data tests
+    // ES6TODO: Verify still true
+    if (Ember.config.overrideAccessors) {
+      Ember.set = set;
+      Ember.config.overrideAccessors();
+      set = Ember.set;
+    }
+
+    function setPath(root, path, value, tolerant) {
+      var keyName;
+
+      // get the last part of the path
+      keyName = path.slice(path.lastIndexOf('.') + 1);
+
+      // get the first part of the part
+      path    = (path === keyName) ? keyName : path.slice(0, path.length-(keyName.length+1));
+
+      // unless the path is this, look up the first part to
+      // get the root
+      if (path !== 'this') {
+        root = getPath(root, path);
+      }
+
+      if (!keyName || keyName.length === 0) {
+        throw new EmberError('Property set failed: You passed an empty path');
+      }
+
+      if (!root) {
+        if (tolerant) { return; }
+        else { throw new EmberError('Property set failed: object in path "'+path+'" could not be found or was destroyed.'); }
+      }
+
+      return set(root, keyName, value);
+    }
+
+    /**
+      Error-tolerant form of `Ember.set`. Will not blow up if any part of the
+      chain is `undefined`, `null`, or destroyed.
+
+      This is primarily used when syncing bindings, which may try to update after
+      an object has been destroyed.
+
+      @method trySet
+      @for Ember
+      @param {Object} obj The object to modify.
+      @param {String} path The property path to set
+      @param {Object} value The value to set
+    */
+    function trySet(root, path, value) {
+      return set(root, path, value, true);
+    };
+
+    __exports__.set = set;
+    __exports__.trySet = trySet;
+  });
+define("ember-metal/run_loop",
+  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var apply = __dependency2__.apply;
+    var indexOf = __dependency3__.indexOf;
+    var beginPropertyChanges = __dependency4__.beginPropertyChanges;
+    var endPropertyChanges = __dependency4__.endPropertyChanges;
+
+    var onBegin = function(current) {
+      run.currentRunLoop = current;
+    };
+
+    var onEnd = function(current, next) {
+      run.currentRunLoop = next;
+    };
+
+    // ES6TODO: should Backburner become es6?
+    var Backburner = requireModule('backburner').Backburner,
+        backburner = new Backburner(['sync', 'actions', 'destroy'], {
+          sync: {
+            before: beginPropertyChanges,
+            after: endPropertyChanges
+          },
+          defaultQueue: 'actions',
+          onBegin: onBegin,
+          onEnd: onEnd,
+          onErrorTarget: Ember,
+          onErrorMethod: 'onerror'
+        }),
+        slice = [].slice,
+        concat = [].concat;
+
+    // ..........................................................
+    // run - this is ideally the only public API the dev sees
+    //
+
+    /**
+      Runs the passed target and method inside of a RunLoop, ensuring any
+      deferred actions including bindings and views updates are flushed at the
+      end.
+
+      Normally you should not need to invoke this method yourself. However if
+      you are implementing raw event handlers when interfacing with other
+      libraries or plugins, you should probably wrap all of your code inside this
+      call.
+
+      ```javascript
+      run(function() {
+        // code to be execute within a RunLoop
+      });
+      ```
+
+      @class run
+      @namespace Ember
+      @static
+      @constructor
+      @param {Object} [target] target of method to call
+      @param {Function|String} method Method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Any additional arguments you wish to pass to the method.
+      @return {Object} return value from invoking the passed function.
+    */
+    var run = function() {
+      return apply(backburner, backburner.run, arguments);
+    };
+
+    /**
+      If no run-loop is present, it creates a new one. If a run loop is
+      present it will queue itself to run on the existing run-loops action
+      queue.
+
+      Please note: This is not for normal usage, and should be used sparingly.
+
+      If invoked when not within a run loop:
+
+      ```javascript
+      run.join(function() {
+        // creates a new run-loop
+      });
+      ```
+
+      Alternatively, if called within an existing run loop:
+
+      ```javascript
+      run(function() {
+        // creates a new run-loop
+        run.join(function() {
+          // joins with the existing run-loop, and queues for invocation on
+          // the existing run-loops action queue.
+        });
+      });
+      ```
+
+      @method join
+      @namespace Ember
+      @param {Object} [target] target of method to call
+      @param {Function|String} method Method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Any additional arguments you wish to pass to the method.
+      @return {Object} Return value from invoking the passed function. Please note,
+      when called within an existing loop, no return value is possible.
+    */
+    run.join = function(target, method /* args */) {
+      if (!run.currentRunLoop) {
+        return apply(Ember, run, arguments);
+      }
+
+      var args = slice.call(arguments);
+      args.unshift('actions');
+      apply(run, run.schedule, args);
+    };
+
+    /**
+      Provides a useful utility for when integrating with non-Ember libraries
+      that provide asynchronous callbacks.
+
+      Ember utilizes a run-loop to batch and coalesce changes. This works by
+      marking the start and end of Ember-related Javascript execution.
+
+      When using events such as a View's click handler, Ember wraps the event
+      handler in a run-loop, but when integrating with non-Ember libraries this
+      can be tedious.
+
+      For example, the following is rather verbose but is the correct way to combine
+      third-party events and Ember code.
+
+      ```javascript
+      var that = this;
+      jQuery(window).on('resize', function(){
+        run(function(){
+          that.handleResize();
+        });
+      });
+      ```
+
+      To reduce the boilerplate, the following can be used to construct a
+      run-loop-wrapped callback handler.
+
+      ```javascript
+      jQuery(window).on('resize', run.bind(this, this.handleResize));
+      ```
+
+      @method bind
+      @namespace run
+      @param {Object} [target] target of method to call
+      @param {Function|String} method Method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Any additional arguments you wish to pass to the method.
+      @return {Object} return value from invoking the passed function. Please note,
+      when called within an existing loop, no return value is possible.
+      @since 1.4.0
+    */
+    run.bind = function(target, method /* args*/) {
+      var args = slice.call(arguments);
+      return function() {
+        return apply(run, run.join, args.concat(slice.call(arguments)));
+      };
+    };
+
+    run.backburner = backburner;
+    run.currentRunLoop = null;
+    run.queues = backburner.queueNames;
+
+    /**
+      Begins a new RunLoop. Any deferred actions invoked after the begin will
+      be buffered until you invoke a matching call to `run.end()`. This is
+      a lower-level way to use a RunLoop instead of using `run()`.
+
+      ```javascript
+      run.begin();
+      // code to be execute within a RunLoop
+      run.end();
+      ```
+
+      @method begin
+      @return {void}
+    */
+    run.begin = function() {
+      backburner.begin();
+    };
+
+    /**
+      Ends a RunLoop. This must be called sometime after you call
+      `run.begin()` to flush any deferred actions. This is a lower-level way
+      to use a RunLoop instead of using `run()`.
+
+      ```javascript
+      run.begin();
+      // code to be execute within a RunLoop
+      run.end();
+      ```
+
+      @method end
+      @return {void}
+    */
+    run.end = function() {
+      backburner.end();
+    };
+
+    /**
+      Array of named queues. This array determines the order in which queues
+      are flushed at the end of the RunLoop. You can define your own queues by
+      simply adding the queue name to this array. Normally you should not need
+      to inspect or modify this property.
+
+      @property queues
+      @type Array
+      @default ['sync', 'actions', 'destroy']
+    */
+
+    /**
+      Adds the passed target/method and any optional arguments to the named
+      queue to be executed at the end of the RunLoop. If you have not already
+      started a RunLoop when calling this method one will be started for you
+      automatically.
+
+      At the end of a RunLoop, any methods scheduled in this way will be invoked.
+      Methods will be invoked in an order matching the named queues defined in
+      the `run.queues` property.
+
+      ```javascript
+      run.schedule('sync', this, function() {
+        // this will be executed in the first RunLoop queue, when bindings are synced
+        console.log("scheduled on sync queue");
+      });
+
+      run.schedule('actions', this, function() {
+        // this will be executed in the 'actions' queue, after bindings have synced.
+        console.log("scheduled on actions queue");
+      });
+
+      // Note the functions will be run in order based on the run queues order.
+      // Output would be:
+      //   scheduled on sync queue
+      //   scheduled on actions queue
+      ```
+
+      @method schedule
+      @param {String} queue The name of the queue to schedule against.
+        Default queues are 'sync' and 'actions'
+      @param {Object} [target] target object to use as the context when invoking a method.
+      @param {String|Function} method The method to invoke. If you pass a string it
+        will be resolved on the target object at the time the scheduled item is
+        invoked allowing you to change the target function.
+      @param {Object} [arguments*] Optional arguments to be passed to the queued method.
+      @return {void}
+    */
+    run.schedule = function(queue, target, method) {
+      checkAutoRun();
+      apply(backburner, backburner.schedule, arguments);
+    };
+
+    // Used by global test teardown
+    run.hasScheduledTimers = function() {
+      return backburner.hasTimers();
+    };
+
+    // Used by global test teardown
+    run.cancelTimers = function () {
+      backburner.cancelTimers();
+    };
+
+    /**
+      Immediately flushes any events scheduled in the 'sync' queue. Bindings
+      use this queue so this method is a useful way to immediately force all
+      bindings in the application to sync.
+
+      You should call this method anytime you need any changed state to propagate
+      throughout the app immediately without repainting the UI (which happens
+      in the later 'render' queue added by the `ember-views` package).
+
+      ```javascript
+      run.sync();
+      ```
+
+      @method sync
+      @return {void}
+    */
+    run.sync = function() {
+      if (backburner.currentInstance) {
+        backburner.currentInstance.queues.sync.flush();
+      }
+    };
+
+    /**
+      Invokes the passed target/method and optional arguments after a specified
+      period if time. The last parameter of this method must always be a number
+      of milliseconds.
+
+      You should use this method whenever you need to run some action after a
+      period of time instead of using `setTimeout()`. This method will ensure that
+      items that expire during the same script execution cycle all execute
+      together, which is often more efficient than using a real setTimeout.
+
+      ```javascript
+      run.later(myContext, function() {
+        // code here will execute within a RunLoop in about 500ms with this == myContext
+      }, 500);
+      ```
+
+      @method later
+      @param {Object} [target] target of method to invoke
+      @param {Function|String} method The method to invoke.
+        If you pass a string it will be resolved on the
+        target at the time the method is invoked.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @param {Number} wait Number of milliseconds to wait.
+      @return {String} a string you can use to cancel the timer in
+        `run.cancel` later.
+    */
+    run.later = function(target, method) {
+      return apply(backburner, backburner.later, arguments);
+    };
+
+    /**
+      Schedule a function to run one time during the current RunLoop. This is equivalent
+      to calling `scheduleOnce` with the "actions" queue.
+
+      @method once
+      @param {Object} [target] The target of the method to invoke.
+      @param {Function|String} method The method to invoke.
+        If you pass a string it will be resolved on the
+        target at the time the method is invoked.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.once = function(target, method) {
+      checkAutoRun();
+      var args = slice.call(arguments);
+      args.unshift('actions');
+      return apply(backburner, backburner.scheduleOnce, args);
+    };
+
+    /**
+      Schedules a function to run one time in a given queue of the current RunLoop.
+      Calling this method with the same queue/target/method combination will have
+      no effect (past the initial call).
+
+      Note that although you can pass optional arguments these will not be
+      considered when looking for duplicates. New arguments will replace previous
+      calls.
+
+      ```javascript
+      run(function() {
+        var sayHi = function() { console.log('hi'); }
+        run.scheduleOnce('afterRender', myContext, sayHi);
+        run.scheduleOnce('afterRender', myContext, sayHi);
+        // sayHi will only be executed once, in the afterRender queue of the RunLoop
+      });
+      ```
+
+      Also note that passing an anonymous function to `run.scheduleOnce` will
+      not prevent additional calls with an identical anonymous function from
+      scheduling the items multiple times, e.g.:
+
+      ```javascript
+      function scheduleIt() {
+        run.scheduleOnce('actions', myContext, function() { console.log("Closure"); });
+      }
+      scheduleIt();
+      scheduleIt();
+      // "Closure" will print twice, even though we're using `run.scheduleOnce`,
+      // because the function we pass to it is anonymous and won't match the
+      // previously scheduled operation.
+      ```
+
+      Available queues, and their order, can be found at `run.queues`
+
+      @method scheduleOnce
+      @param {String} [queue] The name of the queue to schedule against. Default queues are 'sync' and 'actions'.
+      @param {Object} [target] The target of the method to invoke.
+      @param {Function|String} method The method to invoke.
+        If you pass a string it will be resolved on the
+        target at the time the method is invoked.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.scheduleOnce = function(queue, target, method) {
+      checkAutoRun();
+      return apply(backburner, backburner.scheduleOnce, arguments);
+    };
+
+    /**
+      Schedules an item to run from within a separate run loop, after
+      control has been returned to the system. This is equivalent to calling
+      `run.later` with a wait time of 1ms.
+
+      ```javascript
+      run.next(myContext, function() {
+        // code to be executed in the next run loop,
+        // which will be scheduled after the current one
+      });
+      ```
+
+      Multiple operations scheduled with `run.next` will coalesce
+      into the same later run loop, along with any other operations
+      scheduled by `run.later` that expire right around the same
+      time that `run.next` operations will fire.
+
+      Note that there are often alternatives to using `run.next`.
+      For instance, if you'd like to schedule an operation to happen
+      after all DOM element operations have completed within the current
+      run loop, you can make use of the `afterRender` run loop queue (added
+      by the `ember-views` package, along with the preceding `render` queue
+      where all the DOM element operations happen). Example:
+
+      ```javascript
+      App.MyCollectionView = Ember.CollectionView.extend({
+        didInsertElement: function() {
+          run.scheduleOnce('afterRender', this, 'processChildElements');
+        },
+        processChildElements: function() {
+          // ... do something with collectionView's child view
+          // elements after they've finished rendering, which
+          // can't be done within the CollectionView's
+          // `didInsertElement` hook because that gets run
+          // before the child elements have been added to the DOM.
+        }
+      });
+      ```
+
+      One benefit of the above approach compared to using `run.next` is
+      that you will be able to perform DOM/CSS operations before unprocessed
+      elements are rendered to the screen, which may prevent flickering or
+      other artifacts caused by delaying processing until after rendering.
+
+      The other major benefit to the above approach is that `run.next`
+      introduces an element of non-determinism, which can make things much
+      harder to test, due to its reliance on `setTimeout`; it's much harder
+      to guarantee the order of scheduled operations when they are scheduled
+      outside of the current run loop, i.e. with `run.next`.
+
+      @method next
+      @param {Object} [target] target of method to invoke
+      @param {Function|String} method The method to invoke.
+        If you pass a string it will be resolved on the
+        target at the time the method is invoked.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.next = function() {
+      var args = slice.call(arguments);
+      args.push(1);
+      return apply(backburner, backburner.later, args);
+    };
+
+    /**
+      Cancels a scheduled item. Must be a value returned by `run.later()`,
+      `run.once()`, `run.next()`, `run.debounce()`, or
+      `run.throttle()`.
+
+      ```javascript
+      var runNext = run.next(myContext, function() {
+        // will not be executed
+      });
+      run.cancel(runNext);
+
+      var runLater = run.later(myContext, function() {
+        // will not be executed
+      }, 500);
+      run.cancel(runLater);
+
+      var runOnce = run.once(myContext, function() {
+        // will not be executed
+      });
+      run.cancel(runOnce);
+
+      var throttle = run.throttle(myContext, function() {
+        // will not be executed
+      }, 1, false);
+      run.cancel(throttle);
+
+      var debounce = run.debounce(myContext, function() {
+        // will not be executed
+      }, 1);
+      run.cancel(debounce);
+
+      var debounceImmediate = run.debounce(myContext, function() {
+        // will be executed since we passed in true (immediate)
+      }, 100, true);
+      // the 100ms delay until this method can be called again will be cancelled
+      run.cancel(debounceImmediate);
+      ```
+
+      @method cancel
+      @param {Object} timer Timer object to cancel
+      @return {Boolean} true if cancelled or false/undefined if it wasn't found
+    */
+    run.cancel = function(timer) {
+      return backburner.cancel(timer);
+    };
+
+    /**
+      Delay calling the target method until the debounce period has elapsed
+      with no additional debounce calls. If `debounce` is called again before
+      the specified time has elapsed, the timer is reset and the entire period
+      must pass again before the target method is called.
+
+      This method should be used when an event may be called multiple times
+      but the action should only be called once when the event is done firing.
+      A common example is for scroll events where you only want updates to
+      happen once scrolling has ceased.
+
+      ```javascript
+        var myFunc = function() { console.log(this.name + ' ran.'); };
+        var myContext = {name: 'debounce'};
+
+        run.debounce(myContext, myFunc, 150);
+
+        // less than 150ms passes
+
+        run.debounce(myContext, myFunc, 150);
+
+        // 150ms passes
+        // myFunc is invoked with context myContext
+        // console logs 'debounce ran.' one time.
+      ```
+
+      Immediate allows you to run the function immediately, but debounce
+      other calls for this function until the wait time has elapsed. If
+      `debounce` is called again before the specified time has elapsed,
+      the timer is reset and the entire period must pass again before
+      the method can be called again.
+
+      ```javascript
+        var myFunc = function() { console.log(this.name + ' ran.'); };
+        var myContext = {name: 'debounce'};
+
+        run.debounce(myContext, myFunc, 150, true);
+
+        // console logs 'debounce ran.' one time immediately.
+        // 100ms passes
+
+        run.debounce(myContext, myFunc, 150, true);
+
+        // 150ms passes and nothing else is logged to the console and
+        // the debouncee is no longer being watched
+
+        run.debounce(myContext, myFunc, 150, true);
+
+        // console logs 'debounce ran.' one time immediately.
+        // 150ms passes and nothing else is logged to the console and
+        // the debouncee is no longer being watched
+
+      ```
+
+      @method debounce
+      @param {Object} [target] target of method to invoke
+      @param {Function|String} method The method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @param {Number} wait Number of milliseconds to wait.
+      @param {Boolean} immediate Trigger the function on the leading instead
+        of the trailing edge of the wait interval. Defaults to false.
+      @return {Array} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.debounce = function() {
+      return apply(backburner, backburner.debounce, arguments);
+    };
+
+    /**
+      Ensure that the target method is never called more frequently than
+      the specified spacing period. The target method is called immediately.
+
+      ```javascript
+        var myFunc = function() { console.log(this.name + ' ran.'); };
+        var myContext = {name: 'throttle'};
+
+        run.throttle(myContext, myFunc, 150);
+        // myFunc is invoked with context myContext
+        // console logs 'throttle ran.'
+
+        // 50ms passes
+        run.throttle(myContext, myFunc, 150);
+
+        // 50ms passes
+        run.throttle(myContext, myFunc, 150);
+
+        // 150ms passes
+        run.throttle(myContext, myFunc, 150);
+        // myFunc is invoked with context myContext
+        // console logs 'throttle ran.'
+      ```
+
+      @method throttle
+      @param {Object} [target] target of method to invoke
+      @param {Function|String} method The method to invoke.
+        May be a function or a string. If you pass a string
+        then it will be looked up on the passed target.
+      @param {Object} [args*] Optional arguments to pass to the timeout.
+      @param {Number} spacing Number of milliseconds to space out requests.
+      @param {Boolean} immediate Trigger the function on the leading instead
+        of the trailing edge of the wait interval. Defaults to true.
+      @return {Array} Timer information for use in cancelling, see `run.cancel`.
+    */
+    run.throttle = function() {
+      return apply(backburner, backburner.throttle, arguments);
+    };
+
+    // Make sure it's not an autorun during testing
+    function checkAutoRun() {
+      if (!run.currentRunLoop) {
+              }
+    }
+
+    /**
+      Add a new named queue after the specified queue.
+
+      The queue to add will only be added once.
+
+      @method _addQueue
+      @param {String} name the name of the queue to add.
+      @param {String} after the name of the queue to add after.
+      @private
+    */
+    run._addQueue = function(name, after) {
+      if (indexOf.call(run.queues, name) === -1) {
+        run.queues.splice(indexOf.call(run.queues, after)+1, 0, name);
+      }
+    }
+
+    __exports__["default"] = run
+  });
+define("ember-metal/set_properties",
+  ["ember-metal/property_events","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var changeProperties = __dependency1__.changeProperties;
+    var set = __dependency2__.set;
+
+    /**
+      Set a list of properties on an object. These properties are set inside
+      a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+      observers will be buffered.
+
+      ```javascript
+      var anObject = Ember.Object.create();
+
+      anObject.setProperties({
+        firstName: 'Stanley',
+        lastName: 'Stuart',
+        age: 21
+      });
+      ```
+
+      @method setProperties
+      @param self
+      @param {Object} hash
+      @return self
+    */
+    function setProperties(self, hash) {
+      changeProperties(function() {
+        for(var prop in hash) {
+          if (hash.hasOwnProperty(prop)) { set(self, prop, hash[prop]); }
+        }
+      });
+      return self;
+    };
+
+    __exports__["default"] = setProperties;
+  });
+define("ember-metal/utils",
+  ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var platform = __dependency2__.platform;
+    var create = __dependency2__.create;
+    var forEach = __dependency3__.forEach;
+
+    /**
+    @module ember-metal
+    */
+
+    /**
+      Prefix used for guids through out Ember.
+      @private
+      @property GUID_PREFIX
+      @for Ember
+      @type String
+      @final
+    */
+    var GUID_PREFIX = 'ember';
+
+
+    var o_defineProperty = platform.defineProperty,
+        o_create = create,
+        // Used for guid generation...
+        numberCache  = [],
+        stringCache  = {},
+        uuid = 0;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    /**
+      A unique key used to assign guids and other private metadata to objects.
+      If you inspect an object in your browser debugger you will often see these.
+      They can be safely ignored.
+
+      On browsers that support it, these properties are added with enumeration
+      disabled so they won't show up when you iterate over your properties.
+
+      @private
+      @property GUID_KEY
+      @for Ember
+      @type String
+      @final
+    */
+    var GUID_KEY = '__ember' + (+ new Date());
+
+    var GUID_DESC = {
+      writable:    false,
+      configurable: false,
+      enumerable:  false,
+      value: null
+    };
+
+    /**
+      Generates a new guid, optionally saving the guid to the object that you
+      pass in. You will rarely need to use this method. Instead you should
+      call `Ember.guidFor(obj)`, which return an existing guid if available.
+
+      @private
+      @method generateGuid
+      @for Ember
+      @param {Object} [obj] Object the guid will be used for. If passed in, the guid will
+        be saved on the object and reused whenever you pass the same object
+        again.
+
+        If no object is passed, just generate a new guid.
+      @param {String} [prefix] Prefix to place in front of the guid. Useful when you want to
+        separate the guid into separate namespaces.
+      @return {String} the guid
+    */
+    function generateGuid(obj, prefix) {
+      if (!prefix) prefix = GUID_PREFIX;
+      var ret = (prefix + (uuid++));
+      if (obj) {
+        if (obj[GUID_KEY] === null) {
+          obj[GUID_KEY] = ret;
+        } else {
+          GUID_DESC.value = ret;
+          o_defineProperty(obj, GUID_KEY, GUID_DESC);
+        }
+      }
+      return ret;
+    }
+
+    /**
+      Returns a unique id for the object. If the object does not yet have a guid,
+      one will be assigned to it. You can call this on any object,
+      `Ember.Object`-based or not, but be aware that it will add a `_guid`
+      property.
+
+      You can also use this method on DOM Element objects.
+
+      @private
+      @method guidFor
+      @for Ember
+      @param {Object} obj any object, string, number, Element, or primitive
+      @return {String} the unique guid for this instance.
+    */
+    function guidFor(obj) {
+
+      // special cases where we don't want to add a key to object
+      if (obj === undefined) return "(undefined)";
+      if (obj === null) return "(null)";
+
+      var ret;
+      var type = typeof obj;
+
+      // Don't allow prototype changes to String etc. to change the guidFor
+      switch(type) {
+        case 'number':
+          ret = numberCache[obj];
+          if (!ret) ret = numberCache[obj] = 'nu'+obj;
+          return ret;
+
+        case 'string':
+          ret = stringCache[obj];
+          if (!ret) ret = stringCache[obj] = 'st'+(uuid++);
+          return ret;
+
+        case 'boolean':
+          return obj ? '(true)' : '(false)';
+
+        default:
+          if (obj[GUID_KEY]) return obj[GUID_KEY];
+          if (obj === Object) return '(Object)';
+          if (obj === Array)  return '(Array)';
+          ret = 'ember' + (uuid++);
+
+          if (obj[GUID_KEY] === null) {
+            obj[GUID_KEY] = ret;
+          } else {
+            GUID_DESC.value = ret;
+            o_defineProperty(obj, GUID_KEY, GUID_DESC);
+          }
+          return ret;
+      }
+    };
+
+    // ..........................................................
+    // META
+    //
+
+    var META_DESC = {
+      writable:    true,
+      configurable: false,
+      enumerable:  false,
+      value: null
+    };
+
+
+    /**
+      The key used to store meta information on object for property observing.
+
+      @property META_KEY
+      @for Ember
+      @private
+      @final
+      @type String
+    */
+    var META_KEY = '__ember_meta__';
+
+    var isDefinePropertySimulated = platform.defineProperty.isSimulated;
+
+    function Meta(obj) {
+      this.descs = {};
+      this.watching = {};
+      this.cache = {};
+      this.cacheMeta = {};
+      this.source = obj;
+    }
+
+    Meta.prototype = {
+      descs: null,
+      deps: null,
+      watching: null,
+      listeners: null,
+      cache: null,
+      cacheMeta: null,
+      source: null,
+      mixins: null,
+      bindings: null,
+      chains: null,
+      chainWatchers: null,
+      values: null,
+      proto: null
+    };
+
+    if (isDefinePropertySimulated) {
+      // on platforms that don't support enumerable false
+      // make meta fail jQuery.isPlainObject() to hide from
+      // jQuery.extend() by having a property that fails
+      // hasOwnProperty check.
+      Meta.prototype.__preventPlainObject__ = true;
+
+      // Without non-enumerable properties, meta objects will be output in JSON
+      // unless explicitly suppressed
+      Meta.prototype.toJSON = function () { };
+    }
+
+    // Placeholder for non-writable metas.
+    var EMPTY_META = new Meta(null);
+
+    if (MANDATORY_SETTER) { EMPTY_META.values = {}; }
+
+    /**
+      Retrieves the meta hash for an object. If `writable` is true ensures the
+      hash is writable for this object as well.
+
+      The meta object contains information about computed property descriptors as
+      well as any watched properties and other information. You generally will
+      not access this information directly but instead work with higher level
+      methods that manipulate this hash indirectly.
+
+      @method meta
+      @for Ember
+      @private
+
+      @param {Object} obj The object to retrieve meta for
+      @param {Boolean} [writable=true] Pass `false` if you do not intend to modify
+        the meta hash, allowing the method to avoid making an unnecessary copy.
+      @return {Object} the meta hash for an object
+    */
+    function meta(obj, writable) {
+
+      var ret = obj[META_KEY];
+      if (writable===false) return ret || EMPTY_META;
+
+      if (!ret) {
+        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
+
+        ret = new Meta(obj);
+
+        if (MANDATORY_SETTER) { ret.values = {}; }
+
+        obj[META_KEY] = ret;
+
+        // make sure we don't accidentally try to create constructor like desc
+        ret.descs.constructor = null;
+
+      } else if (ret.source !== obj) {
+        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
+
+        ret = o_create(ret);
+        ret.descs     = o_create(ret.descs);
+        ret.watching  = o_create(ret.watching);
+        ret.cache     = {};
+        ret.cacheMeta = {};
+        ret.source    = obj;
+
+        if (MANDATORY_SETTER) { ret.values = o_create(ret.values); }
+
+        obj[META_KEY] = ret;
+      }
+      return ret;
+    };
+
+    function getMeta(obj, property) {
+      var _meta = meta(obj, false);
+      return _meta[property];
+    };
+
+    function setMeta(obj, property, value) {
+      var _meta = meta(obj, true);
+      _meta[property] = value;
+      return value;
+    };
+
+    /**
+      @deprecated
+      @private
+
+      In order to store defaults for a class, a prototype may need to create
+      a default meta object, which will be inherited by any objects instantiated
+      from the class's constructor.
+
+      However, the properties of that meta object are only shallow-cloned,
+      so if a property is a hash (like the event system's `listeners` hash),
+      it will by default be shared across all instances of that class.
+
+      This method allows extensions to deeply clone a series of nested hashes or
+      other complex objects. For instance, the event system might pass
+      `['listeners', 'foo:change', 'ember157']` to `prepareMetaPath`, which will
+      walk down the keys provided.
+
+      For each key, if the key does not exist, it is created. If it already
+      exists and it was inherited from its constructor, the constructor's
+      key is cloned.
+
+      You can also pass false for `writable`, which will simply return
+      undefined if `prepareMetaPath` discovers any part of the path that
+      shared or undefined.
+
+      @method metaPath
+      @for Ember
+      @param {Object} obj The object whose meta we are examining
+      @param {Array} path An array of keys to walk down
+      @param {Boolean} writable whether or not to create a new meta
+        (or meta property) if one does not already exist or if it's
+        shared with its constructor
+    */
+    function metaPath(obj, path, writable) {
+            var _meta = meta(obj, writable), keyName, value;
+
+      for (var i=0, l=path.length; i<l; i++) {
+        keyName = path[i];
+        value = _meta[keyName];
+
+        if (!value) {
+          if (!writable) { return undefined; }
+          value = _meta[keyName] = { __ember_source__: obj };
+        } else if (value.__ember_source__ !== obj) {
+          if (!writable) { return undefined; }
+          value = _meta[keyName] = o_create(value);
+          value.__ember_source__ = obj;
+        }
+
+        _meta = value;
+      }
+
+      return value;
+    };
+
+    /**
+      Wraps the passed function so that `this._super` will point to the superFunc
+      when the function is invoked. This is the primitive we use to implement
+      calls to super.
+
+      @private
+      @method wrap
+      @for Ember
+      @param {Function} func The function to call
+      @param {Function} superFunc The super function.
+      @return {Function} wrapped function.
+    */
+    function wrap(func, superFunc) {
+      function superWrapper() {
+        var ret, sup = this.__nextSuper;
+        this.__nextSuper = superFunc;
+        ret = apply(this, func, arguments);
+        this.__nextSuper = sup;
+        return ret;
+      }
+
+      superWrapper.wrappedFunction = func;
+      superWrapper.wrappedFunction.__ember_arity__ = func.length;
+      superWrapper.__ember_observes__ = func.__ember_observes__;
+      superWrapper.__ember_observesBefore__ = func.__ember_observesBefore__;
+      superWrapper.__ember_listens__ = func.__ember_listens__;
+
+      return superWrapper;
+    };
+
+    var EmberArray;
+
+    /**
+      Returns true if the passed object is an array or Array-like.
+
+      Ember Array Protocol:
+
+        - the object has an objectAt property
+        - the object is a native Array
+        - the object is an Object, and has a length property
+
+      Unlike `Ember.typeOf` this method returns true even if the passed object is
+      not formally array but appears to be array-like (i.e. implements `Ember.Array`)
+
+      ```javascript
+      Ember.isArray();                                          // false
+      Ember.isArray([]);                                        // true
+      Ember.isArray(Ember.ArrayProxy.create({ content: [] }));  // true
+      ```
+
+      @method isArray
+      @for Ember
+      @param {Object} obj The object to test
+      @return {Boolean} true if the passed object is an array or Array-like
+    */
+    // ES6TODO: Move up to runtime? This is only use in ember-metal by concatenatedProperties
+    function isArray(obj) {
+      var modulePath, type;
+
+      if (typeof EmberArray === "undefined") {
+        modulePath = 'ember-runtime/mixins/array';
+        if (requirejs._eak_seen[modulePath]) {
+          EmberArray = requireModule(modulePath)['default'];
+        }
+      }
+
+      if (!obj || obj.setInterval) { return false; }
+      if (Array.isArray && Array.isArray(obj)) { return true; }
+      if (EmberArray && EmberArray.detect(obj)) { return true; }
+
+      type = typeOf(obj);
+      if ('array' === type) { return true; }
+      if ((obj.length !== undefined) && 'object' === type) { return true; }
+      return false;
+    };
+
+    /**
+      Forces the passed object to be part of an array. If the object is already
+      an array or array-like, returns the object. Otherwise adds the object to
+      an array. If obj is `null` or `undefined`, returns an empty array.
+
+      ```javascript
+      Ember.makeArray();            // []
+      Ember.makeArray(null);        // []
+      Ember.makeArray(undefined);   // []
+      Ember.makeArray('lindsay');   // ['lindsay']
+      Ember.makeArray([1, 2, 42]);  // [1, 2, 42]
+
+      var controller = Ember.ArrayProxy.create({ content: [] });
+
+      Ember.makeArray(controller) === controller;  // true
+      ```
+
+      @method makeArray
+      @for Ember
+      @param {Object} obj the object
+      @return {Array}
+    */
+    function makeArray(obj) {
+      if (obj === null || obj === undefined) { return []; }
+      return isArray(obj) ? obj : [obj];
+    };
+
+    /**
+      Checks to see if the `methodName` exists on the `obj`.
+
+      ```javascript
+      var foo = { bar: Ember.K, baz: null };
+
+      Ember.canInvoke(foo, 'bar'); // true
+      Ember.canInvoke(foo, 'baz'); // false
+      Ember.canInvoke(foo, 'bat'); // false
+      ```
+
+      @method canInvoke
+      @for Ember
+      @param {Object} obj The object to check for the method
+      @param {String} methodName The method name to check for
+      @return {Boolean}
+    */
+    function canInvoke(obj, methodName) {
+      return !!(obj && typeof obj[methodName] === 'function');
+    }
+
+    /**
+      Checks to see if the `methodName` exists on the `obj`,
+      and if it does, invokes it with the arguments passed.
+
+      ```javascript
+      var d = new Date('03/15/2013');
+
+      Ember.tryInvoke(d, 'getTime');              // 1363320000000
+      Ember.tryInvoke(d, 'setFullYear', [2014]);  // 1394856000000
+      Ember.tryInvoke(d, 'noSuchMethod', [2014]); // undefined
+      ```
+
+      @method tryInvoke
+      @for Ember
+      @param {Object} obj The object to check for the method
+      @param {String} methodName The method name to check for
+      @param {Array} [args] The arguments to pass to the method
+      @return {*} the return value of the invoked method or undefined if it cannot be invoked
+    */
+    function tryInvoke(obj, methodName, args) {
+      if (canInvoke(obj, methodName)) {
+        return args ? applyStr(obj, methodName, args) : applyStr(obj, methodName);
+      }
+    };
+
+    // https://github.com/emberjs/ember.js/pull/1617
+    var needsFinallyFix = (function() {
+      var count = 0;
+      try{
+        try { }
+        finally {
+          count++;
+          throw new Error('needsFinallyFixTest');
+        }
+      } catch (e) {}
+
+      return count !== 1;
+    })();
+
+    /**
+      Provides try/finally functionality, while working
+      around Safari's double finally bug.
+
+      ```javascript
+      var tryable = function() {
+        someResource.lock();
+        runCallback(); // May throw error.
+      };
+
+      var finalizer = function() {
+        someResource.unlock();
+      };
+
+      Ember.tryFinally(tryable, finalizer);
+      ```
+
+      @method tryFinally
+      @for Ember
+      @param {Function} tryable The function to run the try callback
+      @param {Function} finalizer The function to run the finally callback
+      @param {Object} [binding] The optional calling object. Defaults to 'this'
+      @return {*} The return value is the that of the finalizer,
+      unless that value is undefined, in which case it is the return value
+      of the tryable
+    */
+
+    var tryFinally;
+    if (needsFinallyFix) {
+      tryFinally = function(tryable, finalizer, binding) {
+        var result, finalResult, finalError;
+
+        binding = binding || this;
+
+        try {
+          result = tryable.call(binding);
+        } finally {
+          try {
+            finalResult = finalizer.call(binding);
+          } catch (e) {
+            finalError = e;
+          }
+        }
+
+        if (finalError) { throw finalError; }
+
+        return (finalResult === undefined) ? result : finalResult;
+      };
+    } else {
+      tryFinally = function(tryable, finalizer, binding) {
+        var result, finalResult;
+
+        binding = binding || this;
+
+        try {
+          result = tryable.call(binding);
+        } finally {
+          finalResult = finalizer.call(binding);
+        }
+
+        return (finalResult === undefined) ? result : finalResult;
+      };
+    }
+
+    /**
+      Provides try/catch/finally functionality, while working
+      around Safari's double finally bug.
+
+      ```javascript
+      var tryable = function() {
+        for (i = 0, l = listeners.length; i < l; i++) {
+          listener = listeners[i];
+          beforeValues[i] = listener.before(name, time(), payload);
+        }
+
+        return callback.call(binding);
+      };
+
+      var catchable = function(e) {
+        payload = payload || {};
+        payload.exception = e;
+      };
+
+      var finalizer = function() {
+        for (i = 0, l = listeners.length; i < l; i++) {
+          listener = listeners[i];
+          listener.after(name, time(), payload, beforeValues[i]);
+        }
+      };
+
+      Ember.tryCatchFinally(tryable, catchable, finalizer);
+      ```
+
+      @method tryCatchFinally
+      @for Ember
+      @param {Function} tryable The function to run the try callback
+      @param {Function} catchable The function to run the catchable callback
+      @param {Function} finalizer The function to run the finally callback
+      @param {Object} [binding] The optional calling object. Defaults to 'this'
+      @return {*} The return value is the that of the finalizer,
+      unless that value is undefined, in which case it is the return value
+      of the tryable.
+    */
+    var tryCatchFinally;
+    if (needsFinallyFix) {
+      tryCatchFinally = function(tryable, catchable, finalizer, binding) {
+        var result, finalResult, finalError;
+
+        binding = binding || this;
+
+        try {
+          result = tryable.call(binding);
+        } catch(error) {
+          result = catchable.call(binding, error);
+        } finally {
+          try {
+            finalResult = finalizer.call(binding);
+          } catch (e) {
+            finalError = e;
+          }
+        }
+
+        if (finalError) { throw finalError; }
+
+        return (finalResult === undefined) ? result : finalResult;
+      };
+    } else {
+      tryCatchFinally = function(tryable, catchable, finalizer, binding) {
+        var result, finalResult;
+
+        binding = binding || this;
+
+        try {
+          result = tryable.call(binding);
+        } catch(error) {
+          result = catchable.call(binding, error);
+        } finally {
+          finalResult = finalizer.call(binding);
+        }
+
+        return (finalResult === undefined) ? result : finalResult;
+      };
+    }
+
+    // ........................................
+    // TYPING & ARRAY MESSAGING
+    //
+
+    var TYPE_MAP = {};
+    var t = "Boolean Number String Function Array Date RegExp Object".split(" ");
+    forEach.call(t, function(name) {
+      TYPE_MAP[ "[object " + name + "]" ] = name.toLowerCase();
+    });
+
+    var toString = Object.prototype.toString;
+
+    var EmberObject;
+
+    /**
+      Returns a consistent type for the passed item.
+
+      Use this instead of the built-in `typeof` to get the type of an item.
+      It will return the same result across all browsers and includes a bit
+      more detail. Here is what will be returned:
+
+          | Return Value  | Meaning                                              |
+          |---------------|------------------------------------------------------|
+          | 'string'      | String primitive or String object.                   |
+          | 'number'      | Number primitive or Number object.                   |
+          | 'boolean'     | Boolean primitive or Boolean object.                 |
+          | 'null'        | Null value                                           |
+          | 'undefined'   | Undefined value                                      |
+          | 'function'    | A function                                           |
+          | 'array'       | An instance of Array                                 |
+          | 'regexp'      | An instance of RegExp                                |
+          | 'date'        | An instance of Date                                  |
+          | 'class'       | An Ember class (created using Ember.Object.extend()) |
+          | 'instance'    | An Ember object instance                             |
+          | 'error'       | An instance of the Error object                      |
+          | 'object'      | A JavaScript object not inheriting from Ember.Object |
+
+      Examples:
+
+      ```javascript
+      Ember.typeOf();                       // 'undefined'
+      Ember.typeOf(null);                   // 'null'
+      Ember.typeOf(undefined);              // 'undefined'
+      Ember.typeOf('michael');              // 'string'
+      Ember.typeOf(new String('michael'));  // 'string'
+      Ember.typeOf(101);                    // 'number'
+      Ember.typeOf(new Number(101));        // 'number'
+      Ember.typeOf(true);                   // 'boolean'
+      Ember.typeOf(new Boolean(true));      // 'boolean'
+      Ember.typeOf(Ember.makeArray);        // 'function'
+      Ember.typeOf([1, 2, 90]);             // 'array'
+      Ember.typeOf(/abc/);                  // 'regexp'
+      Ember.typeOf(new Date());             // 'date'
+      Ember.typeOf(Ember.Object.extend());  // 'class'
+      Ember.typeOf(Ember.Object.create());  // 'instance'
+      Ember.typeOf(new Error('teamocil'));  // 'error'
+
+      // 'normal' JavaScript object
+      Ember.typeOf({ a: 'b' });             // 'object'
+      ```
+
+      @method typeOf
+      @for Ember
+      @param {Object} item the item to check
+      @return {String} the type
+    */
+    function typeOf(item) {
+      var ret, modulePath;
+
+      // ES6TODO: Depends on Ember.Object which is defined in runtime.
+      if (typeof EmberObject === "undefined") {
+        modulePath = 'ember-runtime/system/object';
+        if (requirejs._eak_seen[modulePath]) {
+          EmberObject = requireModule(modulePath)['default'];
+        }
+      }
+
+      ret = (item === null || item === undefined) ? String(item) : TYPE_MAP[toString.call(item)] || 'object';
+
+      if (ret === 'function') {
+        if (EmberObject && EmberObject.detect(item)) ret = 'class';
+      } else if (ret === 'object') {
+        if (item instanceof Error) ret = 'error';
+        else if (EmberObject && item instanceof EmberObject) ret = 'instance';
+        else if (item instanceof Date) ret = 'date';
+      }
+
+      return ret;
+    };
+
+    /**
+      Convenience method to inspect an object. This method will attempt to
+      convert the object into a useful string description.
+
+      It is a pretty simple implementation. If you want something more robust,
+      use something like JSDump: https://github.com/NV/jsDump
+
+      @method inspect
+      @for Ember
+      @param {Object} obj The object you want to inspect.
+      @return {String} A description of the object
+      @since 1.4.0
+    */
+    function inspect(obj) {
+      var type = typeOf(obj);
+      if (type === 'array') {
+        return '[' + obj + ']';
+      }
+      if (type !== 'object') {
+        return obj + '';
+      }
+
+      var v, ret = [];
+      for(var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          v = obj[key];
+          if (v === 'toString') { continue; } // ignore useless items
+          if (typeOf(v) === 'function') { v = "function() { ... }"; }
+          ret.push(key + ": " + v);
+        }
+      }
+      return "{" + ret.join(", ") + "}";
+    };
+
+    // The following functions are intentionally minified to keep the functions
+    // below Chrome's function body size inlining limit of 600 chars.
+
+    function apply(t /* target */, m /* method */, a /* args */) {
+      var l = a && a.length;
+      if (!a || !l) { return m.call(t); }
+      switch (l) {
+        case 1:  return m.call(t, a[0]);
+        case 2:  return m.call(t, a[0], a[1]);
+        case 3:  return m.call(t, a[0], a[1], a[2]);
+        case 4:  return m.call(t, a[0], a[1], a[2], a[3]);
+        case 5:  return m.call(t, a[0], a[1], a[2], a[3], a[4]);
+        default: return m.apply(t, a);
+      }
+    };
+
+    function applyStr(t /* target */, m /* method */, a /* args */) {
+      var l = a && a.length;
+      if (!a || !l) { return t[m](); }
+      switch (l) {
+        case 1:  return t[m](a[0]);
+        case 2:  return t[m](a[0], a[1]);
+        case 3:  return t[m](a[0], a[1], a[2]);
+        case 4:  return t[m](a[0], a[1], a[2], a[3]);
+        case 5:  return t[m](a[0], a[1], a[2], a[3], a[4]);
+        default: return t[m].apply(t, a);
+      }
+    };
+
+    __exports__.generateGuid = generateGuid;
+    __exports__.GUID_KEY = GUID_KEY;
+    __exports__.GUID_PREFIX = GUID_PREFIX;
+    __exports__.guidFor = guidFor;
+    __exports__.META_DESC = META_DESC;
+    __exports__.EMPTY_META = EMPTY_META;
+    __exports__.META_KEY = META_KEY;
+    __exports__.meta = meta;
+    __exports__.getMeta = getMeta;
+    __exports__.setMeta = setMeta;
+    __exports__.metaPath = metaPath;
+    __exports__.inspect = inspect;
+    __exports__.typeOf = typeOf;
+    __exports__.tryCatchFinally = tryCatchFinally;
+    __exports__.isArray = isArray;
+    __exports__.makeArray = makeArray;
+    __exports__.canInvoke = canInvoke;
+    __exports__.tryInvoke = tryInvoke;
+    __exports__.tryFinally = tryFinally;
+    __exports__.wrap = wrap;
+    __exports__.applyStr = applyStr;
+    __exports__.apply = apply;
+  });
+define("backburner",
+  ["backburner/utils","backburner/deferred_action_queues","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Utils = __dependency1__["default"];
+    var DeferredActionQueues = __dependency2__.DeferredActionQueues;
+
+    var slice = [].slice,
+        pop = [].pop,
+        each = Utils.each,
+        isString = Utils.isString,
+        isFunction = Utils.isFunction,
+        isNumber = Utils.isNumber,
+        timers = [],
+        global = this,
+        NUMBER = /\d+/;
+
+    // In IE 6-8, try/finally doesn't work without a catch.
+    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
+    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
+    var needsIETryCatchFix = (function(e,x){
+      try{ x(); }
+      catch(e) { } // jshint ignore:line
+      return !!e;
+    })();
+
+    function isCoercableNumber(number) {
+      return isNumber(number) || NUMBER.test(number);
+    }
+
+    function Backburner(queueNames, options) {
+      this.queueNames = queueNames;
+      this.options = options || {};
+      if (!this.options.defaultQueue) {
+        this.options.defaultQueue = queueNames[0];
+      }
+      this.instanceStack = [];
+      this._debouncees = [];
+      this._throttlers = [];
+    }
+
+    Backburner.prototype = {
+      queueNames: null,
+      options: null,
+      currentInstance: null,
+      instanceStack: null,
+
+      begin: function() {
+        var options = this.options,
+            onBegin = options && options.onBegin,
+            previousInstance = this.currentInstance;
+
+        if (previousInstance) {
+          this.instanceStack.push(previousInstance);
+        }
+
+        this.currentInstance = new DeferredActionQueues(this.queueNames, options);
+        if (onBegin) {
+          onBegin(this.currentInstance, previousInstance);
+        }
+      },
+
+      end: function() {
+        var options = this.options,
+            onEnd = options && options.onEnd,
+            currentInstance = this.currentInstance,
+            nextInstance = null;
+
+        // Prevent double-finally bug in Safari 6.0.2 and iOS 6
+        // This bug appears to be resolved in Safari 6.0.5 and iOS 7
+        var finallyAlreadyCalled = false;
+        try {
+          currentInstance.flush();
+        } finally {
+          if (!finallyAlreadyCalled) {
+            finallyAlreadyCalled = true;
+
+            this.currentInstance = null;
+
+            if (this.instanceStack.length) {
+              nextInstance = this.instanceStack.pop();
+              this.currentInstance = nextInstance;
+            }
+
+            if (onEnd) {
+              onEnd(currentInstance, nextInstance);
+            }
+          }
+        }
+      },
+
+      run: function(target, method /*, args */) {
+        var onError = getOnError(this.options);
+
+        this.begin();
+
+        if (!method) {
+          method = target;
+          target = null;
+        }
+
+        if (isString(method)) {
+          method = target[method];
+        }
+
+        var args = slice.call(arguments, 2);
+
+        // guard against Safari 6's double-finally bug
+        var didFinally = false;
+
+        if (onError) {
+          try {
+            return method.apply(target, args);
+          } catch(error) {
+            onError(error);
+          } finally {
+            if (!didFinally) {
+              didFinally = true;
+              this.end();
+            }
+          }
+        } else {
+          try {
+            return method.apply(target, args);
+          } finally {
+            if (!didFinally) {
+              didFinally = true;
+              this.end();
+            }
+          }
+        }
+      },
+
+      defer: function(queueName, target, method /* , args */) {
+        if (!method) {
+          method = target;
+          target = null;
+        }
+
+        if (isString(method)) {
+          method = target[method];
+        }
+
+        var stack = this.DEBUG ? new Error() : undefined,
+            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
+        if (!this.currentInstance) { createAutorun(this); }
+        return this.currentInstance.schedule(queueName, target, method, args, false, stack);
+      },
+
+      deferOnce: function(queueName, target, method /* , args */) {
+        if (!method) {
+          method = target;
+          target = null;
+        }
+
+        if (isString(method)) {
+          method = target[method];
+        }
+
+        var stack = this.DEBUG ? new Error() : undefined,
+            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
+        if (!this.currentInstance) { createAutorun(this); }
+        return this.currentInstance.schedule(queueName, target, method, args, true, stack);
+      },
+
+      setTimeout: function() {
+        var args = slice.call(arguments),
+            length = args.length,
+            method, wait, target,
+            methodOrTarget, methodOrWait, methodOrArgs;
+
+        if (length === 0) {
+          return;
+        } else if (length === 1) {
+          method = args.shift();
+          wait = 0;
+        } else if (length === 2) {
+          methodOrTarget = args[0];
+          methodOrWait = args[1];
+
+          if (isFunction(methodOrWait) || isFunction(methodOrTarget[methodOrWait])) {
+            target = args.shift();
+            method = args.shift();
+            wait = 0;
+          } else if (isCoercableNumber(methodOrWait)) {
+            method = args.shift();
+            wait = args.shift();
+          } else {
+            method = args.shift();
+            wait =  0;
+          }
+        } else {
+          var last = args[args.length - 1];
+
+          if (isCoercableNumber(last)) {
+            wait = args.pop();
+          } else {
+            wait = 0;
+          }
+
+          methodOrTarget = args[0];
+          methodOrArgs = args[1];
+
+          if (isFunction(methodOrArgs) || (isString(methodOrArgs) &&
+                                          methodOrTarget !== null &&
+                                          methodOrArgs in methodOrTarget)) {
+            target = args.shift();
+            method = args.shift();
+          } else {
+            method = args.shift();
+          }
+        }
+
+        var executeAt = (+new Date()) + parseInt(wait, 10);
+
+        if (isString(method)) {
+          method = target[method];
+        }
+
+        var onError = getOnError(this.options);
+
+        function fn() {
+          if (onError) {
+            try {
+              method.apply(target, args);
+            } catch (e) {
+              onError(e);
+            }
+          } else {
+            method.apply(target, args);
+          }
+        }
+
+        // find position to insert
+        var i = searchTimer(executeAt, timers);
+
+        timers.splice(i, 0, executeAt, fn);
+
+        updateLaterTimer(this, executeAt, wait);
+
+        return fn;
+      },
+
+      throttle: function(target, method /* , args, wait, [immediate] */) {
+        var self = this,
+            args = arguments,
+            immediate = pop.call(args),
+            wait,
+            throttler,
+            index,
+            timer;
+
+        if (isNumber(immediate) || isString(immediate)) {
+          wait = immediate;
+          immediate = true;
+        } else {
+          wait = pop.call(args);
+        }
+
+        wait = parseInt(wait, 10);
+
+        index = findThrottler(target, method, this._throttlers);
+        if (index > -1) { return this._throttlers[index]; } // throttled
+
+        timer = global.setTimeout(function() {
+          if (!immediate) {
+            self.run.apply(self, args);
+          }
+          var index = findThrottler(target, method, self._throttlers);
+          if (index > -1) {
+            self._throttlers.splice(index, 1);
+          }
+        }, wait);
+
+        if (immediate) {
+          self.run.apply(self, args);
+        }
+
+        throttler = [target, method, timer];
+
+        this._throttlers.push(throttler);
+
+        return throttler;
+      },
+
+      debounce: function(target, method /* , args, wait, [immediate] */) {
+        var self = this,
+            args = arguments,
+            immediate = pop.call(args),
+            wait,
+            index,
+            debouncee,
+            timer;
+
+        if (isNumber(immediate) || isString(immediate)) {
+          wait = immediate;
+          immediate = false;
+        } else {
+          wait = pop.call(args);
+        }
+
+        wait = parseInt(wait, 10);
+        // Remove debouncee
+        index = findDebouncee(target, method, this._debouncees);
+
+        if (index > -1) {
+          debouncee = this._debouncees[index];
+          this._debouncees.splice(index, 1);
+          clearTimeout(debouncee[2]);
+        }
+
+        timer = global.setTimeout(function() {
+          if (!immediate) {
+            self.run.apply(self, args);
+          }
+          var index = findDebouncee(target, method, self._debouncees);
+          if (index > -1) {
+            self._debouncees.splice(index, 1);
+          }
+        }, wait);
+
+        if (immediate && index === -1) {
+          self.run.apply(self, args);
+        }
+
+        debouncee = [target, method, timer];
+
+        self._debouncees.push(debouncee);
+
+        return debouncee;
+      },
+
+      cancelTimers: function() {
+        var clearItems = function(item) {
+          clearTimeout(item[2]);
+        };
+
+        each(this._throttlers, clearItems);
+        this._throttlers = [];
+
+        each(this._debouncees, clearItems);
+        this._debouncees = [];
+
+        if (this._laterTimer) {
+          clearTimeout(this._laterTimer);
+          this._laterTimer = null;
+        }
+        timers = [];
+
+        if (this._autorun) {
+          clearTimeout(this._autorun);
+          this._autorun = null;
+        }
+      },
+
+      hasTimers: function() {
+        return !!timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
+      },
+
+      cancel: function(timer) {
+        var timerType = typeof timer;
+
+        if (timer && timerType === 'object' && timer.queue && timer.method) { // we're cancelling a deferOnce
+          return timer.queue.cancel(timer);
+        } else if (timerType === 'function') { // we're cancelling a setTimeout
+          for (var i = 0, l = timers.length; i < l; i += 2) {
+            if (timers[i + 1] === timer) {
+              timers.splice(i, 2); // remove the two elements
+              return true;
+            }
+          }
+        } else if (Object.prototype.toString.call(timer) === "[object Array]"){ // we're cancelling a throttle or debounce
+          return this._cancelItem(findThrottler, this._throttlers, timer) ||
+                   this._cancelItem(findDebouncee, this._debouncees, timer);
+        } else {
+          return; // timer was null or not a timer
+        }
+      },
+
+      _cancelItem: function(findMethod, array, timer){
+        var item,
+            index;
+
+        if (timer.length < 3) { return false; }
+
+        index = findMethod(timer[0], timer[1], array);
+
+        if(index > -1) {
+
+          item = array[index];
+
+          if(item[2] === timer[2]){
+            array.splice(index, 1);
+            clearTimeout(timer[2]);
+            return true;
+          }
+        }
+
+        return false;
+      }
+    };
+
+    Backburner.prototype.schedule = Backburner.prototype.defer;
+    Backburner.prototype.scheduleOnce = Backburner.prototype.deferOnce;
+    Backburner.prototype.later = Backburner.prototype.setTimeout;
+
+    if (needsIETryCatchFix) {
+      var originalRun = Backburner.prototype.run;
+      Backburner.prototype.run = wrapInTryCatch(originalRun);
+
+      var originalEnd = Backburner.prototype.end;
+      Backburner.prototype.end = wrapInTryCatch(originalEnd);
+    }
+
+    function wrapInTryCatch(func) {
+      return function () {
+        try {
+          return func.apply(this, arguments);
+        } catch (e) {
+          throw e;
+        }
+      };
+    }
+
+    function getOnError(options) {
+      return options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
+    }
+
+
+    function createAutorun(backburner) {
+      backburner.begin();
+      backburner._autorun = global.setTimeout(function() {
+        backburner._autorun = null;
+        backburner.end();
+      });
+    }
+
+    function updateLaterTimer(self, executeAt, wait) {
+      if (!self._laterTimer || executeAt < self._laterTimerExpiresAt) {
+        self._laterTimer = global.setTimeout(function() {
+          self._laterTimer = null;
+          self._laterTimerExpiresAt = null;
+          executeTimers(self);
+        }, wait);
+        self._laterTimerExpiresAt = executeAt;
+      }
+    }
+
+    function executeTimers(self) {
+      var now = +new Date(),
+          time, fns, i, l;
+
+      self.run(function() {
+        i = searchTimer(now, timers);
+
+        fns = timers.splice(0, i);
+
+        for (i = 1, l = fns.length; i < l; i += 2) {
+          self.schedule(self.options.defaultQueue, null, fns[i]);
+        }
+      });
+
+      if (timers.length) {
+        updateLaterTimer(self, timers[0], timers[0] - now);
+      }
+    }
+
+    function findDebouncee(target, method, debouncees) {
+      return findItem(target, method, debouncees);
+    }
+
+    function findThrottler(target, method, throttlers) {
+      return findItem(target, method, throttlers);
+    }
+
+    function findItem(target, method, collection) {
+      var item,
+          index = -1;
+
+      for (var i = 0, l = collection.length; i < l; i++) {
+        item = collection[i];
+        if (item[0] === target && item[1] === method) {
+          index = i;
+          break;
+        }
+      }
+
+      return index;
+    }
+
+    function searchTimer(time, timers) {
+      var start = 0,
+          end = timers.length - 2,
+          middle, l;
+
+      while (start < end) {
+        // since timers is an array of pairs 'l' will always
+        // be an integer
+        l = (end - start) / 2;
+
+        // compensate for the index in case even number
+        // of pairs inside timers
+        middle = start + l - (l % 2);
+
+        if (time >= timers[middle]) {
+          start = middle + 2;
+        } else {
+          end = middle;
+        }
+      }
+
+      return (time >= timers[start]) ? start + 2 : start;
+    }
+
+    __exports__.Backburner = Backburner;
+  });
+define("backburner/deferred_action_queues",
+  ["backburner/utils","backburner/queue","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Utils = __dependency1__["default"];
+    var Queue = __dependency2__.Queue;
+
+    var each = Utils.each,
+        isString = Utils.isString;
+
+    function DeferredActionQueues(queueNames, options) {
+      var queues = this.queues = {};
+      this.queueNames = queueNames = queueNames || [];
+
+      this.options = options;
+
+      each(queueNames, function(queueName) {
+        queues[queueName] = new Queue(this, queueName, options);
+      });
+    }
+
+    DeferredActionQueues.prototype = {
+      queueNames: null,
+      queues: null,
+      options: null,
+
+      schedule: function(queueName, target, method, args, onceFlag, stack) {
+        var queues = this.queues,
+            queue = queues[queueName];
+
+        if (!queue) { throw new Error("You attempted to schedule an action in a queue (" + queueName + ") that doesn't exist"); }
+
+        if (onceFlag) {
+          return queue.pushUnique(target, method, args, stack);
+        } else {
+          return queue.push(target, method, args, stack);
+        }
+      },
+
+      invoke: function(target, method, args, _) {
+        if (args && args.length > 0) {
+          method.apply(target, args);
+        } else {
+          method.call(target);
+        }
+      },
+
+      invokeWithOnError: function(target, method, args, onError) {
+        try {
+          if (args && args.length > 0) {
+            method.apply(target, args);
+          } else {
+            method.call(target);
+          }
+        } catch(error) {
+          onError(error);
+        }
+      },
+
+      flush: function() {
+        var queues = this.queues,
+            queueNames = this.queueNames,
+            queueName, queue, queueItems, priorQueueNameIndex,
+            queueNameIndex = 0, numberOfQueues = queueNames.length,
+            options = this.options,
+            onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]),
+            invoke = onError ? this.invokeWithOnError : this.invoke;
+
+        outerloop:
+        while (queueNameIndex < numberOfQueues) {
+          queueName = queueNames[queueNameIndex];
+          queue = queues[queueName];
+          queueItems = queue._queueBeingFlushed = queue._queue.slice();
+          queue._queue = [];
+
+          var queueOptions = queue.options, // TODO: write a test for this
+              before = queueOptions && queueOptions.before,
+              after = queueOptions && queueOptions.after,
+              target, method, args, stack,
+              queueIndex = 0, numberOfQueueItems = queueItems.length;
+
+          if (numberOfQueueItems && before) { before(); }
+
+          while (queueIndex < numberOfQueueItems) {
+            target = queueItems[queueIndex];
+            method = queueItems[queueIndex+1];
+            args   = queueItems[queueIndex+2];
+            stack  = queueItems[queueIndex+3]; // Debugging assistance
+
+            if (isString(method)) { method = target[method]; }
+
+            // method could have been nullified / canceled during flush
+            if (method) {
+              invoke(target, method, args, onError);
+            }
+
+            queueIndex += 4;
+          }
+
+          queue._queueBeingFlushed = null;
+          if (numberOfQueueItems && after) { after(); }
+
+          if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
+            queueNameIndex = priorQueueNameIndex;
+            continue outerloop;
+          }
+
+          queueNameIndex++;
+        }
+      }
+    };
+
+    function indexOfPriorQueueWithActions(daq, currentQueueIndex) {
+      var queueName, queue;
+
+      for (var i = 0, l = currentQueueIndex; i <= l; i++) {
+        queueName = daq.queueNames[i];
+        queue = daq.queues[queueName];
+        if (queue._queue.length) { return i; }
+      }
+
+      return -1;
+    }
+
+    __exports__.DeferredActionQueues = DeferredActionQueues;
+  });
+define("backburner/queue",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function Queue(daq, name, options) {
+      this.daq = daq;
+      this.name = name;
+      this.globalOptions = options;
+      this.options = options[name];
+      this._queue = [];
+    }
+
+    Queue.prototype = {
+      daq: null,
+      name: null,
+      options: null,
+      onError: null,
+      _queue: null,
+
+      push: function(target, method, args, stack) {
+        var queue = this._queue;
+        queue.push(target, method, args, stack);
+        return {queue: this, target: target, method: method};
+      },
+
+      pushUnique: function(target, method, args, stack) {
+        var queue = this._queue, currentTarget, currentMethod, i, l;
+
+        for (i = 0, l = queue.length; i < l; i += 4) {
+          currentTarget = queue[i];
+          currentMethod = queue[i+1];
+
+          if (currentTarget === target && currentMethod === method) {
+            queue[i+2] = args; // replace args
+            queue[i+3] = stack; // replace stack
+            return {queue: this, target: target, method: method};
+          }
+        }
+
+        queue.push(target, method, args, stack);
+        return {queue: this, target: target, method: method};
+      },
+
+      // TODO: remove me, only being used for Ember.run.sync
+      flush: function() {
+        var queue = this._queue,
+            globalOptions = this.globalOptions,
+            options = this.options,
+            before = options && options.before,
+            after = options && options.after,
+            onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]),
+            target, method, args, stack, i, l = queue.length;
+
+        if (l && before) { before(); }
+        for (i = 0; i < l; i += 4) {
+          target = queue[i];
+          method = queue[i+1];
+          args   = queue[i+2];
+          stack  = queue[i+3]; // Debugging assistance
+
+          // TODO: error handling
+          if (args && args.length > 0) {
+            if (onError) {
+              try {
+                method.apply(target, args);
+              } catch (e) {
+                onError(e);
+              }
+            } else {
+              method.apply(target, args);
+            }
+          } else {
+            if (onError) {
+              try {
+                method.call(target);
+              } catch(e) {
+                onError(e);
+              }
+            } else {
+              method.call(target);
+            }
+          }
+        }
+        if (l && after) { after(); }
+
+        // check if new items have been added
+        if (queue.length > l) {
+          this._queue = queue.slice(l);
+          this.flush();
+        } else {
+          this._queue.length = 0;
+        }
+      },
+
+      cancel: function(actionToCancel) {
+        var queue = this._queue, currentTarget, currentMethod, i, l;
+
+        for (i = 0, l = queue.length; i < l; i += 4) {
+          currentTarget = queue[i];
+          currentMethod = queue[i+1];
+
+          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+            queue.splice(i, 4);
+            return true;
+          }
+        }
+
+        // if not found in current queue
+        // could be in the queue that is being flushed
+        queue = this._queueBeingFlushed;
+        if (!queue) {
+          return;
+        }
+        for (i = 0, l = queue.length; i < l; i += 4) {
+          currentTarget = queue[i];
+          currentMethod = queue[i+1];
+
+          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+            // don't mess with array during flush
+            // just nullify the method
+            queue[i+1] = null;
+            return true;
+          }
+        }
+      }
+    };
+
+    __exports__.Queue = Queue;
+  });
+define("backburner/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    __exports__["default"] = {
+      each: function(collection, callback) {
+        for (var i = 0; i < collection.length; i++) {
+          callback(collection[i]);
+        }
+      },
+
+      isString: function(suspect) {
+        return typeof suspect === 'string';
+      },
+
+      isFunction: function(suspect) {
+        return typeof suspect === 'function';
+      },
+
+      isNumber: function(suspect) {
+        return typeof suspect === 'number';
+      }
+    };
+  });
+
+define("ember-metal/watch_key",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var meta = __dependency2__.meta;
+    var typeOf = __dependency2__.typeOf;
+    var platform = __dependency3__.platform;
+
+    var metaFor = meta, // utils.js
+        MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER,
+        o_defineProperty = platform.defineProperty;
+
+    function watchKey(obj, keyName, meta) {
+      // can't watch length on Array - it is special...
+      if (keyName === 'length' && typeOf(obj) === 'array') { return; }
+
+      var m = meta || metaFor(obj), watching = m.watching;
+
+      // activate watching first time
+      if (!watching[keyName]) {
+        watching[keyName] = 1;
+
+        if ('function' === typeof obj.willWatchProperty) {
+          obj.willWatchProperty(keyName);
+        }
+
+        if (MANDATORY_SETTER && keyName in obj) {
+          m.values[keyName] = obj[keyName];
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: obj.propertyIsEnumerable(keyName),
+            set: Ember.MANDATORY_SETTER_FUNCTION,
+            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
+      } else {
+        watching[keyName] = (watching[keyName] || 0) + 1;
+      }
+    };
+
+    function unwatchKey(obj, keyName, meta) {
+      var m = meta || metaFor(obj), watching = m.watching;
+
+      if (watching[keyName] === 1) {
+        watching[keyName] = 0;
+
+        if ('function' === typeof obj.didUnwatchProperty) {
+          obj.didUnwatchProperty(keyName);
+        }
+
+        if (MANDATORY_SETTER && keyName in obj) {
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: obj.propertyIsEnumerable(keyName),
+            set: function(val) {
+              // redefine to set as enumerable
+              o_defineProperty(obj, keyName, {
+                configurable: true,
+                writable: true,
+                enumerable: true,
+                value: val
+              });
+              delete m.values[keyName];
+            },
+            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
+      } else if (watching[keyName] > 1) {
+        watching[keyName]--;
+      }
+    };
+
+    __exports__.watchKey = watchKey;
+    __exports__.unwatchKey = unwatchKey;
+  });
+define("ember-metal/watch_path",
+  ["ember-metal/utils","ember-metal/chains","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var meta = __dependency1__.meta;
+    var typeOf = __dependency1__.typeOf;
+    var ChainNode = __dependency2__.ChainNode;
+
+    var metaFor = meta;
+
+    // get the chains for the current object. If the current object has
+    // chains inherited from the proto they will be cloned and reconfigured for
+    // the current object.
+    function chainsFor(obj, meta) {
+      var m = meta || metaFor(obj), ret = m.chains;
+      if (!ret) {
+        ret = m.chains = new ChainNode(null, null, obj);
+      } else if (ret.value() !== obj) {
+        ret = m.chains = ret.copy(obj);
+      }
+      return ret;
+    }
+
+    function watchPath(obj, keyPath, meta) {
+      // can't watch length on Array - it is special...
+      if (keyPath === 'length' && typeOf(obj) === 'array') { return; }
+
+      var m = meta || metaFor(obj), watching = m.watching;
+
+      if (!watching[keyPath]) { // activate watching first time
+        watching[keyPath] = 1;
+        chainsFor(obj, m).add(keyPath);
+      } else {
+        watching[keyPath] = (watching[keyPath] || 0) + 1;
+      }
+    };
+
+    function unwatchPath(obj, keyPath, meta) {
+      var m = meta || metaFor(obj), watching = m.watching;
+
+      if (watching[keyPath] === 1) {
+        watching[keyPath] = 0;
+        chainsFor(obj, m).remove(keyPath);
+      } else if (watching[keyPath] > 1) {
+        watching[keyPath]--;
+      }
+    };
+
+    __exports__.watchPath = watchPath;
+    __exports__.unwatchPath = unwatchPath;
+  });
+define("ember-metal/watching",
+  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    var meta = __dependency1__.meta;
+    var META_KEY = __dependency1__.META_KEY;
+    var GUID_KEY = __dependency1__.GUID_KEY;
+    var typeOf = __dependency1__.typeOf;
+    var generateGuid = __dependency1__.generateGuid;
+    var removeChainWatcher = __dependency2__.removeChainWatcher;
+    var flushPendingChains = __dependency2__.flushPendingChains;
+    var watchKey = __dependency3__.watchKey;
+    var unwatchKey = __dependency3__.unwatchKey;
+    var watchPath = __dependency4__.watchPath;
+    var unwatchPath = __dependency4__.unwatchPath;
+
+    var metaFor = meta; // utils.js
+
+    // returns true if the passed path is just a keyName
+    function isKeyName(path) {
+      return path.indexOf('.') === -1;
+    }
+
+    /**
+      Starts watching a property on an object. Whenever the property changes,
+      invokes `Ember.propertyWillChange` and `Ember.propertyDidChange`. This is the
+      primitive used by observers and dependent keys; usually you will never call
+      this method directly but instead use higher level methods like
+      `Ember.addObserver()`
+
+      @private
+      @method watch
+      @for Ember
+      @param obj
+      @param {String} keyName
+    */
+    function watch(obj, _keyPath, m) {
+      // can't watch length on Array - it is special...
+      if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
+
+      if (isKeyName(_keyPath)) {
+        watchKey(obj, _keyPath, m);
+      } else {
+        watchPath(obj, _keyPath, m);
+      }
+    };
+
+    function isWatching(obj, key) {
+      var meta = obj[META_KEY];
+      return (meta && meta.watching[key]) > 0;
+    };
+
+    watch.flushPending = flushPendingChains;
+
+    function unwatch(obj, _keyPath, m) {
+      // can't watch length on Array - it is special...
+      if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
+
+      if (isKeyName(_keyPath)) {
+        unwatchKey(obj, _keyPath, m);
+      } else {
+        unwatchPath(obj, _keyPath, m);
+      }
+    };
+
+    /**
+      Call on an object when you first beget it from another object. This will
+      setup any chained watchers on the object instance as needed. This method is
+      safe to call multiple times.
+
+      @private
+      @method rewatch
+      @for Ember
+      @param obj
+    */
+    function rewatch(obj) {
+      var m = obj[META_KEY], chains = m && m.chains;
+
+      // make sure the object has its own guid.
+      if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
+        generateGuid(obj);
+      }
+
+      // make sure any chained watchers update.
+      if (chains && chains.value() !== obj) {
+        m.chains = chains.copy(obj);
+      }
+    };
+
+    var NODE_STACK = [];
+
+    /**
+      Tears down the meta on an object so that it can be garbage collected.
+      Multiple calls will have no effect.
+
+      @method destroy
+      @for Ember
+      @param {Object} obj  the object to destroy
+      @return {void}
+    */
+    function destroy(obj) {
+      var meta = obj[META_KEY], node, nodes, key, nodeObject;
+      if (meta) {
+        obj[META_KEY] = null;
+        // remove chainWatchers to remove circular references that would prevent GC
+        node = meta.chains;
+        if (node) {
+          NODE_STACK.push(node);
+          // process tree
+          while (NODE_STACK.length > 0) {
+            node = NODE_STACK.pop();
+            // push children
+            nodes = node._chains;
+            if (nodes) {
+              for (key in nodes) {
+                if (nodes.hasOwnProperty(key)) {
+                  NODE_STACK.push(nodes[key]);
+                }
+              }
+            }
+            // remove chainWatcher in node object
+            if (node._watching) {
+              nodeObject = node._object;
+              if (nodeObject) {
+                removeChainWatcher(nodeObject, node._key, node);
+              }
+            }
+          }
+        }
+      }
+    };
+
+    __exports__.watch = watch;
+    __exports__.isWatching = isWatching;
+    __exports__.unwatch = unwatch;
+    __exports__.rewatch = rewatch;
+    __exports__.destroy = destroy;
+  });
+})();
+
+(function() {
+/**
+  @class RSVP
+  @module RSVP
+  */
+define("rsvp/all",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      This is a convenient alias for `RSVP.Promise.all`.
+
+      @method all
+      @for RSVP
+      @param {Array} array Array of promises.
+      @param {String} label An optional label. This is useful
+      for tooling.
+      @static
+    */
+    __exports__["default"] = function all(array, label) {
+      return Promise.all(array, label);
+    };
+  });
+define("rsvp/all_settled",
+  ["./promise","./utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var isArray = __dependency2__.isArray;
+    var isNonThenable = __dependency2__.isNonThenable;
+
+    /**
+      `RSVP.allSettled` is similar to `RSVP.all`, but instead of implementing
+      a fail-fast method, it waits until all the promises have returned and
+      shows you all the results. This is useful if you want to handle multiple
+      promises' failure states together as a set.
+
+      Returns a promise that is fulfilled when all the given promises have been
+      settled. The return promise is fulfilled with an array of the states of
+      the promises passed into the `promises` array argument.
+
+      Each state object will either indicate fulfillment or rejection, and
+      provide the corresponding value or reason. The states will take one of
+      the following formats:
+
+      ```javascript
+      { state: 'fulfilled', value: value }
+        or
+      { state: 'rejected', reason: reason }
+      ```
+
+      Example:
+
+      ```javascript
+      var promise1 = RSVP.Promise.resolve(1);
+      var promise2 = RSVP.Promise.reject(new Error('2'));
+      var promise3 = RSVP.Promise.reject(new Error('3'));
+      var promises = [ promise1, promise2, promise3 ];
+
+      RSVP.allSettled(promises).then(function(array){
+        // array == [
+        //   { state: 'fulfilled', value: 1 },
+        //   { state: 'rejected', reason: Error },
+        //   { state: 'rejected', reason: Error }
+        // ]
+        // Note that for the second item, reason.message will be "2", and for the
+        // third item, reason.message will be "3".
+      }, function(error) {
+        // Not run. (This block would only be called if allSettled had failed,
+        // for instance if passed an incorrect argument type.)
+      });
+      ```
+
+      @method allSettled
+      @for RSVP
+      @param {Array} promises
+      @param {String} label - optional string that describes the promise.
+      Useful for tooling.
+      @return {Promise} promise that is fulfilled with an array of the settled
+      states of the constituent promises.
+      @static
+    */
+
+    __exports__["default"] = function allSettled(entries, label) {
+      return new Promise(function(resolve, reject) {
+        if (!isArray(entries)) {
+          throw new TypeError('You must pass an array to allSettled.');
+        }
+
+        var remaining = entries.length;
+        var entry;
+
+        if (remaining === 0) {
+          resolve([]);
+          return;
+        }
+
+        var results = new Array(remaining);
+
+        function fulfilledResolver(index) {
+          return function(value) {
+            resolveAll(index, fulfilled(value));
+          };
+        }
+
+        function rejectedResolver(index) {
+          return function(reason) {
+            resolveAll(index, rejected(reason));
+          };
+        }
+
+        function resolveAll(index, value) {
+          results[index] = value;
+          if (--remaining === 0) {
+            resolve(results);
+          }
+        }
+
+        for (var index = 0; index < entries.length; index++) {
+          entry = entries[index];
+
+          if (isNonThenable(entry)) {
+            resolveAll(index, fulfilled(entry));
+          } else {
+            Promise.cast(entry).then(fulfilledResolver(index), rejectedResolver(index));
+          }
+        }
+      }, label);
+    };
+
+    function fulfilled(value) {
+      return { state: 'fulfilled', value: value };
+    }
+
+    function rejected(reason) {
+      return { state: 'rejected', reason: reason };
+    }
+  });
+define("rsvp/config",
+  ["./events","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var EventTarget = __dependency1__["default"];
+
+    var config = {
+      instrument: false
+    };
+
+    EventTarget.mixin(config);
+
+    function configure(name, value) {
+      if (name === 'onerror') {
+        // handle for legacy users that expect the actual
+        // error to be passed to their function added via
+        // `RSVP.configure('onerror', someFunctionHere);`
+        config.on('error', value);
+        return;
+      }
+
+      if (arguments.length === 2) {
+        config[name] = value;
+      } else {
+        return config[name];
+      }
+    }
+
+    __exports__.config = config;
+    __exports__.configure = configure;
+  });
+define("rsvp/defer",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      `RSVP.defer` returns an object similar to jQuery's `$.Deferred`.
+      `RSVP.defer` should be used when porting over code reliant on `$.Deferred`'s
+      interface. New code should use the `RSVP.Promise` constructor instead.
+
+      The object returned from `RSVP.defer` is a plain object with three properties:
+
+      * promise - an `RSVP.Promise`.
+      * reject - a function that causes the `promise` property on this object to
+        become rejected
+      * resolve - a function that causes the `promise` property on this object to
+        become fulfilled.
+
+      Example:
+
+       ```javascript
+       var deferred = RSVP.defer();
+
+       deferred.resolve("Success!");
+
+       deferred.promise.then(function(value){
+         // value here is "Success!"
+       });
+       ```
+
+      @method defer
+      @for RSVP
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Object}
+     */
+
+    __exports__["default"] = function defer(label) {
+      var deferred = { };
+
+      deferred.promise = new Promise(function(resolve, reject) {
+        deferred.resolve = resolve;
+        deferred.reject = reject;
+      }, label);
+
+      return deferred;
+    };
+  });
+define("rsvp/events",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var indexOf = function(callbacks, callback) {
+      for (var i=0, l=callbacks.length; i<l; i++) {
+        if (callbacks[i] === callback) { return i; }
+      }
+
+      return -1;
+    };
+
+    var callbacksFor = function(object) {
+      var callbacks = object._promiseCallbacks;
+
+      if (!callbacks) {
+        callbacks = object._promiseCallbacks = {};
+      }
+
+      return callbacks;
+    };
+
+    /**
+      @class RSVP.EventTarget
+    */
+    __exports__["default"] = {
+
+      /**
+        `RSVP.EventTarget.mixin` extends an object with EventTarget methods. For
+        Example:
+
+        ```javascript
+        var object = {};
+
+        RSVP.EventTarget.mixin(object);
+
+        object.on("finished", function(event) {
+          // handle event
+        });
+
+        object.trigger("finished", { detail: value });
+        ```
+
+        `EventTarget.mixin` also works with prototypes:
+
+        ```javascript
+        var Person = function() {};
+        RSVP.EventTarget.mixin(Person.prototype);
+
+        var yehuda = new Person();
+        var tom = new Person();
+
+        yehuda.on("poke", function(event) {
+          console.log("Yehuda says OW");
+        });
+
+        tom.on("poke", function(event) {
+          console.log("Tom says OW");
+        });
+
+        yehuda.trigger("poke");
+        tom.trigger("poke");
+        ```
+
+        @method mixin
+        @param {Object} object object to extend with EventTarget methods
+        @private
+      */
+      mixin: function(object) {
+        object.on = this.on;
+        object.off = this.off;
+        object.trigger = this.trigger;
+        object._promiseCallbacks = undefined;
+        return object;
+      },
+
+      /**
+        Registers a callback to be executed when `eventName` is triggered
+
+        ```javascript
+        object.on('event', function(eventInfo){
+          // handle the event
+        });
+
+        object.trigger('event');
+        ```
+
+        @method on
+        @param {String} eventName name of the event to listen for
+        @param {Function} callback function to be called when the event is triggered.
+        @private
+      */
+      on: function(eventName, callback) {
+        var allCallbacks = callbacksFor(this), callbacks;
+
+        callbacks = allCallbacks[eventName];
+
+        if (!callbacks) {
+          callbacks = allCallbacks[eventName] = [];
+        }
+
+        if (indexOf(callbacks, callback) === -1) {
+          callbacks.push(callback);
+        }
+      },
+
+      /**
+        You can use `off` to stop firing a particular callback for an event:
+
+        ```javascript
+        function doStuff() { // do stuff! }
+        object.on('stuff', doStuff);
+
+        object.trigger('stuff'); // doStuff will be called
+
+        // Unregister ONLY the doStuff callback
+        object.off('stuff', doStuff);
+        object.trigger('stuff'); // doStuff will NOT be called
+        ```
+
+        If you don't pass a `callback` argument to `off`, ALL callbacks for the
+        event will not be executed when the event fires. For example:
+
+        ```javascript
+        var callback1 = function(){};
+        var callback2 = function(){};
+
+        object.on('stuff', callback1);
+        object.on('stuff', callback2);
+
+        object.trigger('stuff'); // callback1 and callback2 will be executed.
+
+        object.off('stuff');
+        object.trigger('stuff'); // callback1 and callback2 will not be executed!
+        ```
+
+        @method off
+        @param {String} eventName event to stop listening to
+        @param {Function} callback optional argument. If given, only the function
+        given will be removed from the event's callback queue. If no `callback`
+        argument is given, all callbacks will be removed from the event's callback
+        queue.
+        @private
+
+      */
+      off: function(eventName, callback) {
+        var allCallbacks = callbacksFor(this), callbacks, index;
+
+        if (!callback) {
+          allCallbacks[eventName] = [];
+          return;
+        }
+
+        callbacks = allCallbacks[eventName];
+
+        index = indexOf(callbacks, callback);
+
+        if (index !== -1) { callbacks.splice(index, 1); }
+      },
+
+      /**
+        Use `trigger` to fire custom events. For example:
+
+        ```javascript
+        object.on('foo', function(){
+          console.log('foo event happened!');
+        });
+        object.trigger('foo');
+        // 'foo event happened!' logged to the console
+        ```
+
+        You can also pass a value as a second argument to `trigger` that will be
+        passed as an argument to all event listeners for the event:
+
+        ```javascript
+        object.on('foo', function(value){
+          console.log(value.name);
+        });
+
+        object.trigger('foo', { name: 'bar' });
+        // 'bar' logged to the console
+        ```
+
+        @method trigger
+        @param {String} eventName name of the event to be triggered
+        @param {Any} options optional value to be passed to any event handlers for
+        the given `eventName`
+        @private
+      */
+      trigger: function(eventName, options) {
+        var allCallbacks = callbacksFor(this),
+            callbacks, callbackTuple, callback, binding;
+
+        if (callbacks = allCallbacks[eventName]) {
+          // Don't cache the callbacks.length since it may grow
+          for (var i=0; i<callbacks.length; i++) {
+            callback = callbacks[i];
+
+            callback(options);
+          }
+        }
+      }
+    };
+  });
+define("rsvp/filter",
+  ["./all","./map","./utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var all = __dependency1__["default"];
+    var map = __dependency2__["default"];
+    var isFunction = __dependency3__.isFunction;
+    var isArray = __dependency3__.isArray;
+
+    /**
+     `RSVP.filter` is similar to JavaScript's native `filter` method, except that it
+      waits for all promises to become fulfilled before running the `filterFn` on
+      each item in given to `promises`. `RSVP.filter` returns a promise that will
+      become fulfilled with the result of running `filterFn` on the values the
+      promises become fulfilled with.
+
+      For example:
+
+      ```javascript
+
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.resolve(2);
+      var promise3 = RSVP.resolve(3);
+
+      var filterFn = function(item){
+        return item > 1;
+      };
+
+      RSVP.filter(promises, filterFn).then(function(result){
+        // result is [ 2, 3 ]
+      });
+      ```
+
+      If any of the `promises` given to `RSVP.filter` are rejected, the first promise
+      that is rejected will be given as an argument to the returned promise's
+      rejection handler. For example:
+
+      ```javascript
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.reject(new Error("2"));
+      var promise3 = RSVP.reject(new Error("3"));
+      var promises = [ promise1, promise2, promise3 ];
+
+      var filterFn = function(item){
+        return item > 1;
+      };
+
+      RSVP.filter(promises, filterFn).then(function(array){
+        // Code here never runs because there are rejected promises!
+      }, function(reason) {
+        // reason.message === "2"
+      });
+      ```
+
+      `RSVP.filter` will also wait for any promises returned from `filterFn`.
+      For instance, you may want to fetch a list of users then return a subset
+      of those users based on some asynchronous operation:
+
+      ```javascript
+
+      var alice = { name: 'alice' };
+      var bob   = { name: 'bob' };
+      var users = [ alice, bob ];
+
+      var promises = users.map(function(user){
+        return RSVP.resolve(user);
+      });
+
+      var filterFn = function(user){
+        // Here, Alice has permissions to create a blog post, but Bob does not.
+        return getPrivilegesForUser(user).then(function(privs){
+          return privs.can_create_blog_post === true;
+        });
+      };
+      RSVP.filter(promises, filterFn).then(function(users){
+        // true, because the server told us only Alice can create a blog post.
+        users.length === 1;
+        // false, because Alice is the only user present in `users`
+        users[0] === bob;
+      });
+      ```
+
+      @method filter
+      @for RSVP
+      @param {Array} promises
+      @param {Function} filterFn - function to be called on each resolved value to
+      filter the final results.
+      @param {String} label optional string describing the promise. Useful for
+      tooling.
+      @return {Promise}
+    */
+    function filter(promises, filterFn, label) {
+      return all(promises, label).then(function(values){
+        if (!isArray(promises)) {
+          throw new TypeError('You must pass an array to filter.');
+        }
+
+        if (!isFunction(filterFn)){
+          throw new TypeError("You must pass a function to filter's second argument.");
+        }
+
+        return map(promises, filterFn, label).then(function(filterResults){
+           var i,
+               valuesLen = values.length,
+               filtered = [];
+
+           for (i = 0; i < valuesLen; i++){
+             if(filterResults[i]) filtered.push(values[i]);
+           }
+           return filtered;
+        });
+      });
+    }
+
+    __exports__["default"] = filter;
+  });
+define("rsvp/hash",
+  ["./promise","./utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var isNonThenable = __dependency2__.isNonThenable;
+    var keysOf = __dependency2__.keysOf;
+
+    /**
+      `RSVP.hash` is similar to `RSVP.all`, but takes an object instead of an array
+      for its `promises` argument.
+
+      Returns a promise that is fulfilled when all the given promises have been
+      fulfilled, or rejected if any of them become rejected. The returned promise
+      is fulfilled with a hash that has the same key names as the `promises` object
+      argument. If any of the values in the object are not promises, they will
+      simply be copied over to the fulfilled object.
+
+      Example:
+
+      ```javascript
+      var promises = {
+        myPromise: RSVP.resolve(1),
+        yourPromise: RSVP.resolve(2),
+        theirPromise: RSVP.resolve(3),
+        notAPromise: 4
+      };
+
+      RSVP.hash(promises).then(function(hash){
+        // hash here is an object that looks like:
+        // {
+        //   myPromise: 1,
+        //   yourPromise: 2,
+        //   theirPromise: 3,
+        //   notAPromise: 4
+        // }
+      });
+      ````
+
+      If any of the `promises` given to `RSVP.hash` are rejected, the first promise
+      that is rejected will be given as the reason to the rejection handler.
+
+      Example:
+
+      ```javascript
+      var promises = {
+        myPromise: RSVP.resolve(1),
+        rejectedPromise: RSVP.reject(new Error("rejectedPromise")),
+        anotherRejectedPromise: RSVP.reject(new Error("anotherRejectedPromise")),
+      };
+
+      RSVP.hash(promises).then(function(hash){
+        // Code here never runs because there are rejected promises!
+      }, function(reason) {
+        // reason.message === "rejectedPromise"
+      });
+      ```
+
+      An important note: `RSVP.hash` is intended for plain JavaScript objects that
+      are just a set of keys and values. `RSVP.hash` will NOT preserve prototype
+      chains.
+
+      Example:
+
+      ```javascript
+      function MyConstructor(){
+        this.example = RSVP.resolve("Example");
+      }
+
+      MyConstructor.prototype = {
+        protoProperty: RSVP.resolve("Proto Property")
+      };
+
+      var myObject = new MyConstructor();
+
+      RSVP.hash(myObject).then(function(hash){
+        // protoProperty will not be present, instead you will just have an
+        // object that looks like:
+        // {
+        //   example: "Example"
+        // }
+        //
+        // hash.hasOwnProperty('protoProperty'); // false
+        // 'undefined' === typeof hash.protoProperty
+      });
+      ```
+
+      @method hash
+      @for RSVP
+      @param {Object} promises
+      @param {String} label optional string that describes the promise.
+      Useful for tooling.
+      @return {Promise} promise that is fulfilled when all properties of `promises`
+      have been fulfilled, or rejected if any of them become rejected.
+      @static
+    */
+    __exports__["default"] = function hash(object, label) {
+      return new Promise(function(resolve, reject){
+        var results = {};
+        var keys = keysOf(object);
+        var remaining = keys.length;
+        var entry, property;
+
+        if (remaining === 0) {
+          resolve(results);
+          return;
+        }
+
+       function fulfilledTo(property) {
+          return function(value) {
+            results[property] = value;
+            if (--remaining === 0) {
+              resolve(results);
+            }
+          };
+        }
+
+        function onRejection(reason) {
+          remaining = 0;
+          reject(reason);
+        }
+
+        for (var i = 0; i < keys.length; i++) {
+          property = keys[i];
+          entry = object[property];
+
+          if (isNonThenable(entry)) {
+            results[property] = entry;
+            if (--remaining === 0) {
+              resolve(results);
+            }
+          } else {
+            Promise.cast(entry).then(fulfilledTo(property), onRejection);
+          }
+        }
+      });
+    };
+  });
+define("rsvp/instrument",
+  ["./config","./utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var config = __dependency1__.config;
+    var now = __dependency2__.now;
+
+    __exports__["default"] = function instrument(eventName, promise, child) {
+      // instrumentation should not disrupt normal usage.
+      try {
+        config.trigger(eventName, {
+          guid: promise._guidKey + promise._id,
+          eventName: eventName,
+          detail: promise._detail,
+          childGuid: child && promise._guidKey + child._id,
+          label: promise._label,
+          timeStamp: now(),
+          stack: new Error(promise._label).stack
+        });
+      } catch(error) {
+        setTimeout(function(){
+          throw error;
+        }, 0);
+      }
+    };
+  });
+define("rsvp/map",
+  ["./promise","./all","./utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var all = __dependency2__["default"];
+    var isArray = __dependency3__.isArray;
+    var isFunction = __dependency3__.isFunction;
+
+    /**
+     `RSVP.map` is similar to JavaScript's native `map` method, except that it
+      waits for all promises to become fulfilled before running the `mapFn` on
+      each item in given to `promises`. `RSVP.map` returns a promise that will
+      become fulfilled with the result of running `mapFn` on the values the promises
+      become fulfilled with.
+
+      For example:
+
+      ```javascript
+
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.resolve(2);
+      var promise3 = RSVP.resolve(3);
+      var promises = [ promise1, promise2, promise3 ];
+
+      var mapFn = function(item){
+        return item + 1;
+      };
+
+      RSVP.map(promises, mapFn).then(function(result){
+        // result is [ 2, 3, 4 ]
+      });
+      ```
+
+      If any of the `promises` given to `RSVP.map` are rejected, the first promise
+      that is rejected will be given as an argument to the returned promise's
+      rejection handler. For example:
+
+      ```javascript
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.reject(new Error("2"));
+      var promise3 = RSVP.reject(new Error("3"));
+      var promises = [ promise1, promise2, promise3 ];
+
+      var mapFn = function(item){
+        return item + 1;
+      };
+
+      RSVP.map(promises, mapFn).then(function(array){
+        // Code here never runs because there are rejected promises!
+      }, function(reason) {
+        // reason.message === "2"
+      });
+      ```
+
+      `RSVP.map` will also wait if a promise is returned from `mapFn`. For example,
+      say you want to get all comments from a set of blog posts, but you need
+      the blog posts first becuase they contain a url to those comments.
+
+      ```javscript
+
+      var mapFn = function(blogPost){
+        // getComments does some ajax and returns an RSVP.Promise that is fulfilled
+        // with some comments data
+        return getComments(blogPost.comments_url);
+      };
+
+      // getBlogPosts does some ajax and returns an RSVP.Promise that is fulfilled
+      // with some blog post data
+      RSVP.map(getBlogPosts(), mapFn).then(function(comments){
+        // comments is the result of asking the server for the comments
+        // of all blog posts returned from getBlogPosts()
+      });
+      ```
+
+      @method map
+      @for RSVP
+      @param {Array} promises
+      @param {Function} mapFn function to be called on each fulfilled promise.
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise} promise that is fulfilled with the result of calling
+      `mapFn` on each fulfilled promise or value when they become fulfilled.
+       The promise will be rejected if any of the given `promises` become rejected.
+      @static
+    */
+    __exports__["default"] = function map(promises, mapFn, label) {
+      return all(promises, label).then(function(results){
+        if (!isArray(promises)) {
+          throw new TypeError('You must pass an array to map.');
+        }
+
+        if (!isFunction(mapFn)){
+          throw new TypeError("You must pass a function to map's second argument.");
+        }
+
+
+        var resultLen = results.length,
+            mappedResults = [],
+            i;
+
+        for (i = 0; i < resultLen; i++){
+          mappedResults.push(mapFn(results[i]));
+        }
+
+        return all(mappedResults, label);
+      });
+    };
+  });
+define("rsvp/node",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    var slice = Array.prototype.slice;
+
+    function makeNodeCallbackFor(resolve, reject) {
+      return function (error, value) {
+        if (error) {
+          reject(error);
+        } else if (arguments.length > 2) {
+          resolve(slice.call(arguments, 1));
+        } else {
+          resolve(value);
+        }
+      };
+    }
+
+    /**
+      `RSVP.denodeify` takes a "node-style" function and returns a function that
+      will return an `RSVP.Promise`. You can use `denodeify` in Node.js or the
+      browser when you'd prefer to use promises over using callbacks. For example,
+      `denodeify` transforms the following:
+
+      ```javascript
+      var fs = require('fs');
+
+      fs.readFile('myfile.txt', function(err, data){
+        if (err) return handleError(err);
+        handleData(data);
+      });
+      ```
+
+      into:
+
+      ```javascript
+      var fs = require('fs');
+
+      var readFile = RSVP.denodeify(fs.readFile);
+
+      readFile('myfile.txt').then(handleData, handleError);
+      ```
+
+      Using `denodeify` makes it easier to compose asynchronous operations instead
+      of using callbacks. For example, instead of:
+
+      ```javascript
+      var fs = require('fs');
+      var log = require('some-async-logger');
+
+      fs.readFile('myfile.txt', function(err, data){
+        if (err) return handleError(err);
+        fs.writeFile('myfile2.txt', data, function(err){
+          if (err) throw err;
+          log('success', function(err) {
+            if (err) throw err;
+          });
+        });
+      });
+      ```
+
+      You can chain the operations together using `then` from the returned promise:
+
+      ```javascript
+      var fs = require('fs');
+      var denodeify = RSVP.denodeify;
+      var readFile = denodeify(fs.readFile);
+      var writeFile = denodeify(fs.writeFile);
+      var log = denodeify(require('some-async-logger'));
+
+      readFile('myfile.txt').then(function(data){
+        return writeFile('myfile2.txt', data);
+      }).then(function(){
+        return log('SUCCESS');
+      }).then(function(){
+        // success handler
+      }, function(reason){
+        // rejection handler
+      });
+      ```
+
+      @method denodeify
+      @for RSVP
+      @param {Function} nodeFunc a "node-style" function that takes a callback as
+      its last argument. The callback expects an error to be passed as its first
+      argument (if an error occurred, otherwise null), and the value from the
+      operation as its second argument ("function(err, value){ }").
+      @param {Any} binding optional argument for binding the "this" value when
+      calling the `nodeFunc` function.
+      @return {Function} a function that wraps `nodeFunc` to return an
+      `RSVP.Promise`
+      @static
+    */
+    __exports__["default"] = function denodeify(nodeFunc, binding) {
+      return function()  {
+        var nodeArgs = slice.call(arguments), resolve, reject;
+        var thisArg = this || binding;
+
+        return new Promise(function(resolve, reject) {
+          Promise.all(nodeArgs).then(function(nodeArgs) {
+            try {
+              nodeArgs.push(makeNodeCallbackFor(resolve, reject));
+              nodeFunc.apply(thisArg, nodeArgs);
+            } catch(e) {
+              reject(e);
+            }
+          });
+        });
+      };
+    };
+  });
+define("rsvp/promise",
+  ["./config","./events","./instrument","./utils","./promise/cast","./promise/all","./promise/race","./promise/resolve","./promise/reject","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+    "use strict";
+    var config = __dependency1__.config;
+    var EventTarget = __dependency2__["default"];
+    var instrument = __dependency3__["default"];
+    var objectOrFunction = __dependency4__.objectOrFunction;
+    var isFunction = __dependency4__.isFunction;
+    var now = __dependency4__.now;
+    var cast = __dependency5__["default"];
+    var all = __dependency6__["default"];
+    var race = __dependency7__["default"];
+    var Resolve = __dependency8__["default"];
+    var Reject = __dependency9__["default"];
+
+    var guidKey = 'rsvp_' + now() + '-';
+    var counter = 0;
+
+    function noop() {}
+
+    __exports__["default"] = Promise;
+
+
+    /**
+      Promise objects represent the eventual result of an asynchronous operation. The
+      primary way of interacting with a promise is through its `then` method, which
+      registers callbacks to receive either a promise’s eventual value or the reason
+      why the promise cannot be fulfilled.
+
+      Terminology
+      -----------
+
+      - `promise` is an object or function with a `then` method whose behavior conforms to this specification.
+      - `thenable` is an object or function that defines a `then` method.
+      - `value` is any legal JavaScript value (including undefined, a thenable, or a promise).
+      - `exception` is a value that is thrown using the throw statement.
+      - `reason` is a value that indicates why a promise was rejected.
+      - `settled` the final resting state of a promise, fulfilled or rejected.
+
+      A promise can be in one of three states: pending, fulfilled, or rejected.
+
+      Promises that are fulfilled have a fulfillment value and are in the fulfilled
+      state.  Promises that are rejected have a rejection reason and are in the
+      rejected state.  A fulfillment value is never a thenable.  Similarly, a
+      rejection reason is never a thenable.
+
+      Promises can also be said to *resolve* a value.  If this value is also a
+      promise, then the original promise's settled state will match the value's
+      settled state.  So a promise that *resolves* a promise that rejects will
+      itself reject, and a promise that *resolves* a promise that fulfills will
+      itself fulfill.
+
+
+      Basic Usage:
+      ------------
+
+      ```js
+      var promise = new Promise(function(resolve, reject) {
+        // on success
+        resolve(value);
+
+        // on failure
+        reject(reason);
+      });
+
+      promise.then(function(value) {
+        // on fulfillment
+      }, function(reason) {
+        // on rejection
+      });
+      ```
+
+      Advanced Usage:
+      ---------------
+
+      Promises shine when abstracting away asynchronous interactions such as
+      `XMLHttpRequest`s.
+
+      ```js
+      function getJSON(url) {
+        return new Promise(function(resolve, reject){
+          var xhr = new XMLHttpRequest();
+
+          xhr.open('GET', url);
+          xhr.onreadystatechange = handler;
+          xhr.responseType = 'json';
+          xhr.setRequestHeader('Accept', 'application/json');
+          xhr.send();
+
+          function handler() {
+            if (this.readyState === this.DONE) {
+              if (this.status === 200) {
+                resolve(this.response);
+              } else {
+                reject(new Error("getJSON: `" + url + "` failed with status: [" + this.status + "]");
+              }
+            }
+          };
+        });
+      }
+
+      getJSON('/posts.json').then(function(json) {
+        // on fulfillment
+      }, function(reason) {
+        // on rejection
+      });
+      ```
+
+      Unlike callbacks, promises are great composable primitives.
+
+      ```js
+      Promise.all([
+        getJSON('/posts'),
+        getJSON('/comments')
+      ]).then(function(values){
+        values[0] // => postsJSON
+        values[1] // => commentsJSON
+
+        return values;
+      });
+      ```
+
+      @class RSVP.Promise
+      @param {function}
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @constructor
+    */
+    function Promise(resolver, label) {
+      if (!isFunction(resolver)) {
+        throw new TypeError('You must pass a resolver function as the first argument to the promise constructor');
+      }
+
+      if (!(this instanceof Promise)) {
+        throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");
+      }
+
+      this._id = counter++;
+      this._label = label;
+      this._subscribers = [];
+
+      if (config.instrument) {
+        instrument('created', this);
+      }
+
+      if (noop !== resolver) {
+        invokeResolver(resolver, this);
+      }
+    }
+
+    function invokeResolver(resolver, promise) {
+      function resolvePromise(value) {
+        resolve(promise, value);
+      }
+
+      function rejectPromise(reason) {
+        reject(promise, reason);
+      }
+
+      try {
+        resolver(resolvePromise, rejectPromise);
+      } catch(e) {
+        rejectPromise(e);
+      }
+    }
+
+    Promise.cast = cast;
+    Promise.all = all;
+    Promise.race = race;
+    Promise.resolve = Resolve;
+    Promise.reject = Reject;
+
+    var PENDING   = void 0;
+    var SEALED    = 0;
+    var FULFILLED = 1;
+    var REJECTED  = 2;
+
+    function subscribe(parent, child, onFulfillment, onRejection) {
+      var subscribers = parent._subscribers;
+      var length = subscribers.length;
+
+      subscribers[length] = child;
+      subscribers[length + FULFILLED] = onFulfillment;
+      subscribers[length + REJECTED]  = onRejection;
+    }
+
+    function publish(promise, settled) {
+      var child, callback, subscribers = promise._subscribers, detail = promise._detail;
+
+      if (config.instrument) {
+        instrument(settled === FULFILLED ? 'fulfilled' : 'rejected', promise);
+      }
+
+      for (var i = 0; i < subscribers.length; i += 3) {
+        child = subscribers[i];
+        callback = subscribers[i + settled];
+
+        invokeCallback(settled, child, callback, detail);
+      }
+
+      promise._subscribers = null;
+    }
+
+    Promise.prototype = {
+      constructor: Promise,
+
+      _id: undefined,
+      _guidKey: guidKey,
+      _label: undefined,
+
+      _state: undefined,
+      _detail: undefined,
+      _subscribers: undefined,
+
+      _onerror: function (reason) {
+        config.trigger('error', reason);
+      },
+
+    /**
+      The primary way of interacting with a promise is through its `then` method,
+      which registers callbacks to receive either a promise's eventual value or the
+      reason why the promise cannot be fulfilled.
+
+      ```js
+      findUser().then(function(user){
+        // user is available
+      }, function(reason){
+        // user is unavailable, and you are given the reason why
+      });
+      ```
+
+      Chaining
+      --------
+
+      The return value of `then` is itself a promise.  This second, "downstream"
+      promise is resolved with the return value of the first promise's fulfillment
+      or rejection handler, or rejected if the handler throws an exception.
+
+      ```js
+      findUser().then(function (user) {
+        return user.name;
+      }, function (reason) {
+        return "default name";
+      }).then(function (userName) {
+        // If `findUser` fulfilled, `userName` will be the user's name, otherwise it
+        // will be `"default name"`
+      });
+
+      findUser().then(function (user) {
+        throw new Error("Found user, but still unhappy");
+      }, function (reason) {
+        throw new Error("`findUser` rejected and we're unhappy");
+      }).then(function (value) {
+        // never reached
+      }, function (reason) {
+        // if `findUser` fulfilled, `reason` will be "Found user, but still unhappy".
+        // If `findUser` rejected, `reason` will be "`findUser` rejected and we're unhappy".
+      });
+      ```
+      If the downstream promise does not specify a rejection handler, rejection reasons will be propagated further downstream.
+
+      ```js
+      findUser().then(function (user) {
+        throw new PedagogicalException("Upstream error");
+      }).then(function (value) {
+        // never reached
+      }).then(function (value) {
+        // never reached
+      }, function (reason) {
+        // The `PedgagocialException` is propagated all the way down to here
+      });
+      ```
+
+      Assimilation
+      ------------
+
+      Sometimes the value you want to propagate to a downstream promise can only be
+      retrieved asynchronously. This can be achieved by returning a promise in the
+      fulfillment or rejection handler. The downstream promise will then be pending
+      until the returned promise is settled. This is called *assimilation*.
+
+      ```js
+      findUser().then(function (user) {
+        return findCommentsByAuthor(user);
+      }).then(function (comments) {
+        // The user's comments are now available
+      });
+      ```
+
+      If the assimliated promise rejects, then the downstream promise will also reject.
+
+      ```js
+      findUser().then(function (user) {
+        return findCommentsByAuthor(user);
+      }).then(function (comments) {
+        // If `findCommentsByAuthor` fulfills, we'll have the value here
+      }, function (reason) {
+        // If `findCommentsByAuthor` rejects, we'll have the reason here
+      });
+      ```
+
+      Simple Example
+      --------------
+
+      Synchronous Example
+
+      ```javascript
+      var result;
+
+      try {
+        result = findResult();
+        // success
+      } catch(reason) {
+        // failure
+      }
+      ```
+
+      Errback Example
+
+      ```js
+      findResult(function(result, err){
+        if (err) {
+          // failure
+        } else {
+          // success
+        }
+      });
+      ```
+
+      Promise Example;
+
+      ```javascript
+      findResult().then(function(result){
+        // success
+      }, function(reason){
+        // failure
+      });
+      ```
+
+      Advanced Example
+      --------------
+
+      Synchronous Example
+
+      ```javascript
+      var author, books;
+
+      try {
+        author = findAuthor();
+        books  = findBooksByAuthor(author);
+        // success
+      } catch(reason) {
+        // failure
+      }
+      ```
+
+      Errback Example
+
+      ```js
+
+      function foundBooks(books) {
+
+      }
+
+      function failure(reason) {
+
+      }
+
+      findAuthor(function(author, err){
+        if (err) {
+          failure(err);
+          // failure
+        } else {
+          try {
+            findBoooksByAuthor(author, function(books, err) {
+              if (err) {
+                failure(err);
+              } else {
+                try {
+                  foundBooks(books);
+                } catch(reason) {
+                  failure(reason);
+                }
+              }
+            });
+          } catch(error) {
+            failure(err);
+          }
+          // success
+        }
+      });
+      ```
+
+      Promise Example;
+
+      ```javascript
+      findAuthor().
+        then(findBooksByAuthor).
+        then(function(books){
+          // found books
+      }).catch(function(reason){
+        // something went wrong
+      });
+      ```
+
+      @method then
+      @param {Function} onFulfilled
+      @param {Function} onRejected
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      then: function(onFulfillment, onRejection, label) {
+        var promise = this;
+        this._onerror = null;
+
+        var thenPromise = new this.constructor(noop, label);
+
+        if (this._state) {
+          var callbacks = arguments;
+          config.async(function invokePromiseCallback() {
+            invokeCallback(promise._state, thenPromise, callbacks[promise._state - 1], promise._detail);
+          });
+        } else {
+          subscribe(this, thenPromise, onFulfillment, onRejection);
+        }
+
+        if (config.instrument) {
+          instrument('chained', promise, thenPromise);
+        }
+
+        return thenPromise;
+      },
+
+    /**
+      `catch` is simply sugar for `then(undefined, onRejection)` which makes it the same
+      as the catch block of a try/catch statement.
+
+      ```js
+      function findAuthor(){
+        throw new Error("couldn't find that author");
+      }
+
+      // synchronous
+      try {
+        findAuthor();
+      } catch(reason) {
+        // something went wrong
+      }
+
+      // async with promises
+      findAuthor().catch(function(reason){
+        // something went wrong
+      });
+      ```
+
+      @method catch
+      @param {Function} onRejection
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      'catch': function(onRejection, label) {
+        return this.then(null, onRejection, label);
+      },
+
+    /**
+      `finally` will be invoked regardless of the promise's fate just as native
+      try/catch/finally behaves
+
+      Synchronous example:
+
+      ```js
+      findAuthor() {
+        if (Math.random() > 0.5) {
+          throw new Error();
+        }
+        return new Author();
+      }
+
+      try {
+        return findAuthor(); // succeed or fail
+      } catch(error) {
+        return findOtherAuther();
+      } finally {
+        // always runs
+        // doesn't affect the return value
+      }
+      ```
+
+      Asynchronous example:
+
+      ```js
+      findAuthor().catch(function(reason){
+        return findOtherAuther();
+      }).finally(function(){
+        // author was either found, or not
+      });
+      ```
+
+      @method finally
+      @param {Function} callback
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise}
+    */
+      'finally': function(callback, label) {
+        var constructor = this.constructor;
+
+        return this.then(function(value) {
+          return constructor.cast(callback()).then(function(){
+            return value;
+          });
+        }, function(reason) {
+          return constructor.cast(callback()).then(function(){
+            throw reason;
+          });
+        }, label);
+      }
+    };
+
+    function invokeCallback(settled, promise, callback, detail) {
+      var hasCallback = isFunction(callback),
+          value, error, succeeded, failed;
+
+      if (hasCallback) {
+        try {
+          value = callback(detail);
+          succeeded = true;
+        } catch(e) {
+          failed = true;
+          error = e;
+        }
+      } else {
+        value = detail;
+        succeeded = true;
+      }
+
+      if (handleThenable(promise, value)) {
+        return;
+      } else if (hasCallback && succeeded) {
+        resolve(promise, value);
+      } else if (failed) {
+        reject(promise, error);
+      } else if (settled === FULFILLED) {
+        resolve(promise, value);
+      } else if (settled === REJECTED) {
+        reject(promise, value);
+      }
+    }
+
+    function handleThenable(promise, value) {
+      var then = null,
+      resolved;
+
+      try {
+        if (promise === value) {
+          throw new TypeError("A promises callback cannot return that same promise.");
+        }
+
+        if (objectOrFunction(value)) {
+          then = value.then;
+
+          if (isFunction(then)) {
+            then.call(value, function(val) {
+              if (resolved) { return true; }
+              resolved = true;
+
+              if (value !== val) {
+                resolve(promise, val);
+              } else {
+                fulfill(promise, val);
+              }
+            }, function(val) {
+              if (resolved) { return true; }
+              resolved = true;
+
+              reject(promise, val);
+            }, 'derived from: ' + (promise._label || ' unknown promise'));
+
+            return true;
+          }
+        }
+      } catch (error) {
+        if (resolved) { return true; }
+        reject(promise, error);
+        return true;
+      }
+
+      return false;
+    }
+
+    function resolve(promise, value) {
+      if (promise === value) {
+        fulfill(promise, value);
+      } else if (!handleThenable(promise, value)) {
+        fulfill(promise, value);
+      }
+    }
+
+    function fulfill(promise, value) {
+      if (promise._state !== PENDING) { return; }
+      promise._state = SEALED;
+      promise._detail = value;
+
+      config.async(publishFulfillment, promise);
+    }
+
+    function reject(promise, reason) {
+      if (promise._state !== PENDING) { return; }
+      promise._state = SEALED;
+      promise._detail = reason;
+
+      config.async(publishRejection, promise);
+    }
+
+    function publishFulfillment(promise) {
+      publish(promise, promise._state = FULFILLED);
+    }
+
+    function publishRejection(promise) {
+      if (promise._onerror) {
+        promise._onerror(promise._detail);
+      }
+
+      publish(promise, promise._state = REJECTED);
+    }
+  });
+define("rsvp/promise/all",
+  ["../utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var isArray = __dependency1__.isArray;
+    var isNonThenable = __dependency1__.isNonThenable;
+
+    /**
+      `RSVP.Promise.all` accepts an array of promises, and returns a new promise which
+      is fulfilled with an array of fulfillment values for the passed promises, or
+      rejected with the reason of the first passed promise to be rejected. It casts all
+      elements of the passed iterable to promises as it runs this algorithm.
+
+      Example:
+
+      ```javascript
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.resolve(2);
+      var promise3 = RSVP.resolve(3);
+      var promises = [ promise1, promise2, promise3 ];
+
+      RSVP.Promise.all(promises).then(function(array){
+        // The array here would be [ 1, 2, 3 ];
+      });
+      ```
+
+      If any of the `promises` given to `RSVP.all` are rejected, the first promise
+      that is rejected will be given as an argument to the returned promises's
+      rejection handler. For example:
+
+      Example:
+
+      ```javascript
+      var promise1 = RSVP.resolve(1);
+      var promise2 = RSVP.reject(new Error("2"));
+      var promise3 = RSVP.reject(new Error("3"));
+      var promises = [ promise1, promise2, promise3 ];
+
+      RSVP.Promise.all(promises).then(function(array){
+        // Code here never runs because there are rejected promises!
+      }, function(error) {
+        // error.message === "2"
+      });
+      ```
+
+      @method all
+      @for Ember.RSVP.Promise
+      @param {Array} entries array of promises
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise} promise that is fulfilled when all `promises` have been
+      fulfilled, or rejected if any of them become rejected.
+      @static
+    */
+    __exports__["default"] = function all(entries, label) {
+
+      /*jshint validthis:true */
+      var Constructor = this;
+
+      return new Constructor(function(resolve, reject) {
+        if (!isArray(entries)) {
+          throw new TypeError('You must pass an array to all.');
+        }
+
+        var remaining = entries.length;
+        var results = new Array(remaining);
+        var entry, pending = true;
+
+        if (remaining === 0) {
+          resolve(results);
+          return;
+        }
+
+        function fulfillmentAt(index) {
+          return function(value) {
+            results[index] = value;
+            if (--remaining === 0) {
+              resolve(results);
+            }
+          };
+        }
+
+        function onRejection(reason) {
+          remaining = 0;
+          reject(reason);
+        }
+
+        for (var index = 0; index < entries.length; index++) {
+          entry = entries[index];
+          if (isNonThenable(entry)) {
+            results[index] = entry;
+            if (--remaining === 0) {
+              resolve(results);
+            }
+          } else {
+            Constructor.cast(entry).then(fulfillmentAt(index), onRejection);
+          }
+        }
+      }, label);
+    };
+  });
+define("rsvp/promise/cast",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      `RSVP.Promise.cast` coerces its argument to a promise, or returns the
+      argument if it is already a promise which shares a constructor with the caster.
+
+      Example:
+
+      ```javascript
+      var promise = RSVP.Promise.resolve(1);
+      var casted = RSVP.Promise.cast(promise);
+
+      console.log(promise === casted); // true
+      ```
+
+      In the case of a promise whose constructor does not match, it is assimilated.
+      The resulting promise will fulfill or reject based on the outcome of the
+      promise being casted.
+
+      Example:
+
+      ```javascript
+      var thennable = $.getJSON('/api/foo');
+      var casted = RSVP.Promise.cast(thennable);
+
+      console.log(thennable === casted); // false
+      console.log(casted instanceof RSVP.Promise) // true
+
+      casted.then(function(data) {
+        // data is the value getJSON fulfills with
+      });
+      ```
+
+      In the case of a non-promise, a promise which will fulfill with that value is
+      returned.
+
+      Example:
+
+      ```javascript
+      var value = 1; // could be a number, boolean, string, undefined...
+      var casted = RSVP.Promise.cast(value);
+
+      console.log(value === casted); // false
+      console.log(casted instanceof RSVP.Promise) // true
+
+      casted.then(function(val) {
+        val === value // => true
+      });
+      ```
+
+      `RSVP.Promise.cast` is similar to `RSVP.Promise.resolve`, but `RSVP.Promise.cast` differs in the
+      following ways:
+
+      * `RSVP.Promise.cast` serves as a memory-efficient way of getting a promise, when you
+      have something that could either be a promise or a value. RSVP.resolve
+      will have the same effect but will create a new promise wrapper if the
+      argument is a promise.
+      * `RSVP.Promise.cast` is a way of casting incoming thenables or promise subclasses to
+      promises of the exact class specified, so that the resulting object's `then` is
+      ensured to have the behavior of the constructor you are calling cast on (i.e., RSVP.Promise).
+
+      @method cast
+      @param {Object} object to be casted
+      @param {String} label optional string for labeling the promise.
+      Useful for tooling.
+      @return {Promise} promise
+      @static
+    */
+
+    __exports__["default"] = function cast(object, label) {
+      /*jshint validthis:true */
+      var Constructor = this;
+
+      if (object && typeof object === 'object' && object.constructor === Constructor) {
+        return object;
+      }
+
+      return new Constructor(function(resolve) {
+        resolve(object);
+      }, label);
+    };
+  });
+define("rsvp/promise/race",
+  ["../utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    /* global toString */
+
+    var isArray = __dependency1__.isArray;
+    var isFunction = __dependency1__.isFunction;
+    var isNonThenable = __dependency1__.isNonThenable;
+
+    /**
+      `RSVP.Promise.race` returns a new promise which is settled in the same way as the
+      first passed promise to settle.
+
+      Example:
+
+      ```javascript
+      var promise1 = new RSVP.Promise(function(resolve, reject){
+        setTimeout(function(){
+          resolve("promise 1");
+        }, 200);
+      });
+
+      var promise2 = new RSVP.Promise(function(resolve, reject){
+        setTimeout(function(){
+          resolve("promise 2");
+        }, 100);
+      });
+
+      RSVP.Promise.race([promise1, promise2]).then(function(result){
+        // result === "promise 2" because it was resolved before promise1
+        // was resolved.
+      });
+      ```
+
+      `RSVP.Promise.race` is deterministic in that only the state of the first
+      settled promise matters. For example, even if other promises given to the
+      `promises` array argument are resolved, but the first settled promise has
+      become rejected before the other promises became fulfilled, the returned
+      promise will become rejected:
+
+      ```javascript
+      var promise1 = new RSVP.Promise(function(resolve, reject){
+        setTimeout(function(){
+          resolve("promise 1");
+        }, 200);
+      });
+
+      var promise2 = new RSVP.Promise(function(resolve, reject){
+        setTimeout(function(){
+          reject(new Error("promise 2"));
+        }, 100);
+      });
+
+      RSVP.Promise.race([promise1, promise2]).then(function(result){
+        // Code here never runs
+      }, function(reason){
+        // reason.message === "promise2" because promise 2 became rejected before
+        // promise 1 became fulfilled
+      });
+      ```
+
+      An example real-world use case is implementing timeouts:
+
+      ```javascript
+      RSVP.Promise.race([ajax('foo.json'), timeout(5000)])
+      ```
+
+      @method race
+      @param {Array} promises array of promises to observe
+      @param {String} label optional string for describing the promise returned.
+      Useful for tooling.
+      @return {Promise} a promise which settles in the same way as the first passed
+      promise to settle.
+      @static
+    */
+    __exports__["default"] = function race(entries, label) {
+      /*jshint validthis:true */
+      var Constructor = this, entry;
+
+      return new Constructor(function(resolve, reject) {
+        if (!isArray(entries)) {
+          throw new TypeError('You must pass an array to race.');
+        }
+
+        var pending = true;
+
+        function onFulfillment(value) { if (pending) { pending = false; resolve(value); } }
+        function onRejection(reason)  { if (pending) { pending = false; reject(reason); } }
+
+        for (var i = 0; i < entries.length; i++) {
+          entry = entries[i];
+          if (isNonThenable(entry)) {
+            pending = false;
+            resolve(entry);
+            return;
+          } else {
+            Constructor.cast(entry).then(onFulfillment, onRejection);
+          }
+        }
+      }, label);
+    };
+  });
+define("rsvp/promise/reject",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      `RSVP.Promise.reject` returns a promise rejected with the passed `reason`.
+      It is shorthand for the following:
+
+      ```javascript
+      var promise = new RSVP.Promise(function(resolve, reject){
+        reject(new Error('WHOOPS'));
+      });
+
+      promise.then(function(value){
+        // Code here doesn't run because the promise is rejected!
+      }, function(reason){
+        // reason.message === 'WHOOPS'
+      });
+      ```
+
+      Instead of writing the above, your code now simply becomes the following:
+
+      ```javascript
+      var promise = RSVP.Promise.reject(new Error('WHOOPS'));
+
+      promise.then(function(value){
+        // Code here doesn't run because the promise is rejected!
+      }, function(reason){
+        // reason.message === 'WHOOPS'
+      });
+      ```
+
+      @method reject
+      @param {Any} reason value that the returned promise will be rejected with.
+      @param {String} label optional string for identifying the returned promise.
+      Useful for tooling.
+      @return {Promise} a promise rejected with the given `reason`.
+      @static
+    */
+    __exports__["default"] = function reject(reason, label) {
+      /*jshint validthis:true */
+      var Constructor = this;
+
+      return new Constructor(function (resolve, reject) {
+        reject(reason);
+      }, label);
+    };
+  });
+define("rsvp/promise/resolve",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      `RSVP.Promise.resolve` returns a promise that will become resolved with the
+      passed `value`. It is shorthand for the following:
+
+      ```javascript
+      var promise = new RSVP.Promise(function(resolve, reject){
+        resolve(1);
+      });
+
+      promise.then(function(value){
+        // value === 1
+      });
+      ```
+
+      Instead of writing the above, your code now simply becomes the following:
+
+      ```javascript
+      var promise = RSVP.Promise.resolve(1);
+
+      promise.then(function(value){
+        // value === 1
+      });
+      ```
+
+      @method resolve
+      @param {Any} value value that the returned promise will be resolved with
+      @param {String} label optional string for identifying the returned promise.
+      Useful for tooling.
+      @return {Promise} a promise that will become fulfilled with the given
+      `value`
+      @static
+    */
+    __exports__["default"] = function resolve(value, label) {
+      /*jshint validthis:true */
+      var Constructor = this;
+
+      return new Constructor(function(resolve, reject) {
+        resolve(value);
+      }, label);
+    };
+  });
+define("rsvp/race",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      This is a convenient alias for `RSVP.Promise.race`.
+
+      @method race
+      @param {Array} array Array of promises.
+      @param {String} label An optional label. This is useful
+      for tooling.
+      @static
+    */
+    __exports__["default"] = function race(array, label) {
+      return Promise.race(array, label);
+    };
+  });
+define("rsvp/reject",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      This is a convenient alias for `RSVP.Promise.reject`.
+
+      @method reject
+      @for RSVP
+      @param {Any} reason value that the returned promise will be rejected with.
+      @param {String} label optional string for identifying the returned promise.
+      Useful for tooling.
+      @return {Promise} a promise rejected with the given `reason`.
+      @static
+    */
+    __exports__["default"] = function reject(reason, label) {
+      return Promise.reject(reason, label);
+    };
+  });
+define("rsvp/resolve",
+  ["./promise","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+
+    /**
+      This is a convenient alias for `RSVP.Promise.resolve`.
+
+      @method resolve
+      @for RSVP
+      @param {Any} value value that the returned promise will be resolved with
+      @param {String} label optional string for identifying the returned promise.
+      Useful for tooling.
+      @return {Promise} a promise that will become fulfilled with the given
+      `value`
+      @static
+    */
+    __exports__["default"] = function resolve(value, label) {
+      return Promise.resolve(value, label);
+    };
+  });
+define("rsvp/rethrow",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+      `RSVP.rethrow` will rethrow an error on the next turn of the JavaScript event
+      loop in order to aid debugging.
+
+      Promises A+ specifies that any exceptions that occur with a promise must be
+      caught by the promises implementation and bubbled to the last handler. For
+      this reason, it is recommended that you always specify a second rejection
+      handler function to `then`. However, `RSVP.rethrow` will throw the exception
+      outside of the promise, so it bubbles up to your console if in the browser,
+      or domain/cause uncaught exception in Node. `rethrow` will also throw the
+      error again so the error can be handled by the promise per the spec.
+
+      ```javascript
+      function throws(){
+        throw new Error('Whoops!');
+      }
+
+      var promise = new RSVP.Promise(function(resolve, reject){
+        throws();
+      });
+
+      promise.catch(RSVP.rethrow).then(function(){
+        // Code here doesn't run because the promise became rejected due to an
+        // error!
+      }, function (err){
+        // handle the error here
+      });
+      ```
+
+      The 'Whoops' error will be thrown on the next turn of the event loop
+      and you can watch for it in your console. You can also handle it using a
+      rejection handler given to `.then` or `.catch` on the returned promise.
+
+      @method rethrow
+      @for RSVP
+      @param {Error} reason reason the promise became rejected.
+      @throws Error
+      @static
+    */
+    __exports__["default"] = function rethrow(reason) {
+      setTimeout(function() {
+        throw reason;
+      });
+      throw reason;
+    };
+  });
+define("rsvp/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function objectOrFunction(x) {
+      return typeof x === "function" || (typeof x === "object" && x !== null);
+    }
+
+    __exports__.objectOrFunction = objectOrFunction;function isFunction(x) {
+      return typeof x === "function";
+    }
+
+    __exports__.isFunction = isFunction;function isNonThenable(x) {
+      return !objectOrFunction(x);
+    }
+
+    __exports__.isNonThenable = isNonThenable;function isArray(x) {
+      return Object.prototype.toString.call(x) === "[object Array]";
+    }
+
+    __exports__.isArray = isArray;// Date.now is not available in browsers < IE9
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now#Compatibility
+    var now = Date.now || function() { return new Date().getTime(); };
+    __exports__.now = now;
+    var keysOf = Object.keys || function(object) {
+      var result = [];
+
+      for (var prop in object) {
+        result.push(prop);
+      }
+
+      return result;
+    };
+    __exports__.keysOf = keysOf;
+  });
+define("rsvp",
+  ["./rsvp/promise","./rsvp/events","./rsvp/node","./rsvp/all","./rsvp/all_settled","./rsvp/race","./rsvp/hash","./rsvp/rethrow","./rsvp/defer","./rsvp/config","./rsvp/map","./rsvp/resolve","./rsvp/reject","./rsvp/filter","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var EventTarget = __dependency2__["default"];
+    var denodeify = __dependency3__["default"];
+    var all = __dependency4__["default"];
+    var allSettled = __dependency5__["default"];
+    var race = __dependency6__["default"];
+    var hash = __dependency7__["default"];
+    var rethrow = __dependency8__["default"];
+    var defer = __dependency9__["default"];
+    var config = __dependency10__.config;
+    var configure = __dependency10__.configure;
+    var map = __dependency11__["default"];
+    var resolve = __dependency12__["default"];
+    var reject = __dependency13__["default"];
+    var filter = __dependency14__["default"];
+
+    function async(callback, arg) {
+      config.async(callback, arg);
+    }
+
+    function on() {
+      config.on.apply(config, arguments);
+    }
+
+    function off() {
+      config.off.apply(config, arguments);
+    }
+
+    // Set up instrumentation through `window.__PROMISE_INTRUMENTATION__`
+    if (typeof window !== 'undefined' && typeof window.__PROMISE_INSTRUMENTATION__ === 'object') {
+      var callbacks = window.__PROMISE_INSTRUMENTATION__;
+      configure('instrument', true);
+      for (var eventName in callbacks) {
+        if (callbacks.hasOwnProperty(eventName)) {
+          on(eventName, callbacks[eventName]);
+        }
+      }
+    }
+
+    __exports__.Promise = Promise;
+    __exports__.EventTarget = EventTarget;
+    __exports__.all = all;
+    __exports__.allSettled = allSettled;
+    __exports__.race = race;
+    __exports__.hash = hash;
+    __exports__.rethrow = rethrow;
+    __exports__.defer = defer;
+    __exports__.denodeify = denodeify;
+    __exports__.configure = configure;
+    __exports__.on = on;
+    __exports__.off = off;
+    __exports__.resolve = resolve;
+    __exports__.reject = reject;
+    __exports__.async = async;
+    __exports__.map = map;
+    __exports__.filter = filter;
+  });
+
+})();
+
+(function() {
+define("container/container",
+  ["container/inheriting_dict","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var InheritingDict = __dependency1__["default"];
+
+    // A lightweight container that helps to assemble and decouple components.
+    // Public api for the container is still in flux.
+    // The public api, specified on the application namespace should be considered the stable api.
+    function Container(parent) {
+      this.parent = parent;
+      this.children = [];
+
+      this.resolver = parent && parent.resolver || function() {};
+
+      this.registry = new InheritingDict(parent && parent.registry);
+      this.cache = new InheritingDict(parent && parent.cache);
+      this.factoryCache = new InheritingDict(parent && parent.factoryCache);
+      this.resolveCache = new InheritingDict(parent && parent.resolveCache);
+      this.typeInjections = new InheritingDict(parent && parent.typeInjections);
+      this.injections = {};
+
+      this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
+      this.factoryInjections = {};
+
+      this._options = new InheritingDict(parent && parent._options);
+      this._typeOptions = new InheritingDict(parent && parent._typeOptions);
+    }
+
+    Container.prototype = {
+
+      /**
+        @property parent
+        @type Container
+        @default null
+      */
+      parent: null,
+
+      /**
+        @property children
+        @type Array
+        @default []
+      */
+      children: null,
+
+      /**
+        @property resolver
+        @type function
+      */
+      resolver: null,
+
+      /**
+        @property registry
+        @type InheritingDict
+      */
+      registry: null,
+
+      /**
+        @property cache
+        @type InheritingDict
+      */
+      cache: null,
+
+      /**
+        @property typeInjections
+        @type InheritingDict
+      */
+      typeInjections: null,
+
+      /**
+        @property injections
+        @type Object
+        @default {}
+      */
+      injections: null,
+
+      /**
+        @private
+
+        @property _options
+        @type InheritingDict
+        @default null
+      */
+      _options: null,
+
+      /**
+        @private
+
+        @property _typeOptions
+        @type InheritingDict
+      */
+      _typeOptions: null,
+
+      /**
+        Returns a new child of the current container. These children are configured
+        to correctly inherit from the current container.
+
+        @method child
+        @return {Container}
+      */
+      child: function() {
+        var container = new Container(this);
+        this.children.push(container);
+        return container;
+      },
+
+      /**
+        Sets a key-value pair on the current container. If a parent container,
+        has the same key, once set on a child, the parent and child will diverge
+        as expected.
+
+        @method set
+        @param {Object} object
+        @param {String} key
+        @param {any} value
+      */
+      set: function(object, key, value) {
+        object[key] = value;
+      },
+
+      /**
+        Registers a factory for later injection.
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('model:user', Person, {singleton: false });
+        container.register('fruit:favorite', Orange);
+        container.register('communication:main', Email, {singleton: false});
+        ```
+
+        @method register
+        @param {String} fullName
+        @param {Function} factory
+        @param {Object} options
+      */
+      register: function(fullName, factory, options) {
+        validateFullName(fullName);
+
+        if (factory === undefined) {
+          throw new TypeError('Attempting to register an unknown factory: `' + fullName + '`');
+        }
+
+        var normalizedName = this.normalize(fullName);
+
+        if (this.cache.has(normalizedName)) {
+          throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
+        }
+
+        this.registry.set(normalizedName, factory);
+        this._options.set(normalizedName, options || {});
+      },
+
+      /**
+        Unregister a fullName
+
+        ```javascript
+        var container = new Container();
+        container.register('model:user', User);
+
+        container.lookup('model:user') instanceof User //=> true
+
+        container.unregister('model:user')
+        container.lookup('model:user') === undefined //=> true
+        ```
+
+        @method unregister
+        @param {String} fullName
+       */
+      unregister: function(fullName) {
+        validateFullName(fullName);
+
+        var normalizedName = this.normalize(fullName);
+
+        this.registry.remove(normalizedName);
+        this.cache.remove(normalizedName);
+        this.factoryCache.remove(normalizedName);
+        this.resolveCache.remove(normalizedName);
+        this._options.remove(normalizedName);
+      },
+
+      /**
+        Given a fullName return the corresponding factory.
+
+        By default `resolve` will retrieve the factory from
+        its container's registry.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        container.resolve('api:twitter') // => Twitter
+        ```
+
+        Optionally the container can be provided with a custom resolver.
+        If provided, `resolve` will first provide the custom resolver
+        the opportunity to resolve the fullName, otherwise it will fallback
+        to the registry.
+
+        ```javascript
+        var container = new Container();
+        container.resolver = function(fullName) {
+          // lookup via the module system of choice
+        };
+
+        // the twitter factory is added to the module system
+        container.resolve('api:twitter') // => Twitter
+        ```
+
+        @method resolve
+        @param {String} fullName
+        @return {Function} fullName's factory
+      */
+      resolve: function(fullName) {
+        validateFullName(fullName);
+
+        var normalizedName = this.normalize(fullName);
+        var cached = this.resolveCache.get(normalizedName);
+
+        if (cached) { return cached; }
+
+        var resolved = this.resolver(normalizedName) || this.registry.get(normalizedName);
+
+        this.resolveCache.set(normalizedName, resolved);
+
+        return resolved;
+      },
+
+      /**
+        A hook that can be used to describe how the resolver will
+        attempt to find the factory.
+
+        For example, the default Ember `.describe` returns the full
+        class name (including namespace) where Ember's resolver expects
+        to find the `fullName`.
+
+        @method describe
+        @param {String} fullName
+        @return {string} described fullName
+      */
+      describe: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        A hook to enable custom fullName normalization behaviour
+
+        @method normalize
+        @param {String} fullName
+        @return {string} normalized fullName
+      */
+      normalize: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        @method makeToString
+
+        @param {any} factory
+        @param {string} fullName
+        @return {function} toString function
+      */
+      makeToString: function(factory, fullName) {
+        return factory.toString();
+      },
+
+      /**
+        Given a fullName return a corresponding instance.
+
+        The default behaviour is for lookup to return a singleton instance.
+        The singleton is scoped to the container, allowing multiple containers
+        to all have their own locally scoped singletons.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        var twitter = container.lookup('api:twitter');
+
+        twitter instanceof Twitter; // => true
+
+        // by default the container will return singletons
+        var twitter2 = container.lookup('api:twitter');
+        twitter2 instanceof Twitter; // => true
+
+        twitter === twitter2; //=> true
+        ```
+
+        If singletons are not wanted an optional flag can be provided at lookup.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        var twitter = container.lookup('api:twitter', { singleton: false });
+        var twitter2 = container.lookup('api:twitter', { singleton: false });
+
+        twitter === twitter2; //=> false
+        ```
+
+        @method lookup
+        @param {String} fullName
+        @param {Object} options
+        @return {any}
+      */
+      lookup: function(fullName, options) {
+        validateFullName(fullName);
+        return lookup(this, this.normalize(fullName), options);
+      },
+
+      /**
+        Given a fullName return the corresponding factory.
+
+        @method lookupFactory
+        @param {String} fullName
+        @return {any}
+      */
+      lookupFactory: function(fullName) {
+        validateFullName(fullName);
+        return factoryFor(this, this.normalize(fullName));
+      },
+
+      /**
+        Given a fullName check if the container is aware of its factory
+        or singleton instance.
+
+        @method has
+        @param {String} fullName
+        @return {Boolean}
+      */
+      has: function(fullName) {
+        validateFullName(fullName);
+        return has(this, this.normalize(fullName));
+      },
+
+      /**
+        Allow registering options for all factories of a type.
+
+        ```javascript
+        var container = new Container();
+
+        // if all of type `connection` must not be singletons
+        container.optionsForType('connection', { singleton: false });
+
+        container.register('connection:twitter', TwitterConnection);
+        container.register('connection:facebook', FacebookConnection);
+
+        var twitter = container.lookup('connection:twitter');
+        var twitter2 = container.lookup('connection:twitter');
+
+        twitter === twitter2; // => false
+
+        var facebook = container.lookup('connection:facebook');
+        var facebook2 = container.lookup('connection:facebook');
+
+        facebook === facebook2; // => false
+        ```
+
+        @method optionsForType
+        @param {String} type
+        @param {Object} options
+      */
+      optionsForType: function(type, options) {
+        if (this.parent) { illegalChildOperation('optionsForType'); }
+
+        this._typeOptions.set(type, options);
+      },
+
+      /**
+        @method options
+        @param {String} type
+        @param {Object} options
+      */
+      options: function(type, options) {
+        this.optionsForType(type, options);
+      },
+
+      /**
+        Used only via `injection`.
+
+        Provides a specialized form of injection, specifically enabling
+        all objects of one type to be injected with a reference to another
+        object.
+
+        For example, provided each object of type `controller` needed a `router`.
+        one would do the following:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('router:main', Router);
+        container.register('controller:user', UserController);
+        container.register('controller:post', PostController);
+
+        container.typeInjection('controller', 'router', 'router:main');
+
+        var user = container.lookup('controller:user');
+        var post = container.lookup('controller:post');
+
+        user.router instanceof Router; //=> true
+        post.router instanceof Router; //=> true
+
+        // both controllers share the same router
+        user.router === post.router; //=> true
+        ```
+
+        @private
+        @method typeInjection
+        @param {String} type
+        @param {String} property
+        @param {String} fullName
+      */
+      typeInjection: function(type, property, fullName) {
+        validateFullName(fullName);
+        if (this.parent) { illegalChildOperation('typeInjection'); }
+
+        var fullNameType = fullName.split(':')[0];
+        if(fullNameType === type) {
+          throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
+        }
+        addTypeInjection(this.typeInjections, type, property, fullName);
+      },
+
+      /**
+        Defines injection rules.
+
+        These rules are used to inject dependencies onto objects when they
+        are instantiated.
+
+        Two forms of injections are possible:
+
+        * Injecting one fullName on another fullName
+        * Injecting one fullName on a type
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('source:main', Source);
+        container.register('model:user', User);
+        container.register('model:post', Post);
+
+        // injecting one fullName on another fullName
+        // eg. each user model gets a post model
+        container.injection('model:user', 'post', 'model:post');
+
+        // injecting one fullName on another type
+        container.injection('model', 'source', 'source:main');
+
+        var user = container.lookup('model:user');
+        var post = container.lookup('model:post');
+
+        user.source instanceof Source; //=> true
+        post.source instanceof Source; //=> true
+
+        user.post instanceof Post; //=> true
+
+        // and both models share the same source
+        user.source === post.source; //=> true
+        ```
+
+        @method injection
+        @param {String} factoryName
+        @param {String} property
+        @param {String} injectionName
+      */
+      injection: function(fullName, property, injectionName) {
+        if (this.parent) { illegalChildOperation('injection'); }
+
+        validateFullName(injectionName);
+        var normalizedInjectionName = this.normalize(injectionName);
+
+        if (fullName.indexOf(':') === -1) {
+          return this.typeInjection(fullName, property, normalizedInjectionName);
+        }
+
+        validateFullName(fullName);
+        var normalizedName = this.normalize(fullName);
+
+        addInjection(this.injections, normalizedName, property, normalizedInjectionName);
+      },
+
+
+      /**
+        Used only via `factoryInjection`.
+
+        Provides a specialized form of injection, specifically enabling
+        all factory of one type to be injected with a reference to another
+        object.
+
+        For example, provided each factory of type `model` needed a `store`.
+        one would do the following:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('store:main', SomeStore);
+
+        container.factoryTypeInjection('model', 'store', 'store:main');
+
+        var store = container.lookup('store:main');
+        var UserFactory = container.lookupFactory('model:user');
+
+        UserFactory.store instanceof SomeStore; //=> true
+        ```
+
+        @private
+        @method factoryTypeInjection
+        @param {String} type
+        @param {String} property
+        @param {String} fullName
+      */
+      factoryTypeInjection: function(type, property, fullName) {
+        if (this.parent) { illegalChildOperation('factoryTypeInjection'); }
+
+        addTypeInjection(this.factoryTypeInjections, type, property, this.normalize(fullName));
+      },
+
+      /**
+        Defines factory injection rules.
+
+        Similar to regular injection rules, but are run against factories, via
+        `Container#lookupFactory`.
+
+        These rules are used to inject objects onto factories when they
+        are looked up.
+
+        Two forms of injections are possible:
+
+      * Injecting one fullName on another fullName
+      * Injecting one fullName on a type
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('store:main', Store);
+        container.register('store:secondary', OtherStore);
+        container.register('model:user', User);
+        container.register('model:post', Post);
+
+        // injecting one fullName on another type
+        container.factoryInjection('model', 'store', 'store:main');
+
+        // injecting one fullName on another fullName
+        container.factoryInjection('model:post', 'secondaryStore', 'store:secondary');
+
+        var UserFactory = container.lookupFactory('model:user');
+        var PostFactory = container.lookupFactory('model:post');
+        var store = container.lookup('store:main');
+
+        UserFactory.store instanceof Store; //=> true
+        UserFactory.secondaryStore instanceof OtherStore; //=> false
+
+        PostFactory.store instanceof Store; //=> true
+        PostFactory.secondaryStore instanceof OtherStore; //=> true
+
+        // and both models share the same source instance
+        UserFactory.store === PostFactory.store; //=> true
+        ```
+
+        @method factoryInjection
+        @param {String} factoryName
+        @param {String} property
+        @param {String} injectionName
+      */
+      factoryInjection: function(fullName, property, injectionName) {
+        if (this.parent) { illegalChildOperation('injection'); }
+
+        var normalizedName = this.normalize(fullName);
+        var normalizedInjectionName = this.normalize(injectionName);
+
+        validateFullName(injectionName);
+
+        if (fullName.indexOf(':') === -1) {
+          return this.factoryTypeInjection(normalizedName, property, normalizedInjectionName);
+        }
+
+        validateFullName(fullName);
+
+        addInjection(this.factoryInjections, normalizedName, property, normalizedInjectionName);
+      },
+
+      /**
+        A depth first traversal, destroying the container, its descendant containers and all
+        their managed objects.
+
+        @method destroy
+      */
+      destroy: function() {
+        for (var i=0, l=this.children.length; i<l; i++) {
+          this.children[i].destroy();
+        }
+
+        this.children = [];
+
+        eachDestroyable(this, function(item) {
+          item.destroy();
+        });
+
+        this.parent = undefined;
+        this.isDestroyed = true;
+      },
+
+      /**
+        @method reset
+      */
+      reset: function() {
+        for (var i=0, l=this.children.length; i<l; i++) {
+          resetCache(this.children[i]);
+        }
+        resetCache(this);
+      }
+    };
+
+    function has(container, fullName){
+      if (container.cache.has(fullName)) {
+        return true;
+      }
+
+      return !!container.resolve(fullName);
+    }
+
+    function lookup(container, fullName, options) {
+      options = options || {};
+
+      if (container.cache.has(fullName) && options.singleton !== false) {
+        return container.cache.get(fullName);
+      }
+
+      var value = instantiate(container, fullName);
+
+      if (value === undefined) { return; }
+
+      if (isSingleton(container, fullName) && options.singleton !== false) {
+        container.cache.set(fullName, value);
+      }
+
+      return value;
+    }
+
+    function illegalChildOperation(operation) {
+      throw new Error(operation + " is not currently supported on child containers");
+    }
+
+    function isSingleton(container, fullName) {
+      var singleton = option(container, fullName, 'singleton');
+
+      return singleton !== false;
+    }
+
+    function buildInjections(container, injections) {
+      var hash = {};
+
+      if (!injections) { return hash; }
+
+      var injection, injectable;
+
+      for (var i=0, l=injections.length; i<l; i++) {
+        injection = injections[i];
+        injectable = lookup(container, injection.fullName);
+
+        if (injectable !== undefined) {
+          hash[injection.property] = injectable;
+        } else {
+          throw new Error('Attempting to inject an unknown injection: `' + injection.fullName + '`');
+        }
+      }
+
+      return hash;
+    }
+
+    function option(container, fullName, optionName) {
+      var options = container._options.get(fullName);
+
+      if (options && options[optionName] !== undefined) {
+        return options[optionName];
+      }
+
+      var type = fullName.split(":")[0];
+      options = container._typeOptions.get(type);
+
+      if (options) {
+        return options[optionName];
+      }
+    }
+
+    function factoryFor(container, fullName) {
+      var name = fullName;
+      var factory = container.resolve(name);
+      var injectedFactory;
+      var cache = container.factoryCache;
+      var type = fullName.split(":")[0];
+
+      if (factory === undefined) { return; }
+
+      if (cache.has(fullName)) {
+        return cache.get(fullName);
+      }
+
+      if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
+        // TODO: think about a 'safe' merge style extension
+        // for now just fallback to create time injection
+        return factory;
+      } else {
+
+        var injections        = injectionsFor(container, fullName);
+        var factoryInjections = factoryInjectionsFor(container, fullName);
+
+        factoryInjections._toString = container.makeToString(factory, fullName);
+
+        injectedFactory = factory.extend(injections);
+        injectedFactory.reopenClass(factoryInjections);
+
+        cache.set(fullName, injectedFactory);
+
+        return injectedFactory;
+      }
+    }
+
+    function injectionsFor(container, fullName) {
+      var splitName = fullName.split(":"),
+        type = splitName[0],
+        injections = [];
+
+      injections = injections.concat(container.typeInjections.get(type) || []);
+      injections = injections.concat(container.injections[fullName] || []);
+
+      injections = buildInjections(container, injections);
+      injections._debugContainerKey = fullName;
+      injections.container = container;
+
+      return injections;
+    }
+
+    function factoryInjectionsFor(container, fullName) {
+      var splitName = fullName.split(":"),
+        type = splitName[0],
+        factoryInjections = [];
+
+      factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
+      factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
+
+      factoryInjections = buildInjections(container, factoryInjections);
+      factoryInjections._debugContainerKey = fullName;
+
+      return factoryInjections;
+    }
+
+    function instantiate(container, fullName) {
+      var factory = factoryFor(container, fullName);
+
+      if (option(container, fullName, 'instantiate') === false) {
+        return factory;
+      }
+
+      if (factory) {
+        if (typeof factory.extend === 'function') {
+          // assume the factory was extendable and is already injected
+          return factory.create();
+        } else {
+          // assume the factory was extendable
+          // to create time injections
+          // TODO: support new'ing for instantiation and merge injections for pure JS Functions
+          return factory.create(injectionsFor(container, fullName));
+        }
+      }
+    }
+
+    function eachDestroyable(container, callback) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        callback(value);
+      });
+    }
+
+    function resetCache(container) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        value.destroy();
+      });
+      container.cache.dict = {};
+    }
+
+    function addTypeInjection(rules, type, property, fullName) {
+      var injections = rules.get(type);
+
+      if (!injections) {
+        injections = [];
+        rules.set(type, injections);
+      }
+
+      injections.push({
+        property: property,
+        fullName: fullName
+      });
+    }
+
+    var VALID_FULL_NAME_REGEXP = /^[^:]+.+:[^:]+$/;
+    function validateFullName(fullName) {
+      if (!VALID_FULL_NAME_REGEXP.test(fullName)) {
+        throw new TypeError('Invalid Fullname, expected: `type:name` got: ' + fullName);
+      }
+    }
+
+    function addInjection(rules, factoryName, property, injectionName) {
+      var injections = rules[factoryName] = rules[factoryName] || [];
+      injections.push({ property: property, fullName: injectionName });
+    }
+
+    __exports__["default"] = Container;
+  });
+define("container/inheriting_dict",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    // A safe and simple inheriting object.
+    function InheritingDict(parent) {
+      this.parent = parent;
+      this.dict = {};
+    }
+
+    InheritingDict.prototype = {
+
+      /**
+        @property parent
+        @type InheritingDict
+        @default null
+      */
+
+      parent: null,
+
+      /**
+        Object used to store the current nodes data.
+
+        @property dict
+        @type Object
+        @default Object
+      */
+      dict: null,
+
+      /**
+        Retrieve the value given a key, if the value is present at the current
+        level use it, otherwise walk up the parent hierarchy and try again. If
+        no matching key is found, return undefined.
+
+        @method get
+        @param {String} key
+        @return {any}
+      */
+      get: function(key) {
+        var dict = this.dict;
+
+        if (dict.hasOwnProperty(key)) {
+          return dict[key];
+        }
+
+        if (this.parent) {
+          return this.parent.get(key);
+        }
+      },
+
+      /**
+        Set the given value for the given key, at the current level.
+
+        @method set
+        @param {String} key
+        @param {Any} value
+      */
+      set: function(key, value) {
+        this.dict[key] = value;
+      },
+
+      /**
+        Delete the given key
+
+        @method remove
+        @param {String} key
+      */
+      remove: function(key) {
+        delete this.dict[key];
+      },
+
+      /**
+        Check for the existence of given a key, if the key is present at the current
+        level return true, otherwise walk up the parent hierarchy and try again. If
+        no matching key is found, return false.
+
+        @method has
+        @param {String} key
+        @return {Boolean}
+      */
+      has: function(key) {
+        var dict = this.dict;
+
+        if (dict.hasOwnProperty(key)) {
+          return true;
+        }
+
+        if (this.parent) {
+          return this.parent.has(key);
+        }
+
+        return false;
+      },
+
+      /**
+        Iterate and invoke a callback for each local key-value pair.
+
+        @method eachLocal
+        @param {Function} callback
+        @param {Object} binding
+      */
+      eachLocal: function(callback, binding) {
+        var dict = this.dict;
+
+        for (var prop in dict) {
+          if (dict.hasOwnProperty(prop)) {
+            callback.call(binding, prop, dict[prop]);
+          }
+        }
+      }
+    };
+
+    __exports__["default"] = InheritingDict;
+  });
+define("container",
+  ["container/container","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    /*
+    Public api for the container is still in flux.
+    The public api, specified on the application namespace should be considered the stable api.
+    // @module container
+      @private
+    */
+
+    /*
+     Flag to enable/disable model factory injections (disabled by default)
+     If model factory injections are enabled, models should not be
+     accessed globally (only through `container.lookupFactory('model:modelName'))`);
+    */
+    Ember.MODEL_FACTORY_INJECTIONS = false;
+
+    if (Ember.ENV && typeof Ember.ENV.MODEL_FACTORY_INJECTIONS !== 'undefined') {
+      Ember.MODEL_FACTORY_INJECTIONS = !!Ember.ENV.MODEL_FACTORY_INJECTIONS;
+    }
+
+
+    var Container = __dependency1__["default"];
+
+    __exports__["default"] = Container;
+  });
+})();
+
+(function() {
+define("ember-runtime/compare",
+  ["ember-metal/core","ember-metal/utils","ember-runtime/mixins/comparable","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+     // for Ember.ORDER_DEFINITION
+    var typeOf = __dependency2__.typeOf;
+    var Comparable = __dependency3__["default"];
+
+    // Used by Ember.compare
+    Ember.ORDER_DEFINITION = Ember.ENV.ORDER_DEFINITION || [
+      'undefined',
+      'null',
+      'boolean',
+      'number',
+      'string',
+      'array',
+      'object',
+      'instance',
+      'function',
+      'class',
+      'date'
+    ];
+
+    /**
+     This will compare two javascript values of possibly different types.
+     It will tell you which one is greater than the other by returning:
+
+      - -1 if the first is smaller than the second,
+      - 0 if both are equal,
+      - 1 if the first is greater than the second.
+
+     The order is calculated based on `Ember.ORDER_DEFINITION`, if types are different.
+     In case they have the same type an appropriate comparison for this type is made.
+
+      ```javascript
+      Ember.compare('hello', 'hello');  // 0
+      Ember.compare('abc', 'dfg');      // -1
+      Ember.compare(2, 1);              // 1
+      ```
+
+     @method compare
+     @for Ember
+     @param {Object} v First value to compare
+     @param {Object} w Second value to compare
+     @return {Number} -1 if v < w, 0 if v = w and 1 if v > w.
+    */
+    function compare(v, w) {
+      if (v === w) { return 0; }
+
+      var type1 = typeOf(v);
+      var type2 = typeOf(w);
+
+      if (Comparable) {
+        if (type1==='instance' && Comparable.detect(v.constructor)) {
+          return v.constructor.compare(v, w);
+        }
+
+        if (type2 === 'instance' && Comparable.detect(w.constructor)) {
+          return 1-w.constructor.compare(w, v);
+        }
+      }
+
+      // If we haven't yet generated a reverse-mapping of Ember.ORDER_DEFINITION,
+      // do so now.
+      var mapping = Ember.ORDER_DEFINITION_MAPPING;
+      if (!mapping) {
+        var order = Ember.ORDER_DEFINITION;
+        mapping = Ember.ORDER_DEFINITION_MAPPING = {};
+        var idx, len;
+        for (idx = 0, len = order.length; idx < len;  ++idx) {
+          mapping[order[idx]] = idx;
+        }
+
+        // We no longer need Ember.ORDER_DEFINITION.
+        delete Ember.ORDER_DEFINITION;
+      }
+
+      var type1Index = mapping[type1];
+      var type2Index = mapping[type2];
+
+      if (type1Index < type2Index) { return -1; }
+      if (type1Index > type2Index) { return 1; }
+
+      // types are equal - so we have to check values now
+      switch (type1) {
+        case 'boolean':
+        case 'number':
+          if (v < w) { return -1; }
+          if (v > w) { return 1; }
+          return 0;
+
+        case 'string':
+          var comp = v.localeCompare(w);
+          if (comp < 0) { return -1; }
+          if (comp > 0) { return 1; }
+          return 0;
+
+        case 'array':
+          var vLen = v.length;
+          var wLen = w.length;
+          var l = Math.min(vLen, wLen);
+          var r = 0;
+          var i = 0;
+          while (r === 0 && i < l) {
+            r = compare(v[i],w[i]);
+            i++;
+          }
+          if (r !== 0) { return r; }
+
+          // all elements are equal now
+          // shorter array should be ordered first
+          if (vLen < wLen) { return -1; }
+          if (vLen > wLen) { return 1; }
+          // arrays are equal now
+          return 0;
+
+        case 'instance':
+          if (Comparable && Comparable.detect(v)) {
+            return v.compare(v, w);
+          }
+          return 0;
+
+        case 'date':
+          var vNum = v.getTime();
+          var wNum = w.getTime();
+          if (vNum < wNum) { return -1; }
+          if (vNum > wNum) { return 1; }
+          return 0;
+
+        default:
+          return 0;
+      }
+    };
+
+    __exports__["default"] = compare;
+  });
+define("ember-runtime/computed/array_computed",
+  ["ember-metal/core","ember-runtime/computed/reduce_computed","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/observer","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var reduceComputed = __dependency2__.reduceComputed;
+    var ReduceComputedProperty = __dependency2__.ReduceComputedProperty;
+    var EnumerableUtils = __dependency3__["default"];
+    var create = __dependency4__.create;
+    var addObserver = __dependency5__.addObserver;
+    var EmberError = __dependency6__["default"];
+
+    var a_slice = [].slice,
+        o_create = create,
+        forEach = EnumerableUtils.forEach;
+
+    function ArrayComputedProperty() {
+      var cp = this;
+
+      ReduceComputedProperty.apply(this, arguments);
+
+      this.func = (function(reduceFunc) {
+        return function (propertyName) {
+          if (!cp._hasInstanceMeta(this, propertyName)) {
+            // When we recompute an array computed property, we need already
+            // retrieved arrays to be updated; we can't simply empty the cache and
+            // hope the array is re-retrieved.
+            forEach(cp._dependentKeys, function(dependentKey) {
+              addObserver(this, dependentKey, function() {
+                cp.recomputeOnce.call(this, propertyName);
+              });
+            }, this);
+          }
+
+          return reduceFunc.apply(this, arguments);
+        };
+      })(this.func);
+
+      return this;
+    }
+
+    ArrayComputedProperty.prototype = o_create(ReduceComputedProperty.prototype);
+    ArrayComputedProperty.prototype.initialValue = function () {
+      return Ember.A();
+    };
+    ArrayComputedProperty.prototype.resetValue = function (array) {
+      array.clear();
+      return array;
+    };
+
+    // This is a stopgap to keep the reference counts correct with lazy CPs.
+    ArrayComputedProperty.prototype.didChange = function (obj, keyName) {
+      return;
+    };
+
+    /**
+      Creates a computed property which operates on dependent arrays and
+      is updated with "one at a time" semantics. When items are added or
+      removed from the dependent array(s) an array computed only operates
+      on the change instead of re-evaluating the entire array. This should
+      return an array, if you'd like to use "one at a time" semantics and
+      compute some value other then an array look at
+      `Ember.reduceComputed`.
+
+      If there are more than one arguments the first arguments are
+      considered to be dependent property keys. The last argument is
+      required to be an options object. The options object can have the
+      following three properties.
+
+      `initialize` - An optional initialize function. Typically this will be used
+      to set up state on the instanceMeta object.
+
+      `removedItem` - A function that is called each time an element is
+      removed from the array.
+
+      `addedItem` - A function that is called each time an element is
+      added to the array.
+
+
+      The `initialize` function has the following signature:
+
+      ```javascript
+      function(array, changeMeta, instanceMeta)
+      ```
+
+      `array` - The initial value of the arrayComputed, an empty array.
+
+      `changeMeta` - An object which contains meta information about the
+      computed. It contains the following properties:
+
+         - `property` the computed property
+         - `propertyName` the name of the property on the object
+
+      `instanceMeta` - An object that can be used to store meta
+      information needed for calculating your computed. For example a
+      unique computed might use this to store the number of times a given
+      element is found in the dependent array.
+
+
+      The `removedItem` and `addedItem` functions both have the following signature:
+
+      ```javascript
+      function(accumulatedValue, item, changeMeta, instanceMeta)
+      ```
+
+      `accumulatedValue` - The value returned from the last time
+      `removedItem` or `addedItem` was called or an empty array.
+
+      `item` - the element added or removed from the array
+
+      `changeMeta` - An object which contains meta information about the
+      change. It contains the following properties:
+
+        - `property` the computed property
+        - `propertyName` the name of the property on the object
+        - `index` the index of the added or removed item
+        - `item` the added or removed item: this is exactly the same as
+          the second arg
+        - `arrayChanged` the array that triggered the change. Can be
+          useful when depending on multiple arrays.
+
+      For property changes triggered on an item property change (when
+      depKey is something like `someArray.@each.someProperty`),
+      `changeMeta` will also contain the following property:
+
+        - `previousValues` an object whose keys are the properties that changed on
+        the item, and whose values are the item's previous values.
+
+      `previousValues` is important Ember coalesces item property changes via
+      Ember.run.once. This means that by the time removedItem gets called, item has
+      the new values, but you may need the previous value (eg for sorting &
+      filtering).
+
+      `instanceMeta` - An object that can be used to store meta
+      information needed for calculating your computed. For example a
+      unique computed might use this to store the number of times a given
+      element is found in the dependent array.
+
+      The `removedItem` and `addedItem` functions should return the accumulated
+      value. It is acceptable to not return anything (ie return undefined)
+      to invalidate the computation. This is generally not a good idea for
+      arrayComputed but it's used in eg max and min.
+
+      Example
+
+      ```javascript
+      Ember.computed.map = function(dependentKey, callback) {
+        var options = {
+          addedItem: function(array, item, changeMeta, instanceMeta) {
+            var mapped = callback(item);
+            array.insertAt(changeMeta.index, mapped);
+            return array;
+          },
+          removedItem: function(array, item, changeMeta, instanceMeta) {
+            array.removeAt(changeMeta.index, 1);
+            return array;
+          }
+        };
+
+        return Ember.arrayComputed(dependentKey, options);
+      };
+      ```
+
+      @method arrayComputed
+      @for Ember
+      @param {String} [dependentKeys*]
+      @param {Object} options
+      @return {Ember.ComputedProperty}
+    */
+    function arrayComputed (options) {
+      var args;
+
+      if (arguments.length > 1) {
+        args = a_slice.call(arguments, 0, -1);
+        options = a_slice.call(arguments, -1)[0];
+      }
+
+      if (typeof options !== "object") {
+        throw new EmberError("Array Computed Property declared without an options hash");
+      }
+
+      var cp = new ArrayComputedProperty(options);
+
+      if (args) {
+        cp.property.apply(cp, args);
+      }
+
+      return cp;
+    };
+
+    __exports__.arrayComputed = arrayComputed;
+    __exports__.ArrayComputedProperty = ArrayComputedProperty;
+  });
+define("ember-runtime/computed/reduce_computed",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","ember-runtime/system/set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var e_get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+    var metaFor = __dependency4__.meta;
+    var EmberError = __dependency5__["default"];
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var expandProperties = __dependency7__["default"];
+    var addObserver = __dependency8__.addObserver;
+    var observersFor = __dependency8__.observersFor;
+    var removeObserver = __dependency8__.removeObserver;
+    var addBeforeObserver = __dependency8__.addBeforeObserver;
+    var removeBeforeObserver = __dependency8__.removeBeforeObserver;
+    var ComputedProperty = __dependency9__.ComputedProperty;
+    var cacheFor = __dependency9__.cacheFor;
+    var create = __dependency10__.create;
+    var EnumerableUtils = __dependency11__["default"];
+    var TrackedArray = __dependency12__["default"];
+    var EmberArray = __dependency13__["default"];
+    var run = __dependency14__["default"];
+    var Set = __dependency15__["default"];
+    var isArray = __dependency4__.isArray;
+
+    var cacheSet = cacheFor.set,
+        cacheGet = cacheFor.get,
+        cacheRemove = cacheFor.remove,
+        a_slice = [].slice,
+        o_create = create,
+        forEach = EnumerableUtils.forEach,
+        // Here we explicitly don't allow `@each.foo`; it would require some special
+        // testing, but there's no particular reason why it should be disallowed.
+        eachPropertyPattern = /^(.*)\.@each\.(.*)/,
+        doubleEachPropertyPattern = /(.*\.@each){2,}/,
+        arrayBracketPattern = /\.\[\]$/;
+
+    function get(obj, key) {
+      if (key === '@this') {
+        return obj;
+      }
+
+      return e_get(obj, key);
+    }
+
+    /*
+      Tracks changes to dependent arrays, as well as to properties of items in
+      dependent arrays.
+
+      @class DependentArraysObserver
+    */
+    function DependentArraysObserver(callbacks, cp, instanceMeta, context, propertyName, sugarMeta) {
+      // user specified callbacks for `addedItem` and `removedItem`
+      this.callbacks = callbacks;
+
+      // the computed property: remember these are shared across instances
+      this.cp = cp;
+
+      // the ReduceComputedPropertyInstanceMeta this DependentArraysObserver is
+      // associated with
+      this.instanceMeta = instanceMeta;
+
+      // A map of array guids to dependentKeys, for the given context.  We track
+      // this because we want to set up the computed property potentially before the
+      // dependent array even exists, but when the array observer fires, we lack
+      // enough context to know what to update: we can recover that context by
+      // getting the dependentKey.
+      this.dependentKeysByGuid = {};
+
+      // a map of dependent array guids -> TrackedArray instances.  We use
+      // this to lazily recompute indexes for item property observers.
+      this.trackedArraysByGuid = {};
+
+      // We suspend observers to ignore replacements from `reset` when totally
+      // recomputing.  Unfortunately we cannot properly suspend the observers
+      // because we only have the key; instead we make the observers no-ops
+      this.suspended = false;
+
+      // This is used to coalesce item changes from property observers within a
+      // single item.
+      this.changedItems = {};
+      // This is used to coalesce item changes for multiple items that depend on
+      // some shared state.
+      this.changedItemCount = 0;
+    }
+
+    function ItemPropertyObserverContext (dependentArray, index, trackedArray) {
+      
+      this.dependentArray = dependentArray;
+      this.index = index;
+      this.item = dependentArray.objectAt(index);
+      this.trackedArray = trackedArray;
+      this.beforeObserver = null;
+      this.observer = null;
+
+      this.destroyed = false;
+    }
+
+    DependentArraysObserver.prototype = {
+      setValue: function (newValue) {
+        this.instanceMeta.setValue(newValue, true);
+      },
+      getValue: function () {
+        return this.instanceMeta.getValue();
+      },
+
+      setupObservers: function (dependentArray, dependentKey) {
+        this.dependentKeysByGuid[guidFor(dependentArray)] = dependentKey;
+
+        dependentArray.addArrayObserver(this, {
+          willChange: 'dependentArrayWillChange',
+          didChange: 'dependentArrayDidChange'
+        });
+
+        if (this.cp._itemPropertyKeys[dependentKey]) {
+          this.setupPropertyObservers(dependentKey, this.cp._itemPropertyKeys[dependentKey]);
+        }
+      },
+
+      teardownObservers: function (dependentArray, dependentKey) {
+        var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey] || [];
+
+        delete this.dependentKeysByGuid[guidFor(dependentArray)];
+
+        this.teardownPropertyObservers(dependentKey, itemPropertyKeys);
+
+        dependentArray.removeArrayObserver(this, {
+          willChange: 'dependentArrayWillChange',
+          didChange: 'dependentArrayDidChange'
+        });
+      },
+
+      suspendArrayObservers: function (callback, binding) {
+        var oldSuspended = this.suspended;
+        this.suspended = true;
+        callback.call(binding);
+        this.suspended = oldSuspended;
+      },
+
+      setupPropertyObservers: function (dependentKey, itemPropertyKeys) {
+        var dependentArray = get(this.instanceMeta.context, dependentKey),
+            length = get(dependentArray, 'length'),
+            observerContexts = new Array(length);
+
+        this.resetTransformations(dependentKey, observerContexts);
+
+        forEach(dependentArray, function (item, index) {
+          var observerContext = this.createPropertyObserverContext(dependentArray, index, this.trackedArraysByGuid[dependentKey]);
+          observerContexts[index] = observerContext;
+
+          forEach(itemPropertyKeys, function (propertyKey) {
+            addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
+            addObserver(item, propertyKey, this, observerContext.observer);
+          }, this);
+        }, this);
+      },
+
+      teardownPropertyObservers: function (dependentKey, itemPropertyKeys) {
+        var dependentArrayObserver = this,
+            trackedArray = this.trackedArraysByGuid[dependentKey],
+            beforeObserver,
+            observer,
+            item;
+
+        if (!trackedArray) { return; }
+
+        trackedArray.apply(function (observerContexts, offset, operation) {
+          if (operation === TrackedArray.DELETE) { return; }
+
+          forEach(observerContexts, function (observerContext) {
+            observerContext.destroyed = true;
+            beforeObserver = observerContext.beforeObserver;
+            observer = observerContext.observer;
+            item = observerContext.item;
+
+            forEach(itemPropertyKeys, function (propertyKey) {
+              removeBeforeObserver(item, propertyKey, dependentArrayObserver, beforeObserver);
+              removeObserver(item, propertyKey, dependentArrayObserver, observer);
+            });
+          });
+        });
+      },
+
+      createPropertyObserverContext: function (dependentArray, index, trackedArray) {
+        var observerContext = new ItemPropertyObserverContext(dependentArray, index, trackedArray);
+
+        this.createPropertyObserver(observerContext);
+
+        return observerContext;
+      },
+
+      createPropertyObserver: function (observerContext) {
+        var dependentArrayObserver = this;
+
+        observerContext.beforeObserver = function (obj, keyName) {
+          return dependentArrayObserver.itemPropertyWillChange(obj, keyName, observerContext.dependentArray, observerContext);
+        };
+        observerContext.observer = function (obj, keyName) {
+          return dependentArrayObserver.itemPropertyDidChange(obj, keyName, observerContext.dependentArray, observerContext);
+        };
+      },
+
+      resetTransformations: function (dependentKey, observerContexts) {
+        this.trackedArraysByGuid[dependentKey] = new TrackedArray(observerContexts);
+      },
+
+      trackAdd: function (dependentKey, index, newItems) {
+        var trackedArray = this.trackedArraysByGuid[dependentKey];
+        if (trackedArray) {
+          trackedArray.addItems(index, newItems);
+        }
+      },
+
+      trackRemove: function (dependentKey, index, removedCount) {
+        var trackedArray = this.trackedArraysByGuid[dependentKey];
+
+        if (trackedArray) {
+          return trackedArray.removeItems(index, removedCount);
+        }
+
+        return [];
+      },
+
+      updateIndexes: function (trackedArray, array) {
+        var length = get(array, 'length');
+        // OPTIMIZE: we could stop updating once we hit the object whose observer
+        // fired; ie partially apply the transformations
+        trackedArray.apply(function (observerContexts, offset, operation, operationIndex) {
+          // we don't even have observer contexts for removed items, even if we did,
+          // they no longer have any index in the array
+          if (operation === TrackedArray.DELETE) { return; }
+          if (operationIndex === 0 && operation === TrackedArray.RETAIN && observerContexts.length === length && offset === 0) {
+            // If we update many items we don't want to walk the array each time: we
+            // only need to update the indexes at most once per run loop.
+            return;
+          }
+
+          forEach(observerContexts, function (context, index) {
+            context.index = index + offset;
+          });
+        });
+      },
+
+      dependentArrayWillChange: function (dependentArray, index, removedCount, addedCount) {
+        if (this.suspended) { return; }
+
+        var removedItem = this.callbacks.removedItem,
+            changeMeta,
+            guid = guidFor(dependentArray),
+            dependentKey = this.dependentKeysByGuid[guid],
+            itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey] || [],
+            length = get(dependentArray, 'length'),
+            normalizedIndex = normalizeIndex(index, length, 0),
+            normalizedRemoveCount = normalizeRemoveCount(normalizedIndex, length, removedCount),
+            item,
+            itemIndex,
+            sliceIndex,
+            observerContexts;
+
+        observerContexts = this.trackRemove(dependentKey, normalizedIndex, normalizedRemoveCount);
+
+        function removeObservers(propertyKey) {
+          observerContexts[sliceIndex].destroyed = true;
+          removeBeforeObserver(item, propertyKey, this, observerContexts[sliceIndex].beforeObserver);
+          removeObserver(item, propertyKey, this, observerContexts[sliceIndex].observer);
+        }
+
+        for (sliceIndex = normalizedRemoveCount - 1; sliceIndex >= 0; --sliceIndex) {
+          itemIndex = normalizedIndex + sliceIndex;
+          if (itemIndex >= length) { break; }
+
+          item = dependentArray.objectAt(itemIndex);
+
+          forEach(itemPropertyKeys, removeObservers, this);
+
+          changeMeta = createChangeMeta(dependentArray, item, itemIndex, this.instanceMeta.propertyName, this.cp);
+          this.setValue( removedItem.call(
+            this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
+        }
+      },
+
+      dependentArrayDidChange: function (dependentArray, index, removedCount, addedCount) {
+        if (this.suspended) { return; }
+
+        var addedItem = this.callbacks.addedItem,
+            guid = guidFor(dependentArray),
+            dependentKey = this.dependentKeysByGuid[guid],
+            observerContexts = new Array(addedCount),
+            itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey],
+            length = get(dependentArray, 'length'),
+            normalizedIndex = normalizeIndex(index, length, addedCount),
+            changeMeta,
+            observerContext;
+
+        forEach(dependentArray.slice(normalizedIndex, normalizedIndex + addedCount), function (item, sliceIndex) {
+          if (itemPropertyKeys) {
+            observerContext =
+              observerContexts[sliceIndex] =
+              this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex, this.trackedArraysByGuid[dependentKey]);
+            forEach(itemPropertyKeys, function (propertyKey) {
+              addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
+              addObserver(item, propertyKey, this, observerContext.observer);
+            }, this);
+          }
+
+          changeMeta = createChangeMeta(dependentArray, item, normalizedIndex + sliceIndex, this.instanceMeta.propertyName, this.cp);
+          this.setValue( addedItem.call(
+            this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
+        }, this);
+
+        this.trackAdd(dependentKey, normalizedIndex, observerContexts);
+      },
+
+      itemPropertyWillChange: function (obj, keyName, array, observerContext) {
+        var guid = guidFor(obj);
+
+        if (!this.changedItems[guid]) {
+          this.changedItems[guid] = {
+            array:            array,
+            observerContext:  observerContext,
+            obj:              obj,
+            previousValues:   {}
+          };
+        }
+        ++this.changedItemCount;
+
+        this.changedItems[guid].previousValues[keyName] = get(obj, keyName);
+      },
+
+      itemPropertyDidChange: function(obj, keyName, array, observerContext) {
+        if (--this.changedItemCount === 0) {
+          this.flushChanges();
+        }
+      },
+
+      flushChanges: function() {
+        var changedItems = this.changedItems, key, c, changeMeta;
+
+        for (key in changedItems) {
+          c = changedItems[key];
+          if (c.observerContext.destroyed) { continue; }
+
+          this.updateIndexes(c.observerContext.trackedArray, c.observerContext.dependentArray);
+
+          changeMeta = createChangeMeta(c.array, c.obj, c.observerContext.index, this.instanceMeta.propertyName, this.cp, c.previousValues);
+          this.setValue(
+            this.callbacks.removedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
+          this.setValue(
+            this.callbacks.addedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
+        }
+        this.changedItems = {};
+      }
+    };
+
+    function normalizeIndex(index, length, newItemsOffset) {
+      if (index < 0) {
+        return Math.max(0, length + index);
+      } else if (index < length) {
+        return index;
+      } else /* index > length */ {
+        return Math.min(length - newItemsOffset, index);
+      }
+    }
+
+    function normalizeRemoveCount(index, length, removedCount) {
+      return Math.min(removedCount, length - index);
+    }
+
+    function createChangeMeta(dependentArray, item, index, propertyName, property, previousValues) {
+      var meta = {
+        arrayChanged: dependentArray,
+        index: index,
+        item: item,
+        propertyName: propertyName,
+        property: property
+      };
+
+      if (previousValues) {
+        // previous values only available for item property changes
+        meta.previousValues = previousValues;
+      }
+
+      return meta;
+    }
+
+    function addItems (dependentArray, callbacks, cp, propertyName, meta) {
+      forEach(dependentArray, function (item, index) {
+        meta.setValue( callbacks.addedItem.call(
+          this, meta.getValue(), item, createChangeMeta(dependentArray, item, index, propertyName, cp), meta.sugarMeta));
+      }, this);
+    }
+
+    function reset(cp, propertyName) {
+      var callbacks = cp._callbacks(),
+          meta;
+
+      if (cp._hasInstanceMeta(this, propertyName)) {
+        meta = cp._instanceMeta(this, propertyName);
+        meta.setValue(cp.resetValue(meta.getValue()));
+      } else {
+        meta = cp._instanceMeta(this, propertyName);
+      }
+
+      if (cp.options.initialize) {
+        cp.options.initialize.call(this, meta.getValue(), { property: cp, propertyName: propertyName }, meta.sugarMeta);
+      }
+    }
+
+    function partiallyRecomputeFor(obj, dependentKey) {
+      if (arrayBracketPattern.test(dependentKey)) {
+        return false;
+      }
+
+      var value = get(obj, dependentKey);
+      return EmberArray.detect(value);
+    }
+
+    function ReduceComputedPropertyInstanceMeta(context, propertyName, initialValue) {
+      this.context = context;
+      this.propertyName = propertyName;
+      this.cache = metaFor(context).cache;
+
+      this.dependentArrays = {};
+      this.sugarMeta = {};
+
+      this.initialValue = initialValue;
+    }
+
+    ReduceComputedPropertyInstanceMeta.prototype = {
+      getValue: function () {
+        var value = cacheGet(this.cache, this.propertyName);
+        if (value !== undefined) {
+          return value;
+        } else {
+          return this.initialValue;
+        }
+      },
+
+      setValue: function(newValue, triggerObservers) {
+        // This lets sugars force a recomputation, handy for very simple
+        // implementations of eg max.
+        if (newValue === cacheGet(this.cache, this.propertyName)) {
+          return;
+        }
+
+        if (triggerObservers) {
+          propertyWillChange(this.context, this.propertyName);
+        }
+
+        if (newValue === undefined) {
+          cacheRemove(this.cache, this.propertyName);
+        } else {
+          cacheSet(this.cache, this.propertyName, newValue);
+        }
+
+        if (triggerObservers) {
+          propertyDidChange(this.context, this.propertyName);
+        }
+      }
+    };
+
+    /**
+      A computed property whose dependent keys are arrays and which is updated with
+      "one at a time" semantics.
+
+      @class ReduceComputedProperty
+      @namespace Ember
+      @extends Ember.ComputedProperty
+      @constructor
+    */
+    function ReduceComputedProperty(options) {
+      var cp = this;
+
+      this.options = options;
+
+      this._dependentKeys = null;
+      // A map of dependentKey -> [itemProperty, ...] that tracks what properties of
+      // items in the array we must track to update this property.
+      this._itemPropertyKeys = {};
+      this._previousItemPropertyKeys = {};
+
+      this.readOnly();
+      this.cacheable();
+
+      this.recomputeOnce = function(propertyName) {
+        // What we really want to do is coalesce by <cp, propertyName>.
+        // We need a form of `scheduleOnce` that accepts an arbitrary token to
+        // coalesce by, in addition to the target and method.
+        run.once(this, recompute, propertyName);
+      };
+      var recompute = function(propertyName) {
+        var dependentKeys = cp._dependentKeys,
+            meta = cp._instanceMeta(this, propertyName),
+            callbacks = cp._callbacks();
+
+        reset.call(this, cp, propertyName);
+
+        meta.dependentArraysObserver.suspendArrayObservers(function () {
+          forEach(cp._dependentKeys, function (dependentKey) {
+            
+            if (!partiallyRecomputeFor(this, dependentKey)) { return; }
+
+            var dependentArray = get(this, dependentKey),
+                previousDependentArray = meta.dependentArrays[dependentKey];
+
+            if (dependentArray === previousDependentArray) {
+              // The array may be the same, but our item property keys may have
+              // changed, so we set them up again.  We can't easily tell if they've
+              // changed: the array may be the same object, but with different
+              // contents.
+              if (cp._previousItemPropertyKeys[dependentKey]) {
+                delete cp._previousItemPropertyKeys[dependentKey];
+                meta.dependentArraysObserver.setupPropertyObservers(dependentKey, cp._itemPropertyKeys[dependentKey]);
+              }
+            } else {
+              meta.dependentArrays[dependentKey] = dependentArray;
+
+              if (previousDependentArray) {
+                meta.dependentArraysObserver.teardownObservers(previousDependentArray, dependentKey);
+              }
+
+              if (dependentArray) {
+                meta.dependentArraysObserver.setupObservers(dependentArray, dependentKey);
+              }
+            }
+          }, this);
+        }, this);
+
+        forEach(cp._dependentKeys, function(dependentKey) {
+          if (!partiallyRecomputeFor(this, dependentKey)) { return; }
+
+          var dependentArray = get(this, dependentKey);
+          if (dependentArray) {
+            addItems.call(this, dependentArray, callbacks, cp, propertyName, meta);
+          }
+        }, this);
+      };
+
+
+      this.func = function (propertyName) {
+        
+        recompute.call(this, propertyName);
+
+        return cp._instanceMeta(this, propertyName).getValue();
+      };
+    }
+
+    ReduceComputedProperty.prototype = o_create(ComputedProperty.prototype);
+
+    function defaultCallback(computedValue) {
+      return computedValue;
+    }
+
+    ReduceComputedProperty.prototype._callbacks = function () {
+      if (!this.callbacks) {
+        var options = this.options;
+        this.callbacks = {
+          removedItem: options.removedItem || defaultCallback,
+          addedItem: options.addedItem || defaultCallback
+        };
+      }
+      return this.callbacks;
+    };
+
+    ReduceComputedProperty.prototype._hasInstanceMeta = function (context, propertyName) {
+      return !!metaFor(context).cacheMeta[propertyName];
+    };
+
+    ReduceComputedProperty.prototype._instanceMeta = function (context, propertyName) {
+      var cacheMeta = metaFor(context).cacheMeta,
+          meta = cacheMeta[propertyName];
+
+      if (!meta) {
+        meta = cacheMeta[propertyName] = new ReduceComputedPropertyInstanceMeta(context, propertyName, this.initialValue());
+        meta.dependentArraysObserver = new DependentArraysObserver(this._callbacks(), this, meta, context, propertyName, meta.sugarMeta);
+      }
+
+      return meta;
+    };
+
+    ReduceComputedProperty.prototype.initialValue = function () {
+      if (typeof this.options.initialValue === 'function') {
+        return this.options.initialValue();
+      }
+      else {
+        return this.options.initialValue;
+      }
+    };
+
+    ReduceComputedProperty.prototype.resetValue = function (value) {
+      return this.initialValue();
+    };
+
+    ReduceComputedProperty.prototype.itemPropertyKey = function (dependentArrayKey, itemPropertyKey) {
+      this._itemPropertyKeys[dependentArrayKey] = this._itemPropertyKeys[dependentArrayKey] || [];
+      this._itemPropertyKeys[dependentArrayKey].push(itemPropertyKey);
+    };
+
+    ReduceComputedProperty.prototype.clearItemPropertyKeys = function (dependentArrayKey) {
+      if (this._itemPropertyKeys[dependentArrayKey]) {
+        this._previousItemPropertyKeys[dependentArrayKey] = this._itemPropertyKeys[dependentArrayKey];
+        this._itemPropertyKeys[dependentArrayKey] = [];
+      }
+    };
+
+    ReduceComputedProperty.prototype.property = function () {
+      var cp = this,
+          args = a_slice.call(arguments),
+          propertyArgs = new Set(),
+          match,
+          dependentArrayKey,
+          itemPropertyKey;
+
+      forEach(args, function (dependentKey) {
+        if (doubleEachPropertyPattern.test(dependentKey)) {
+          throw new EmberError("Nested @each properties not supported: " + dependentKey);
+        } else if (match = eachPropertyPattern.exec(dependentKey)) {
+          dependentArrayKey = match[1];
+
+          var itemPropertyKeyPattern = match[2],
+              addItemPropertyKey = function (itemPropertyKey) {
+                cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
+              };
+
+          expandProperties(itemPropertyKeyPattern, addItemPropertyKey);
+          propertyArgs.add(dependentArrayKey);
+        } else {
+          propertyArgs.add(dependentKey);
+        }
+      });
+
+      return ComputedProperty.prototype.property.apply(this, propertyArgs.toArray());
+
+    };
+
+    /**
+      Creates a computed property which operates on dependent arrays and
+      is updated with "one at a time" semantics. When items are added or
+      removed from the dependent array(s) a reduce computed only operates
+      on the change instead of re-evaluating the entire array.
+
+      If there are more than one arguments the first arguments are
+      considered to be dependent property keys. The last argument is
+      required to be an options object. The options object can have the
+      following four properties:
+
+      `initialValue` - A value or function that will be used as the initial
+      value for the computed. If this property is a function the result of calling
+      the function will be used as the initial value. This property is required.
+
+      `initialize` - An optional initialize function. Typically this will be used
+      to set up state on the instanceMeta object.
+
+      `removedItem` - A function that is called each time an element is removed
+      from the array.
+
+      `addedItem` - A function that is called each time an element is added to
+      the array.
+
+
+      The `initialize` function has the following signature:
+
+      ```javascript
+      function(initialValue, changeMeta, instanceMeta)
+      ```
+
+      `initialValue` - The value of the `initialValue` property from the
+      options object.
+
+      `changeMeta` - An object which contains meta information about the
+      computed. It contains the following properties:
+
+         - `property` the computed property
+         - `propertyName` the name of the property on the object
+
+      `instanceMeta` - An object that can be used to store meta
+      information needed for calculating your computed. For example a
+      unique computed might use this to store the number of times a given
+      element is found in the dependent array.
+
+
+      The `removedItem` and `addedItem` functions both have the following signature:
+
+      ```javascript
+      function(accumulatedValue, item, changeMeta, instanceMeta)
+      ```
+
+      `accumulatedValue` - The value returned from the last time
+      `removedItem` or `addedItem` was called or `initialValue`.
+
+      `item` - the element added or removed from the array
+
+      `changeMeta` - An object which contains meta information about the
+      change. It contains the following properties:
+
+        - `property` the computed property
+        - `propertyName` the name of the property on the object
+        - `index` the index of the added or removed item
+        - `item` the added or removed item: this is exactly the same as
+          the second arg
+        - `arrayChanged` the array that triggered the change. Can be
+          useful when depending on multiple arrays.
+
+      For property changes triggered on an item property change (when
+      depKey is something like `someArray.@each.someProperty`),
+      `changeMeta` will also contain the following property:
+
+        - `previousValues` an object whose keys are the properties that changed on
+        the item, and whose values are the item's previous values.
+
+      `previousValues` is important Ember coalesces item property changes via
+      Ember.run.once. This means that by the time removedItem gets called, item has
+      the new values, but you may need the previous value (eg for sorting &
+      filtering).
+
+      `instanceMeta` - An object that can be used to store meta
+      information needed for calculating your computed. For example a
+      unique computed might use this to store the number of times a given
+      element is found in the dependent array.
+
+      The `removedItem` and `addedItem` functions should return the accumulated
+      value. It is acceptable to not return anything (ie return undefined)
+      to invalidate the computation. This is generally not a good idea for
+      arrayComputed but it's used in eg max and min.
+
+      Note that observers will be fired if either of these functions return a value
+      that differs from the accumulated value.  When returning an object that
+      mutates in response to array changes, for example an array that maps
+      everything from some other array (see `Ember.computed.map`), it is usually
+      important that the *same* array be returned to avoid accidentally triggering observers.
+
+      Example
+
+      ```javascript
+      Ember.computed.max = function(dependentKey) {
+        return Ember.reduceComputed(dependentKey, {
+          initialValue: -Infinity,
+
+          addedItem: function(accumulatedValue, item, changeMeta, instanceMeta) {
+            return Math.max(accumulatedValue, item);
+          },
+
+          removedItem: function(accumulatedValue, item, changeMeta, instanceMeta) {
+            if (item < accumulatedValue) {
+              return accumulatedValue;
+            }
+          }
+        });
+      };
+      ```
+
+      Dependent keys may refer to `@this` to observe changes to the object itself,
+      which must be array-like, rather than a property of the object.  This is
+      mostly useful for array proxies, to ensure objects are retrieved via
+      `objectAtContent`.  This is how you could sort items by properties defined on an item controller.
+
+      Example
+
+      ```javascript
+      App.PeopleController = Ember.ArrayController.extend({
+        itemController: 'person',
+
+        sortedPeople: Ember.computed.sort('@this.@each.reversedName', function(personA, personB) {
+          // `reversedName` isn't defined on Person, but we have access to it via
+          // the item controller App.PersonController.  If we'd used
+          // `content.@each.reversedName` above, we would be getting the objects
+          // directly and not have access to `reversedName`.
+          //
+          var reversedNameA = get(personA, 'reversedName'),
+              reversedNameB = get(personB, 'reversedName');
+
+          return Ember.compare(reversedNameA, reversedNameB);
+        })
+      });
+
+      App.PersonController = Ember.ObjectController.extend({
+        reversedName: function() {
+          return reverse(get(this, 'name'));
+        }.property('name')
+      });
+      ```
+
+      Dependent keys whose values are not arrays are treated as regular
+      dependencies: when they change, the computed property is completely
+      recalculated.  It is sometimes useful to have dependent arrays with similar
+      semantics.  Dependent keys which end in `.[]` do not use "one at a time"
+      semantics.  When an item is added or removed from such a dependency, the
+      computed property is completely recomputed.
+
+      When the computed property is completely recomputed, the `accumulatedValue`
+      is discarded, it starts with `initialValue` again, and each item is passed
+      to `addedItem` in turn.
+
+      Example
+
+      ```javascript
+      Ember.Object.extend({
+        // When `string` is changed, `computed` is completely recomputed.
+        string: 'a string',
+
+        // When an item is added to `array`, `addedItem` is called.
+        array: [],
+
+        // When an item is added to `anotherArray`, `computed` is completely
+        // recomputed.
+        anotherArray: [],
+
+        computed: Ember.reduceComputed('string', 'array', 'anotherArray.[]', {
+          addedItem: addedItemCallback,
+          removedItem: removedItemCallback
+        })
+      });
+      ```
+
+      @method reduceComputed
+      @for Ember
+      @param {String} [dependentKeys*]
+      @param {Object} options
+      @return {Ember.ComputedProperty}
+    */
+    function reduceComputed(options) {
+      var args;
+
+      if (arguments.length > 1) {
+        args = a_slice.call(arguments, 0, -1);
+        options = a_slice.call(arguments, -1)[0];
+      }
+
+      if (typeof options !== "object") {
+        throw new EmberError("Reduce Computed Property declared without an options hash");
+      }
+
+      if (!('initialValue' in options)) {
+        throw new EmberError("Reduce Computed Property declared without an initial value");
+      }
+
+      var cp = new ReduceComputedProperty(options);
+
+      if (args) {
+        cp.property.apply(cp, args);
+      }
+
+      return cp;
+    }
+
+    __exports__.reduceComputed = reduceComputed;
+    __exports__.ReduceComputedProperty = ReduceComputedProperty;
+  });
+define("ember-runtime/computed/reduce_computed_macros",
+  ["ember-metal/core","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/object_proxy","ember-runtime/system/subarray","ember-runtime/keys","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var merge = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var isArray = __dependency5__.isArray;
+    var guidFor = __dependency5__.guidFor;
+    var EmberError = __dependency6__["default"];
+    var EnumerableUtils = __dependency7__["default"];
+    var run = __dependency8__["default"];
+    var addObserver = __dependency9__.addObserver;
+    var arrayComputed = __dependency10__.arrayComputed;
+    var reduceComputed = __dependency11__.reduceComputed;
+    var ObjectProxy = __dependency12__["default"];
+    var SubArray = __dependency13__["default"];
+    var keys = __dependency14__["default"];
+    var compare = __dependency15__["default"];
+
+    var a_slice = [].slice,
+        forEach = EnumerableUtils.forEach,
+        SearchProxy;
+
+    /**
+     A computed property that returns the sum of the value
+     in the dependent array.
+
+     @method computed.sum
+     @for Ember
+     @param {String} dependentKey
+     @return {Ember.ComputedProperty} computes the sum of all values in the dependentKey's array
+     @since 1.4.0
+    */
+
+    function sum(dependentKey){
+      return reduceComputed(dependentKey, {
+        initialValue: 0,
+
+        addedItem: function(accumulatedValue, item, changeMeta, instanceMeta){
+          return accumulatedValue + item;
+        },
+
+        removedItem: function(accumulatedValue, item, changeMeta, instanceMeta){
+          return accumulatedValue - item;
+        }
+      });
+    };
+
+    /**
+      A computed property that calculates the maximum value in the
+      dependent array. This will return `-Infinity` when the dependent
+      array is empty.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        childAges: Ember.computed.mapBy('children', 'age'),
+        maxChildAge: Ember.computed.max('childAges')
+      });
+
+      var lordByron = Person.create({ children: [] });
+
+      lordByron.get('maxChildAge'); // -Infinity
+      lordByron.get('children').pushObject({
+        name: 'Augusta Ada Byron', age: 7
+      });
+      lordByron.get('maxChildAge'); // 7
+      lordByron.get('children').pushObjects([{
+        name: 'Allegra Byron',
+        age: 5
+      }, {
+        name: 'Elizabeth Medora Leigh',
+        age: 8
+      }]);
+      lordByron.get('maxChildAge'); // 8
+      ```
+
+      @method computed.max
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computes the largest value in the dependentKey's array
+    */
+    function max (dependentKey) {
+      return reduceComputed(dependentKey, {
+        initialValue: -Infinity,
+
+        addedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          return Math.max(accumulatedValue, item);
+        },
+
+        removedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          if (item < accumulatedValue) {
+            return accumulatedValue;
+          }
+        }
+      });
+    };
+
+    /**
+      A computed property that calculates the minimum value in the
+      dependent array. This will return `Infinity` when the dependent
+      array is empty.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        childAges: Ember.computed.mapBy('children', 'age'),
+        minChildAge: Ember.computed.min('childAges')
+      });
+
+      var lordByron = Person.create({ children: [] });
+
+      lordByron.get('minChildAge'); // Infinity
+      lordByron.get('children').pushObject({
+        name: 'Augusta Ada Byron', age: 7
+      });
+      lordByron.get('minChildAge'); // 7
+      lordByron.get('children').pushObjects([{
+        name: 'Allegra Byron',
+        age: 5
+      }, {
+        name: 'Elizabeth Medora Leigh',
+        age: 8
+      }]);
+      lordByron.get('minChildAge'); // 5
+      ```
+
+      @method computed.min
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computes the smallest value in the dependentKey's array
+    */
+    function min(dependentKey) {
+      return reduceComputed(dependentKey, {
+        initialValue: Infinity,
+
+        addedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          return Math.min(accumulatedValue, item);
+        },
+
+        removedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+          if (item > accumulatedValue) {
+            return accumulatedValue;
+          }
+        }
+      });
+    };
+
+    /**
+      Returns an array mapped via the callback
+
+      The callback method you provide should have the following signature.
+      `item` is the current item in the iteration.
+
+      ```javascript
+      function(item);
+      ```
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        excitingChores: Ember.computed.map('chores', function(chore) {
+          return chore.toUpperCase() + '!';
+        })
+      });
+
+      var hamster = Hamster.create({
+        chores: ['clean', 'write more unit tests']
+      });
+
+      hamster.get('excitingChores'); // ['CLEAN!', 'WRITE MORE UNIT TESTS!']
+      ```
+
+      @method computed.map
+      @for Ember
+      @param {String} dependentKey
+      @param {Function} callback
+      @return {Ember.ComputedProperty} an array mapped via the callback
+    */
+    function map(dependentKey, callback) {
+      var options = {
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var mapped = callback.call(this, item);
+          array.insertAt(changeMeta.index, mapped);
+          return array;
+        },
+        removedItem: function(array, item, changeMeta, instanceMeta) {
+          array.removeAt(changeMeta.index, 1);
+          return array;
+        }
+      };
+
+      return arrayComputed(dependentKey, options);
+    };
+
+    /**
+      Returns an array mapped to the specified key.
+
+      ```javascript
+      var Person = Ember.Object.extend({
+        childAges: Ember.computed.mapBy('children', 'age')
+      });
+
+      var lordByron = Person.create({ children: [] });
+
+      lordByron.get('childAges'); // []
+      lordByron.get('children').pushObject({ name: 'Augusta Ada Byron', age: 7 });
+      lordByron.get('childAges'); // [7]
+      lordByron.get('children').pushObjects([{
+        name: 'Allegra Byron',
+        age: 5
+      }, {
+        name: 'Elizabeth Medora Leigh',
+        age: 8
+      }]);
+      lordByron.get('childAges'); // [7, 5, 8]
+      ```
+
+      @method computed.mapBy
+      @for Ember
+      @param {String} dependentKey
+      @param {String} propertyKey
+      @return {Ember.ComputedProperty} an array mapped to the specified key
+    */
+    function mapBy (dependentKey, propertyKey) {
+      var callback = function(item) { return get(item, propertyKey); };
+      return map(dependentKey + '.@each.' + propertyKey, callback);
+    };
+
+    /**
+      @method computed.mapProperty
+      @for Ember
+      @deprecated Use `Ember.computed.mapBy` instead
+      @param dependentKey
+      @param propertyKey
+    */
+    var mapProperty = mapBy;
+
+    /**
+      Filters the array by the callback.
+
+      The callback method you provide should have the following signature.
+      `item` is the current item in the iteration.
+
+      ```javascript
+      function(item);
+      ```
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        remainingChores: Ember.computed.filter('chores', function(chore) {
+          return !chore.done;
+        })
+      });
+
+      var hamster = Hamster.create({ 
+        chores: [
+          { name: 'cook', done: true },
+          { name: 'clean', done: true },
+          { name: 'write more unit tests', done: false }
+        ] 
+      });
+
+      hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
+      ```
+
+      @method computed.filter
+      @for Ember
+      @param {String} dependentKey
+      @param {Function} callback
+      @return {Ember.ComputedProperty} the filtered array
+    */
+    function filter(dependentKey, callback) {
+      var options = {
+        initialize: function (array, changeMeta, instanceMeta) {
+          instanceMeta.filteredArrayIndexes = new SubArray();
+        },
+
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var match = !!callback.call(this, item),
+              filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
+
+          if (match) {
+            array.insertAt(filterIndex, item);
+          }
+
+          return array;
+        },
+
+        removedItem: function(array, item, changeMeta, instanceMeta) {
+          var filterIndex = instanceMeta.filteredArrayIndexes.removeItem(changeMeta.index);
+
+          if (filterIndex > -1) {
+            array.removeAt(filterIndex);
+          }
+
+          return array;
+        }
+      };
+
+      return arrayComputed(dependentKey, options);
+    };
+
+    /**
+      Filters the array by the property and value
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        remainingChores: Ember.computed.filterBy('chores', 'done', false)
+      });
+
+      var hamster = Hamster.create({
+        chores: [
+          { name: 'cook', done: true },
+          { name: 'clean', done: true },
+          { name: 'write more unit tests', done: false }
+        ]
+      });
+
+      hamster.get('remainingChores'); // [{ name: 'write more unit tests', done: false }]
+      ```
+
+      @method computed.filterBy
+      @for Ember
+      @param {String} dependentKey
+      @param {String} propertyKey
+      @param {*} value
+      @return {Ember.ComputedProperty} the filtered array
+    */
+    function filterBy (dependentKey, propertyKey, value) {
+      var callback;
+
+      if (arguments.length === 2) {
+        callback = function(item) {
+          return get(item, propertyKey);
+        };
+      } else {
+        callback = function(item) {
+          return get(item, propertyKey) === value;
+        };
+      }
+
+      return filter(dependentKey + '.@each.' + propertyKey, callback);
+    };
+
+    /**
+      @method computed.filterProperty
+      @for Ember
+      @param dependentKey
+      @param propertyKey
+      @param value
+      @deprecated Use `Ember.computed.filterBy` instead
+    */
+    var filterProperty = filterBy;
+
+    /**
+      A computed property which returns a new array with all the unique
+      elements from one or more dependent arrays.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        uniqueFruits: Ember.computed.uniq('fruits')
+      });
+
+      var hamster = Hamster.create({
+        fruits: [
+          'banana',
+          'grape',
+          'kale',
+          'banana'
+        ]
+      });
+
+      hamster.get('uniqueFruits'); // ['banana', 'grape', 'kale']
+      ```
+
+      @method computed.uniq
+      @for Ember
+      @param {String} propertyKey*
+      @return {Ember.ComputedProperty} computes a new array with all the
+      unique elements from the dependent array
+    */
+    function uniq() {
+      var args = a_slice.call(arguments);
+      args.push({
+        initialize: function(array, changeMeta, instanceMeta) {
+          instanceMeta.itemCounts = {};
+        },
+
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var guid = guidFor(item);
+
+          if (!instanceMeta.itemCounts[guid]) {
+            instanceMeta.itemCounts[guid] = 1;
+          } else {
+            ++instanceMeta.itemCounts[guid];
+          }
+          array.addObject(item);
+          return array;
+        },
+        removedItem: function(array, item, _, instanceMeta) {
+          var guid = guidFor(item),
+              itemCounts = instanceMeta.itemCounts;
+
+          if (--itemCounts[guid] === 0) {
+            array.removeObject(item);
+          }
+          return array;
+        }
+      });
+      return arrayComputed.apply(null, args);
+    };
+
+    /**
+      Alias for [Ember.computed.uniq](/api/#method_computed_uniq).
+
+      @method computed.union
+      @for Ember
+      @param {String} propertyKey*
+      @return {Ember.ComputedProperty} computes a new array with all the
+      unique elements from the dependent array
+    */
+    var union = uniq;
+
+    /**
+      A computed property which returns a new array with all the duplicated
+      elements from two or more dependent arrays.
+
+      Example
+
+      ```javascript
+      var obj = Ember.Object.createWithMixins({
+        adaFriends: ['Charles Babbage', 'John Hobhouse', 'William King', 'Mary Somerville'],
+        charlesFriends: ['William King', 'Mary Somerville', 'Ada Lovelace', 'George Peacock'],
+        friendsInCommon: Ember.computed.intersect('adaFriends', 'charlesFriends')
+      });
+
+      obj.get('friendsInCommon'); // ['William King', 'Mary Somerville']
+      ```
+
+      @method computed.intersect
+      @for Ember
+      @param {String} propertyKey*
+      @return {Ember.ComputedProperty} computes a new array with all the
+      duplicated elements from the dependent arrays
+    */
+    function intersect() {
+      var getDependentKeyGuids = function (changeMeta) {
+        return EnumerableUtils.map(changeMeta.property._dependentKeys, function (dependentKey) {
+          return guidFor(dependentKey);
+        });
+      };
+
+      var args = a_slice.call(arguments);
+      args.push({
+        initialize: function (array, changeMeta, instanceMeta) {
+          instanceMeta.itemCounts = {};
+        },
+
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var itemGuid = guidFor(item),
+              dependentGuids = getDependentKeyGuids(changeMeta),
+              dependentGuid = guidFor(changeMeta.arrayChanged),
+              numberOfDependentArrays = changeMeta.property._dependentKeys.length,
+              itemCounts = instanceMeta.itemCounts;
+
+          if (!itemCounts[itemGuid]) { itemCounts[itemGuid] = {}; }
+          if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
+
+          if (++itemCounts[itemGuid][dependentGuid] === 1 &&
+              numberOfDependentArrays === keys(itemCounts[itemGuid]).length) {
+
+            array.addObject(item);
+          }
+          return array;
+        },
+        removedItem: function(array, item, changeMeta, instanceMeta) {
+          var itemGuid = guidFor(item),
+              dependentGuids = getDependentKeyGuids(changeMeta),
+              dependentGuid = guidFor(changeMeta.arrayChanged),
+              numberOfDependentArrays = changeMeta.property._dependentKeys.length,
+              numberOfArraysItemAppearsIn,
+              itemCounts = instanceMeta.itemCounts;
+
+          if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
+          if (--itemCounts[itemGuid][dependentGuid] === 0) {
+            delete itemCounts[itemGuid][dependentGuid];
+            numberOfArraysItemAppearsIn = keys(itemCounts[itemGuid]).length;
+
+            if (numberOfArraysItemAppearsIn === 0) {
+              delete itemCounts[itemGuid];
+            }
+            array.removeObject(item);
+          }
+          return array;
+        }
+      });
+      return arrayComputed.apply(null, args);
+    };
+
+    /**
+      A computed property which returns a new array with all the
+      properties from the first dependent array that are not in the second
+      dependent array.
+
+      Example
+
+      ```javascript
+      var Hamster = Ember.Object.extend({
+        likes: ['banana', 'grape', 'kale'],
+        wants: Ember.computed.setDiff('likes', 'fruits')
+      });
+
+      var hamster = Hamster.create({
+        fruits: [
+          'grape',
+          'kale',
+        ]
+      });
+
+      hamster.get('wants'); // ['banana']
+      ```
+
+      @method computed.setDiff
+      @for Ember
+      @param {String} setAProperty
+      @param {String} setBProperty
+      @return {Ember.ComputedProperty} computes a new array with all the
+      items from the first dependent array that are not in the second
+      dependent array
+    */
+    function setDiff(setAProperty, setBProperty) {
+      if (arguments.length !== 2) {
+        throw new EmberError("setDiff requires exactly two dependent arrays.");
+      }
+      return arrayComputed(setAProperty, setBProperty, {
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          var setA = get(this, setAProperty),
+              setB = get(this, setBProperty);
+
+          if (changeMeta.arrayChanged === setA) {
+            if (!setB.contains(item)) {
+              array.addObject(item);
+            }
+          } else {
+            array.removeObject(item);
+          }
+          return array;
+        },
+
+        removedItem: function (array, item, changeMeta, instanceMeta) {
+          var setA = get(this, setAProperty),
+              setB = get(this, setBProperty);
+
+          if (changeMeta.arrayChanged === setB) {
+            if (setA.contains(item)) {
+              array.addObject(item);
+            }
+          } else {
+            array.removeObject(item);
+          }
+          return array;
+        }
+      });
+    };
+
+    function binarySearch(array, item, low, high) {
+      var mid, midItem, res, guidMid, guidItem;
+
+      if (arguments.length < 4) { high = get(array, 'length'); }
+      if (arguments.length < 3) { low = 0; }
+
+      if (low === high) {
+        return low;
+      }
+
+      mid = low + Math.floor((high - low) / 2);
+      midItem = array.objectAt(mid);
+
+      guidMid = _guidFor(midItem);
+      guidItem = _guidFor(item);
+
+      if (guidMid === guidItem) {
+        return mid;
+      }
+
+      res = this.order(midItem, item);
+      if (res === 0) {
+        res = guidMid < guidItem ? -1 : 1;
+      }
+
+
+      if (res < 0) {
+        return this.binarySearch(array, item, mid+1, high);
+      } else if (res > 0) {
+        return this.binarySearch(array, item, low, mid);
+      }
+
+      return mid;
+
+      function _guidFor(item) {
+        if (SearchProxy.detectInstance(item)) {
+          return guidFor(get(item, 'content'));
+        }
+        return guidFor(item);
+      }
+    }
+
+
+    var SearchProxy = ObjectProxy.extend();
+
+    /**
+      A computed property which returns a new array with all the
+      properties from the first dependent array sorted based on a property
+      or sort function.
+
+      The callback method you provide should have the following signature:
+
+      ```javascript
+      function(itemA, itemB);
+      ```
+
+      - `itemA` the first item to compare.
+      - `itemB` the second item to compare.
+
+      This function should return negative number (e.g. `-1`) when `itemA` should come before
+      `itemB`. It should return positive number (e.g. `1`) when `itemA` should come after
+      `itemB`. If the `itemA` and `itemB` are equal this function should return `0`.
+
+      Therefore, if this function is comparing some numeric values, simple `itemA - itemB` or
+      `itemA.get( 'foo' ) - itemB.get( 'foo' )` can be used instead of series of `if`.
+
+      Example
+
+      ```javascript
+      var ToDoList = Ember.Object.extend({
+        // using standard ascending sort
+        todosSorting: ['name'],
+        sortedTodos: Ember.computed.sort('todos', 'todosSorting'),
+
+        // using descending sort
+        todosSortingDesc: ['name:desc'],
+        sortedTodosDesc: Ember.computed.sort('todos', 'todosSortingDesc'),
+
+        // using a custom sort function
+        priorityTodos: Ember.computed.sort('todos', function(a, b){
+          if (a.priority > b.priority) {
+            return 1;
+          } else if (a.priority < b.priority) {
+            return -1;
+          }
+
+          return 0;
+        }),
+      });
+
+      var todoList = ToDoList.create({todos: [
+        { name: 'Unit Test', priority: 2 },
+        { name: 'Documentation', priority: 3 },
+        { name: 'Release', priority: 1 }
+      ]});
+
+      todoList.get('sortedTodos');      // [{ name:'Documentation', priority:3 }, { name:'Release', priority:1 }, { name:'Unit Test', priority:2 }]
+      todoList.get('sortedTodosDesc');  // [{ name:'Unit Test', priority:2 }, { name:'Release', priority:1 }, { name:'Documentation', priority:3 }]
+      todoList.get('priorityTodos');    // [{ name:'Release', priority:1 }, { name:'Unit Test', priority:2 }, { name:'Documentation', priority:3 }]
+      ```
+
+      @method computed.sort
+      @for Ember
+      @param {String} dependentKey
+      @param {String or Function} sortDefinition a dependent key to an
+      array of sort properties (add `:desc` to the arrays sort properties to sort descending) or a function to use when sorting
+      @return {Ember.ComputedProperty} computes a new sorted array based
+      on the sort property array or callback function
+    */
+    function sort(itemsKey, sortDefinition) {
+      
+      var initFn, sortPropertiesKey;
+
+      if (typeof sortDefinition === 'function') {
+        initFn = function (array, changeMeta, instanceMeta) {
+          instanceMeta.order = sortDefinition;
+          instanceMeta.binarySearch = binarySearch;
+        };
+      } else {
+        sortPropertiesKey = sortDefinition;
+        initFn = function (array, changeMeta, instanceMeta) {
+          function setupSortProperties() {
+            var sortPropertyDefinitions = get(this, sortPropertiesKey),
+                sortProperty,
+                sortProperties = instanceMeta.sortProperties = [],
+                sortPropertyAscending = instanceMeta.sortPropertyAscending = {},
+                idx,
+                asc;
+
+            
+            changeMeta.property.clearItemPropertyKeys(itemsKey);
+
+            forEach(sortPropertyDefinitions, function (sortPropertyDefinition) {
+              if ((idx = sortPropertyDefinition.indexOf(':')) !== -1) {
+                sortProperty = sortPropertyDefinition.substring(0, idx);
+                asc = sortPropertyDefinition.substring(idx+1).toLowerCase() !== 'desc';
+              } else {
+                sortProperty = sortPropertyDefinition;
+                asc = true;
+              }
+
+              sortProperties.push(sortProperty);
+              sortPropertyAscending[sortProperty] = asc;
+              changeMeta.property.itemPropertyKey(itemsKey, sortProperty);
+            });
+
+            sortPropertyDefinitions.addObserver('@each', this, updateSortPropertiesOnce);
+          }
+
+          function updateSortPropertiesOnce() {
+            run.once(this, updateSortProperties, changeMeta.propertyName);
+          }
+
+          function updateSortProperties(propertyName) {
+            setupSortProperties.call(this);
+            changeMeta.property.recomputeOnce.call(this, propertyName);
+          }
+
+          addObserver(this, sortPropertiesKey, updateSortPropertiesOnce);
+
+          setupSortProperties.call(this);
+
+
+          instanceMeta.order = function (itemA, itemB) {
+            var isProxy = itemB instanceof SearchProxy,
+                sortProperty, result, asc;
+
+            for (var i = 0; i < this.sortProperties.length; ++i) {
+              sortProperty = this.sortProperties[i];
+              result = compare(get(itemA, sortProperty), isProxy ? itemB[sortProperty] : get(itemB, sortProperty));
+
+              if (result !== 0) {
+                asc = this.sortPropertyAscending[sortProperty];
+                return asc ? result : (-1 * result);
+              }
+            }
+
+            return 0;
+          };
+
+          instanceMeta.binarySearch = binarySearch;
+        };
+      }
+
+      return arrayComputed(itemsKey, {
+        initialize: initFn,
+
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          var index = instanceMeta.binarySearch(array, item);
+          array.insertAt(index, item);
+          return array;
+        },
+
+        removedItem: function (array, item, changeMeta, instanceMeta) {
+          var proxyProperties, index, searchItem;
+
+          if (changeMeta.previousValues) {
+            proxyProperties = merge({ content: item }, changeMeta.previousValues);
+
+            searchItem = SearchProxy.create(proxyProperties);
+          } else {
+            searchItem = item;
+          }
+
+          index = instanceMeta.binarySearch(array, searchItem);
+          array.removeAt(index);
+          return array;
+        }
+      });
+    };
+
+
+    __exports__.sum = sum;
+    __exports__.min = min;
+    __exports__.max = max;
+    __exports__.map = map;
+    __exports__.sort = sort;
+    __exports__.setDiff = setDiff;
+    __exports__.mapBy = mapBy;
+    __exports__.mapProperty = mapProperty;
+    __exports__.filter = filter;
+    __exports__.filterBy = filterBy;
+    __exports__.filterProperty = filterProperty;
+    __exports__.uniq = uniq;
+    __exports__.union = union;
+    __exports__.intersect = intersect;
+  });
+define("ember-runtime/controllers/array_controller",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-runtime/system/array_proxy","ember-runtime/mixins/sortable","ember-runtime/controllers/controller","ember-metal/computed","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EnumerableUtils = __dependency4__["default"];
+    var ArrayProxy = __dependency5__["default"];
+    var SortableMixin = __dependency6__["default"];
+    var ControllerMixin = __dependency7__.ControllerMixin;
+    var computed = __dependency8__.computed;
+    var EmberError = __dependency9__["default"];
+
+    var forEach = EnumerableUtils.forEach,
+        replace = EnumerableUtils.replace;
+
+    /**
+      `Ember.ArrayController` provides a way for you to publish a collection of
+      objects so that you can easily bind to the collection from a Handlebars
+      `#each` helper, an `Ember.CollectionView`, or other controllers.
+
+      The advantage of using an `ArrayController` is that you only have to set up
+      your view bindings once; to change what's displayed, simply swap out the
+      `content` property on the controller.
+
+      For example, imagine you wanted to display a list of items fetched via an XHR
+      request. Create an `Ember.ArrayController` and set its `content` property:
+
+      ```javascript
+      MyApp.listController = Ember.ArrayController.create();
+
+      $.get('people.json', function(data) {
+        MyApp.listController.set('content', data);
+      });
+      ```
+
+      Then, create a view that binds to your new controller:
+
+      ```handlebars
+      {{#each MyApp.listController}}
+        {{firstName}} {{lastName}}
+      {{/each}}
+      ```
+
+      Although you are binding to the controller, the behavior of this controller
+      is to pass through any methods or properties to the underlying array. This
+      capability comes from `Ember.ArrayProxy`, which this class inherits from.
+
+      Sometimes you want to display computed properties within the body of an
+      `#each` helper that depend on the underlying items in `content`, but are not
+      present on those items.   To do this, set `itemController` to the name of a
+      controller (probably an `ObjectController`) that will wrap each individual item.
+
+      For example:
+
+      ```handlebars
+        {{#each post in controller}}
+          <li>{{post.title}} ({{post.titleLength}} characters)</li>
+        {{/each}}
+      ```
+
+      ```javascript
+      App.PostsController = Ember.ArrayController.extend({
+        itemController: 'post'
+      });
+
+      App.PostController = Ember.ObjectController.extend({
+        // the `title` property will be proxied to the underlying post.
+
+        titleLength: function() {
+          return this.get('title').length;
+        }.property('title')
+      });
+      ```
+
+      In some cases it is helpful to return a different `itemController` depending
+      on the particular item.  Subclasses can do this by overriding
+      `lookupItemController`.
+
+      For example:
+
+      ```javascript
+      App.MyArrayController = Ember.ArrayController.extend({
+        lookupItemController: function( object ) {
+          if (object.get('isSpecial')) {
+            return "special"; // use App.SpecialController
+          } else {
+            return "regular"; // use App.RegularController
+          }
+        }
+      });
+      ```
+
+      The itemController instances will have a `parentController` property set to
+      the `ArrayController` instance.
+
+      @class ArrayController
+      @namespace Ember
+      @extends Ember.ArrayProxy
+      @uses Ember.SortableMixin
+      @uses Ember.ControllerMixin
+    */
+
+    var ArrayController = ArrayProxy.extend(ControllerMixin, SortableMixin, {
+
+      /**
+        The controller used to wrap items, if any.
+
+        @property itemController
+        @type String
+        @default null
+      */
+      itemController: null,
+
+      /**
+        Return the name of the controller to wrap items, or `null` if items should
+        be returned directly.  The default implementation simply returns the
+        `itemController` property, but subclasses can override this method to return
+        different controllers for different objects.
+
+        For example:
+
+        ```javascript
+        App.MyArrayController = Ember.ArrayController.extend({
+          lookupItemController: function( object ) {
+            if (object.get('isSpecial')) {
+              return "special"; // use App.SpecialController
+            } else {
+              return "regular"; // use App.RegularController
+            }
+          }
+        });
+        ```
+
+        @method lookupItemController
+        @param {Object} object
+        @return {String}
+      */
+      lookupItemController: function(object) {
+        return get(this, 'itemController');
+      },
+
+      objectAtContent: function(idx) {
+        var length = get(this, 'length'),
+            arrangedContent = get(this,'arrangedContent'),
+            object = arrangedContent && arrangedContent.objectAt(idx);
+
+        if (idx >= 0 && idx < length) {
+          var controllerClass = this.lookupItemController(object);
+          if (controllerClass) {
+            return this.controllerAt(idx, object, controllerClass);
+          }
+        }
+
+        // When `controllerClass` is falsy, we have not opted in to using item
+        // controllers, so return the object directly.
+
+        // When the index is out of range, we want to return the "out of range"
+        // value, whatever that might be.  Rather than make assumptions
+        // (e.g. guessing `null` or `undefined`) we defer this to `arrangedContent`.
+        return object;
+      },
+
+      arrangedContentDidChange: function() {
+        this._super();
+        this._resetSubControllers();
+      },
+
+      arrayContentDidChange: function(idx, removedCnt, addedCnt) {
+        var subControllers = get(this, '_subControllers'),
+            subControllersToRemove = subControllers.slice(idx, idx+removedCnt);
+
+        forEach(subControllersToRemove, function(subController) {
+          if (subController) { subController.destroy(); }
+        });
+
+        replace(subControllers, idx, removedCnt, new Array(addedCnt));
+
+        // The shadow array of subcontrollers must be updated before we trigger
+        // observers, otherwise observers will get the wrong subcontainer when
+        // calling `objectAt`
+        this._super(idx, removedCnt, addedCnt);
+      },
+
+      init: function() {
+        this._super();
+
+        this.set('_subControllers', [ ]);
+      },
+
+      content: computed(function () {
+        return Ember.A();
+      }),
+
+      /**
+       * Flag to mark as being "virtual". Used to keep this instance
+       * from participating in the parentController hierarchy.
+       *
+       * @private
+       * @property _isVirtual
+       * @type Boolean
+       */
+      _isVirtual: false,
+
+      controllerAt: function(idx, object, controllerClass) {
+        var container = get(this, 'container'),
+            subControllers = get(this, '_subControllers'),
+            subController = subControllers[idx],
+            fullName;
+
+        if (subController) { return subController; }
+
+        fullName = "controller:" + controllerClass;
+
+        if (!container.has(fullName)) {
+          throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
+        }
+        var parentController;
+        if (this._isVirtual) {
+          parentController = get(this, 'parentController');
+        }
+        parentController = parentController || this;
+        subController = container.lookupFactory(fullName).create({
+          target: this,
+          parentController: parentController,
+          content: object
+        });
+
+        subControllers[idx] = subController;
+
+        return subController;
+      },
+
+      _subControllers: null,
+
+      _resetSubControllers: function() {
+        var subControllers = get(this, '_subControllers');
+        var controller;
+
+        if (subControllers.length) {
+          for (var i = 0, length = subControllers.length; length > i; i++) {
+            controller = subControllers[i];
+            if (controller) {
+              controller.destroy();
+            }
+          }
+
+          subControllers.length = 0;
+        }
+      },
+
+      willDestroy: function() {
+        this._resetSubControllers();
+        this._super();
+      }
+    });
+
+    __exports__["default"] = ArrayController;
+  });
+define("ember-runtime/controllers/controller",
+  ["ember-metal/core","ember-metal/property_get","ember-runtime/system/object","ember-metal/mixin","ember-metal/computed","ember-runtime/mixins/action_handler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.deprecate
+    var get = __dependency2__.get;
+    var EmberObject = __dependency3__["default"];
+    var Mixin = __dependency4__.Mixin;
+    var computed = __dependency5__.computed;
+    var ActionHandler = __dependency6__["default"];
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    /**
+      `Ember.ControllerMixin` provides a standard interface for all classes that
+      compose Ember's controller layer: `Ember.Controller`,
+      `Ember.ArrayController`, and `Ember.ObjectController`.
+
+      @class ControllerMixin
+      @namespace Ember
+      @uses Ember.ActionHandler
+    */
+    var ControllerMixin = Mixin.create(ActionHandler, {
+      /* ducktype as a controller */
+      isController: true,
+
+      /**
+        The object to which actions from the view should be sent.
+
+        For example, when a Handlebars template uses the `{{action}}` helper,
+        it will attempt to send the action to the view's controller's `target`.
+
+        By default, the value of the target property is set to the router, and
+        is injected when a controller is instantiated. This injection is defined
+        in Ember.Application#buildContainer, and is applied as part of the
+        applications initialization process. It can also be set after a controller
+        has been instantiated, for instance when using the render helper in a
+        template, or when a controller is used as an `itemController`. In most
+        cases the `target` property will automatically be set to the logical
+        consumer of actions for the controller.
+
+        @property target
+        @default null
+      */
+      target: null,
+
+      container: null,
+
+      parentController: null,
+
+      store: null,
+
+      model: computed.alias('content'),
+
+      deprecatedSendHandles: function(actionName) {
+        return !!this[actionName];
+      },
+
+      deprecatedSend: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+                        this[actionName].apply(this, args);
+        return;
+      }
+    });
+
+    /**
+      @class Controller
+      @namespace Ember
+      @extends Ember.Object
+      @uses Ember.ControllerMixin
+    */
+    var Controller = EmberObject.extend(ControllerMixin);
+
+    __exports__.Controller = Controller;
+    __exports__.ControllerMixin = ControllerMixin;
+  });
+define("ember-runtime/controllers/object_controller",
+  ["ember-runtime/controllers/controller","ember-runtime/system/object_proxy","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var ControllerMixin = __dependency1__.ControllerMixin;
+    var ObjectProxy = __dependency2__["default"];
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    /**
+      `Ember.ObjectController` is part of Ember's Controller layer. It is intended
+      to wrap a single object, proxying unhandled attempts to `get` and `set` to the underlying
+      content object, and to forward unhandled action attempts to its `target`.
+
+      `Ember.ObjectController` derives this functionality from its superclass
+      `Ember.ObjectProxy` and the `Ember.ControllerMixin` mixin.
+
+      @class ObjectController
+      @namespace Ember
+      @extends Ember.ObjectProxy
+      @uses Ember.ControllerMixin
+    **/
+    var ObjectController = ObjectProxy.extend(ControllerMixin);
+    __exports__["default"] = ObjectController;
+  });
+define("ember-runtime/copy",
+  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var EnumerableUtils = __dependency1__["default"];
+    var typeOf = __dependency2__.typeOf;
+    var EmberObject = __dependency3__["default"];
+    var Copyable = __dependency4__["default"];
+    var create = __dependency5__.create;
+
+    var indexOf = EnumerableUtils.indexOf;
+
+    function _copy(obj, deep, seen, copies) {
+      var ret, loc, key;
+
+      // primitive data types are immutable, just return them.
+      if ('object' !== typeof obj || obj===null) return obj;
+
+      // avoid cyclical loops
+      if (deep && (loc=indexOf(seen, obj))>=0) return copies[loc];
+
+      
+      // IMPORTANT: this specific test will detect a native array only. Any other
+      // object will need to implement Copyable.
+      if (typeOf(obj) === 'array') {
+        ret = obj.slice();
+        if (deep) {
+          loc = ret.length;
+          while(--loc>=0) ret[loc] = _copy(ret[loc], deep, seen, copies);
+        }
+      } else if (Copyable && Copyable.detect(obj)) {
+        ret = obj.copy(deep, seen, copies);
+      } else if (obj instanceof Date) {
+        ret = new Date(obj.getTime());
+      } else {
+        ret = {};
+        for(key in obj) {
+          if (!obj.hasOwnProperty(key)) continue;
+
+          // Prevents browsers that don't respect non-enumerability from
+          // copying internal Ember properties
+          if (key.substring(0,2) === '__') continue;
+
+          ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
+        }
+      }
+
+      if (deep) {
+        seen.push(obj);
+        copies.push(ret);
+      }
+
+      return ret;
+    }
+
+    /**
+      Creates a clone of the passed object. This function can take just about
+      any type of object and create a clone of it, including primitive values
+      (which are not actually cloned because they are immutable).
+
+      If the passed object implements the `clone()` method, then this function
+      will simply call that method and return the result.
+
+      @method copy
+      @for Ember
+      @param {Object} obj The object to clone
+      @param {Boolean} deep If true, a deep copy of the object is made
+      @return {Object} The cloned object
+    */
+    function copy(obj, deep) {
+      // fast paths
+      if ('object' !== typeof obj || obj===null) return obj; // can't copy primitives
+      if (Copyable && Copyable.detect(obj)) return obj.copy(deep);
+      return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
+    };
+
+    __exports__["default"] = copy;
+  });
+define("ember-runtime/core",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    /**
+      Compares two objects, returning true if they are logically equal. This is
+      a deeper comparison than a simple triple equal. For sets it will compare the
+      internal objects. For any other object that implements `isEqual()` it will
+      respect that method.
+
+      ```javascript
+      Ember.isEqual('hello', 'hello');  // true
+      Ember.isEqual(1, 2);              // false
+      Ember.isEqual([4, 2], [4, 2]);    // false
+      ```
+
+      @method isEqual
+      @for Ember
+      @param {Object} a first object to compare
+      @param {Object} b second object to compare
+      @return {Boolean}
+    */
+    function isEqual(a, b) {
+      if (a && 'function'===typeof a.isEqual) return a.isEqual(b);
+      if (a instanceof Date && b instanceof Date) {
+        return a.getTime() === b.getTime();
+      } 
+      return a === b;
+    };
+
+    __exports__.isEqual = isEqual;
+  });
+define("ember-runtime/ext/function",
+  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.EXTEND_PROTOTYPES, Ember.assert
+    var expandProperties = __dependency2__["default"];
+    var computed = __dependency3__.computed;
+
+    var a_slice = Array.prototype.slice;
+    var FunctionPrototype = Function.prototype;
+
+    if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Function) {
+
+      /**
+        The `property` extension of Javascript's Function prototype is available
+        when `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Function` is
+        `true`, which is the default.
+
+        Computed properties allow you to treat a function like a property:
+
+        ```javascript
+        MyApp.President = Ember.Object.extend({
+          firstName: '',
+          lastName:  '',
+
+          fullName: function() {
+            return this.get('firstName') + ' ' + this.get('lastName');
+
+            // Call this flag to mark the function as a property
+          }.property()
+        });
+
+        var president = MyApp.President.create({
+          firstName: "Barack",
+          lastName: "Obama"
+        });
+
+        president.get('fullName');    // "Barack Obama"
+        ```
+
+        Treating a function like a property is useful because they can work with
+        bindings, just like any other property.
+
+        Many computed properties have dependencies on other properties. For
+        example, in the above example, the `fullName` property depends on
+        `firstName` and `lastName` to determine its value. You can tell Ember
+        about these dependencies like this:
+
+        ```javascript
+        MyApp.President = Ember.Object.extend({
+          firstName: '',
+          lastName:  '',
+
+          fullName: function() {
+            return this.get('firstName') + ' ' + this.get('lastName');
+
+            // Tell Ember.js that this computed property depends on firstName
+            // and lastName
+          }.property('firstName', 'lastName')
+        });
+        ```
+
+        Make sure you list these dependencies so Ember knows when to update
+        bindings that connect to a computed property. Changing a dependency
+        will not immediately trigger an update of the computed property, but
+        will instead clear the cache so that it is updated when the next `get`
+        is called on the property.
+
+        See [Ember.ComputedProperty](/api/classes/Ember.ComputedProperty.html), [Ember.computed](/api/#method_computed).
+
+        @method property
+        @for Function
+      */
+      FunctionPrototype.property = function() {
+        var ret = computed(this);
+        // ComputedProperty.prototype.property expands properties; no need for us to
+        // do so here.
+        return ret.property.apply(ret, arguments);
+      };
+
+      /**
+        The `observes` extension of Javascript's Function prototype is available
+        when `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Function` is
+        true, which is the default.
+
+        You can observe property changes simply by adding the `observes`
+        call to the end of your method declarations in classes that you write.
+        For example:
+
+        ```javascript
+        Ember.Object.extend({
+          valueObserver: function() {
+            // Executes whenever the "value" property changes
+          }.observes('value')
+        });
+        ```
+
+        In the future this method may become asynchronous. If you want to ensure
+        synchronous behavior, use `observesImmediately`.
+
+        See `Ember.observer`.
+
+        @method observes
+        @for Function
+      */
+      FunctionPrototype.observes = function() {
+        var addWatchedProperty = function (obs) { watched.push(obs); };
+        var watched = [];
+
+        for (var i=0; i<arguments.length; ++i) {
+          expandProperties(arguments[i], addWatchedProperty);
+        }
+
+        this.__ember_observes__ = watched;
+
+        return this;
+      };
+
+      /**
+        The `observesImmediately` extension of Javascript's Function prototype is
+        available when `Ember.EXTEND_PROTOTYPES` or
+        `Ember.EXTEND_PROTOTYPES.Function` is true, which is the default.
+
+        You can observe property changes simply by adding the `observesImmediately`
+        call to the end of your method declarations in classes that you write.
+        For example:
+
+        ```javascript
+        Ember.Object.extend({
+          valueObserver: function() {
+            // Executes immediately after the "value" property changes
+          }.observesImmediately('value')
+        });
+        ```
+
+        In the future, `observes` may become asynchronous. In this event,
+        `observesImmediately` will maintain the synchronous behavior.
+
+        See `Ember.immediateObserver`.
+
+        @method observesImmediately
+        @for Function
+      */
+      FunctionPrototype.observesImmediately = function() {
+        for (var i=0, l=arguments.length; i<l; i++) {
+          var arg = arguments[i];
+                  }
+
+        // observes handles property expansion
+        return this.observes.apply(this, arguments);
+      };
+
+      /**
+        The `observesBefore` extension of Javascript's Function prototype is
+        available when `Ember.EXTEND_PROTOTYPES` or
+        `Ember.EXTEND_PROTOTYPES.Function` is true, which is the default.
+
+        You can get notified when a property change is about to happen by
+        by adding the `observesBefore` call to the end of your method
+        declarations in classes that you write. For example:
+
+        ```javascript
+        Ember.Object.extend({
+          valueObserver: function() {
+            // Executes whenever the "value" property is about to change
+          }.observesBefore('value')
+        });
+        ```
+
+        See `Ember.beforeObserver`.
+
+        @method observesBefore
+        @for Function
+      */
+      FunctionPrototype.observesBefore = function() {
+        var addWatchedProperty = function (obs) { watched.push(obs); };
+        var watched = [];
+
+        for (var i=0; i<arguments.length; ++i) {
+          expandProperties(arguments[i], addWatchedProperty);
+        }
+
+        this.__ember_observesBefore__ = watched;
+
+        return this;
+      };
+
+      /**
+        The `on` extension of Javascript's Function prototype is available
+        when `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Function` is
+        true, which is the default.
+
+        You can listen for events simply by adding the `on` call to the end of
+        your method declarations in classes or mixins that you write. For example:
+
+        ```javascript
+        Ember.Mixin.create({
+          doSomethingWithElement: function() {
+            // Executes whenever the "didInsertElement" event fires
+          }.on('didInsertElement')
+        });
+        ```
+
+        See `Ember.on`.
+
+        @method on
+        @for Function
+      */
+      FunctionPrototype.on = function() {
+        var events = a_slice.call(arguments);
+        this.__ember_listens__ = events;
+        return this;
+      };
+    }
+  });
+define("ember-runtime/ext/rsvp",
+  ["ember-metal/core","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var Logger = __dependency2__["default"];
+
+    var RSVP = requireModule("rsvp");
+    var Test, testModuleName = 'ember-testing/test';
+
+    RSVP.onerrorDefault = function(error) {
+      if (error instanceof Error) {
+        if (Ember.testing) {
+          // ES6TODO: remove when possible
+          if (!Test && Ember.__loader.registry[testModuleName]) {
+            Test = requireModule(testModuleName)['default'];
+          }
+
+          if (Test && Test.adapter) {
+            Test.adapter.exception(error);
+          } else {
+            throw error;
+          }
+        } else if (Ember.onerror) {
+          Ember.onerror(error);
+        } else {
+          Logger.error(error.stack);
+                  }
+      }
+    };
+
+    RSVP.on('error', RSVP.onerrorDefault);
+
+    __exports__["default"] = RSVP;
+  });
+define("ember-runtime/ext/string",
+  ["ember-metal/core","ember-runtime/system/string"],
+  function(__dependency1__, __dependency2__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.EXTEND_PROTOTYPES, Ember.assert, Ember.FEATURES
+    var fmt = __dependency2__.fmt;
+    var w = __dependency2__.w;
+    var loc = __dependency2__.loc;
+    var camelize = __dependency2__.camelize;
+    var decamelize = __dependency2__.decamelize;
+    var dasherize = __dependency2__.dasherize;
+    var underscore = __dependency2__.underscore;
+    var capitalize = __dependency2__.capitalize;
+    var classify = __dependency2__.classify;
+    var StringPrototype = String.prototype;
+
+    if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
+
+      /**
+        See [Ember.String.fmt](/api/classes/Ember.String.html#method_fmt).
+
+        @method fmt
+        @for String
+      */
+      StringPrototype.fmt = function() {
+        return fmt(this, arguments);
+      };
+
+      /**
+        See [Ember.String.w](/api/classes/Ember.String.html#method_w).
+
+        @method w
+        @for String
+      */
+      StringPrototype.w = function() {
+        return w(this);
+      };
+
+      /**
+        See [Ember.String.loc](/api/classes/Ember.String.html#method_loc).
+
+        @method loc
+        @for String
+      */
+      StringPrototype.loc = function() {
+        return loc(this, arguments);
+      };
+
+      /**
+        See [Ember.String.camelize](/api/classes/Ember.String.html#method_camelize).
+
+        @method camelize
+        @for String
+      */
+      StringPrototype.camelize = function() {
+        return camelize(this);
+      };
+
+      /**
+        See [Ember.String.decamelize](/api/classes/Ember.String.html#method_decamelize).
+
+        @method decamelize
+        @for String
+      */
+      StringPrototype.decamelize = function() {
+        return decamelize(this);
+      };
+
+      /**
+        See [Ember.String.dasherize](/api/classes/Ember.String.html#method_dasherize).
+
+        @method dasherize
+        @for String
+      */
+      StringPrototype.dasherize = function() {
+        return dasherize(this);
+      };
+
+      /**
+        See [Ember.String.underscore](/api/classes/Ember.String.html#method_underscore).
+
+        @method underscore
+        @for String
+      */
+      StringPrototype.underscore = function() {
+        return underscore(this);
+      };
+
+      /**
+        See [Ember.String.classify](/api/classes/Ember.String.html#method_classify).
+
+        @method classify
+        @for String
+      */
+      StringPrototype.classify = function() {
+        return classify(this);
+      };
+
+      /**
+        See [Ember.String.capitalize](/api/classes/Ember.String.html#method_capitalize).
+
+        @method capitalize
+        @for String
+      */
+      StringPrototype.capitalize = function() {
+        return capitalize(this);
+      };
+    }
+  });
+define("ember-runtime/keys",
+  ["ember-metal/enumerable_utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var EnumerableUtils = __dependency1__["default"];
+    var create = __dependency2__.create;
+
+    /**
+      Returns all of the keys defined on an object or hash. This is useful
+      when inspecting objects for debugging. On browsers that support it, this
+      uses the native `Object.keys` implementation.
+
+      @method keys
+      @for Ember
+      @param {Object} obj
+      @return {Array} Array containing keys of obj
+    */
+    var keys = Object.keys;
+    if (!keys || create.isSimulated) {
+      var prototypeProperties = [
+        'constructor',
+        'hasOwnProperty',
+        'isPrototypeOf',
+        'propertyIsEnumerable',
+        'valueOf',
+        'toLocaleString',
+        'toString'
+      ],
+      pushPropertyName = function(obj, array, key) {
+        // Prevents browsers that don't respect non-enumerability from
+        // copying internal Ember properties
+        if (key.substring(0,2) === '__') return;
+        if (key === '_super') return;
+        if (EnumerableUtils.indexOf(array, key) >= 0) return;
+        if (typeof obj.hasOwnProperty === 'function' && !obj.hasOwnProperty(key)) return;
+
+        array.push(key);
+      };
+
+      keys = function keys(obj) {
+        var ret = [], key;
+        for (key in obj) {
+          pushPropertyName(obj, ret, key);
+        }
+
+        // IE8 doesn't enumerate property that named the same as prototype properties.
+        for (var i = 0, l = prototypeProperties.length; i < l; i++) {
+          key = prototypeProperties[i];
+
+          pushPropertyName(obj, ret, key);
+        }
+
+        return ret;
+      };
+    }
+
+    __exports__["default"] = keys;
+  });
+define("ember-runtime",
+  ["ember-metal","ember-runtime/core","ember-runtime/keys","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __dependency37__, __dependency38__, __dependency39__, __dependency40__, __dependency41__, __dependency42__, __dependency43__, __exports__) {
+    "use strict";
+    /**
+    Ember Runtime
+
+    @module ember
+    @submodule ember-runtime
+    @requires ember-metal
+    */
+
+
+    // BEGIN EXPORTS
+    Ember.compare = __dependency4__["default"];
+    Ember.copy = __dependency5__["default"];
+    Ember.isEqual = __dependency2__.isEqual;
+    Ember.keys = __dependency3__["default"];
+
+    Ember.Array = __dependency21__["default"];
+
+    Ember.Comparable = __dependency22__["default"];
+    Ember.Copyable = __dependency23__["default"];
+
+    Ember.SortableMixin = __dependency34__["default"];
+
+    Ember.Freezable = __dependency25__.Freezable;
+    Ember.FROZEN_ERROR = __dependency25__.FROZEN_ERROR;
+
+    Ember.DeferredMixin = __dependency28__["default"];
+
+    Ember.MutableEnumerable = __dependency29__["default"];
+    Ember.MutableArray = __dependency30__["default"];
+
+    Ember.TargetActionSupport = __dependency31__["default"];
+    Ember.Evented = __dependency32__["default"];
+
+    Ember.PromiseProxyMixin = __dependency33__["default"];
+
+    Ember.Observable = __dependency26__["default"];
+
+    Ember.arrayComputed = __dependency35__.arrayComputed;
+    Ember.ArrayComputedProperty = __dependency35__.ArrayComputedProperty;
+    Ember.reduceComputed = __dependency36__.reduceComputed;
+    Ember.ReduceComputedProperty = __dependency36__.ReduceComputedProperty;
+
+    // ES6TODO: this seems a less than ideal way/place to add properties to Ember.computed
+    var EmComputed = Ember.computed;
+
+    EmComputed.sum = __dependency37__.sum;
+    EmComputed.min = __dependency37__.min;
+    EmComputed.max = __dependency37__.max;
+    EmComputed.map = __dependency37__.map;
+    EmComputed.sort = __dependency37__.sort;
+    EmComputed.setDiff = __dependency37__.setDiff;
+    EmComputed.mapBy = __dependency37__.mapBy;
+    EmComputed.mapProperty = __dependency37__.mapProperty;
+    EmComputed.filter = __dependency37__.filter;
+    EmComputed.filterBy = __dependency37__.filterBy;
+    EmComputed.filterProperty = __dependency37__.filterProperty;
+    EmComputed.uniq = __dependency37__.uniq;
+    EmComputed.union = __dependency37__.union;
+    EmComputed.intersect = __dependency37__.intersect;
+
+    Ember.String = __dependency18__["default"];
+    Ember.Object = __dependency7__["default"];
+    Ember.TrackedArray = __dependency8__["default"];
+    Ember.SubArray = __dependency9__["default"];
+    Ember.Container = __dependency10__["default"];
+    Ember.Namespace = __dependency6__["default"];
+    Ember.Application = __dependency11__["default"];
+    Ember.Enumerable = __dependency24__["default"];
+    Ember.ArrayProxy = __dependency12__["default"];
+    Ember.ObjectProxy = __dependency13__["default"];
+    Ember.ActionHandler = __dependency27__["default"];
+    Ember.CoreObject = __dependency14__["default"];
+    Ember.EachArray = __dependency15__.EachArray;
+    Ember.EachProxy = __dependency15__.EachProxy;
+    Ember.NativeArray = __dependency16__["default"];
+    // ES6TODO: Currently we must rely on the global from ember-metal/core to avoid circular deps
+    // Ember.A = A;
+    Ember.Set = __dependency17__["default"];
+    Ember.Deferred = __dependency19__["default"];
+    Ember.onLoad = __dependency20__.onLoad;
+    Ember.runLoadHooks = __dependency20__.runLoadHooks;
+
+    Ember.ArrayController = __dependency38__["default"];
+    Ember.ObjectController = __dependency39__["default"];
+    Ember.Controller = __dependency40__.Controller;
+    Ember.ControllerMixin = __dependency40__.ControllerMixin;
+
+    Ember.RSVP = __dependency41__["default"];
+    // END EXPORTS
+
+    __exports__["default"] = Ember;
+  });
+define("ember-runtime/mixins/action_handler",
+  ["ember-metal/merge","ember-metal/mixin","ember-metal/property_get","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var merge = __dependency1__["default"];
+    var Mixin = __dependency2__.Mixin;
+    var get = __dependency3__.get;
+    var typeOf = __dependency4__.typeOf;
+
+    /**
+      The `Ember.ActionHandler` mixin implements support for moving an `actions`
+      property to an `_actions` property at extend time, and adding `_actions`
+      to the object's mergedProperties list.
+
+      `Ember.ActionHandler` is available on some familiar classes including
+      `Ember.Route`, `Ember.View`, `Ember.Component`, and controllers such as
+      `Ember.Controller` and `Ember.ObjectController`.
+      (Internally the mixin is used by `Ember.CoreView`, `Ember.ControllerMixin`,
+      and `Ember.Route` and available to the above classes through
+      inheritance.)
+
+      @class ActionHandler
+      @namespace Ember
+    */
+    var ActionHandler = Mixin.create({
+      mergedProperties: ['_actions'],
+
+      /**
+        The collection of functions, keyed by name, available on this
+        `ActionHandler` as action targets.
+
+        These functions will be invoked when a matching `{{action}}` is triggered
+        from within a template and the application's current route is this route.
+
+        Actions can also be invoked from other parts of your application
+        via `ActionHandler#send`.
+
+        The `actions` hash will inherit action handlers from
+        the `actions` hash defined on extended parent classes
+        or mixins rather than just replace the entire hash, e.g.:
+
+        ```js
+        App.CanDisplayBanner = Ember.Mixin.create({
+          actions: {
+            displayBanner: function(msg) {
+              // ...
+            }
+          }
+        });
+
+        App.WelcomeRoute = Ember.Route.extend(App.CanDisplayBanner, {
+          actions: {
+            playMusic: function() {
+              // ...
+            }
+          }
+        });
+
+        // `WelcomeRoute`, when active, will be able to respond
+        // to both actions, since the actions hash is merged rather
+        // then replaced when extending mixins / parent classes.
+        this.send('displayBanner');
+        this.send('playMusic');
+        ```
+
+        Within a Controller, Route, View or Component's action handler,
+        the value of the `this` context is the Controller, Route, View or
+        Component object:
+
+        ```js
+        App.SongRoute = Ember.Route.extend({
+          actions: {
+            myAction: function() {
+              this.controllerFor("song");
+              this.transitionTo("other.route");
+              ...
+            }
+          }
+        });
+        ```
+
+        It is also possible to call `this._super()` from within an
+        action handler if it overrides a handler defined on a parent
+        class or mixin:
+
+        Take for example the following routes:
+
+        ```js
+        App.DebugRoute = Ember.Mixin.create({
+          actions: {
+            debugRouteInformation: function() {
+              console.debug("trololo");
+            }
+          }
+        });
+
+        App.AnnoyingDebugRoute = Ember.Route.extend(App.DebugRoute, {
+          actions: {
+            debugRouteInformation: function() {
+              // also call the debugRouteInformation of mixed in App.DebugRoute
+              this._super();
+
+              // show additional annoyance
+              window.alert(...);
+            }
+          }
+        });
+        ```
+
+        ## Bubbling
+
+        By default, an action will stop bubbling once a handler defined
+        on the `actions` hash handles it. To continue bubbling the action,
+        you must return `true` from the handler:
+
+        ```js
+        App.Router.map(function() {
+          this.resource("album", function() {
+            this.route("song");
+          });
+        });
+
+        App.AlbumRoute = Ember.Route.extend({
+          actions: {
+            startPlaying: function() {
+            }
+          }
+        });
+
+        App.AlbumSongRoute = Ember.Route.extend({
+          actions: {
+            startPlaying: function() {
+              // ...
+
+              if (actionShouldAlsoBeTriggeredOnParentRoute) {
+                return true;
+              }
+            }
+          }
+        });
+        ```
+
+        @property actions
+        @type Hash
+        @default null
+      */
+
+      /**
+        Moves `actions` to `_actions` at extend time. Note that this currently
+        modifies the mixin themselves, which is technically dubious but
+        is practically of little consequence. This may change in the future.
+
+        @private
+        @method willMergeMixin
+      */
+      willMergeMixin: function(props) {
+        var hashName;
+
+        if (!props._actions) {
+          
+          if (typeOf(props.actions) === 'object') {
+            hashName = 'actions';
+          } else if (typeOf(props.events) === 'object') {
+                        hashName = 'events';
+          }
+
+          if (hashName) {
+            props._actions = merge(props._actions || {}, props[hashName]);
+          }
+
+          delete props[hashName];
+        }
+      },
+
+      /**
+        Triggers a named action on the `ActionHandler`. Any parameters
+        supplied after the `actionName` string will be passed as arguments
+        to the action target function.
+
+        If the `ActionHandler` has its `target` property set, actions may
+        bubble to the `target`. Bubbling happens when an `actionName` can
+        not be found in the `ActionHandler`'s `actions` hash or if the
+        action target function returns `true`.
+
+        Example
+
+        ```js
+        App.WelcomeRoute = Ember.Route.extend({
+          actions: {
+            playTheme: function() {
+               this.send('playMusic', 'theme.mp3');
+            },
+            playMusic: function(track) {
+              // ...
+            }
+          }
+        });
+        ```
+
+        @method send
+        @param {String} actionName The action to trigger
+        @param {*} context a context to send with the action
+      */
+      send: function(actionName) {
+        var args = [].slice.call(arguments, 1), target;
+
+        if (this._actions && this._actions[actionName]) {
+          if (this._actions[actionName].apply(this, args) === true) {
+            // handler returned true, so this action will bubble
+          } else {
+            return;
+          }
+        } else if (!Ember.FEATURES.isEnabled('ember-routing-drop-deprecated-action-style') && this.deprecatedSend && this.deprecatedSendHandles && this.deprecatedSendHandles(actionName)) {
+                    if (this.deprecatedSend.apply(this, [].slice.call(arguments)) === true) {
+            // handler return true, so this action will bubble
+          } else {
+            return;
+          }
+        }
+
+        if (target = get(this, 'target')) {
+                    target.send.apply(target, arguments);
+        }
+      }
+    });
+
+    __exports__["default"] = ActionHandler;
+  });
+define("ember-runtime/mixins/array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    // ..........................................................
+    // HELPERS
+    //
+    var Ember = __dependency1__["default"];
+    // ES6TODO: Ember.A
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var computed = __dependency4__.computed;
+    var cacheFor = __dependency4__.cacheFor;
+    var isNone = __dependency5__.isNone;
+    var none = __dependency5__.none;
+    var Enumerable = __dependency6__["default"];
+    var EnumerableUtils = __dependency7__["default"];
+    var Mixin = __dependency8__.Mixin;
+    var required = __dependency8__.required;
+    var propertyWillChange = __dependency9__.propertyWillChange;
+    var propertyDidChange = __dependency9__.propertyDidChange;
+    var addListener = __dependency10__.addListener;
+    var removeListener = __dependency10__.removeListener;
+    var sendEvent = __dependency10__.sendEvent;
+    var hasListeners = __dependency10__.hasListeners;
+    var isWatching = __dependency11__.isWatching;
+
+    var map = EnumerableUtils.map;
+
+    // ..........................................................
+    // ARRAY
+    //
+    /**
+      This mixin implements Observer-friendly Array-like behavior. It is not a
+      concrete implementation, but it can be used up by other classes that want
+      to appear like arrays.
+
+      For example, ArrayProxy and ArrayController are both concrete classes that can
+      be instantiated to implement array-like behavior. Both of these classes use
+      the Array Mixin by way of the MutableArray mixin, which allows observable
+      changes to be made to the underlying array.
+
+      Unlike `Ember.Enumerable,` this mixin defines methods specifically for
+      collections that provide index-ordered access to their contents. When you
+      are designing code that needs to accept any kind of Array-like object, you
+      should use these methods instead of Array primitives because these will
+      properly notify observers of changes to the array.
+
+      Although these methods are efficient, they do add a layer of indirection to
+      your application so it is a good idea to use them only when you need the
+      flexibility of using both true JavaScript arrays and "virtual" arrays such
+      as controllers and collections.
+
+      You can use the methods defined in this module to access and modify array
+      contents in a KVO-friendly way. You can also be notified whenever the
+      membership of an array changes by using `.observes('myArray.[]')`.
+
+      To support `Ember.Array` in your own class, you must override two
+      primitives to use it: `replace()` and `objectAt()`.
+
+      Note that the Ember.Array mixin also incorporates the `Ember.Enumerable`
+      mixin. All `Ember.Array`-like objects are also enumerable.
+
+      @class Array
+      @namespace Ember
+      @uses Ember.Enumerable
+      @since Ember 0.9.0
+    */
+    var EmberArray = Mixin.create(Enumerable, {
+
+      /**
+        Your array must support the `length` property. Your replace methods should
+        set this property whenever it changes.
+
+        @property {Number} length
+      */
+      length: required(),
+
+      /**
+        Returns the object at the given `index`. If the given `index` is negative
+        or is greater or equal than the array length, returns `undefined`.
+
+        This is one of the primitives you must implement to support `Ember.Array`.
+        If your object supports retrieving the value of an array item using `get()`
+        (i.e. `myArray.get(0)`), then you do not need to implement this method
+        yourself.
+
+        ```javascript
+        var arr = ['a', 'b', 'c', 'd'];
+        arr.objectAt(0);   // "a"
+        arr.objectAt(3);   // "d"
+        arr.objectAt(-1);  // undefined
+        arr.objectAt(4);   // undefined
+        arr.objectAt(5);   // undefined
+        ```
+
+        @method objectAt
+        @param {Number} idx The index of the item to return.
+        @return {*} item at index or undefined
+      */
+      objectAt: function(idx) {
+        if ((idx < 0) || (idx >= get(this, 'length'))) return undefined;
+        return get(this, idx);
+      },
+
+      /**
+        This returns the objects at the specified indexes, using `objectAt`.
+
+        ```javascript
+        var arr = ['a', 'b', 'c', 'd'];
+        arr.objectsAt([0, 1, 2]);  // ["a", "b", "c"]
+        arr.objectsAt([2, 3, 4]);  // ["c", "d", undefined]
+        ```
+
+        @method objectsAt
+        @param {Array} indexes An array of indexes of items to return.
+        @return {Array}
+       */
+      objectsAt: function(indexes) {
+        var self = this;
+        return map(indexes, function(idx) { return self.objectAt(idx); });
+      },
+
+      // overrides Ember.Enumerable version
+      nextObject: function(idx) {
+        return this.objectAt(idx);
+      },
+
+      /**
+        This is the handler for the special array content property. If you get
+        this property, it will return this. If you set this property it a new
+        array, it will replace the current content.
+
+        This property overrides the default property defined in `Ember.Enumerable`.
+
+        @property []
+        @return this
+      */
+      '[]': computed(function(key, value) {
+        if (value !== undefined) this.replace(0, get(this, 'length'), value) ;
+        return this ;
+      }),
+
+      firstObject: computed(function() {
+        return this.objectAt(0);
+      }),
+
+      lastObject: computed(function() {
+        return this.objectAt(get(this, 'length')-1);
+      }),
+
+      // optimized version from Enumerable
+      contains: function(obj) {
+        return this.indexOf(obj) >= 0;
+      },
+
+      // Add any extra methods to Ember.Array that are native to the built-in Array.
+      /**
+        Returns a new array that is a slice of the receiver. This implementation
+        uses the observable array methods to retrieve the objects for the new
+        slice.
+
+        ```javascript
+        var arr = ['red', 'green', 'blue'];
+        arr.slice(0);       // ['red', 'green', 'blue']
+        arr.slice(0, 2);    // ['red', 'green']
+        arr.slice(1, 100);  // ['green', 'blue']
+        ```
+
+        @method slice
+        @param {Integer} beginIndex (Optional) index to begin slicing from.
+        @param {Integer} endIndex (Optional) index to end the slice at (but not included).
+        @return {Array} New array with specified slice
+      */
+      slice: function(beginIndex, endIndex) {
+        var ret = Ember.A();
+        var length = get(this, 'length') ;
+        if (isNone(beginIndex)) beginIndex = 0 ;
+        if (isNone(endIndex) || (endIndex > length)) endIndex = length ;
+
+        if (beginIndex < 0) beginIndex = length + beginIndex;
+        if (endIndex < 0) endIndex = length + endIndex;
+
+        while(beginIndex < endIndex) {
+          ret[ret.length] = this.objectAt(beginIndex++) ;
+        }
+        return ret ;
+      },
+
+      /**
+        Returns the index of the given object's first occurrence.
+        If no `startAt` argument is given, the starting location to
+        search is 0. If it's negative, will count backward from
+        the end of the array. Returns -1 if no match is found.
+
+        ```javascript
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.indexOf("a");       //  0
+        arr.indexOf("z");       // -1
+        arr.indexOf("a", 2);    //  4
+        arr.indexOf("a", -1);   //  4
+        arr.indexOf("b", 3);    // -1
+        arr.indexOf("a", 100);  // -1
+        ```
+
+        @method indexOf
+        @param {Object} object the item to search for
+        @param {Number} startAt optional starting location to search, default 0
+        @return {Number} index or -1 if not found
+      */
+      indexOf: function(object, startAt) {
+        var idx, len = get(this, 'length');
+
+        if (startAt === undefined) startAt = 0;
+        if (startAt < 0) startAt += len;
+
+        for(idx = startAt; idx < len; idx++) {
+          if (this.objectAt(idx) === object) return idx;
+        }
+        return -1;
+      },
+
+      /**
+        Returns the index of the given object's last occurrence.
+        If no `startAt` argument is given, the search starts from
+        the last position. If it's negative, will count backward
+        from the end of the array. Returns -1 if no match is found.
+
+        ```javascript
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.lastIndexOf("a");       //  4
+        arr.lastIndexOf("z");       // -1
+        arr.lastIndexOf("a", 2);    //  0
+        arr.lastIndexOf("a", -1);   //  4
+        arr.lastIndexOf("b", 3);    //  1
+        arr.lastIndexOf("a", 100);  //  4
+        ```
+
+        @method lastIndexOf
+        @param {Object} object the item to search for
+        @param {Number} startAt optional starting location to search, default 0
+        @return {Number} index or -1 if not found
+      */
+      lastIndexOf: function(object, startAt) {
+        var idx, len = get(this, 'length');
+
+        if (startAt === undefined || startAt >= len) startAt = len-1;
+        if (startAt < 0) startAt += len;
+
+        for(idx = startAt; idx >= 0; idx--) {
+          if (this.objectAt(idx) === object) return idx;
+        }
+        return -1;
+      },
+
+      // ..........................................................
+      // ARRAY OBSERVERS
+      //
+
+      /**
+        Adds an array observer to the receiving array. The array observer object
+        normally must implement two methods:
+
+        * `arrayWillChange(observedObj, start, removeCount, addCount)` - This method will be
+          called just before the array is modified.
+        * `arrayDidChange(observedObj, start, removeCount, addCount)` - This method will be
+          called just after the array is modified.
+
+        Both callbacks will be passed the observed object, starting index of the
+        change as well a a count of the items to be removed and added. You can use
+        these callbacks to optionally inspect the array during the change, clear
+        caches, or do any other bookkeeping necessary.
+
+        In addition to passing a target, you can also include an options hash
+        which you can use to override the method names that will be invoked on the
+        target.
+
+        @method addArrayObserver
+        @param {Object} target The observer object.
+        @param {Hash} opts Optional hash of configuration options including
+          `willChange` and `didChange` option.
+        @return {Ember.Array} receiver
+      */
+      addArrayObserver: function(target, opts) {
+        var willChange = (opts && opts.willChange) || 'arrayWillChange',
+            didChange  = (opts && opts.didChange) || 'arrayDidChange';
+
+        var hasObservers = get(this, 'hasArrayObservers');
+        if (!hasObservers) propertyWillChange(this, 'hasArrayObservers');
+        addListener(this, '@array:before', target, willChange);
+        addListener(this, '@array:change', target, didChange);
+        if (!hasObservers) propertyDidChange(this, 'hasArrayObservers');
+        return this;
+      },
+
+      /**
+        Removes an array observer from the object if the observer is current
+        registered. Calling this method multiple times with the same object will
+        have no effect.
+
+        @method removeArrayObserver
+        @param {Object} target The object observing the array.
+        @param {Hash} opts Optional hash of configuration options including
+          `willChange` and `didChange` option.
+        @return {Ember.Array} receiver
+      */
+      removeArrayObserver: function(target, opts) {
+        var willChange = (opts && opts.willChange) || 'arrayWillChange',
+            didChange  = (opts && opts.didChange) || 'arrayDidChange';
+
+        var hasObservers = get(this, 'hasArrayObservers');
+        if (hasObservers) propertyWillChange(this, 'hasArrayObservers');
+        removeListener(this, '@array:before', target, willChange);
+        removeListener(this, '@array:change', target, didChange);
+        if (hasObservers) propertyDidChange(this, 'hasArrayObservers');
+        return this;
+      },
+
+      /**
+        Becomes true whenever the array currently has observers watching changes
+        on the array.
+
+        @property {Boolean} hasArrayObservers
+      */
+      hasArrayObservers: computed(function() {
+        return hasListeners(this, '@array:change') || hasListeners(this, '@array:before');
+      }),
+
+      /**
+        If you are implementing an object that supports `Ember.Array`, call this
+        method just before the array content changes to notify any observers and
+        invalidate any related properties. Pass the starting index of the change
+        as well as a delta of the amounts to change.
+
+        @method arrayContentWillChange
+        @param {Number} startIdx The starting index in the array that will change.
+        @param {Number} removeAmt The number of items that will be removed. If you
+          pass `null` assumes 0
+        @param {Number} addAmt The number of items that will be added. If you
+          pass `null` assumes 0.
+        @return {Ember.Array} receiver
+      */
+      arrayContentWillChange: function(startIdx, removeAmt, addAmt) {
+
+        // if no args are passed assume everything changes
+        if (startIdx===undefined) {
+          startIdx = 0;
+          removeAmt = addAmt = -1;
+        } else {
+          if (removeAmt === undefined) removeAmt=-1;
+          if (addAmt    === undefined) addAmt=-1;
+        }
+
+        // Make sure the @each proxy is set up if anyone is observing @each
+        if (isWatching(this, '@each')) { get(this, '@each'); }
+
+        sendEvent(this, '@array:before', [this, startIdx, removeAmt, addAmt]);
+
+        var removing, lim;
+        if (startIdx>=0 && removeAmt>=0 && get(this, 'hasEnumerableObservers')) {
+          removing = [];
+          lim = startIdx+removeAmt;
+          for(var idx=startIdx;idx<lim;idx++) removing.push(this.objectAt(idx));
+        } else {
+          removing = removeAmt;
+        }
+
+        this.enumerableContentWillChange(removing, addAmt);
+
+        return this;
+      },
+
+      /**
+        If you are implementing an object that supports `Ember.Array`, call this
+        method just after the array content changes to notify any observers and
+        invalidate any related properties. Pass the starting index of the change
+        as well as a delta of the amounts to change.
+
+        @method arrayContentDidChange
+        @param {Number} startIdx The starting index in the array that did change.
+        @param {Number} removeAmt The number of items that were removed. If you
+          pass `null` assumes 0
+        @param {Number} addAmt The number of items that were added. If you
+          pass `null` assumes 0.
+        @return {Ember.Array} receiver
+      */
+      arrayContentDidChange: function(startIdx, removeAmt, addAmt) {
+
+        // if no args are passed assume everything changes
+        if (startIdx===undefined) {
+          startIdx = 0;
+          removeAmt = addAmt = -1;
+        } else {
+          if (removeAmt === undefined) removeAmt=-1;
+          if (addAmt    === undefined) addAmt=-1;
+        }
+
+        var adding, lim;
+        if (startIdx>=0 && addAmt>=0 && get(this, 'hasEnumerableObservers')) {
+          adding = [];
+          lim = startIdx+addAmt;
+          for(var idx=startIdx;idx<lim;idx++) adding.push(this.objectAt(idx));
+        } else {
+          adding = addAmt;
+        }
+
+        this.enumerableContentDidChange(removeAmt, adding);
+        sendEvent(this, '@array:change', [this, startIdx, removeAmt, addAmt]);
+
+        var length      = get(this, 'length'),
+            cachedFirst = cacheFor(this, 'firstObject'),
+            cachedLast  = cacheFor(this, 'lastObject');
+        if (this.objectAt(0) !== cachedFirst) {
+          propertyWillChange(this, 'firstObject');
+          propertyDidChange(this, 'firstObject');
+        }
+        if (this.objectAt(length-1) !== cachedLast) {
+          propertyWillChange(this, 'lastObject');
+          propertyDidChange(this, 'lastObject');
+        }
+
+        return this;
+      },
+
+      // ..........................................................
+      // ENUMERATED PROPERTIES
+      //
+
+      /**
+        Returns a special object that can be used to observe individual properties
+        on the array. Just get an equivalent property on this object and it will
+        return an enumerable that maps automatically to the named key on the
+        member objects.
+
+        If you merely want to watch for any items being added or removed to the array,
+        use the `[]` property instead of `@each`.
+
+        @property @each
+      */
+      '@each': computed(function() {
+        if (!this.__each) {
+          // ES6TODO: GRRRRR
+          var EachProxy = requireModule('ember-runtime/system/each_proxy')['EachProxy'];
+
+          this.__each = new EachProxy(this);
+        }
+
+        return this.__each;
+      })
+
+    });
+
+    __exports__["default"] = EmberArray;
+  });
+define("ember-runtime/mixins/comparable",
+  ["ember-metal/mixin","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Mixin = __dependency1__.Mixin;
+    var required = __dependency1__.required;
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+
+    /**
+      Implements some standard methods for comparing objects. Add this mixin to
+      any class you create that can compare its instances.
+
+      You should implement the `compare()` method.
+
+      @class Comparable
+      @namespace Ember
+      @since Ember 0.9
+    */
+    var Comparable = Mixin.create({
+
+      /**
+        Override to return the result of the comparison of the two parameters. The
+        compare method should return:
+
+        - `-1` if `a < b`
+        - `0` if `a == b`
+        - `1` if `a > b`
+
+        Default implementation raises an exception.
+
+        @method compare
+        @param a {Object} the first object to compare
+        @param b {Object} the second object to compare
+        @return {Integer} the result of the comparison
+      */
+      compare: required(Function)
+
+    });
+
+    __exports__["default"] = Comparable;
+  });
+define("ember-runtime/mixins/copyable",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/freezable","ember-runtime/system/string","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var required = __dependency3__.required;
+    var Freezable = __dependency4__.Freezable;
+    var Mixin = __dependency3__.Mixin;
+    var fmt = __dependency5__.fmt;
+    var EmberError = __dependency6__["default"];
+
+
+    /**
+      Implements some standard methods for copying an object. Add this mixin to
+      any object you create that can create a copy of itself. This mixin is
+      added automatically to the built-in array.
+
+      You should generally implement the `copy()` method to return a copy of the
+      receiver.
+
+      Note that `frozenCopy()` will only work if you also implement
+      `Ember.Freezable`.
+
+      @class Copyable
+      @namespace Ember
+      @since Ember 0.9
+    */
+    var Copyable = Mixin.create({
+
+      /**
+        Override to return a copy of the receiver. Default implementation raises
+        an exception.
+
+        @method copy
+        @param {Boolean} deep if `true`, a deep copy of the object should be made
+        @return {Object} copy of receiver
+      */
+      copy: required(Function),
+
+      /**
+        If the object implements `Ember.Freezable`, then this will return a new
+        copy if the object is not frozen and the receiver if the object is frozen.
+
+        Raises an exception if you try to call this method on a object that does
+        not support freezing.
+
+        You should use this method whenever you want a copy of a freezable object
+        since a freezable object can simply return itself without actually
+        consuming more memory.
+
+        @method frozenCopy
+        @return {Object} copy of receiver or receiver
+      */
+      frozenCopy: function() {
+        if (Freezable && Freezable.detect(this)) {
+          return get(this, 'isFrozen') ? this : this.copy().freeze();
+        } else {
+          throw new EmberError(fmt("%@ does not support freezing", [this]));
+        }
+      }
+    });
+
+    __exports__["default"] = Copyable;
+  });
+define("ember-runtime/mixins/deferred",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-metal/run_loop","ember-runtime/ext/rsvp","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.FEATURES, Ember.Test
+    var get = __dependency2__.get;
+    var Mixin = __dependency3__.Mixin;
+    var computed = __dependency4__.computed;
+    var run = __dependency5__["default"];
+    var RSVP = __dependency6__["default"];
+
+    var asyncStart = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncStart();
+      }
+    };
+
+    var asyncEnd = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncEnd();
+      }
+    };
+
+    RSVP.configure('async', function(callback, promise) {
+      var async = !run.currentRunLoop;
+
+      if (Ember.testing && async) { asyncStart(); }
+
+      run.backburner.schedule('actions', function(){
+        if (Ember.testing && async) { asyncEnd(); }
+        callback(promise);
+      });
+    });
+
+    RSVP.Promise.prototype.fail = function(callback, label){
+            return this['catch'](callback, label);
+    };
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+
+    /**
+      @class Deferred
+      @namespace Ember
+     */
+    var DeferredMixin = Mixin.create({
+      /**
+        Add handlers to be called when the Deferred object is resolved or rejected.
+
+        @method then
+        @param {Function} resolve a callback function to be called when done
+        @param {Function} reject  a callback function to be called when failed
+      */
+      then: function(resolve, reject, label) {
+        var deferred, promise, entity;
+
+        entity = this;
+        deferred = get(this, '_deferred');
+        promise = deferred.promise;
+
+        function fulfillmentHandler(fulfillment) {
+          if (fulfillment === promise) {
+            return resolve(entity);
+          } else {
+            return resolve(fulfillment);
+          }
+        }
+
+        return promise.then(resolve && fulfillmentHandler, reject, label);
+      },
+
+      /**
+        Resolve a Deferred object and call any `doneCallbacks` with the given args.
+
+        @method resolve
+      */
+      resolve: function(value) {
+        var deferred, promise;
+
+        deferred = get(this, '_deferred');
+        promise = deferred.promise;
+
+        if (value === this) {
+          deferred.resolve(promise);
+        } else {
+          deferred.resolve(value);
+        }
+      },
+
+      /**
+        Reject a Deferred object and call any `failCallbacks` with the given args.
+
+        @method reject
+      */
+      reject: function(value) {
+        get(this, '_deferred').reject(value);
+      },
+
+      _deferred: computed(function() {
+        return RSVP.defer('Ember: DeferredMixin - ' + this);
+      })
+    });
+
+    __exports__["default"] = DeferredMixin;
+  });
+define("ember-runtime/mixins/enumerable",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/property_events","ember-metal/events","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    // ..........................................................
+    // HELPERS
+    //
+
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var apply = __dependency4__.apply;
+    var Mixin = __dependency5__.Mixin;
+    var required = __dependency5__.required;
+    var aliasMethod = __dependency5__.aliasMethod;
+    var EnumerableUtils = __dependency6__["default"];
+    var computed = __dependency7__.computed;
+    var propertyWillChange = __dependency8__.propertyWillChange;
+    var propertyDidChange = __dependency8__.propertyDidChange;
+    var addListener = __dependency9__.addListener;
+    var removeListener = __dependency9__.removeListener;
+    var sendEvent = __dependency9__.sendEvent;
+    var hasListeners = __dependency9__.hasListeners;
+    var compare = __dependency10__["default"];
+
+    var a_slice = Array.prototype.slice;
+    var a_indexOf = EnumerableUtils.indexOf;
+
+    var contexts = [];
+
+    function popCtx() {
+      return contexts.length===0 ? {} : contexts.pop();
+    }
+
+    function pushCtx(ctx) {
+      contexts.push(ctx);
+      return null;
+    }
+
+    function iter(key, value) {
+      var valueProvided = arguments.length === 2;
+
+      function i(item) {
+        var cur = get(item, key);
+        return valueProvided ? value===cur : !!cur;
+      }
+      return i ;
+    }
+
+    /**
+      This mixin defines the common interface implemented by enumerable objects
+      in Ember. Most of these methods follow the standard Array iteration
+      API defined up to JavaScript 1.8 (excluding language-specific features that
+      cannot be emulated in older versions of JavaScript).
+
+      This mixin is applied automatically to the Array class on page load, so you
+      can use any of these methods on simple arrays. If Array already implements
+      one of these methods, the mixin will not override them.
+
+      ## Writing Your Own Enumerable
+
+      To make your own custom class enumerable, you need two items:
+
+      1. You must have a length property. This property should change whenever
+         the number of items in your enumerable object changes. If you use this
+         with an `Ember.Object` subclass, you should be sure to change the length
+         property using `set().`
+
+      2. You must implement `nextObject().` See documentation.
+
+      Once you have these two methods implemented, apply the `Ember.Enumerable` mixin
+      to your class and you will be able to enumerate the contents of your object
+      like any other collection.
+
+      ## Using Ember Enumeration with Other Libraries
+
+      Many other libraries provide some kind of iterator or enumeration like
+      facility. This is often where the most common API conflicts occur.
+      Ember's API is designed to be as friendly as possible with other
+      libraries by implementing only methods that mostly correspond to the
+      JavaScript 1.8 API.
+
+      @class Enumerable
+      @namespace Ember
+      @since Ember 0.9
+    */
+    var Enumerable = Mixin.create({
+
+      /**
+        Implement this method to make your class enumerable.
+
+        This method will be call repeatedly during enumeration. The index value
+        will always begin with 0 and increment monotonically. You don't have to
+        rely on the index value to determine what object to return, but you should
+        always check the value and start from the beginning when you see the
+        requested index is 0.
+
+        The `previousObject` is the object that was returned from the last call
+        to `nextObject` for the current iteration. This is a useful way to
+        manage iteration if you are tracing a linked list, for example.
+
+        Finally the context parameter will always contain a hash you can use as
+        a "scratchpad" to maintain any other state you need in order to iterate
+        properly. The context object is reused and is not reset between
+        iterations so make sure you setup the context with a fresh state whenever
+        the index parameter is 0.
+
+        Generally iterators will continue to call `nextObject` until the index
+        reaches the your current length-1. If you run out of data before this
+        time for some reason, you should simply return undefined.
+
+        The default implementation of this method simply looks up the index.
+        This works great on any Array-like objects.
+
+        @method nextObject
+        @param {Number} index the current index of the iteration
+        @param {Object} previousObject the value returned by the last call to
+          `nextObject`.
+        @param {Object} context a context object you can use to maintain state.
+        @return {Object} the next object in the iteration or undefined
+      */
+      nextObject: required(Function),
+
+      /**
+        Helper method returns the first object from a collection. This is usually
+        used by bindings and other parts of the framework to extract a single
+        object if the enumerable contains only one item.
+
+        If you override this method, you should implement it so that it will
+        always return the same value each time it is called. If your enumerable
+        contains only one object, this method should always return that object.
+        If your enumerable is empty, this method should return `undefined`.
+
+        ```javascript
+        var arr = ["a", "b", "c"];
+        arr.get('firstObject');  // "a"
+
+        var arr = [];
+        arr.get('firstObject');  // undefined
+        ```
+
+        @property firstObject
+        @return {Object} the object or undefined
+      */
+      firstObject: computed(function() {
+        if (get(this, 'length')===0) return undefined ;
+
+        // handle generic enumerables
+        var context = popCtx(), ret;
+        ret = this.nextObject(0, null, context);
+        pushCtx(context);
+        return ret ;
+      }).property('[]'),
+
+      /**
+        Helper method returns the last object from a collection. If your enumerable
+        contains only one object, this method should always return that object.
+        If your enumerable is empty, this method should return `undefined`.
+
+        ```javascript
+        var arr = ["a", "b", "c"];
+        arr.get('lastObject');  // "c"
+
+        var arr = [];
+        arr.get('lastObject');  // undefined
+        ```
+
+        @property lastObject
+        @return {Object} the last object or undefined
+      */
+      lastObject: computed(function() {
+        var len = get(this, 'length');
+        if (len===0) return undefined ;
+        var context = popCtx(), idx=0, cur, last = null;
+        do {
+          last = cur;
+          cur = this.nextObject(idx++, last, context);
+        } while (cur !== undefined);
+        pushCtx(context);
+        return last;
+      }).property('[]'),
+
+      /**
+        Returns `true` if the passed object can be found in the receiver. The
+        default version will iterate through the enumerable until the object
+        is found. You may want to override this with a more efficient version.
+
+        ```javascript
+        var arr = ["a", "b", "c"];
+        arr.contains("a"); // true
+        arr.contains("z"); // false
+        ```
+
+        @method contains
+        @param {Object} obj The object to search for.
+        @return {Boolean} `true` if object is found in enumerable.
+      */
+      contains: function(obj) {
+        return this.find(function(item) { return item===obj; }) !== undefined;
+      },
+
+      /**
+        Iterates through the enumerable, calling the passed function on each
+        item. This method corresponds to the `forEach()` method defined in
+        JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method forEach
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Object} receiver
+      */
+      forEach: function(callback, target) {
+        if (typeof callback !== "function") throw new TypeError() ;
+        var len = get(this, 'length'), last = null, context = popCtx();
+
+        if (target === undefined) target = null;
+
+        for(var idx=0;idx<len;idx++) {
+          var next = this.nextObject(idx, last, context) ;
+          callback.call(target, next, idx, this);
+          last = next ;
+        }
+        last = null ;
+        context = pushCtx(context);
+        return this ;
+      },
+
+      /**
+        Alias for `mapBy`
+
+        @method getEach
+        @param {String} key name of the property
+        @return {Array} The mapped array.
+      */
+      getEach: function(key) {
+        return this.mapBy(key);
+      },
+
+      /**
+        Sets the value on the named property for each member. This is more
+        efficient than using other methods defined on this helper. If the object
+        implements Ember.Observable, the value will be changed to `set(),` otherwise
+        it will be set directly. `null` objects are skipped.
+
+        @method setEach
+        @param {String} key The key to set
+        @param {Object} value The object to set
+        @return {Object} receiver
+      */
+      setEach: function(key, value) {
+        return this.forEach(function(item) {
+          set(item, key, value);
+        });
+      },
+
+      /**
+        Maps all of the items in the enumeration to another value, returning
+        a new array. This method corresponds to `map()` defined in JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the mapped value.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method map
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Array} The mapped array.
+      */
+      map: function(callback, target) {
+        var ret = Ember.A();
+        this.forEach(function(x, idx, i) {
+          ret[idx] = callback.call(target, x, idx,i);
+        });
+        return ret ;
+      },
+
+      /**
+        Similar to map, this specialized function returns the value of the named
+        property on all items in the enumeration.
+
+        @method mapBy
+        @param {String} key name of the property
+        @return {Array} The mapped array.
+      */
+      mapBy: function(key) {
+        return this.map(function(next) {
+          return get(next, key);
+        });
+      },
+
+      /**
+        Similar to map, this specialized function returns the value of the named
+        property on all items in the enumeration.
+
+        @method mapProperty
+        @param {String} key name of the property
+        @return {Array} The mapped array.
+        @deprecated Use `mapBy` instead
+      */
+
+      mapProperty: aliasMethod('mapBy'),
+
+      /**
+        Returns an array with all of the items in the enumeration that the passed
+        function returns true for. This method corresponds to `filter()` defined in
+        JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` to include the item in the results, `false`
+        otherwise.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method filter
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Array} A filtered array.
+      */
+      filter: function(callback, target) {
+        var ret = Ember.A();
+        this.forEach(function(x, idx, i) {
+          if (callback.call(target, x, idx, i)) ret.push(x);
+        });
+        return ret ;
+      },
+
+      /**
+        Returns an array with all of the items in the enumeration where the passed
+        function returns false for. This method is the inverse of filter().
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - *item* is the current item in the iteration.
+        - *index* is the current index in the iteration
+        - *enumerable* is the enumerable object itself.
+
+        It should return the a falsey value to include the item in the results.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as "this" on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method reject
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Array} A rejected array.
+       */
+      reject: function(callback, target) {
+        return this.filter(function() {
+          return !(apply(target, callback, arguments));
+        });
+      },
+
+      /**
+        Returns an array with just the items with the matched property. You
+        can pass an optional second argument with the target value. Otherwise
+        this will match any property that evaluates to `true`.
+
+        @method filterBy
+        @param {String} key the property to test
+        @param {*} [value] optional value to test against.
+        @return {Array} filtered array
+      */
+      filterBy: function(key, value) {
+        return this.filter(apply(this, iter, arguments));
+      },
+
+      /**
+        Returns an array with just the items with the matched property. You
+        can pass an optional second argument with the target value. Otherwise
+        this will match any property that evaluates to `true`.
+
+        @method filterProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Array} filtered array
+        @deprecated Use `filterBy` instead
+      */
+      filterProperty: aliasMethod('filterBy'),
+
+      /**
+        Returns an array with the items that do not have truthy values for
+        key.  You can pass an optional second argument with the target value.  Otherwise
+        this will match any property that evaluates to false.
+
+        @method rejectBy
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Array} rejected array
+      */
+      rejectBy: function(key, value) {
+        var exactValue = function(item) { return get(item, key) === value; },
+            hasValue = function(item) { return !!get(item, key); },
+            use = (arguments.length === 2 ? exactValue : hasValue);
+
+        return this.reject(use);
+      },
+
+      /**
+        Returns an array with the items that do not have truthy values for
+        key.  You can pass an optional second argument with the target value.  Otherwise
+        this will match any property that evaluates to false.
+
+        @method rejectProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Array} rejected array
+        @deprecated Use `rejectBy` instead
+      */
+      rejectProperty: aliasMethod('rejectBy'),
+
+      /**
+        Returns the first item in the array for which the callback returns true.
+        This method works similar to the `filter()` method defined in JavaScript 1.6
+        except that it will stop working on the array once a match is found.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` to include the item in the results, `false`
+        otherwise.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        @method find
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Object} Found item or `undefined`.
+      */
+      find: function(callback, target) {
+        var len = get(this, 'length') ;
+        if (target === undefined) target = null;
+
+        var last = null, next, found = false, ret ;
+        var context = popCtx();
+        for(var idx=0;idx<len && !found;idx++) {
+          next = this.nextObject(idx, last, context) ;
+          if (found = callback.call(target, next, idx, this)) ret = next ;
+          last = next ;
+        }
+        next = last = null ;
+        context = pushCtx(context);
+        return ret ;
+      },
+
+      /**
+        Returns the first item with a property matching the passed value. You
+        can pass an optional second argument with the target value. Otherwise
+        this will match any property that evaluates to `true`.
+
+        This method works much like the more generic `find()` method.
+
+        @method findBy
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Object} found item or `undefined`
+      */
+      findBy: function(key, value) {
+        return this.find(apply(this, iter, arguments));
+      },
+
+      /**
+        Returns the first item with a property matching the passed value. You
+        can pass an optional second argument with the target value. Otherwise
+        this will match any property that evaluates to `true`.
+
+        This method works much like the more generic `find()` method.
+
+        @method findProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Object} found item or `undefined`
+        @deprecated Use `findBy` instead
+      */
+      findProperty: aliasMethod('findBy'),
+
+      /**
+        Returns `true` if the passed function returns true for every item in the
+        enumeration. This corresponds with the `every()` method in JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` or `false`.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        Example Usage:
+
+        ```javascript
+        if (people.every(isEngineer)) { Paychecks.addBigBonus(); }
+        ```
+
+        @method every
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Boolean}
+      */
+      every: function(callback, target) {
+        return !this.find(function(x, idx, i) {
+          return !callback.call(target, x, idx, i);
+        });
+      },
+
+      /**
+        @method everyBy
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @deprecated Use `isEvery` instead
+        @return {Boolean}
+      */
+      everyBy: aliasMethod('isEvery'),
+
+      /**
+        @method everyProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @deprecated Use `isEvery` instead
+        @return {Boolean}
+      */
+      everyProperty: aliasMethod('isEvery'),
+
+      /**
+        Returns `true` if the passed property resolves to `true` for all items in
+        the enumerable. This method is often simpler/faster than using a callback.
+
+        @method isEvery
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Boolean}
+        @since 1.3.0
+      */
+      isEvery: function(key, value) {
+        return this.every(apply(this, iter, arguments));
+      },
+
+      /**
+        Returns `true` if the passed function returns true for any item in the
+        enumeration. This corresponds with the `some()` method in JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` to include the item in the results, `false`
+        otherwise.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        Usage Example:
+
+        ```javascript
+        if (people.any(isManager)) { Paychecks.addBiggerBonus(); }
+        ```
+
+        @method any
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Boolean} `true` if the passed function returns `true` for any item
+      */
+      any: function(callback, target) {
+        var len     = get(this, 'length'),
+            context = popCtx(),
+            found   = false,
+            last    = null,
+            next, idx;
+
+        if (target === undefined) { target = null; }
+
+        for (idx = 0; idx < len && !found; idx++) {
+          next  = this.nextObject(idx, last, context);
+          found = callback.call(target, next, idx, this);
+          last  = next;
+        }
+
+        next = last = null;
+        context = pushCtx(context);
+        return found;
+      },
+
+      /**
+        Returns `true` if the passed function returns true for any item in the
+        enumeration. This corresponds with the `some()` method in JavaScript 1.6.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(item, index, enumerable);
+        ```
+
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        It should return the `true` to include the item in the results, `false`
+        otherwise.
+
+        Note that in addition to a callback, you can also pass an optional target
+        object that will be set as `this` on the context. This is a good way
+        to give your iterator function access to the current object.
+
+        Usage Example:
+
+        ```javascript
+        if (people.some(isManager)) { Paychecks.addBiggerBonus(); }
+        ```
+
+        @method some
+        @param {Function} callback The callback to execute
+        @param {Object} [target] The target object to use
+        @return {Boolean} `true` if the passed function returns `true` for any item
+        @deprecated Use `any` instead
+      */
+      some: aliasMethod('any'),
+
+      /**
+        Returns `true` if the passed property resolves to `true` for any item in
+        the enumerable. This method is often simpler/faster than using a callback.
+
+        @method isAny
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Boolean} `true` if the passed function returns `true` for any item
+        @since 1.3.0
+      */
+      isAny: function(key, value) {
+        return this.any(apply(this, iter, arguments));
+      },
+
+      /**
+        @method anyBy
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Boolean} `true` if the passed function returns `true` for any item
+        @deprecated Use `isAny` instead
+      */
+      anyBy: aliasMethod('isAny'),
+
+      /**
+        @method someProperty
+        @param {String} key the property to test
+        @param {String} [value] optional value to test against.
+        @return {Boolean} `true` if the passed function returns `true` for any item
+        @deprecated Use `isAny` instead
+      */
+      someProperty: aliasMethod('isAny'),
+
+      /**
+        This will combine the values of the enumerator into a single value. It
+        is a useful way to collect a summary value from an enumeration. This
+        corresponds to the `reduce()` method defined in JavaScript 1.8.
+
+        The callback method you provide should have the following signature (all
+        parameters are optional):
+
+        ```javascript
+        function(previousValue, item, index, enumerable);
+        ```
+
+        - `previousValue` is the value returned by the last call to the iterator.
+        - `item` is the current item in the iteration.
+        - `index` is the current index in the iteration.
+        - `enumerable` is the enumerable object itself.
+
+        Return the new cumulative value.
+
+        In addition to the callback you can also pass an `initialValue`. An error
+        will be raised if you do not pass an initial value and the enumerator is
+        empty.
+
+        Note that unlike the other methods, this method does not allow you to
+        pass a target object to set as this for the callback. It's part of the
+        spec. Sorry.
+
+        @method reduce
+        @param {Function} callback The callback to execute
+        @param {Object} initialValue Initial value for the reduce
+        @param {String} reducerProperty internal use only.
+        @return {Object} The reduced value.
+      */
+      reduce: function(callback, initialValue, reducerProperty) {
+        if (typeof callback !== "function") { throw new TypeError(); }
+
+        var ret = initialValue;
+
+        this.forEach(function(item, i) {
+          ret = callback(ret, item, i, this, reducerProperty);
+        }, this);
+
+        return ret;
+      },
+
+      /**
+        Invokes the named method on every object in the receiver that
+        implements it. This method corresponds to the implementation in
+        Prototype 1.6.
+
+        @method invoke
+        @param {String} methodName the name of the method
+        @param {Object...} args optional arguments to pass as well.
+        @return {Array} return values from calling invoke.
+      */
+      invoke: function(methodName) {
+        var args, ret = Ember.A();
+        if (arguments.length>1) args = a_slice.call(arguments, 1);
+
+        this.forEach(function(x, idx) {
+          var method = x && x[methodName];
+          if ('function' === typeof method) {
+            ret[idx] = args ? apply(x, method, args) : x[methodName]();
+          }
+        }, this);
+
+        return ret;
+      },
+
+      /**
+        Simply converts the enumerable into a genuine array. The order is not
+        guaranteed. Corresponds to the method implemented by Prototype.
+
+        @method toArray
+        @return {Array} the enumerable as an array.
+      */
+      toArray: function() {
+        var ret = Ember.A();
+        this.forEach(function(o, idx) { ret[idx] = o; });
+        return ret;
+      },
+
+      /**
+        Returns a copy of the array with all null and undefined elements removed.
+
+        ```javascript
+        var arr = ["a", null, "c", undefined];
+        arr.compact();  // ["a", "c"]
+        ```
+
+        @method compact
+        @return {Array} the array without null and undefined elements.
+      */
+      compact: function() {
+        return this.filter(function(value) { return value != null; });
+      },
+
+      /**
+        Returns a new enumerable that excludes the passed value. The default
+        implementation returns an array regardless of the receiver type unless
+        the receiver does not contain the value.
+
+        ```javascript
+        var arr = ["a", "b", "a", "c"];
+        arr.without("a");  // ["b", "c"]
+        ```
+
+        @method without
+        @param {Object} value
+        @return {Ember.Enumerable}
+      */
+      without: function(value) {
+        if (!this.contains(value)) return this; // nothing to do
+        var ret = Ember.A();
+        this.forEach(function(k) {
+          if (k !== value) ret[ret.length] = k;
+        }) ;
+        return ret ;
+      },
+
+      /**
+        Returns a new enumerable that contains only unique values. The default
+        implementation returns an array regardless of the receiver type.
+
+        ```javascript
+        var arr = ["a", "a", "b", "b"];
+        arr.uniq();  // ["a", "b"]
+        ```
+
+        @method uniq
+        @return {Ember.Enumerable}
+      */
+      uniq: function() {
+        var ret = Ember.A();
+        this.forEach(function(k) {
+          if (a_indexOf(ret, k)<0) ret.push(k);
+        });
+        return ret;
+      },
+
+      /**
+        This property will trigger anytime the enumerable's content changes.
+        You can observe this property to be notified of changes to the enumerables
+        content.
+
+        For plain enumerables, this property is read only. `Array` overrides
+        this method.
+
+        @property []
+        @type Array
+        @return this
+      */
+      '[]': computed(function(key, value) {
+        return this;
+      }),
+
+      // ..........................................................
+      // ENUMERABLE OBSERVERS
+      //
+
+      /**
+        Registers an enumerable observer. Must implement `Ember.EnumerableObserver`
+        mixin.
+
+        @method addEnumerableObserver
+        @param {Object} target
+        @param {Hash} [opts]
+        @return this
+      */
+      addEnumerableObserver: function(target, opts) {
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
+            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
+
+        var hasObservers = get(this, 'hasEnumerableObservers');
+        if (!hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
+        addListener(this, '@enumerable:before', target, willChange);
+        addListener(this, '@enumerable:change', target, didChange);
+        if (!hasObservers) propertyDidChange(this, 'hasEnumerableObservers');
+        return this;
+      },
+
+      /**
+        Removes a registered enumerable observer.
+
+        @method removeEnumerableObserver
+        @param {Object} target
+        @param {Hash} [opts]
+        @return this
+      */
+      removeEnumerableObserver: function(target, opts) {
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
+            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
+
+        var hasObservers = get(this, 'hasEnumerableObservers');
+        if (hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
+        removeListener(this, '@enumerable:before', target, willChange);
+        removeListener(this, '@enumerable:change', target, didChange);
+        if (hasObservers) propertyDidChange(this, 'hasEnumerableObservers');
+        return this;
+      },
+
+      /**
+        Becomes true whenever the array currently has observers watching changes
+        on the array.
+
+        @property hasEnumerableObservers
+        @type Boolean
+      */
+      hasEnumerableObservers: computed(function() {
+        return hasListeners(this, '@enumerable:change') || hasListeners(this, '@enumerable:before');
+      }),
+
+
+      /**
+        Invoke this method just before the contents of your enumerable will
+        change. You can either omit the parameters completely or pass the objects
+        to be removed or added if available or just a count.
+
+        @method enumerableContentWillChange
+        @param {Ember.Enumerable|Number} removing An enumerable of the objects to
+          be removed or the number of items to be removed.
+        @param {Ember.Enumerable|Number} adding An enumerable of the objects to be
+          added or the number of items to be added.
+        @chainable
+      */
+      enumerableContentWillChange: function(removing, adding) {
+
+        var removeCnt, addCnt, hasDelta;
+
+        if ('number' === typeof removing) removeCnt = removing;
+        else if (removing) removeCnt = get(removing, 'length');
+        else removeCnt = removing = -1;
+
+        if ('number' === typeof adding) addCnt = adding;
+        else if (adding) addCnt = get(adding,'length');
+        else addCnt = adding = -1;
+
+        hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
+
+        if (removing === -1) removing = null;
+        if (adding   === -1) adding   = null;
+
+        propertyWillChange(this, '[]');
+        if (hasDelta) propertyWillChange(this, 'length');
+        sendEvent(this, '@enumerable:before', [this, removing, adding]);
+
+        return this;
+      },
+
+      /**
+        Invoke this method when the contents of your enumerable has changed.
+        This will notify any observers watching for content changes. If your are
+        implementing an ordered enumerable (such as an array), also pass the
+        start and end values where the content changed so that it can be used to
+        notify range observers.
+
+        @method enumerableContentDidChange
+        @param {Ember.Enumerable|Number} removing An enumerable of the objects to
+          be removed or the number of items to be removed.
+        @param {Ember.Enumerable|Number} adding  An enumerable of the objects to
+          be added or the number of items to be added.
+        @chainable
+      */
+      enumerableContentDidChange: function(removing, adding) {
+        var removeCnt, addCnt, hasDelta;
+
+        if ('number' === typeof removing) removeCnt = removing;
+        else if (removing) removeCnt = get(removing, 'length');
+        else removeCnt = removing = -1;
+
+        if ('number' === typeof adding) addCnt = adding;
+        else if (adding) addCnt = get(adding, 'length');
+        else addCnt = adding = -1;
+
+        hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
+
+        if (removing === -1) removing = null;
+        if (adding   === -1) adding   = null;
+
+        sendEvent(this, '@enumerable:change', [this, removing, adding]);
+        if (hasDelta) propertyDidChange(this, 'length');
+        propertyDidChange(this, '[]');
+
+        return this ;
+      },
+
+      /**
+        Converts the enumerable into an array and sorts by the keys
+        specified in the argument.
+
+        You may provide multiple arguments to sort by multiple properties.
+
+        @method sortBy
+        @param {String} property name(s) to sort on
+        @return {Array} The sorted array.
+        @since 1.2.0
+        */
+      sortBy: function() {
+        var sortKeys = arguments;
+        return this.toArray().sort(function(a, b){
+          for(var i = 0; i < sortKeys.length; i++) {
+            var key = sortKeys[i],
+            propA = get(a, key),
+            propB = get(b, key);
+            // return 1 or -1 else continue to the next sortKey
+            var compareValue = compare(propA, propB);
+            if (compareValue) { return compareValue; }
+          }
+          return 0;
+        });
+      }
+    });
+
+    __exports__["default"] = Enumerable;
+  });
+define("ember-runtime/mixins/evented",
+  ["ember-metal/mixin","ember-metal/events","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Mixin = __dependency1__.Mixin;
+    var addListener = __dependency2__.addListener;
+    var removeListener = __dependency2__.removeListener;
+    var hasListeners = __dependency2__.hasListeners;
+    var sendEvent = __dependency2__.sendEvent;
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    /**
+      This mixin allows for Ember objects to subscribe to and emit events.
+
+      ```javascript
+      App.Person = Ember.Object.extend(Ember.Evented, {
+        greet: function() {
+          // ...
+          this.trigger('greet');
+        }
+      });
+
+      var person = App.Person.create();
+
+      person.on('greet', function() {
+        console.log('Our person has greeted');
+      });
+
+      person.greet();
+
+      // outputs: 'Our person has greeted'
+      ```
+
+      You can also chain multiple event subscriptions:
+
+      ```javascript
+      person.on('greet', function() {
+        console.log('Our person has greeted');
+      }).one('greet', function() {
+        console.log('Offer one-time special');
+      }).off('event', this, forgetThis);
+      ```
+
+      @class Evented
+      @namespace Ember
+     */
+    var Evented = Mixin.create({
+
+      /**
+       Subscribes to a named event with given function.
+
+       ```javascript
+       person.on('didLoad', function() {
+         // fired once the person has loaded
+       });
+       ```
+
+       An optional target can be passed in as the 2nd argument that will
+       be set as the "this" for the callback. This is a good way to give your
+       function access to the object triggering the event. When the target
+       parameter is used the callback becomes the third argument.
+
+       @method on
+       @param {String} name The name of the event
+       @param {Object} [target] The "this" binding for the callback
+       @param {Function} method The callback to execute
+       @return this
+      */
+      on: function(name, target, method) {
+        addListener(this, name, target, method);
+        return this;
+      },
+
+      /**
+        Subscribes a function to a named event and then cancels the subscription
+        after the first time the event is triggered. It is good to use ``one`` when
+        you only care about the first time an event has taken place.
+
+        This function takes an optional 2nd argument that will become the "this"
+        value for the callback. If this argument is passed then the 3rd argument
+        becomes the function.
+
+        @method one
+        @param {String} name The name of the event
+        @param {Object} [target] The "this" binding for the callback
+        @param {Function} method The callback to execute
+        @return this
+      */
+      one: function(name, target, method) {
+        if (!method) {
+          method = target;
+          target = null;
+        }
+
+        addListener(this, name, target, method, true);
+        return this;
+      },
+
+      /**
+        Triggers a named event for the object. Any additional arguments
+        will be passed as parameters to the functions that are subscribed to the
+        event.
+
+        ```javascript
+        person.on('didEat', function(food) {
+          console.log('person ate some ' + food);
+        });
+
+        person.trigger('didEat', 'broccoli');
+
+        // outputs: person ate some broccoli
+        ```
+        @method trigger
+        @param {String} name The name of the event
+        @param {Object...} args Optional arguments to pass on
+      */
+      trigger: function(name) {
+        var args = [], i, l;
+        for (i = 1, l = arguments.length; i < l; i++) {
+          args.push(arguments[i]);
+        }
+        sendEvent(this, name, args);
+      },
+
+      /**
+        Cancels subscription for given name, target, and method.
+
+        @method off
+        @param {String} name The name of the event
+        @param {Object} target The target of the subscription
+        @param {Function} method The function of the subscription
+        @return this
+      */
+      off: function(name, target, method) {
+        removeListener(this, name, target, method);
+        return this;
+      },
+
+      /**
+        Checks to see if object has any subscriptions for named event.
+
+        @method has
+        @param {String} name The name of the event
+        @return {Boolean} does the object have a subscription for event
+       */
+      has: function(name) {
+        return hasListeners(this, name);
+      }
+    });
+
+    __exports__["default"] = Evented;
+  });
+define("ember-runtime/mixins/freezable",
+  ["ember-metal/mixin","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Mixin = __dependency1__.Mixin;
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+
+    /**
+      The `Ember.Freezable` mixin implements some basic methods for marking an
+      object as frozen. Once an object is frozen it should be read only. No changes
+      may be made the internal state of the object.
+
+      ## Enforcement
+
+      To fully support freezing in your subclass, you must include this mixin and
+      override any method that might alter any property on the object to instead
+      raise an exception. You can check the state of an object by checking the
+      `isFrozen` property.
+
+      Although future versions of JavaScript may support language-level freezing
+      object objects, that is not the case today. Even if an object is freezable,
+      it is still technically possible to modify the object, even though it could
+      break other parts of your application that do not expect a frozen object to
+      change. It is, therefore, very important that you always respect the
+      `isFrozen` property on all freezable objects.
+
+      ## Example Usage
+
+      The example below shows a simple object that implement the `Ember.Freezable`
+      protocol.
+
+      ```javascript
+      Contact = Ember.Object.extend(Ember.Freezable, {
+        firstName: null,
+        lastName: null,
+
+        // swaps the names
+        swapNames: function() {
+          if (this.get('isFrozen')) throw Ember.FROZEN_ERROR;
+          var tmp = this.get('firstName');
+          this.set('firstName', this.get('lastName'));
+          this.set('lastName', tmp);
+          return this;
+        }
+
+      });
+
+      c = Contact.create({ firstName: "John", lastName: "Doe" });
+      c.swapNames();  // returns c
+      c.freeze();
+      c.swapNames();  // EXCEPTION
+      ```
+
+      ## Copying
+
+      Usually the `Ember.Freezable` protocol is implemented in cooperation with the
+      `Ember.Copyable` protocol, which defines a `frozenCopy()` method that will
+      return a frozen object, if the object implements this method as well.
+
+      @class Freezable
+      @namespace Ember
+      @since Ember 0.9
+    */
+    var Freezable = Mixin.create({
+
+      /**
+        Set to `true` when the object is frozen. Use this property to detect
+        whether your object is frozen or not.
+
+        @property isFrozen
+        @type Boolean
+      */
+      isFrozen: false,
+
+      /**
+        Freezes the object. Once this method has been called the object should
+        no longer allow any properties to be edited.
+
+        @method freeze
+        @return {Object} receiver
+      */
+      freeze: function() {
+        if (get(this, 'isFrozen')) return this;
+        set(this, 'isFrozen', true);
+        return this;
+      }
+
+    });
+
+    var FROZEN_ERROR = "Frozen object cannot be modified.";
+
+    __exports__.Freezable = Freezable;
+    __exports__.FROZEN_ERROR = FROZEN_ERROR;
+  });
+define("ember-runtime/mixins/mutable_array",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+
+    // require('ember-runtime/mixins/array');
+    // require('ember-runtime/mixins/mutable_enumerable');
+
+    // ..........................................................
+    // CONSTANTS
+    //
+
+    var OUT_OF_RANGE_EXCEPTION = "Index out of range";
+    var EMPTY = [];
+
+    // ..........................................................
+    // HELPERS
+    //
+
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var isArray = __dependency3__.isArray;
+    var EmberError = __dependency4__["default"];
+    var Mixin = __dependency5__.Mixin;
+    var required = __dependency5__.required;
+    var EmberArray = __dependency6__["default"];
+    var MutableEnumerable = __dependency7__["default"];
+    var Enumerable = __dependency8__["default"];
+    /**
+      This mixin defines the API for modifying array-like objects. These methods
+      can be applied only to a collection that keeps its items in an ordered set.
+      It builds upon the Array mixin and adds methods to modify the array.
+      Concrete implementations of this class include ArrayProxy and ArrayController.
+
+      It is important to use the methods in this class to modify arrays so that
+      changes are observable. This allows the binding system in Ember to function
+      correctly.
+
+
+      Note that an Array can change even if it does not implement this mixin.
+      For example, one might implement a SparseArray that cannot be directly
+      modified, but if its underlying enumerable changes, it will change also.
+
+      @class MutableArray
+      @namespace Ember
+      @uses Ember.Array
+      @uses Ember.MutableEnumerable
+    */
+    var MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
+
+      /**
+        __Required.__ You must implement this method to apply this mixin.
+
+        This is one of the primitives you must implement to support `Ember.Array`.
+        You should replace amt objects started at idx with the objects in the
+        passed array. You should also call `this.enumerableContentDidChange()`
+
+        @method replace
+        @param {Number} idx Starting index in the array to replace. If
+          idx >= length, then append to the end of the array.
+        @param {Number} amt Number of elements that should be removed from
+          the array, starting at *idx*.
+        @param {Array} objects An array of zero or more objects that should be
+          inserted into the array at *idx*
+      */
+      replace: required(),
+
+      /**
+        Remove all elements from the array. This is useful if you
+        want to reuse an existing array without having to recreate it.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        color.length();   //  3
+        colors.clear();   //  []
+        colors.length();  //  0
+        ```
+
+        @method clear
+        @return {Ember.Array} An empty Array.
+      */
+      clear: function () {
+        var len = get(this, 'length');
+        if (len === 0) return this;
+        this.replace(0, len, EMPTY);
+        return this;
+      },
+
+      /**
+        This will use the primitive `replace()` method to insert an object at the
+        specified index.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        colors.insertAt(2, "yellow");  // ["red", "green", "yellow", "blue"]
+        colors.insertAt(5, "orange");  // Error: Index out of range
+        ```
+
+        @method insertAt
+        @param {Number} idx index of insert the object at.
+        @param {Object} object object to insert
+        @return {Ember.Array} receiver
+      */
+      insertAt: function(idx, object) {
+        if (idx > get(this, 'length')) throw new EmberError(OUT_OF_RANGE_EXCEPTION);
+        this.replace(idx, 0, [object]);
+        return this;
+      },
+
+      /**
+        Remove an object at the specified index using the `replace()` primitive
+        method. You can pass either a single index, or a start and a length.
+
+        If you pass a start and length that is beyond the
+        length this method will throw an `OUT_OF_RANGE_EXCEPTION`.
+
+        ```javascript
+        var colors = ["red", "green", "blue", "yellow", "orange"];
+        colors.removeAt(0);     // ["green", "blue", "yellow", "orange"]
+        colors.removeAt(2, 2);  // ["green", "blue"]
+        colors.removeAt(4, 2);  // Error: Index out of range
+        ```
+
+        @method removeAt
+        @param {Number} start index, start of range
+        @param {Number} len length of passing range
+        @return {Ember.Array} receiver
+      */
+      removeAt: function(start, len) {
+        if ('number' === typeof start) {
+
+          if ((start < 0) || (start >= get(this, 'length'))) {
+            throw new EmberError(OUT_OF_RANGE_EXCEPTION);
+          }
+
+          // fast case
+          if (len === undefined) len = 1;
+          this.replace(start, len, EMPTY);
+        }
+
+        return this;
+      },
+
+      /**
+        Push the object onto the end of the array. Works just like `push()` but it
+        is KVO-compliant.
+
+        ```javascript
+        var colors = ["red", "green"];
+        colors.pushObject("black");     // ["red", "green", "black"]
+        colors.pushObject(["yellow"]);  // ["red", "green", ["yellow"]]
+        ```
+
+        @method pushObject
+        @param {*} obj object to push
+        @return object same object passed as a param
+      */
+      pushObject: function(obj) {
+        this.insertAt(get(this, 'length'), obj);
+        return obj;
+      },
+
+      /**
+        Add the objects in the passed numerable to the end of the array. Defers
+        notifying observers of the change until all objects are added.
+
+        ```javascript
+        var colors = ["red"];
+        colors.pushObjects(["yellow", "orange"]);  // ["red", "yellow", "orange"]
+        ```
+
+        @method pushObjects
+        @param {Ember.Enumerable} objects the objects to add
+        @return {Ember.Array} receiver
+      */
+      pushObjects: function(objects) {
+        if (!(Enumerable.detect(objects) || isArray(objects))) {
+          throw new TypeError("Must pass Ember.Enumerable to Ember.MutableArray#pushObjects");
+        }
+        this.replace(get(this, 'length'), 0, objects);
+        return this;
+      },
+
+      /**
+        Pop object from array or nil if none are left. Works just like `pop()` but
+        it is KVO-compliant.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        colors.popObject();   // "blue"
+        console.log(colors);  // ["red", "green"]
+        ```
+
+        @method popObject
+        @return object
+      */
+      popObject: function() {
+        var len = get(this, 'length');
+        if (len === 0) return null;
+
+        var ret = this.objectAt(len-1);
+        this.removeAt(len-1, 1);
+        return ret;
+      },
+
+      /**
+        Shift an object from start of array or nil if none are left. Works just
+        like `shift()` but it is KVO-compliant.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        colors.shiftObject();  // "red"
+        console.log(colors);   // ["green", "blue"]
+        ```
+
+        @method shiftObject
+        @return object
+      */
+      shiftObject: function() {
+        if (get(this, 'length') === 0) return null;
+        var ret = this.objectAt(0);
+        this.removeAt(0);
+        return ret;
+      },
+
+      /**
+        Unshift an object to start of array. Works just like `unshift()` but it is
+        KVO-compliant.
+
+        ```javascript
+        var colors = ["red"];
+        colors.unshiftObject("yellow");    // ["yellow", "red"]
+        colors.unshiftObject(["black"]);   // [["black"], "yellow", "red"]
+        ```
+
+        @method unshiftObject
+        @param {*} obj object to unshift
+        @return object same object passed as a param
+      */
+      unshiftObject: function(obj) {
+        this.insertAt(0, obj);
+        return obj;
+      },
+
+      /**
+        Adds the named objects to the beginning of the array. Defers notifying
+        observers until all objects have been added.
+
+        ```javascript
+        var colors = ["red"];
+        colors.unshiftObjects(["black", "white"]);   // ["black", "white", "red"]
+        colors.unshiftObjects("yellow"); // Type Error: 'undefined' is not a function
+        ```
+
+        @method unshiftObjects
+        @param {Ember.Enumerable} objects the objects to add
+        @return {Ember.Array} receiver
+      */
+      unshiftObjects: function(objects) {
+        this.replace(0, 0, objects);
+        return this;
+      },
+
+      /**
+        Reverse objects in the array. Works just like `reverse()` but it is
+        KVO-compliant.
+
+        @method reverseObjects
+        @return {Ember.Array} receiver
+       */
+      reverseObjects: function() {
+        var len = get(this, 'length');
+        if (len === 0) return this;
+        var objects = this.toArray().reverse();
+        this.replace(0, len, objects);
+        return this;
+      },
+
+      /**
+        Replace all the the receiver's content with content of the argument.
+        If argument is an empty array receiver will be cleared.
+
+        ```javascript
+        var colors = ["red", "green", "blue"];
+        colors.setObjects(["black", "white"]);  // ["black", "white"]
+        colors.setObjects([]);                  // []
+        ```
+
+        @method setObjects
+        @param {Ember.Array} objects array whose content will be used for replacing
+            the content of the receiver
+        @return {Ember.Array} receiver with the new content
+       */
+      setObjects: function(objects) {
+        if (objects.length === 0) return this.clear();
+
+        var len = get(this, 'length');
+        this.replace(0, len, objects);
+        return this;
+      },
+
+      // ..........................................................
+      // IMPLEMENT Ember.MutableEnumerable
+      //
+
+      /**
+        Remove all occurances of an object in the array.
+
+        ```javascript
+        var cities = ["Chicago", "Berlin", "Lima", "Chicago"];
+        cities.removeObject("Chicago");  // ["Berlin", "Lima"]
+        cities.removeObject("Lima");     // ["Berlin"]
+        cities.removeObject("Tokyo")     // ["Berlin"]
+        ```
+
+        @method removeObject
+        @param {*} obj object to remove
+        @return {Ember.Array} receiver
+      */
+      removeObject: function(obj) {
+        var loc = get(this, 'length') || 0;
+        while(--loc >= 0) {
+          var curObject = this.objectAt(loc);
+          if (curObject === obj) this.removeAt(loc);
+        }
+        return this;
+      },
+
+      /**
+        Push the object onto the end of the array if it is not already
+        present in the array.
+
+        ```javascript
+        var cities = ["Chicago", "Berlin"];
+        cities.addObject("Lima");    // ["Chicago", "Berlin", "Lima"]
+        cities.addObject("Berlin");  // ["Chicago", "Berlin", "Lima"]
+        ```
+
+        @method addObject
+        @param {*} obj object to add, if not already present
+        @return {Ember.Array} receiver
+      */
+      addObject: function(obj) {
+        if (!this.contains(obj)) this.pushObject(obj);
+        return this;
+      }
+
+    });
+
+    __exports__["default"] = MutableArray;
+  });
+define("ember-runtime/mixins/mutable_enumerable",
+  ["ember-metal/enumerable_utils","ember-runtime/mixins/enumerable","ember-metal/mixin","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var EnumerableUtils = __dependency1__["default"];
+    var Enumerable = __dependency2__["default"];
+    var Mixin = __dependency3__.Mixin;
+    var required = __dependency3__.required;
+    var beginPropertyChanges = __dependency4__.beginPropertyChanges;
+    var endPropertyChanges = __dependency4__.endPropertyChanges;
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var forEach = EnumerableUtils.forEach;
+
+    /**
+      This mixin defines the API for modifying generic enumerables. These methods
+      can be applied to an object regardless of whether it is ordered or
+      unordered.
+
+      Note that an Enumerable can change even if it does not implement this mixin.
+      For example, a MappedEnumerable cannot be directly modified but if its
+      underlying enumerable changes, it will change also.
+
+      ## Adding Objects
+
+      To add an object to an enumerable, use the `addObject()` method. This
+      method will only add the object to the enumerable if the object is not
+      already present and is of a type supported by the enumerable.
+
+      ```javascript
+      set.addObject(contact);
+      ```
+
+      ## Removing Objects
+
+      To remove an object from an enumerable, use the `removeObject()` method. This
+      will only remove the object if it is present in the enumerable, otherwise
+      this method has no effect.
+
+      ```javascript
+      set.removeObject(contact);
+      ```
+
+      ## Implementing In Your Own Code
+
+      If you are implementing an object and want to support this API, just include
+      this mixin in your class and implement the required methods. In your unit
+      tests, be sure to apply the Ember.MutableEnumerableTests to your object.
+
+      @class MutableEnumerable
+      @namespace Ember
+      @uses Ember.Enumerable
+    */
+    var MutableEnumerable = Mixin.create(Enumerable, {
+
+      /**
+        __Required.__ You must implement this method to apply this mixin.
+
+        Attempts to add the passed object to the receiver if the object is not
+        already present in the collection. If the object is present, this method
+        has no effect.
+
+        If the passed object is of a type not supported by the receiver,
+        then this method should raise an exception.
+
+        @method addObject
+        @param {Object} object The object to add to the enumerable.
+        @return {Object} the passed object
+      */
+      addObject: required(Function),
+
+      /**
+        Adds each object in the passed enumerable to the receiver.
+
+        @method addObjects
+        @param {Ember.Enumerable} objects the objects to add.
+        @return {Object} receiver
+      */
+      addObjects: function(objects) {
+        beginPropertyChanges(this);
+        forEach(objects, function(obj) { this.addObject(obj); }, this);
+        endPropertyChanges(this);
+        return this;
+      },
+
+      /**
+        __Required.__ You must implement this method to apply this mixin.
+
+        Attempts to remove the passed object from the receiver collection if the
+        object is present in the collection. If the object is not present,
+        this method has no effect.
+
+        If the passed object is of a type not supported by the receiver,
+        then this method should raise an exception.
+
+        @method removeObject
+        @param {Object} object The object to remove from the enumerable.
+        @return {Object} the passed object
+      */
+      removeObject: required(Function),
+
+
+      /**
+        Removes each object in the passed enumerable from the receiver.
+
+        @method removeObjects
+        @param {Ember.Enumerable} objects the objects to remove
+        @return {Object} receiver
+      */
+      removeObjects: function(objects) {
+        beginPropertyChanges(this);
+        for (var i = objects.length - 1; i >= 0; i--) {
+          this.removeObject(objects[i]);
+        }
+        endPropertyChanges(this);
+        return this;
+      }
+    });
+
+    __exports__["default"] = MutableEnumerable;
+  });
+define("ember-runtime/mixins/observable",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/get_properties","ember-metal/set_properties","ember-metal/mixin","ember-metal/events","ember-metal/property_events","ember-metal/observer","ember-metal/computed","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    var get = __dependency2__.get;
+    var getWithDefault = __dependency2__.getWithDefault;
+    var set = __dependency3__.set;
+    var apply = __dependency4__.apply;
+    var getProperties = __dependency5__["default"];
+    var setProperties = __dependency6__["default"];
+    var Mixin = __dependency7__.Mixin;
+    var hasListeners = __dependency8__.hasListeners;
+    var beginPropertyChanges = __dependency9__.beginPropertyChanges;
+    var propertyWillChange = __dependency9__.propertyWillChange;
+    var propertyDidChange = __dependency9__.propertyDidChange;
+    var endPropertyChanges = __dependency9__.endPropertyChanges;
+    var addObserver = __dependency10__.addObserver;
+    var addBeforeObserver = __dependency10__.addBeforeObserver;
+    var removeObserver = __dependency10__.removeObserver;
+    var observersFor = __dependency10__.observersFor;
+    var cacheFor = __dependency11__.cacheFor;
+    var isNone = __dependency12__.isNone;
+
+
+    var slice = Array.prototype.slice;
+    /**
+      ## Overview
+
+      This mixin provides properties and property observing functionality, core
+      features of the Ember object model.
+
+      Properties and observers allow one object to observe changes to a
+      property on another object. This is one of the fundamental ways that
+      models, controllers and views communicate with each other in an Ember
+      application.
+
+      Any object that has this mixin applied can be used in observer
+      operations. That includes `Ember.Object` and most objects you will
+      interact with as you write your Ember application.
+
+      Note that you will not generally apply this mixin to classes yourself,
+      but you will use the features provided by this module frequently, so it
+      is important to understand how to use it.
+
+      ## Using `get()` and `set()`
+
+      Because of Ember's support for bindings and observers, you will always
+      access properties using the get method, and set properties using the
+      set method. This allows the observing objects to be notified and
+      computed properties to be handled properly.
+
+      More documentation about `get` and `set` are below.
+
+      ## Observing Property Changes
+
+      You typically observe property changes simply by adding the `observes`
+      call to the end of your method declarations in classes that you write.
+      For example:
+
+      ```javascript
+      Ember.Object.extend({
+        valueObserver: function() {
+          // Executes whenever the "value" property changes
+        }.observes('value')
+      });
+      ```
+
+      Although this is the most common way to add an observer, this capability
+      is actually built into the `Ember.Object` class on top of two methods
+      defined in this mixin: `addObserver` and `removeObserver`. You can use
+      these two methods to add and remove observers yourself if you need to
+      do so at runtime.
+
+      To add an observer for a property, call:
+
+      ```javascript
+      object.addObserver('propertyKey', targetObject, targetAction)
+      ```
+
+      This will call the `targetAction` method on the `targetObject` whenever
+      the value of the `propertyKey` changes.
+
+      Note that if `propertyKey` is a computed property, the observer will be
+      called when any of the property dependencies are changed, even if the
+      resulting value of the computed property is unchanged. This is necessary
+      because computed properties are not computed until `get` is called.
+
+      @class Observable
+      @namespace Ember
+    */
+    var Observable = Mixin.create({
+
+      /**
+        Retrieves the value of a property from the object.
+
+        This method is usually similar to using `object[keyName]` or `object.keyName`,
+        however it supports both computed properties and the unknownProperty
+        handler.
+
+        Because `get` unifies the syntax for accessing all these kinds
+        of properties, it can make many refactorings easier, such as replacing a
+        simple property with a computed property, or vice versa.
+
+        ### Computed Properties
+
+        Computed properties are methods defined with the `property` modifier
+        declared at the end, such as:
+
+        ```javascript
+        fullName: function() {
+          return this.get('firstName') + ' ' + this.get('lastName');
+        }.property('firstName', 'lastName')
+        ```
+
+        When you call `get` on a computed property, the function will be
+        called and the return value will be returned instead of the function
+        itself.
+
+        ### Unknown Properties
+
+        Likewise, if you try to call `get` on a property whose value is
+        `undefined`, the `unknownProperty()` method will be called on the object.
+        If this method returns any value other than `undefined`, it will be returned
+        instead. This allows you to implement "virtual" properties that are
+        not defined upfront.
+
+        @method get
+        @param {String} keyName The property to retrieve
+        @return {Object} The property value or undefined.
+      */
+      get: function(keyName) {
+        return get(this, keyName);
+      },
+
+      /**
+        To get multiple properties at once, call `getProperties`
+        with a list of strings or an array:
+
+        ```javascript
+        record.getProperties('firstName', 'lastName', 'zipCode');  // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+        ```
+
+        is equivalent to:
+
+        ```javascript
+        record.getProperties(['firstName', 'lastName', 'zipCode']);  // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+        ```
+
+        @method getProperties
+        @param {String...|Array} list of keys to get
+        @return {Hash}
+      */
+      getProperties: function() {
+        return apply(null, getProperties, [this].concat(slice.call(arguments)));
+      },
+
+      /**
+        Sets the provided key or path to the value.
+
+        This method is generally very similar to calling `object[key] = value` or
+        `object.key = value`, except that it provides support for computed
+        properties, the `setUnknownProperty()` method and property observers.
+
+        ### Computed Properties
+
+        If you try to set a value on a key that has a computed property handler
+        defined (see the `get()` method for an example), then `set()` will call
+        that method, passing both the value and key instead of simply changing
+        the value itself. This is useful for those times when you need to
+        implement a property that is composed of one or more member
+        properties.
+
+        ### Unknown Properties
+
+        If you try to set a value on a key that is undefined in the target
+        object, then the `setUnknownProperty()` handler will be called instead. This
+        gives you an opportunity to implement complex "virtual" properties that
+        are not predefined on the object. If `setUnknownProperty()` returns
+        undefined, then `set()` will simply set the value on the object.
+
+        ### Property Observers
+
+        In addition to changing the property, `set()` will also register a property
+        change with the object. Unless you have placed this call inside of a
+        `beginPropertyChanges()` and `endPropertyChanges(),` any "local" observers
+        (i.e. observer methods declared on the same object), will be called
+        immediately. Any "remote" observers (i.e. observer methods declared on
+        another object) will be placed in a queue and called at a later time in a
+        coalesced manner.
+
+        ### Chaining
+
+        In addition to property changes, `set()` returns the value of the object
+        itself so you can do chaining like this:
+
+        ```javascript
+        record.set('firstName', 'Charles').set('lastName', 'Jolley');
+        ```
+
+        @method set
+        @param {String} keyName The property to set
+        @param {Object} value The value to set or `null`.
+        @return {Ember.Observable}
+      */
+      set: function(keyName, value) {
+        set(this, keyName, value);
+        return this;
+      },
+
+
+      /**
+        Sets a list of properties at once. These properties are set inside
+        a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+        observers will be buffered.
+
+        ```javascript
+        record.setProperties({ firstName: 'Charles', lastName: 'Jolley' });
+        ```
+
+        @method setProperties
+        @param {Hash} hash the hash of keys and values to set
+        @return {Ember.Observable}
+      */
+      setProperties: function(hash) {
+        return setProperties(this, hash);
+      },
+
+      /**
+        Begins a grouping of property changes.
+
+        You can use this method to group property changes so that notifications
+        will not be sent until the changes are finished. If you plan to make a
+        large number of changes to an object at one time, you should call this
+        method at the beginning of the changes to begin deferring change
+        notifications. When you are done making changes, call
+        `endPropertyChanges()` to deliver the deferred change notifications and end
+        deferring.
+
+        @method beginPropertyChanges
+        @return {Ember.Observable}
+      */
+      beginPropertyChanges: function() {
+        beginPropertyChanges();
+        return this;
+      },
+
+      /**
+        Ends a grouping of property changes.
+
+        You can use this method to group property changes so that notifications
+        will not be sent until the changes are finished. If you plan to make a
+        large number of changes to an object at one time, you should call
+        `beginPropertyChanges()` at the beginning of the changes to defer change
+        notifications. When you are done making changes, call this method to
+        deliver the deferred change notifications and end deferring.
+
+        @method endPropertyChanges
+        @return {Ember.Observable}
+      */
+      endPropertyChanges: function() {
+        endPropertyChanges();
+        return this;
+      },
+
+      /**
+        Notify the observer system that a property is about to change.
+
+        Sometimes you need to change a value directly or indirectly without
+        actually calling `get()` or `set()` on it. In this case, you can use this
+        method and `propertyDidChange()` instead. Calling these two methods
+        together will notify all observers that the property has potentially
+        changed value.
+
+        Note that you must always call `propertyWillChange` and `propertyDidChange`
+        as a pair. If you do not, it may get the property change groups out of
+        order and cause notifications to be delivered more often than you would
+        like.
+
+        @method propertyWillChange
+        @param {String} keyName The property key that is about to change.
+        @return {Ember.Observable}
+      */
+      propertyWillChange: function(keyName) {
+        propertyWillChange(this, keyName);
+        return this;
+      },
+
+      /**
+        Notify the observer system that a property has just changed.
+
+        Sometimes you need to change a value directly or indirectly without
+        actually calling `get()` or `set()` on it. In this case, you can use this
+        method and `propertyWillChange()` instead. Calling these two methods
+        together will notify all observers that the property has potentially
+        changed value.
+
+        Note that you must always call `propertyWillChange` and `propertyDidChange`
+        as a pair. If you do not, it may get the property change groups out of
+        order and cause notifications to be delivered more often than you would
+        like.
+
+        @method propertyDidChange
+        @param {String} keyName The property key that has just changed.
+        @return {Ember.Observable}
+      */
+      propertyDidChange: function(keyName) {
+        propertyDidChange(this, keyName);
+        return this;
+      },
+
+      /**
+        Convenience method to call `propertyWillChange` and `propertyDidChange` in
+        succession.
+
+        @method notifyPropertyChange
+        @param {String} keyName The property key to be notified about.
+        @return {Ember.Observable}
+      */
+      notifyPropertyChange: function(keyName) {
+        this.propertyWillChange(keyName);
+        this.propertyDidChange(keyName);
+        return this;
+      },
+
+      addBeforeObserver: function(key, target, method) {
+        addBeforeObserver(this, key, target, method);
+      },
+
+      /**
+        Adds an observer on a property.
+
+        This is the core method used to register an observer for a property.
+
+        Once you call this method, any time the key's value is set, your observer
+        will be notified. Note that the observers are triggered any time the
+        value is set, regardless of whether it has actually changed. Your
+        observer should be prepared to handle that.
+
+        You can also pass an optional context parameter to this method. The
+        context will be passed to your observer method whenever it is triggered.
+        Note that if you add the same target/method pair on a key multiple times
+        with different context parameters, your observer will only be called once
+        with the last context you passed.
+
+        ### Observer Methods
+
+        Observer methods you pass should generally have the following signature if
+        you do not pass a `context` parameter:
+
+        ```javascript
+        fooDidChange: function(sender, key, value, rev) { };
+        ```
+
+        The sender is the object that changed. The key is the property that
+        changes. The value property is currently reserved and unused. The rev
+        is the last property revision of the object when it changed, which you can
+        use to detect if the key value has really changed or not.
+
+        If you pass a `context` parameter, the context will be passed before the
+        revision like so:
+
+        ```javascript
+        fooDidChange: function(sender, key, value, context, rev) { };
+        ```
+
+        Usually you will not need the value, context or revision parameters at
+        the end. In this case, it is common to write observer methods that take
+        only a sender and key value as parameters or, if you aren't interested in
+        any of these values, to write an observer that has no parameters at all.
+
+        @method addObserver
+        @param {String} key The key to observer
+        @param {Object} target The target object to invoke
+        @param {String|Function} method The method to invoke.
+      */
+      addObserver: function(key, target, method) {
+        addObserver(this, key, target, method);
+      },
+
+      /**
+        Remove an observer you have previously registered on this object. Pass
+        the same key, target, and method you passed to `addObserver()` and your
+        target will no longer receive notifications.
+
+        @method removeObserver
+        @param {String} key The key to observer
+        @param {Object} target The target object to invoke
+        @param {String|Function} method The method to invoke.
+      */
+      removeObserver: function(key, target, method) {
+        removeObserver(this, key, target, method);
+      },
+
+      /**
+        Returns `true` if the object currently has observers registered for a
+        particular key. You can use this method to potentially defer performing
+        an expensive action until someone begins observing a particular property
+        on the object.
+
+        @method hasObserverFor
+        @param {String} key Key to check
+        @return {Boolean}
+      */
+      hasObserverFor: function(key) {
+        return hasListeners(this, key+':change');
+      },
+
+      /**
+        Retrieves the value of a property, or a default value in the case that the
+        property returns `undefined`.
+
+        ```javascript
+        person.getWithDefault('lastName', 'Doe');
+        ```
+
+        @method getWithDefault
+        @param {String} keyName The name of the property to retrieve
+        @param {Object} defaultValue The value to return if the property value is undefined
+        @return {Object} The property value or the defaultValue.
+      */
+      getWithDefault: function(keyName, defaultValue) {
+        return getWithDefault(this, keyName, defaultValue);
+      },
+
+      /**
+        Set the value of a property to the current value plus some amount.
+
+        ```javascript
+        person.incrementProperty('age');
+        team.incrementProperty('score', 2);
+        ```
+
+        @method incrementProperty
+        @param {String} keyName The name of the property to increment
+        @param {Number} increment The amount to increment by. Defaults to 1
+        @return {Number} The new property value
+      */
+      incrementProperty: function(keyName, increment) {
+        if (isNone(increment)) { increment = 1; }
+                set(this, keyName, (parseFloat(get(this, keyName)) || 0) + increment);
+        return get(this, keyName);
+      },
+
+      /**
+        Set the value of a property to the current value minus some amount.
+
+        ```javascript
+        player.decrementProperty('lives');
+        orc.decrementProperty('health', 5);
+        ```
+
+        @method decrementProperty
+        @param {String} keyName The name of the property to decrement
+        @param {Number} decrement The amount to decrement by. Defaults to 1
+        @return {Number} The new property value
+      */
+      decrementProperty: function(keyName, decrement) {
+        if (isNone(decrement)) { decrement = 1; }
+                set(this, keyName, (get(this, keyName) || 0) - decrement);
+        return get(this, keyName);
+      },
+
+      /**
+        Set the value of a boolean property to the opposite of it's
+        current value.
+
+        ```javascript
+        starship.toggleProperty('warpDriveEngaged');
+        ```
+
+        @method toggleProperty
+        @param {String} keyName The name of the property to toggle
+        @return {Object} The new property value
+      */
+      toggleProperty: function(keyName) {
+        set(this, keyName, !get(this, keyName));
+        return get(this, keyName);
+      },
+
+      /**
+        Returns the cached value of a computed property, if it exists.
+        This allows you to inspect the value of a computed property
+        without accidentally invoking it if it is intended to be
+        generated lazily.
+
+        @method cacheFor
+        @param {String} keyName
+        @return {Object} The cached value of the computed property, if any
+      */
+      cacheFor: function(keyName) {
+        return cacheFor(this, keyName);
+      },
+
+      // intended for debugging purposes
+      observersForKey: function(keyName) {
+        return observersFor(this, keyName);
+      }
+    });
+
+    __exports__["default"] = Observable;
+  });
+define("ember-runtime/mixins/promise_proxy",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var computed = __dependency3__.computed;
+    var Mixin = __dependency4__.Mixin;
+    var EmberError = __dependency5__["default"];
+
+    var not = computed.not, or = computed.or;
+
+    /**
+      @module ember
+      @submodule ember-runtime
+     */
+
+    function tap(proxy, promise) {
+      set(proxy, 'isFulfilled', false);
+      set(proxy, 'isRejected', false);
+
+      return promise.then(function(value) {
+        set(proxy, 'isFulfilled', true);
+        set(proxy, 'content', value);
+        return value;
+      }, function(reason) {
+        set(proxy, 'isRejected', true);
+        set(proxy, 'reason', reason);
+        throw reason;
+      }, "Ember: PromiseProxy");
+    }
+
+    /**
+      A low level mixin making ObjectProxy, ObjectController or ArrayController's promise aware.
+
+      ```javascript
+      var ObjectPromiseController = Ember.ObjectController.extend(Ember.PromiseProxyMixin);
+
+      var controller = ObjectPromiseController.create({
+        promise: $.getJSON('/some/remote/data.json')
+      });
+
+      controller.then(function(json){
+         // the json
+      }, function(reason) {
+         // the reason why you have no json
+      });
+      ```
+
+      the controller has bindable attributes which
+      track the promises life cycle
+
+      ```javascript
+      controller.get('isPending')   //=> true
+      controller.get('isSettled')  //=> false
+      controller.get('isRejected')  //=> false
+      controller.get('isFulfilled') //=> false
+      ```
+
+      When the the $.getJSON completes, and the promise is fulfilled
+      with json, the life cycle attributes will update accordingly.
+
+      ```javascript
+      controller.get('isPending')   //=> false
+      controller.get('isSettled')   //=> true
+      controller.get('isRejected')  //=> false
+      controller.get('isFulfilled') //=> true
+      ```
+
+      As the controller is an ObjectController, and the json now its content,
+      all the json properties will be available directly from the controller.
+
+      ```javascript
+      // Assuming the following json:
+      {
+        firstName: 'Stefan',
+        lastName: 'Penner'
+      }
+
+      // both properties will accessible on the controller
+      controller.get('firstName') //=> 'Stefan'
+      controller.get('lastName')  //=> 'Penner'
+      ```
+
+      If the controller is backing a template, the attributes are
+      bindable from within that template
+
+      ```handlebars
+      {{#if isPending}}
+        loading...
+      {{else}}
+        firstName: {{firstName}}
+        lastName: {{lastName}}
+      {{/if}}
+      ```
+      @class Ember.PromiseProxyMixin
+    */
+    var PromiseProxyMixin = Mixin.create({
+      /**
+        If the proxied promise is rejected this will contain the reason
+        provided.
+
+        @property reason
+        @default null
+      */
+      reason:    null,
+
+      /**
+        Once the proxied promise has settled this will become `false`.
+
+        @property isPending
+        @default true
+      */
+      isPending:  not('isSettled').readOnly(),
+
+      /**
+        Once the proxied promise has settled this will become `true`.
+
+        @property isSettled
+        @default false
+      */
+      isSettled:  or('isRejected', 'isFulfilled').readOnly(),
+
+      /**
+        Will become `true` if the proxied promise is rejected.
+
+        @property isRejected
+        @default false
+      */
+      isRejected:  false,
+
+      /**
+        Will become `true` if the proxied promise is fulfilled.
+
+        @property isFullfilled
+        @default false
+      */
+      isFulfilled: false,
+
+      /**
+        The promise whose fulfillment value is being proxied by this object.
+
+        This property must be specified upon creation, and should not be
+        changed once created.
+
+        Example:
+
+        ```javascript
+        Ember.ObjectController.extend(Ember.PromiseProxyMixin).create({
+          promise: <thenable>
+        });
+        ```
+
+        @property promise
+      */
+      promise: computed(function(key, promise) {
+        if (arguments.length === 2) {
+          return tap(this, promise);
+        } else {
+          throw new EmberError("PromiseProxy's promise must be set");
+        }
+      }),
+
+      /**
+        An alias to the proxied promise's `then`.
+
+        See RSVP.Promise.then.
+
+        @method then
+        @param {Function} callback
+        @return {RSVP.Promise}
+      */
+      then: promiseAlias('then'),
+
+      /**
+        An alias to the proxied promise's `catch`.
+
+        See RSVP.Promise.catch.
+
+        @method catch
+        @param {Function} callback
+        @return {RSVP.Promise}
+        @since 1.3.0
+      */
+      'catch': promiseAlias('catch'),
+
+      /**
+        An alias to the proxied promise's `finally`.
+
+        See RSVP.Promise.finally.
+
+        @method finally
+        @param {Function} callback
+        @return {RSVP.Promise}
+        @since 1.3.0
+      */
+      'finally': promiseAlias('finally')
+
+    });
+
+    function promiseAlias(name) {
+      return function () {
+        var promise = get(this, 'promise');
+        return promise[name].apply(promise, arguments);
+      };
+    }
+
+    __exports__["default"] = PromiseProxyMixin;
+  });
+define("ember-runtime/mixins/sortable",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/mutable_enumerable","ember-runtime/compare","ember-metal/observer","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.A
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EnumerableUtils = __dependency4__["default"];
+    var Mixin = __dependency5__.Mixin;
+    var MutableEnumerable = __dependency6__["default"];
+    var compare = __dependency7__["default"];
+    var addObserver = __dependency8__.addObserver;
+    var removeObserver = __dependency8__.removeObserver;
+    var computed = __dependency9__.computed;
+    var beforeObserver = __dependency5__.beforeObserver;
+    var observer = __dependency5__.observer;
+    //ES6TODO: should we access these directly from their package or from how thier exposed in ember-metal?
+
+    var forEach = EnumerableUtils.forEach;
+
+    /**
+      `Ember.SortableMixin` provides a standard interface for array proxies
+      to specify a sort order and maintain this sorting when objects are added,
+      removed, or updated without changing the implicit order of their underlying
+      content array:
+
+      ```javascript
+      songs = [
+        {trackNumber: 4, title: 'Ob-La-Di, Ob-La-Da'},
+        {trackNumber: 2, title: 'Back in the U.S.S.R.'},
+        {trackNumber: 3, title: 'Glass Onion'},
+      ];
+
+      songsController = Ember.ArrayController.create({
+        content: songs,
+        sortProperties: ['trackNumber'],
+        sortAscending: true
+      });
+
+      songsController.get('firstObject');  // {trackNumber: 2, title: 'Back in the U.S.S.R.'}
+
+      songsController.addObject({trackNumber: 1, title: 'Dear Prudence'});
+      songsController.get('firstObject');  // {trackNumber: 1, title: 'Dear Prudence'}
+      ```
+
+      If you add or remove the properties to sort by or change the sort direction the content
+      sort order will be automatically updated.
+
+      ```javascript
+      songsController.set('sortProperties', ['title']);
+      songsController.get('firstObject'); // {trackNumber: 2, title: 'Back in the U.S.S.R.'}
+
+      songsController.toggleProperty('sortAscending');
+      songsController.get('firstObject'); // {trackNumber: 4, title: 'Ob-La-Di, Ob-La-Da'}
+      ```
+
+      SortableMixin works by sorting the arrangedContent array, which is the array that
+      arrayProxy displays. Due to the fact that the underlying 'content' array is not changed, that
+      array will not display the sorted list:
+
+       ```javascript
+      songsController.get('content').get('firstObject'); // Returns the unsorted original content
+      songsController.get('firstObject'); // Returns the sorted content.
+      ```
+
+      Although the sorted content can also be accessed through the arrangedContent property,
+      it is preferable to use the proxied class and not the arrangedContent array directly.
+
+      @class SortableMixin
+      @namespace Ember
+      @uses Ember.MutableEnumerable
+    */
+    var SortableMixin = Mixin.create(MutableEnumerable, {
+
+      /**
+        Specifies which properties dictate the arrangedContent's sort order.
+
+        When specifying multiple properties the sorting will use properties
+        from the `sortProperties` array prioritized from first to last.
+
+        @property {Array} sortProperties
+      */
+      sortProperties: null,
+
+      /**
+        Specifies the arrangedContent's sort direction.
+        Sorts the content in ascending order by default. Set to `false` to
+        use descending order.
+
+        @property {Boolean} sortAscending
+        @default true
+      */
+      sortAscending: true,
+
+      /**
+        The function used to compare two values. You can override this if you
+        want to do custom comparisons. Functions must be of the type expected by
+        Array#sort, i.e.
+          return 0 if the two parameters are equal,
+          return a negative value if the first parameter is smaller than the second or
+          return a positive value otherwise:
+
+        ```javascript
+        function(x,y) { // These are assumed to be integers
+          if (x === y)
+            return 0;
+          return x < y ? -1 : 1;
+        }
+        ```
+
+        @property sortFunction
+        @type {Function}
+        @default Ember.compare
+      */
+      sortFunction: compare,
+
+      orderBy: function(item1, item2) {
+        var result = 0,
+            sortProperties = get(this, 'sortProperties'),
+            sortAscending = get(this, 'sortAscending'),
+            sortFunction = get(this, 'sortFunction');
+
+        
+        forEach(sortProperties, function(propertyName) {
+          if (result === 0) {
+            result = sortFunction.call(this, get(item1, propertyName), get(item2, propertyName));
+            if ((result !== 0) && !sortAscending) {
+              result = (-1) * result;
+            }
+          }
+        }, this);
+
+        return result;
+      },
+
+      destroy: function() {
+        var content = get(this, 'content'),
+            sortProperties = get(this, 'sortProperties');
+
+        if (content && sortProperties) {
+          forEach(content, function(item) {
+            forEach(sortProperties, function(sortProperty) {
+              removeObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+        }
+
+        return this._super();
+      },
+
+      isSorted: computed.notEmpty('sortProperties'),
+
+      /**
+        Overrides the default arrangedContent from arrayProxy in order to sort by sortFunction.
+        Also sets up observers for each sortProperty on each item in the content Array.
+
+        @property arrangedContent
+      */
+
+      arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
+        var content = get(this, 'content'),
+            isSorted = get(this, 'isSorted'),
+            sortProperties = get(this, 'sortProperties'),
+            self = this;
+
+        if (content && isSorted) {
+          content = content.slice();
+          content.sort(function(item1, item2) {
+            return self.orderBy(item1, item2);
+          });
+          forEach(content, function(item) {
+            forEach(sortProperties, function(sortProperty) {
+              addObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+          return Ember.A(content);
+        }
+
+        return content;
+      }),
+
+      _contentWillChange: beforeObserver('content', function() {
+        var content = get(this, 'content'),
+            sortProperties = get(this, 'sortProperties');
+
+        if (content && sortProperties) {
+          forEach(content, function(item) {
+            forEach(sortProperties, function(sortProperty) {
+              removeObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+        }
+
+        this._super();
+      }),
+
+      sortPropertiesWillChange: beforeObserver('sortProperties', function() {
+        this._lastSortAscending = undefined;
+      }),
+
+      sortPropertiesDidChange: observer('sortProperties', function() {
+        this._lastSortAscending = undefined;
+      }),
+
+      sortAscendingWillChange: beforeObserver('sortAscending', function() {
+        this._lastSortAscending = get(this, 'sortAscending');
+      }),
+
+      sortAscendingDidChange: observer('sortAscending', function() {
+        if (this._lastSortAscending !== undefined && get(this, 'sortAscending') !== this._lastSortAscending) {
+          var arrangedContent = get(this, 'arrangedContent');
+          arrangedContent.reverseObjects();
+        }
+      }),
+
+      contentArrayWillChange: function(array, idx, removedCount, addedCount) {
+        var isSorted = get(this, 'isSorted');
+
+        if (isSorted) {
+          var arrangedContent = get(this, 'arrangedContent');
+          var removedObjects = array.slice(idx, idx+removedCount);
+          var sortProperties = get(this, 'sortProperties');
+
+          forEach(removedObjects, function(item) {
+            arrangedContent.removeObject(item);
+
+            forEach(sortProperties, function(sortProperty) {
+              removeObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+        }
+
+        return this._super(array, idx, removedCount, addedCount);
+      },
+
+      contentArrayDidChange: function(array, idx, removedCount, addedCount) {
+        var isSorted = get(this, 'isSorted'),
+            sortProperties = get(this, 'sortProperties');
+
+        if (isSorted) {
+          var addedObjects = array.slice(idx, idx+addedCount);
+
+          forEach(addedObjects, function(item) {
+            this.insertItemSorted(item);
+
+            forEach(sortProperties, function(sortProperty) {
+              addObserver(item, sortProperty, this, 'contentItemSortPropertyDidChange');
+            }, this);
+          }, this);
+        }
+
+        return this._super(array, idx, removedCount, addedCount);
+      },
+
+      insertItemSorted: function(item) {
+        var arrangedContent = get(this, 'arrangedContent');
+        var length = get(arrangedContent, 'length');
+
+        var idx = this._binarySearch(item, 0, length);
+        arrangedContent.insertAt(idx, item);
+      },
+
+      contentItemSortPropertyDidChange: function(item) {
+        var arrangedContent = get(this, 'arrangedContent'),
+            oldIndex = arrangedContent.indexOf(item),
+            leftItem = arrangedContent.objectAt(oldIndex - 1),
+            rightItem = arrangedContent.objectAt(oldIndex + 1),
+            leftResult = leftItem && this.orderBy(item, leftItem),
+            rightResult = rightItem && this.orderBy(item, rightItem);
+
+        if (leftResult < 0 || rightResult > 0) {
+          arrangedContent.removeObject(item);
+          this.insertItemSorted(item);
+        }
+      },
+
+      _binarySearch: function(item, low, high) {
+        var mid, midItem, res, arrangedContent;
+
+        if (low === high) {
+          return low;
+        }
+
+        arrangedContent = get(this, 'arrangedContent');
+
+        mid = low + Math.floor((high - low) / 2);
+        midItem = arrangedContent.objectAt(mid);
+
+        res = this.orderBy(midItem, item);
+
+        if (res < 0) {
+          return this._binarySearch(item, mid+1, high);
+        } else if (res > 0) {
+          return this._binarySearch(item, low, mid);
+        }
+
+        return mid;
+      }
+    });
+
+    __exports__["default"] = SortableMixin;
+  });
+define("ember-runtime/mixins/target_action_support",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.lookup, Ember.assert
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var typeOf = __dependency4__.typeOf;
+    var Mixin = __dependency5__.Mixin;
+    var computed = __dependency6__.computed;
+
+    /**
+    `Ember.TargetActionSupport` is a mixin that can be included in a class
+    to add a `triggerAction` method with semantics similar to the Handlebars
+    `{{action}}` helper. In normal Ember usage, the `{{action}}` helper is
+    usually the best choice. This mixin is most often useful when you are
+    doing more complex event handling in View objects.
+
+    See also `Ember.ViewTargetActionSupport`, which has
+    view-aware defaults for target and actionContext.
+
+    @class TargetActionSupport
+    @namespace Ember
+    @extends Ember.Mixin
+    */
+    var TargetActionSupport = Mixin.create({
+      target: null,
+      action: null,
+      actionContext: null,
+
+      targetObject: computed(function() {
+        var target = get(this, 'target');
+
+        if (typeOf(target) === "string") {
+          var value = get(this, target);
+          if (value === undefined) { value = get(Ember.lookup, target); }
+          return value;
+        } else {
+          return target;
+        }
+      }).property('target'),
+
+      actionContextObject: computed(function() {
+        var actionContext = get(this, 'actionContext');
+
+        if (typeOf(actionContext) === "string") {
+          var value = get(this, actionContext);
+          if (value === undefined) { value = get(Ember.lookup, actionContext); }
+          return value;
+        } else {
+          return actionContext;
+        }
+      }).property('actionContext'),
+
+      /**
+      Send an `action` with an `actionContext` to a `target`. The action, actionContext
+      and target will be retrieved from properties of the object. For example:
+
+      ```javascript
+      App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
+        target: Ember.computed.alias('controller'),
+        action: 'save',
+        actionContext: Ember.computed.alias('context'),
+        click: function() {
+          this.triggerAction(); // Sends the `save` action, along with the current context
+                                // to the current controller
+        }
+      });
+      ```
+
+      The `target`, `action`, and `actionContext` can be provided as properties of
+      an optional object argument to `triggerAction` as well.
+
+      ```javascript
+      App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
+        click: function() {
+          this.triggerAction({
+            action: 'save',
+            target: this.get('controller'),
+            actionContext: this.get('context'),
+          }); // Sends the `save` action, along with the current context
+              // to the current controller
+        }
+      });
+      ```
+
+      The `actionContext` defaults to the object you are mixing `TargetActionSupport` into.
+      But `target` and `action` must be specified either as properties or with the argument
+      to `triggerAction`, or a combination:
+
+      ```javascript
+      App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
+        target: Ember.computed.alias('controller'),
+        click: function() {
+          this.triggerAction({
+            action: 'save'
+          }); // Sends the `save` action, along with a reference to `this`,
+              // to the current controller
+        }
+      });
+      ```
+
+      @method triggerAction
+      @param opts {Hash} (optional, with the optional keys action, target and/or actionContext)
+      @return {Boolean} true if the action was sent successfully and did not return false
+      */
+      triggerAction: function(opts) {
+        opts = opts || {};
+        var action = opts.action || get(this, 'action'),
+            target = opts.target || get(this, 'targetObject'),
+            actionContext = opts.actionContext;
+
+        function args(options, actionName) {
+          var ret = [];
+          if (actionName) { ret.push(actionName); }
+
+          return ret.concat(options);
+        }
+
+        if (typeof actionContext === 'undefined') {
+          actionContext = get(this, 'actionContextObject') || this;
+        }
+
+        if (target && action) {
+          var ret;
+
+          if (target.send) {
+            ret = target.send.apply(target, args(actionContext, action));
+          } else {
+                        ret = target[action].apply(target, args(actionContext));
+          }
+
+          if (ret !== false) ret = true;
+
+          return ret;
+        } else {
+          return false;
+        }
+      }
+    });
+
+    __exports__["default"] = TargetActionSupport;
+  });
+define("ember-runtime/system/application",
+  ["ember-runtime/system/namespace","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Namespace = __dependency1__["default"];
+
+    var Application = Namespace.extend();
+    __exports__["default"] = Application;
+  });
+define("ember-runtime/system/array_proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/property_events","ember-metal/error","ember-runtime/system/object","ember-runtime/mixins/mutable_array","ember-runtime/mixins/enumerable","ember-runtime/system/string","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.K, Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var isArray = __dependency4__.isArray;
+    var apply = __dependency4__.apply;
+    var computed = __dependency5__.computed;
+    var beforeObserver = __dependency6__.beforeObserver;
+    var observer = __dependency6__.observer;
+    var beginPropertyChanges = __dependency7__.beginPropertyChanges;
+    var endPropertyChanges = __dependency7__.endPropertyChanges;
+    var EmberError = __dependency8__["default"];
+    var EmberObject = __dependency9__["default"];var MutableArray = __dependency10__["default"];var Enumerable = __dependency11__["default"];
+    var fmt = __dependency12__.fmt;
+
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var OUT_OF_RANGE_EXCEPTION = "Index out of range";
+    var EMPTY = [];
+    var alias = computed.alias;
+    var K = Ember.K;
+
+    /**
+      An ArrayProxy wraps any other object that implements `Ember.Array` and/or
+      `Ember.MutableArray,` forwarding all requests. This makes it very useful for
+      a number of binding use cases or other cases where being able to swap
+      out the underlying array is useful.
+
+      A simple example of usage:
+
+      ```javascript
+      var pets = ['dog', 'cat', 'fish'];
+      var ap = Ember.ArrayProxy.create({ content: Ember.A(pets) });
+
+      ap.get('firstObject');                        // 'dog'
+      ap.set('content', ['amoeba', 'paramecium']);
+      ap.get('firstObject');                        // 'amoeba'
+      ```
+
+      This class can also be useful as a layer to transform the contents of
+      an array, as they are accessed. This can be done by overriding
+      `objectAtContent`:
+
+      ```javascript
+      var pets = ['dog', 'cat', 'fish'];
+      var ap = Ember.ArrayProxy.create({
+          content: Ember.A(pets),
+          objectAtContent: function(idx) {
+              return this.get('content').objectAt(idx).toUpperCase();
+          }
+      });
+
+      ap.get('firstObject'); // . 'DOG'
+      ```
+
+      @class ArrayProxy
+      @namespace Ember
+      @extends Ember.Object
+      @uses Ember.MutableArray
+    */
+    var ArrayProxy = EmberObject.extend(MutableArray, {
+
+      /**
+        The content array. Must be an object that implements `Ember.Array` and/or
+        `Ember.MutableArray.`
+
+        @property content
+        @type Ember.Array
+      */
+      content: null,
+
+      /**
+       The array that the proxy pretends to be. In the default `ArrayProxy`
+       implementation, this and `content` are the same. Subclasses of `ArrayProxy`
+       can override this property to provide things like sorting and filtering.
+
+       @property arrangedContent
+      */
+      arrangedContent: alias('content'),
+
+      /**
+        Should actually retrieve the object at the specified index from the
+        content. You can override this method in subclasses to transform the
+        content item to something new.
+
+        This method will only be called if content is non-`null`.
+
+        @method objectAtContent
+        @param {Number} idx The index to retrieve.
+        @return {Object} the value or undefined if none found
+      */
+      objectAtContent: function(idx) {
+        return get(this, 'arrangedContent').objectAt(idx);
+      },
+
+      /**
+        Should actually replace the specified objects on the content array.
+        You can override this method in subclasses to transform the content item
+        into something new.
+
+        This method will only be called if content is non-`null`.
+
+        @method replaceContent
+        @param {Number} idx The starting index
+        @param {Number} amt The number of items to remove from the content.
+        @param {Array} objects Optional array of objects to insert or null if no
+          objects.
+        @return {void}
+      */
+      replaceContent: function(idx, amt, objects) {
+        get(this, 'content').replace(idx, amt, objects);
+      },
+
+      /**
+        Invoked when the content property is about to change. Notifies observers that the
+        entire array content will change.
+
+        @private
+        @method _contentWillChange
+      */
+      _contentWillChange: beforeObserver('content', function() {
+        this._teardownContent();
+      }),
+
+      _teardownContent: function() {
+        var content = get(this, 'content');
+
+        if (content) {
+          content.removeArrayObserver(this, {
+            willChange: 'contentArrayWillChange',
+            didChange: 'contentArrayDidChange'
+          });
+        }
+      },
+
+      contentArrayWillChange: K,
+      contentArrayDidChange: K,
+
+      /**
+        Invoked when the content property changes. Notifies observers that the
+        entire array content has changed.
+
+        @private
+        @method _contentDidChange
+      */
+      _contentDidChange: observer('content', function() {
+        var content = get(this, 'content');
+
+        
+        this._setupContent();
+      }),
+
+      _setupContent: function() {
+        var content = get(this, 'content');
+
+        if (content) {
+          
+          content.addArrayObserver(this, {
+            willChange: 'contentArrayWillChange',
+            didChange: 'contentArrayDidChange'
+          });
+        }
+      },
+
+      _arrangedContentWillChange: beforeObserver('arrangedContent', function() {
+        var arrangedContent = get(this, 'arrangedContent'),
+            len = arrangedContent ? get(arrangedContent, 'length') : 0;
+
+        this.arrangedContentArrayWillChange(this, 0, len, undefined);
+        this.arrangedContentWillChange(this);
+
+        this._teardownArrangedContent(arrangedContent);
+      }),
+
+      _arrangedContentDidChange: observer('arrangedContent', function() {
+        var arrangedContent = get(this, 'arrangedContent'),
+            len = arrangedContent ? get(arrangedContent, 'length') : 0;
+
+        
+        this._setupArrangedContent();
+
+        this.arrangedContentDidChange(this);
+        this.arrangedContentArrayDidChange(this, 0, undefined, len);
+      }),
+
+      _setupArrangedContent: function() {
+        var arrangedContent = get(this, 'arrangedContent');
+
+        if (arrangedContent) {
+          
+          arrangedContent.addArrayObserver(this, {
+            willChange: 'arrangedContentArrayWillChange',
+            didChange: 'arrangedContentArrayDidChange'
+          });
+        }
+      },
+
+      _teardownArrangedContent: function() {
+        var arrangedContent = get(this, 'arrangedContent');
+
+        if (arrangedContent) {
+          arrangedContent.removeArrayObserver(this, {
+            willChange: 'arrangedContentArrayWillChange',
+            didChange: 'arrangedContentArrayDidChange'
+          });
+        }
+      },
+
+      arrangedContentWillChange: K,
+      arrangedContentDidChange: K,
+
+      objectAt: function(idx) {
+        return get(this, 'content') && this.objectAtContent(idx);
+      },
+
+      length: computed(function() {
+        var arrangedContent = get(this, 'arrangedContent');
+        return arrangedContent ? get(arrangedContent, 'length') : 0;
+        // No dependencies since Enumerable notifies length of change
+      }),
+
+      _replace: function(idx, amt, objects) {
+        var content = get(this, 'content');
+                if (content) this.replaceContent(idx, amt, objects);
+        return this;
+      },
+
+      replace: function() {
+        if (get(this, 'arrangedContent') === get(this, 'content')) {
+          apply(this, this._replace, arguments);
+        } else {
+          throw new EmberError("Using replace on an arranged ArrayProxy is not allowed.");
+        }
+      },
+
+      _insertAt: function(idx, object) {
+        if (idx > get(this, 'content.length')) throw new EmberError(OUT_OF_RANGE_EXCEPTION);
+        this._replace(idx, 0, [object]);
+        return this;
+      },
+
+      insertAt: function(idx, object) {
+        if (get(this, 'arrangedContent') === get(this, 'content')) {
+          return this._insertAt(idx, object);
+        } else {
+          throw new EmberError("Using insertAt on an arranged ArrayProxy is not allowed.");
+        }
+      },
+
+      removeAt: function(start, len) {
+        if ('number' === typeof start) {
+          var content = get(this, 'content'),
+              arrangedContent = get(this, 'arrangedContent'),
+              indices = [], i;
+
+          if ((start < 0) || (start >= get(this, 'length'))) {
+            throw new EmberError(OUT_OF_RANGE_EXCEPTION);
+          }
+
+          if (len === undefined) len = 1;
+
+          // Get a list of indices in original content to remove
+          for (i=start; i<start+len; i++) {
+            // Use arrangedContent here so we avoid confusion with objects transformed by objectAtContent
+            indices.push(content.indexOf(arrangedContent.objectAt(i)));
+          }
+
+          // Replace in reverse order since indices will change
+          indices.sort(function(a,b) { return b - a; });
+
+          beginPropertyChanges();
+          for (i=0; i<indices.length; i++) {
+            this._replace(indices[i], 1, EMPTY);
+          }
+          endPropertyChanges();
+        }
+
+        return this ;
+      },
+
+      pushObject: function(obj) {
+        this._insertAt(get(this, 'content.length'), obj) ;
+        return obj ;
+      },
+
+      pushObjects: function(objects) {
+        if (!(Enumerable.detect(objects) || isArray(objects))) {
+          throw new TypeError("Must pass Ember.Enumerable to Ember.MutableArray#pushObjects");
+        }
+        this._replace(get(this, 'length'), 0, objects);
+        return this;
+      },
+
+      setObjects: function(objects) {
+        if (objects.length === 0) return this.clear();
+
+        var len = get(this, 'length');
+        this._replace(0, len, objects);
+        return this;
+      },
+
+      unshiftObject: function(obj) {
+        this._insertAt(0, obj) ;
+        return obj ;
+      },
+
+      unshiftObjects: function(objects) {
+        this._replace(0, 0, objects);
+        return this;
+      },
+
+      slice: function() {
+        var arr = this.toArray();
+        return arr.slice.apply(arr, arguments);
+      },
+
+      arrangedContentArrayWillChange: function(item, idx, removedCnt, addedCnt) {
+        this.arrayContentWillChange(idx, removedCnt, addedCnt);
+      },
+
+      arrangedContentArrayDidChange: function(item, idx, removedCnt, addedCnt) {
+        this.arrayContentDidChange(idx, removedCnt, addedCnt);
+      },
+
+      init: function() {
+        this._super();
+        this._setupContent();
+        this._setupArrangedContent();
+      },
+
+      willDestroy: function() {
+        this._teardownArrangedContent();
+        this._teardownContent();
+      }
+    });
+
+    __exports__["default"] = ArrayProxy;
+  });
+define("ember-runtime/system/container",
+  ["ember-metal/property_set","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var set = __dependency1__["default"];
+
+    var Container = requireModule('container')["default"];
+    Container.set = set;
+
+    __exports__["default"] = Container;
+  });
+define("ember-runtime/system/core_object",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-runtime/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+    "use strict";
+    /**
+      @module ember
+      @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.ENV.MANDATORY_SETTER, Ember.assert, Ember.K, Ember.config
+
+    // NOTE: this object should never be included directly. Instead use `Ember.Object`.
+    // We only define this separately so that `Ember.Set` can depend on it.
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+    var apply = __dependency4__.apply;
+    var create = __dependency5__.create;
+    var generateGuid = __dependency4__.generateGuid;
+    var GUID_KEY = __dependency4__.GUID_KEY;
+    var meta = __dependency4__.meta;
+    var META_KEY = __dependency4__.META_KEY;
+    var makeArray = __dependency4__.makeArray;
+    var rewatch = __dependency6__.rewatch;
+    var finishChains = __dependency7__.finishChains;
+    var sendEvent = __dependency8__.sendEvent;
+    var IS_BINDING = __dependency9__.IS_BINDING;
+    var Mixin = __dependency9__.Mixin;
+    var required = __dependency9__.required;
+    var EnumerableUtils = __dependency10__["default"];
+    var EmberError = __dependency11__["default"];
+    var platform = __dependency5__.platform;
+    var keys = __dependency12__["default"];
+    var ActionHandler = __dependency13__["default"];
+    var defineProperty = __dependency14__.defineProperty;
+    var Binding = __dependency15__.Binding;
+    var ComputedProperty = __dependency16__.ComputedProperty;
+    var run = __dependency17__["default"];
+    var destroy = __dependency6__.destroy;
+
+
+    var o_create = create,
+        o_defineProperty = platform.defineProperty,
+        schedule = run.schedule,
+        applyMixin = Mixin._apply,
+        finishPartial = Mixin.finishPartial,
+        reopen = Mixin.prototype.reopen,
+        MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER,
+        indexOf = EnumerableUtils.indexOf,
+        K = Ember.K;
+
+    var undefinedDescriptor = {
+      configurable: true,
+      writable: true,
+      enumerable: false,
+      value: undefined
+    };
+
+    var nullDescriptor = {
+      configurable: true,
+      writable: true,
+      enumerable: false,
+      value: null
+    };
+
+    function makeCtor() {
+
+      // Note: avoid accessing any properties on the object since it makes the
+      // method a lot faster. This is glue code so we want it to be as fast as
+      // possible.
+
+      var wasApplied = false, initMixins, initProperties;
+
+      var Class = function() {
+        if (!wasApplied) {
+          Class.proto(); // prepare prototype...
+        }
+        o_defineProperty(this, GUID_KEY, nullDescriptor);
+        o_defineProperty(this, '__nextSuper', undefinedDescriptor);
+        var m = meta(this), proto = m.proto;
+        m.proto = this;
+        if (initMixins) {
+          // capture locally so we can clear the closed over variable
+          var mixins = initMixins;
+          initMixins = null;
+          apply(this, this.reopen, mixins);
+        }
+        if (initProperties) {
+          // capture locally so we can clear the closed over variable
+          var props = initProperties;
+          initProperties = null;
+
+          var concatenatedProperties = this.concatenatedProperties;
+
+          for (var i = 0, l = props.length; i < l; i++) {
+            var properties = props[i];
+
+            
+            if (typeof properties !== 'object' && properties !== undefined) {
+              throw new EmberError("Ember.Object.create only accepts objects.");
+            }
+
+            if (!properties) { continue; }
+
+            var keyNames = keys(properties);
+
+            for (var j = 0, ll = keyNames.length; j < ll; j++) {
+              var keyName = keyNames[j];
+              if (!properties.hasOwnProperty(keyName)) { continue; }
+
+              var value = properties[keyName];
+
+              if (IS_BINDING.test(keyName)) {
+                var bindings = m.bindings;
+                if (!bindings) {
+                  bindings = m.bindings = {};
+                } else if (!m.hasOwnProperty('bindings')) {
+                  bindings = m.bindings = o_create(m.bindings);
+                }
+                bindings[keyName] = value;
+              }
+
+              var desc = m.descs[keyName];
+
+                                          
+              if (concatenatedProperties && indexOf(concatenatedProperties, keyName) >= 0) {
+                var baseValue = this[keyName];
+
+                if (baseValue) {
+                  if ('function' === typeof baseValue.concat) {
+                    value = baseValue.concat(value);
+                  } else {
+                    value = makeArray(baseValue).concat(value);
+                  }
+                } else {
+                  value = makeArray(value);
+                }
+              }
+
+              if (desc) {
+                desc.set(this, keyName, value);
+              } else {
+                if (typeof this.setUnknownProperty === 'function' && !(keyName in this)) {
+                  this.setUnknownProperty(keyName, value);
+                } else if (MANDATORY_SETTER) {
+                  defineProperty(this, keyName, null, value); // setup mandatory setter
+                } else {
+                  this[keyName] = value;
+                }
+              }
+            }
+          }
+        }
+        finishPartial(this, m);
+        apply(this, this.init, arguments);
+        m.proto = proto;
+        finishChains(this);
+        sendEvent(this, "init");
+      };
+
+      Class.toString = Mixin.prototype.toString;
+      Class.willReopen = function() {
+        if (wasApplied) {
+          Class.PrototypeMixin = Mixin.create(Class.PrototypeMixin);
+        }
+
+        wasApplied = false;
+      };
+      Class._initMixins = function(args) { initMixins = args; };
+      Class._initProperties = function(args) { initProperties = args; };
+
+      Class.proto = function() {
+        var superclass = Class.superclass;
+        if (superclass) { superclass.proto(); }
+
+        if (!wasApplied) {
+          wasApplied = true;
+          Class.PrototypeMixin.applyPartial(Class.prototype);
+          rewatch(Class.prototype);
+        }
+
+        return this.prototype;
+      };
+
+      return Class;
+
+    }
+
+    /**
+      @class CoreObject
+      @namespace Ember
+    */
+    var CoreObject = makeCtor();
+    CoreObject.toString = function() { return "Ember.CoreObject"; };
+
+    CoreObject.PrototypeMixin = Mixin.create({
+      reopen: function() {
+        applyMixin(this, arguments, true);
+        return this;
+      },
+
+      /**
+        An overridable method called when objects are instantiated. By default,
+        does nothing unless it is overridden during class definition.
+
+        Example:
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          init: function() {
+            alert('Name is ' + this.get('name'));
+          }
+        });
+
+        var steve = App.Person.create({
+          name: "Steve"
+        });
+
+        // alerts 'Name is Steve'.
+        ```
+
+        NOTE: If you do override `init` for a framework class like `Ember.View` or
+        `Ember.ArrayController`, be sure to call `this._super()` in your
+        `init` declaration! If you don't, Ember may not have an opportunity to
+        do important setup work, and you'll see strange behavior in your
+        application.
+
+        @method init
+      */
+      init: function() {},
+
+      /**
+        Defines the properties that will be concatenated from the superclass
+        (instead of overridden).
+
+        By default, when you extend an Ember class a property defined in
+        the subclass overrides a property with the same name that is defined
+        in the superclass. However, there are some cases where it is preferable
+        to build up a property's value by combining the superclass' property
+        value with the subclass' value. An example of this in use within Ember
+        is the `classNames` property of `Ember.View`.
+
+        Here is some sample code showing the difference between a concatenated
+        property and a normal one:
+
+        ```javascript
+        App.BarView = Ember.View.extend({
+          someNonConcatenatedProperty: ['bar'],
+          classNames: ['bar']
+        });
+
+        App.FooBarView = App.BarView.extend({
+          someNonConcatenatedProperty: ['foo'],
+          classNames: ['foo'],
+        });
+
+        var fooBarView = App.FooBarView.create();
+        fooBarView.get('someNonConcatenatedProperty'); // ['foo']
+        fooBarView.get('classNames'); // ['ember-view', 'bar', 'foo']
+        ```
+
+        This behavior extends to object creation as well. Continuing the
+        above example:
+
+        ```javascript
+        var view = App.FooBarView.create({
+          someNonConcatenatedProperty: ['baz'],
+          classNames: ['baz']
+        })
+        view.get('someNonConcatenatedProperty'); // ['baz']
+        view.get('classNames'); // ['ember-view', 'bar', 'foo', 'baz']
+        ```
+        Adding a single property that is not an array will just add it in the array:
+
+        ```javascript
+        var view = App.FooBarView.create({
+          classNames: 'baz'
+        })
+        view.get('classNames'); // ['ember-view', 'bar', 'foo', 'baz']
+        ```
+
+        Using the `concatenatedProperties` property, we can tell to Ember that mix
+        the content of the properties.
+
+        In `Ember.View` the `classNameBindings` and `attributeBindings` properties
+        are also concatenated, in addition to `classNames`.
+
+        This feature is available for you to use throughout the Ember object model,
+        although typical app developers are likely to use it infrequently. Since
+        it changes expectations about behavior of properties, you should properly
+        document its usage in each individual concatenated property (to not
+        mislead your users to think they can override the property in a subclass).
+
+        @property concatenatedProperties
+        @type Array
+        @default null
+      */
+      concatenatedProperties: null,
+
+      /**
+        Destroyed object property flag.
+
+        if this property is `true` the observers and bindings were already
+        removed by the effect of calling the `destroy()` method.
+
+        @property isDestroyed
+        @default false
+      */
+      isDestroyed: false,
+
+      /**
+        Destruction scheduled flag. The `destroy()` method has been called.
+
+        The object stays intact until the end of the run loop at which point
+        the `isDestroyed` flag is set.
+
+        @property isDestroying
+        @default false
+      */
+      isDestroying: false,
+
+      /**
+        Destroys an object by setting the `isDestroyed` flag and removing its
+        metadata, which effectively destroys observers and bindings.
+
+        If you try to set a property on a destroyed object, an exception will be
+        raised.
+
+        Note that destruction is scheduled for the end of the run loop and does not
+        happen immediately.  It will set an isDestroying flag immediately.
+
+        @method destroy
+        @return {Ember.Object} receiver
+      */
+      destroy: function() {
+        if (this.isDestroying) { return; }
+        this.isDestroying = true;
+
+        schedule('actions', this, this.willDestroy);
+        schedule('destroy', this, this._scheduledDestroy);
+        return this;
+      },
+
+      /**
+        Override to implement teardown.
+
+        @method willDestroy
+       */
+      willDestroy: K,
+
+      /**
+        Invoked by the run loop to actually destroy the object. This is
+        scheduled for execution by the `destroy` method.
+
+        @private
+        @method _scheduledDestroy
+      */
+      _scheduledDestroy: function() {
+        if (this.isDestroyed) { return; }
+        destroy(this);
+        this.isDestroyed = true;
+      },
+
+      bind: function(to, from) {
+        if (!(from instanceof Binding)) { from = Binding.from(from); }
+        from.to(to).connect(this);
+        return from;
+      },
+
+      /**
+        Returns a string representation which attempts to provide more information
+        than Javascript's `toString` typically does, in a generic way for all Ember
+        objects.
+
+        ```javascript
+        App.Person = Em.Object.extend()
+        person = App.Person.create()
+        person.toString() //=> "<App.Person:ember1024>"
+        ```
+
+        If the object's class is not defined on an Ember namespace, it will
+        indicate it is a subclass of the registered superclass:
+
+       ```javascript
+        Student = App.Person.extend()
+        student = Student.create()
+        student.toString() //=> "<(subclass of App.Person):ember1025>"
+        ```
+
+        If the method `toStringExtension` is defined, its return value will be
+        included in the output.
+
+        ```javascript
+        App.Teacher = App.Person.extend({
+          toStringExtension: function() {
+            return this.get('fullName');
+          }
+        });
+        teacher = App.Teacher.create()
+        teacher.toString(); //=> "<App.Teacher:ember1026:Tom Dale>"
+        ```
+
+        @method toString
+        @return {String} string representation
+      */
+      toString: function toString() {
+        var hasToStringExtension = typeof this.toStringExtension === 'function',
+            extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
+        var ret = '<'+this.constructor.toString()+':'+guidFor(this)+extension+'>';
+        this.toString = makeToString(ret);
+        return ret;
+      }
+    });
+
+    CoreObject.PrototypeMixin.ownerConstructor = CoreObject;
+
+    function makeToString(ret) {
+      return function() { return ret; };
+    }
+
+    if (Ember.config.overridePrototypeMixin) {
+      Ember.config.overridePrototypeMixin(CoreObject.PrototypeMixin);
+    }
+
+    CoreObject.__super__ = null;
+
+    var ClassMixin = Mixin.create({
+
+      ClassMixin: required(),
+
+      PrototypeMixin: required(),
+
+      isClass: true,
+
+      isMethod: false,
+
+      /**
+        Creates a new subclass.
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          say: function(thing) {
+            alert(thing);
+           }
+        });
+        ```
+
+        This defines a new subclass of Ember.Object: `App.Person`. It contains one method: `say()`.
+
+        You can also create a subclass from any existing class by calling its `extend()`  method. For example, you might want to create a subclass of Ember's built-in `Ember.View` class:
+
+        ```javascript
+        App.PersonView = Ember.View.extend({
+          tagName: 'li',
+          classNameBindings: ['isAdministrator']
+        });
+        ```
+
+        When defining a subclass, you can override methods but still access the implementation of your parent class by calling the special `_super()` method:
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          say: function(thing) {
+            var name = this.get('name');
+            alert(name + ' says: ' + thing);
+          }
+        });
+
+        App.Soldier = App.Person.extend({
+          say: function(thing) {
+            this._super(thing + ", sir!");
+          },
+          march: function(numberOfHours) {
+            alert(this.get('name') + ' marches for ' + numberOfHours + ' hours.')
+          }
+        });
+
+        var yehuda = App.Soldier.create({
+          name: "Yehuda Katz"
+        });
+
+        yehuda.say("Yes");  // alerts "Yehuda Katz says: Yes, sir!"
+        ```
+
+        The `create()` on line #17 creates an *instance* of the `App.Soldier` class. The `extend()` on line #8 creates a *subclass* of `App.Person`. Any instance of the `App.Person` class will *not* have the `march()` method.
+
+        You can also pass `Mixin` classes to add additional properties to the subclass.
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          say: function(thing) {
+            alert(this.get('name') + ' says: ' + thing);
+          }
+        });
+
+        App.SingingMixin = Mixin.create({
+          sing: function(thing){
+            alert(this.get('name') + ' sings: la la la ' + thing);
+          }
+        });
+
+        App.BroadwayStar = App.Person.extend(App.SingingMixin, {
+          dance: function() {
+            alert(this.get('name') + ' dances: tap tap tap tap ');
+          }
+        });
+        ```
+
+        The `App.BroadwayStar` class contains three methods: `say()`, `sing()`, and `dance()`.
+
+        @method extend
+        @static
+
+        @param {Mixin} [mixins]* One or more Mixin classes
+        @param {Object} [arguments]* Object containing values to use within the new class
+      */
+      extend: function() {
+        var Class = makeCtor(), proto;
+        Class.ClassMixin = Mixin.create(this.ClassMixin);
+        Class.PrototypeMixin = Mixin.create(this.PrototypeMixin);
+
+        Class.ClassMixin.ownerConstructor = Class;
+        Class.PrototypeMixin.ownerConstructor = Class;
+
+        reopen.apply(Class.PrototypeMixin, arguments);
+
+        Class.superclass = this;
+        Class.__super__  = this.prototype;
+
+        proto = Class.prototype = o_create(this.prototype);
+        proto.constructor = Class;
+        generateGuid(proto);
+        meta(proto).proto = proto; // this will disable observers on prototype
+
+        Class.ClassMixin.apply(Class);
+        return Class;
+      },
+
+      /**
+        Equivalent to doing `extend(arguments).create()`.
+        If possible use the normal `create` method instead.
+
+        @method createWithMixins
+        @static
+        @param [arguments]*
+      */
+      createWithMixins: function() {
+        var C = this;
+        if (arguments.length>0) { this._initMixins(arguments); }
+        return new C();
+      },
+
+      /**
+        Creates an instance of a class. Accepts either no arguments, or an object
+        containing values to initialize the newly instantiated object with.
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          helloWorld: function() {
+            alert("Hi, my name is " + this.get('name'));
+          }
+        });
+
+        var tom = App.Person.create({
+          name: 'Tom Dale'
+        });
+
+        tom.helloWorld(); // alerts "Hi, my name is Tom Dale".
+        ```
+
+        `create` will call the `init` function if defined during
+        `Ember.AnyObject.extend`
+
+        If no arguments are passed to `create`, it will not set values to the new
+        instance during initialization:
+
+        ```javascript
+        var noName = App.Person.create();
+        noName.helloWorld(); // alerts undefined
+        ```
+
+        NOTE: For performance reasons, you cannot declare methods or computed
+        properties during `create`. You should instead declare methods and computed
+        properties when using `extend` or use the `createWithMixins` shorthand.
+
+        @method create
+        @static
+        @param [arguments]*
+      */
+      create: function() {
+        var C = this;
+        if (arguments.length>0) { this._initProperties(arguments); }
+        return new C();
+      },
+
+      /**
+        Augments a constructor's prototype with additional
+        properties and functions:
+
+        ```javascript
+        MyObject = Ember.Object.extend({
+          name: 'an object'
+        });
+
+        o = MyObject.create();
+        o.get('name'); // 'an object'
+
+        MyObject.reopen({
+          say: function(msg){
+            console.log(msg);
+          }
+        })
+
+        o2 = MyObject.create();
+        o2.say("hello"); // logs "hello"
+
+        o.say("goodbye"); // logs "goodbye"
+        ```
+
+        To add functions and properties to the constructor itself,
+        see `reopenClass`
+
+        @method reopen
+      */
+      reopen: function() {
+        this.willReopen();
+        apply(this.PrototypeMixin, reopen, arguments);
+        return this;
+      },
+
+      /**
+        Augments a constructor's own properties and functions:
+
+        ```javascript
+        MyObject = Ember.Object.extend({
+          name: 'an object'
+        });
+
+        MyObject.reopenClass({
+          canBuild: false
+        });
+
+        MyObject.canBuild; // false
+        o = MyObject.create();
+        ```
+
+        In other words, this creates static properties and functions for the class. These are only available on the class
+        and not on any instance of that class.
+
+        ```javascript
+        App.Person = Ember.Object.extend({
+          name : "",
+          sayHello : function(){
+            alert("Hello. My name is " + this.get('name'));
+          }
+        });
+
+        App.Person.reopenClass({
+          species : "Homo sapiens",
+          createPerson: function(newPersonsName){
+            return App.Person.create({
+              name:newPersonsName
+            });
+          }
+        });
+
+        var tom = App.Person.create({
+          name : "Tom Dale"
+        });
+        var yehuda = App.Person.createPerson("Yehuda Katz");
+
+        tom.sayHello(); // "Hello. My name is Tom Dale"
+        yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
+        alert(App.Person.species); // "Homo sapiens"
+        ```
+
+        Note that `species` and `createPerson` are *not* valid on the `tom` and `yehuda`
+        variables. They are only valid on `App.Person`.
+
+        To add functions and properties to instances of
+        a constructor by extending the constructor's prototype
+        see `reopen`
+
+        @method reopenClass
+      */
+      reopenClass: function() {
+        apply(this.ClassMixin, reopen, arguments);
+        applyMixin(this, arguments, false);
+        return this;
+      },
+
+      detect: function(obj) {
+        if ('function' !== typeof obj) { return false; }
+        while(obj) {
+          if (obj===this) { return true; }
+          obj = obj.superclass;
+        }
+        return false;
+      },
+
+      detectInstance: function(obj) {
+        return obj instanceof this;
+      },
+
+      /**
+        In some cases, you may want to annotate computed properties with additional
+        metadata about how they function or what values they operate on. For
+        example, computed property functions may close over variables that are then
+        no longer available for introspection.
+
+        You can pass a hash of these values to a computed property like this:
+
+        ```javascript
+        person: function() {
+          var personId = this.get('personId');
+          return App.Person.create({ id: personId });
+        }.property().meta({ type: App.Person })
+        ```
+
+        Once you've done this, you can retrieve the values saved to the computed
+        property from your class like this:
+
+        ```javascript
+        MyClass.metaForProperty('person');
+        ```
+
+        This will return the original hash that was passed to `meta()`.
+
+        @method metaForProperty
+        @param key {String} property name
+      */
+      metaForProperty: function(key) {
+        var meta = this.proto()[META_KEY],
+            desc = meta && meta.descs[key];
+
+                return desc._meta || {};
+      },
+
+      /**
+        Iterate over each computed property for the class, passing its name
+        and any associated metadata (see `metaForProperty`) to the callback.
+
+        @method eachComputedProperty
+        @param {Function} callback
+        @param {Object} binding
+      */
+      eachComputedProperty: function(callback, binding) {
+        var proto = this.proto(),
+            descs = meta(proto).descs,
+            empty = {},
+            property;
+
+        for (var name in descs) {
+          property = descs[name];
+
+          if (property instanceof ComputedProperty) {
+            callback.call(binding || this, name, property._meta || empty);
+          }
+        }
+      }
+
+    });
+
+    ClassMixin.ownerConstructor = CoreObject;
+
+    if (Ember.config.overrideClassMixin) {
+      Ember.config.overrideClassMixin(ClassMixin);
+    }
+
+    CoreObject.ClassMixin = ClassMixin;
+    ClassMixin.apply(CoreObject);
+
+    __exports__["default"] = CoreObject;
+  });
+define("ember-runtime/system/deferred",
+  ["ember-runtime/mixins/deferred","ember-metal/property_get","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var DeferredMixin = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var EmberObject = __dependency3__["default"];
+
+    var Deferred = EmberObject.extend(DeferredMixin);
+
+    Deferred.reopenClass({
+      promise: function(callback, binding) {
+        var deferred = Deferred.create();
+        callback.call(binding, deferred);
+        return deferred;
+      }
+    });
+
+    __exports__["default"] = Deferred;
+  });
+define("ember-runtime/system/each_proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/enumerable_utils","ember-metal/array","ember-runtime/mixins/array","ember-runtime/system/object","ember-metal/computed","ember-metal/observer","ember-metal/events","ember-metal/properties","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+    var EnumerableUtils = __dependency5__["default"];
+    var indexOf = __dependency6__.indexOf;
+    var EmberArray = __dependency7__["default"];
+    // ES6TODO: WAT? Circular dep?
+    var EmberObject = __dependency8__["default"];
+    var computed = __dependency9__.computed;
+    var addObserver = __dependency10__.addObserver;
+    var addBeforeObserver = __dependency10__.addBeforeObserver;
+    var removeBeforeObserver = __dependency10__.removeBeforeObserver;
+    var removeObserver = __dependency10__.removeObserver;
+    var typeOf = __dependency4__.typeOf;
+    var watchedEvents = __dependency11__.watchedEvents;
+    var defineProperty = __dependency12__.defineProperty;
+    var beginPropertyChanges = __dependency13__.beginPropertyChanges;
+    var propertyDidChange = __dependency13__.propertyDidChange;
+    var propertyWillChange = __dependency13__.propertyWillChange;
+    var endPropertyChanges = __dependency13__.endPropertyChanges;
+    var changeProperties = __dependency13__.changeProperties;
+
+    var forEach = EnumerableUtils.forEach;
+
+    var EachArray = EmberObject.extend(EmberArray, {
+
+      init: function(content, keyName, owner) {
+        this._super();
+        this._keyName = keyName;
+        this._owner   = owner;
+        this._content = content;
+      },
+
+      objectAt: function(idx) {
+        var item = this._content.objectAt(idx);
+        return item && get(item, this._keyName);
+      },
+
+      length: computed(function() {
+        var content = this._content;
+        return content ? get(content, 'length') : 0;
+      })
+
+    });
+
+    var IS_OBSERVER = /^.+:(before|change)$/;
+
+    function addObserverForContentKey(content, keyName, proxy, idx, loc) {
+      var objects = proxy._objects, guid;
+      if (!objects) objects = proxy._objects = {};
+
+      while(--loc>=idx) {
+        var item = content.objectAt(loc);
+        if (item) {
+                    addBeforeObserver(item, keyName, proxy, 'contentKeyWillChange');
+          addObserver(item, keyName, proxy, 'contentKeyDidChange');
+
+          // keep track of the index each item was found at so we can map
+          // it back when the obj changes.
+          guid = guidFor(item);
+          if (!objects[guid]) objects[guid] = [];
+          objects[guid].push(loc);
+        }
+      }
+    }
+
+    function removeObserverForContentKey(content, keyName, proxy, idx, loc) {
+      var objects = proxy._objects;
+      if (!objects) objects = proxy._objects = {};
+      var indicies, guid;
+
+      while(--loc>=idx) {
+        var item = content.objectAt(loc);
+        if (item) {
+          removeBeforeObserver(item, keyName, proxy, 'contentKeyWillChange');
+          removeObserver(item, keyName, proxy, 'contentKeyDidChange');
+
+          guid = guidFor(item);
+          indicies = objects[guid];
+          indicies[indexOf.call(indicies, loc)] = null;
+        }
+      }
+    }
+
+    /**
+      This is the object instance returned when you get the `@each` property on an
+      array. It uses the unknownProperty handler to automatically create
+      EachArray instances for property names.
+
+      @private
+      @class EachProxy
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var EachProxy = EmberObject.extend({
+
+      init: function(content) {
+        this._super();
+        this._content = content;
+        content.addArrayObserver(this);
+
+        // in case someone is already observing some keys make sure they are
+        // added
+        forEach(watchedEvents(this), function(eventName) {
+          this.didAddListener(eventName);
+        }, this);
+      },
+
+      /**
+        You can directly access mapped properties by simply requesting them.
+        The `unknownProperty` handler will generate an EachArray of each item.
+
+        @method unknownProperty
+        @param keyName {String}
+        @param value {*}
+      */
+      unknownProperty: function(keyName, value) {
+        var ret;
+        ret = new EachArray(this._content, keyName, this);
+        defineProperty(this, keyName, null, ret);
+        this.beginObservingContentKey(keyName);
+        return ret;
+      },
+
+      // ..........................................................
+      // ARRAY CHANGES
+      // Invokes whenever the content array itself changes.
+
+      arrayWillChange: function(content, idx, removedCnt, addedCnt) {
+        var keys = this._keys, key, lim;
+
+        lim = removedCnt>0 ? idx+removedCnt : -1;
+        beginPropertyChanges(this);
+
+        for(key in keys) {
+          if (!keys.hasOwnProperty(key)) { continue; }
+
+          if (lim>0) { removeObserverForContentKey(content, key, this, idx, lim); }
+
+          propertyWillChange(this, key);
+        }
+
+        propertyWillChange(this._content, '@each');
+        endPropertyChanges(this);
+      },
+
+      arrayDidChange: function(content, idx, removedCnt, addedCnt) {
+        var keys = this._keys, lim;
+
+        lim = addedCnt>0 ? idx+addedCnt : -1;
+        changeProperties(function() {
+          for(var key in keys) {
+            if (!keys.hasOwnProperty(key)) { continue; }
+
+            if (lim>0) { addObserverForContentKey(content, key, this, idx, lim); }
+
+            propertyDidChange(this, key);
+          }
+
+          propertyDidChange(this._content, '@each');
+        }, this);
+      },
+
+      // ..........................................................
+      // LISTEN FOR NEW OBSERVERS AND OTHER EVENT LISTENERS
+      // Start monitoring keys based on who is listening...
+
+      didAddListener: function(eventName) {
+        if (IS_OBSERVER.test(eventName)) {
+          this.beginObservingContentKey(eventName.slice(0, -7));
+        }
+      },
+
+      didRemoveListener: function(eventName) {
+        if (IS_OBSERVER.test(eventName)) {
+          this.stopObservingContentKey(eventName.slice(0, -7));
+        }
+      },
+
+      // ..........................................................
+      // CONTENT KEY OBSERVING
+      // Actual watch keys on the source content.
+
+      beginObservingContentKey: function(keyName) {
+        var keys = this._keys;
+        if (!keys) keys = this._keys = {};
+        if (!keys[keyName]) {
+          keys[keyName] = 1;
+          var content = this._content,
+              len = get(content, 'length');
+          addObserverForContentKey(content, keyName, this, 0, len);
+        } else {
+          keys[keyName]++;
+        }
+      },
+
+      stopObservingContentKey: function(keyName) {
+        var keys = this._keys;
+        if (keys && (keys[keyName]>0) && (--keys[keyName]<=0)) {
+          var content = this._content,
+              len     = get(content, 'length');
+          removeObserverForContentKey(content, keyName, this, 0, len);
+        }
+      },
+
+      contentKeyWillChange: function(obj, keyName) {
+        propertyWillChange(this, keyName);
+      },
+
+      contentKeyDidChange: function(obj, keyName) {
+        propertyDidChange(this, keyName);
+      }
+
+    });
+
+    __exports__.EachArray = EachArray;
+    __exports__.EachProxy = EachProxy;
+  });
+define("ember-runtime/system/lazy_load",
+  ["ember-metal/core","ember-metal/array","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /*globals CustomEvent */
+
+    var Ember = __dependency1__["default"];
+    // Ember.ENV.EMBER_LOAD_HOOKS
+    var forEach = __dependency2__.forEach;
+    // make sure Ember.A is setup.
+
+    /**
+      @module ember
+      @submodule ember-runtime
+    */
+
+    var loadHooks = Ember.ENV.EMBER_LOAD_HOOKS || {};
+    var loaded = {};
+
+    /**
+      Detects when a specific package of Ember (e.g. 'Ember.Handlebars')
+      has fully loaded and is available for extension.
+
+      The provided `callback` will be called with the `name` passed
+      resolved from a string into the object:
+
+      ``` javascript
+      Ember.onLoad('Ember.Handlebars' function(hbars) {
+        hbars.registerHelper(...);
+      });
+      ```
+
+      @method onLoad
+      @for Ember
+      @param name {String} name of hook
+      @param callback {Function} callback to be called
+    */
+    function onLoad(name, callback) {
+      var object;
+
+      loadHooks[name] = loadHooks[name] || Ember.A();
+      loadHooks[name].pushObject(callback);
+
+      if (object = loaded[name]) {
+        callback(object);
+      }
+    };
+
+    /**
+      Called when an Ember.js package (e.g Ember.Handlebars) has finished
+      loading. Triggers any callbacks registered for this event.
+
+      @method runLoadHooks
+      @for Ember
+      @param name {String} name of hook
+      @param object {Object} object to pass to callbacks
+    */
+    function runLoadHooks(name, object) {
+      loaded[name] = object;
+
+      if (typeof window === 'object' && typeof window.dispatchEvent === 'function' && typeof CustomEvent === "function") {
+        var event = new CustomEvent(name, {detail: object, name: name});
+        window.dispatchEvent(event);
+      }
+
+      if (loadHooks[name]) {
+        forEach.call(loadHooks[name], function(callback) {
+          callback(object);
+        });
+      }
+    };
+
+    __exports__.onLoad = onLoad;
+    __exports__.runLoadHooks = runLoadHooks;
+  });
+define("ember-runtime/system/namespace",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/mixin","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    // Ember.lookup, Ember.BOOTED, Ember.deprecate, Ember.NAME_KEY, Ember.anyUnprocessedMixins
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var indexOf = __dependency3__.indexOf;
+    var GUID_KEY = __dependency4__.GUID_KEY;
+    var guidFor = __dependency4__.guidFor;
+    var Mixin = __dependency5__.Mixin;
+
+    var EmberObject = __dependency6__["default"];
+
+    /**
+      A Namespace is an object usually used to contain other objects or methods
+      such as an application or framework. Create a namespace anytime you want
+      to define one of these new containers.
+
+      # Example Usage
+
+      ```javascript
+      MyFramework = Ember.Namespace.create({
+        VERSION: '1.0.0'
+      });
+      ```
+
+      @class Namespace
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var Namespace = EmberObject.extend({
+      isNamespace: true,
+
+      init: function() {
+        Namespace.NAMESPACES.push(this);
+        Namespace.PROCESSED = false;
+      },
+
+      toString: function() {
+        var name = get(this, 'name');
+        if (name) { return name; }
+
+        findNamespaces();
+        return this[NAME_KEY];
+      },
+
+      nameClasses: function() {
+        processNamespace([this.toString()], this, {});
+      },
+
+      destroy: function() {
+        var namespaces = Namespace.NAMESPACES,
+            toString = this.toString();
+
+        if (toString) {
+          Ember.lookup[toString] = undefined;
+          delete Namespace.NAMESPACES_BY_ID[toString];
+        }
+        namespaces.splice(indexOf.call(namespaces, this), 1);
+        this._super();
+      }
+    });
+
+    Namespace.reopenClass({
+      NAMESPACES: [Ember],
+      NAMESPACES_BY_ID: {},
+      PROCESSED: false,
+      processAll: processAllNamespaces,
+      byName: function(name) {
+        if (!Ember.BOOTED) {
+          processAllNamespaces();
+        }
+
+        return NAMESPACES_BY_ID[name];
+      }
+    });
+
+    var NAMESPACES_BY_ID = Namespace.NAMESPACES_BY_ID;
+
+    var hasOwnProp = ({}).hasOwnProperty;
+
+    function processNamespace(paths, root, seen) {
+      var idx = paths.length;
+
+      NAMESPACES_BY_ID[paths.join('.')] = root;
+
+      // Loop over all of the keys in the namespace, looking for classes
+      for(var key in root) {
+        if (!hasOwnProp.call(root, key)) { continue; }
+        var obj = root[key];
+
+        // If we are processing the `Ember` namespace, for example, the
+        // `paths` will start with `["Ember"]`. Every iteration through
+        // the loop will update the **second** element of this list with
+        // the key, so processing `Ember.View` will make the Array
+        // `['Ember', 'View']`.
+        paths[idx] = key;
+
+        // If we have found an unprocessed class
+        if (obj && obj.toString === classToString) {
+          // Replace the class' `toString` with the dot-separated path
+          // and set its `NAME_KEY`
+          obj.toString = makeToString(paths.join('.'));
+          obj[NAME_KEY] = paths.join('.');
+
+        // Support nested namespaces
+        } else if (obj && obj.isNamespace) {
+          // Skip aliased namespaces
+          if (seen[guidFor(obj)]) { continue; }
+          seen[guidFor(obj)] = true;
+
+          // Process the child namespace
+          processNamespace(paths, obj, seen);
+        }
+      }
+
+      paths.length = idx; // cut out last item
+    }
+
+    var STARTS_WITH_UPPERCASE = /^[A-Z]/;
+
+    function findNamespaces() {
+      var lookup = Ember.lookup, obj, isNamespace;
+
+      if (Namespace.PROCESSED) { return; }
+
+      for (var prop in lookup) {
+        // Only process entities that start with uppercase A-Z
+        if (!STARTS_WITH_UPPERCASE.test(prop)) { continue; }
+
+        // Unfortunately, some versions of IE don't support window.hasOwnProperty
+        if (lookup.hasOwnProperty && !lookup.hasOwnProperty(prop)) { continue; }
+
+        // At times we are not allowed to access certain properties for security reasons.
+        // There are also times where even if we can access them, we are not allowed to access their properties.
+        try {
+          obj = lookup[prop];
+          isNamespace = obj && obj.isNamespace;
+        } catch (e) {
+          continue;
+        }
+
+        if (isNamespace) {
+          obj[NAME_KEY] = prop;
+        }
+      }
+    }
+
+    var NAME_KEY = Ember.NAME_KEY = GUID_KEY + '_name';
+
+    function superClassString(mixin) {
+      var superclass = mixin.superclass;
+      if (superclass) {
+        if (superclass[NAME_KEY]) { return superclass[NAME_KEY]; }
+        else { return superClassString(superclass); }
+      } else {
+        return;
+      }
+    }
+
+    function classToString() {
+      if (!Ember.BOOTED && !this[NAME_KEY]) {
+        processAllNamespaces();
+      }
+
+      var ret;
+
+      if (this[NAME_KEY]) {
+        ret = this[NAME_KEY];
+      } else if (this._toString) {
+        ret = this._toString;
+      } else {
+        var str = superClassString(this);
+        if (str) {
+          ret = "(subclass of " + str + ")";
+        } else {
+          ret = "(unknown mixin)";
+        }
+        this.toString = makeToString(ret);
+      }
+
+      return ret;
+    }
+
+    function processAllNamespaces() {
+      var unprocessedNamespaces = !Namespace.PROCESSED,
+          unprocessedMixins = Ember.anyUnprocessedMixins;
+
+      if (unprocessedNamespaces) {
+        findNamespaces();
+        Namespace.PROCESSED = true;
+      }
+
+      if (unprocessedNamespaces || unprocessedMixins) {
+        var namespaces = Namespace.NAMESPACES, namespace;
+        for (var i=0, l=namespaces.length; i<l; i++) {
+          namespace = namespaces[i];
+          processNamespace([namespace.toString()], namespace, {});
+        }
+
+        Ember.anyUnprocessedMixins = false;
+      }
+    }
+
+    function makeToString(ret) {
+      return function() { return ret; };
+    }
+
+    Mixin.prototype.toString = classToString; // ES6TODO: altering imported objects. SBB.
+
+    __exports__["default"] = Namespace;
+  });
+define("ember-runtime/system/native_array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.EXTEND_PROTOTYPES
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EnumerableUtils = __dependency4__["default"];
+    var Mixin = __dependency5__.Mixin;
+    var EmberArray = __dependency6__["default"];
+    var MutableArray = __dependency7__["default"];
+    var Observable = __dependency8__["default"];
+    var Copyable = __dependency9__["default"];
+    var FROZEN_ERROR = __dependency10__.FROZEN_ERROR;
+    var copy = __dependency11__["default"];
+
+    var replace = EnumerableUtils._replace,
+        forEach = EnumerableUtils.forEach;
+
+    // Add Ember.Array to Array.prototype. Remove methods with native
+    // implementations and supply some more optimized versions of generic methods
+    // because they are so common.
+
+    /**
+      The NativeArray mixin contains the properties needed to to make the native
+      Array support Ember.MutableArray and all of its dependent APIs. Unless you
+      have `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Array` set to
+      false, this will be applied automatically. Otherwise you can apply the mixin
+      at anytime by calling `Ember.NativeArray.activate`.
+
+      @class NativeArray
+      @namespace Ember
+      @uses Ember.MutableArray
+      @uses Ember.Observable
+      @uses Ember.Copyable
+    */
+    var NativeArray = Mixin.create(MutableArray, Observable, Copyable, {
+
+      // because length is a built-in property we need to know to just get the
+      // original property.
+      get: function(key) {
+        if (key==='length') return this.length;
+        else if ('number' === typeof key) return this[key];
+        else return this._super(key);
+      },
+
+      objectAt: function(idx) {
+        return this[idx];
+      },
+
+      // primitive for array support.
+      replace: function(idx, amt, objects) {
+
+        if (this.isFrozen) throw FROZEN_ERROR;
+
+        // if we replaced exactly the same number of items, then pass only the
+        // replaced range. Otherwise, pass the full remaining array length
+        // since everything has shifted
+        var len = objects ? get(objects, 'length') : 0;
+        this.arrayContentWillChange(idx, amt, len);
+
+        if (len === 0) {
+          this.splice(idx, amt);
+        } else {
+          replace(this, idx, amt, objects);
+        }
+
+        this.arrayContentDidChange(idx, amt, len);
+        return this;
+      },
+
+      // If you ask for an unknown property, then try to collect the value
+      // from member items.
+      unknownProperty: function(key, value) {
+        var ret;// = this.reducedProperty(key, value) ;
+        if ((value !== undefined) && ret === undefined) {
+          ret = this[key] = value;
+        }
+        return ret ;
+      },
+
+      // If browser did not implement indexOf natively, then override with
+      // specialized version
+      indexOf: function(object, startAt) {
+        var idx, len = this.length;
+
+        if (startAt === undefined) startAt = 0;
+        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
+        if (startAt < 0) startAt += len;
+
+        for(idx=startAt;idx<len;idx++) {
+          if (this[idx] === object) return idx ;
+        }
+        return -1;
+      },
+
+      lastIndexOf: function(object, startAt) {
+        var idx, len = this.length;
+
+        if (startAt === undefined) startAt = len-1;
+        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
+        if (startAt < 0) startAt += len;
+
+        for(idx=startAt;idx>=0;idx--) {
+          if (this[idx] === object) return idx ;
+        }
+        return -1;
+      },
+
+      copy: function(deep) {
+        if (deep) {
+          return this.map(function(item) { return copy(item, true); });
+        }
+
+        return this.slice();
+      }
+    });
+
+    // Remove any methods implemented natively so we don't override them
+    var ignore = ['length'];
+    forEach(NativeArray.keys(), function(methodName) {
+      if (Array.prototype[methodName]) ignore.push(methodName);
+    });
+
+    if (ignore.length>0) {
+      NativeArray = NativeArray.without.apply(NativeArray, ignore);
+    }
+
+    /**
+      Creates an `Ember.NativeArray` from an Array like object.
+      Does not modify the original object. Ember.A is not needed if
+      `Ember.EXTEND_PROTOTYPES` is `true` (the default value). However,
+      it is recommended that you use Ember.A when creating addons for
+      ember or when you can not guarantee that `Ember.EXTEND_PROTOTYPES`
+      will be `true`.
+
+      Example
+
+      ```js
+      var Pagination = Ember.CollectionView.extend({
+        tagName: 'ul',
+        classNames: ['pagination'],
+
+        init: function() {
+          this._super();
+          if (!this.get('content')) {
+            this.set('content', Ember.A());
+          }
+        }
+      });
+      ```
+
+      @method A
+      @for Ember
+      @return {Ember.NativeArray}
+    */
+    var A = function(arr) {
+      if (arr === undefined) { arr = []; }
+      return EmberArray.detect(arr) ? arr : NativeArray.apply(arr);
+    };
+
+    /**
+      Activates the mixin on the Array.prototype if not already applied. Calling
+      this method more than once is safe. This will be called when ember is loaded
+      unless you have `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Array`
+      set to `false`.
+
+      Example
+
+      ```js
+      if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Array) {
+        Ember.NativeArray.activate();
+      }
+      ```
+
+      @method activate
+      @for Ember.NativeArray
+      @static
+      @return {void}
+    */
+    NativeArray.activate = function() {
+      NativeArray.apply(Array.prototype);
+
+      A = function(arr) { return arr || []; };
+    };
+
+    if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Array) {
+      NativeArray.activate();
+    }
+
+    Ember.A = A; // ES6TODO: Setting A onto the object returned by ember-metal/core to avoid circles
+    __exports__.A = A;
+    __exports__.NativeArray = NativeArray;__exports__["default"] = NativeArray;
+  });
+define("ember-runtime/system/object",
+  ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+
+    var CoreObject = __dependency1__["default"];
+    var Observable = __dependency2__["default"];
+
+    /**
+      `Ember.Object` is the main base class for all Ember objects. It is a subclass
+      of `Ember.CoreObject` with the `Ember.Observable` mixin applied. For details,
+      see the documentation for each of these.
+
+      @class Object
+      @namespace Ember
+      @extends Ember.CoreObject
+      @uses Ember.Observable
+    */
+    var EmberObject = CoreObject.extend(Observable);
+    EmberObject.toString = function() { return "Ember.Object"; };
+
+    __exports__["default"] = EmberObject;
+  });
+define("ember-runtime/system/object_proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var meta = __dependency4__.meta;
+    var addObserver = __dependency5__.addObserver;
+    var removeObserver = __dependency5__.removeObserver;
+    var addBeforeObserver = __dependency5__.addBeforeObserver;
+    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var computed = __dependency7__.computed;
+    var defineProperty = __dependency8__.defineProperty;
+    var observer = __dependency9__.observer;
+    var fmt = __dependency10__.fmt;
+    var EmberObject = __dependency11__["default"];
+
+    function contentPropertyWillChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; }  // if shadowed in proxy
+      propertyWillChange(this, key);
+    }
+
+    function contentPropertyDidChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; } // if shadowed in proxy
+      propertyDidChange(this, key);
+    }
+
+    /**
+      `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
+      to a proxied `content` object.
+
+      ```javascript
+      object = Ember.Object.create({
+        name: 'Foo'
+      });
+
+      proxy = Ember.ObjectProxy.create({
+        content: object
+      });
+
+      // Access and change existing properties
+      proxy.get('name')          // 'Foo'
+      proxy.set('name', 'Bar');
+      object.get('name')         // 'Bar'
+
+      // Create new 'description' property on `object`
+      proxy.set('description', 'Foo is a whizboo baz');
+      object.get('description')  // 'Foo is a whizboo baz'
+      ```
+
+      While `content` is unset, setting a property to be delegated will throw an
+      Error.
+
+      ```javascript
+      proxy = Ember.ObjectProxy.create({
+        content: null,
+        flag: null
+      });
+      proxy.set('flag', true);
+      proxy.get('flag');         // true
+      proxy.get('foo');          // undefined
+      proxy.set('foo', 'data');  // throws Error
+      ```
+
+      Delegated properties can be bound to and will change when content is updated.
+
+      Computed properties on the proxy itself can depend on delegated properties.
+
+      ```javascript
+      ProxyWithComputedProperty = Ember.ObjectProxy.extend({
+        fullName: function () {
+          var firstName = this.get('firstName'),
+              lastName = this.get('lastName');
+          if (firstName && lastName) {
+            return firstName + ' ' + lastName;
+          }
+          return firstName || lastName;
+        }.property('firstName', 'lastName')
+      });
+
+      proxy = ProxyWithComputedProperty.create();
+
+      proxy.get('fullName');  // undefined
+      proxy.set('content', {
+        firstName: 'Tom', lastName: 'Dale'
+      }); // triggers property change for fullName on proxy
+
+      proxy.get('fullName');  // 'Tom Dale'
+      ```
+
+      @class ObjectProxy
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var ObjectProxy = EmberObject.extend({
+      /**
+        The object whose properties will be forwarded.
+
+        @property content
+        @type Ember.Object
+        @default null
+      */
+      content: null,
+      _contentDidChange: observer('content', function() {
+              }),
+
+      isTruthy: computed.bool('content'),
+
+      _debugContainerKey: null,
+
+      willWatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        addObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      didUnwatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        removeObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      unknownProperty: function (key) {
+        var content = get(this, 'content');
+        if (content) {
+          return get(content, key);
+        }
+      },
+
+      setUnknownProperty: function (key, value) {
+        var m = meta(this);
+        if (m.proto === this) {
+          // if marked as prototype then just defineProperty
+          // rather than delegate
+          defineProperty(this, key, null, value);
+          return value;
+        }
+
+        var content = get(this, 'content');
+                return set(content, key, value);
+      }
+
+    });
+
+    __exports__["default"] = ObjectProxy;
+  });
+define("ember-runtime/system/set",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/is_none","ember-runtime/system/string","ember-runtime/system/core_object","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-metal/error","ember-metal/property_events","ember-metal/mixin","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.isNone
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+    var isNone = __dependency5__.isNone;
+    var fmt = __dependency6__.fmt;
+    var CoreObject = __dependency7__["default"];
+    var MutableEnumerable = __dependency8__["default"];
+    var Enumerable = __dependency9__["default"];
+    var Copyable = __dependency10__["default"];
+    var Freezable = __dependency11__.Freezable;
+    var FROZEN_ERROR = __dependency11__.FROZEN_ERROR;
+    var EmberError = __dependency12__["default"];
+    var propertyWillChange = __dependency13__.propertyWillChange;
+    var propertyDidChange = __dependency13__.propertyDidChange;
+    var aliasMethod = __dependency14__.aliasMethod;
+    var computed = __dependency15__.computed;
+
+    /**
+      An unordered collection of objects.
+
+      A Set works a bit like an array except that its items are not ordered. You
+      can create a set to efficiently test for membership for an object. You can
+      also iterate through a set just like an array, even accessing objects by
+      index, however there is no guarantee as to their order.
+
+      All Sets are observable via the Enumerable Observer API - which works
+      on any enumerable object including both Sets and Arrays.
+
+      ## Creating a Set
+
+      You can create a set like you would most objects using
+      `new Ember.Set()`. Most new sets you create will be empty, but you can
+      also initialize the set with some content by passing an array or other
+      enumerable of objects to the constructor.
+
+      Finally, you can pass in an existing set and the set will be copied. You
+      can also create a copy of a set by calling `Ember.Set#copy()`.
+
+      ```javascript
+      // creates a new empty set
+      var foundNames = new Ember.Set();
+
+      // creates a set with four names in it.
+      var names = new Ember.Set(["Charles", "Tom", "Juan", "Alex"]); // :P
+
+      // creates a copy of the names set.
+      var namesCopy = new Ember.Set(names);
+
+      // same as above.
+      var anotherNamesCopy = names.copy();
+      ```
+
+      ## Adding/Removing Objects
+
+      You generally add or remove objects from a set using `add()` or
+      `remove()`. You can add any type of object including primitives such as
+      numbers, strings, and booleans.
+
+      Unlike arrays, objects can only exist one time in a set. If you call `add()`
+      on a set with the same object multiple times, the object will only be added
+      once. Likewise, calling `remove()` with the same object multiple times will
+      remove the object the first time and have no effect on future calls until
+      you add the object to the set again.
+
+      NOTE: You cannot add/remove `null` or `undefined` to a set. Any attempt to do
+      so will be ignored.
+
+      In addition to add/remove you can also call `push()`/`pop()`. Push behaves
+      just like `add()` but `pop()`, unlike `remove()` will pick an arbitrary
+      object, remove it and return it. This is a good way to use a set as a job
+      queue when you don't care which order the jobs are executed in.
+
+      ## Testing for an Object
+
+      To test for an object's presence in a set you simply call
+      `Ember.Set#contains()`.
+
+      ## Observing changes
+
+      When using `Ember.Set`, you can observe the `"[]"` property to be
+      alerted whenever the content changes. You can also add an enumerable
+      observer to the set to be notified of specific objects that are added and
+      removed from the set. See [Ember.Enumerable](/api/classes/Ember.Enumerable.html)
+      for more information on enumerables.
+
+      This is often unhelpful. If you are filtering sets of objects, for instance,
+      it is very inefficient to re-filter all of the items each time the set
+      changes. It would be better if you could just adjust the filtered set based
+      on what was changed on the original set. The same issue applies to merging
+      sets, as well.
+
+      ## Other Methods
+
+      `Ember.Set` primary implements other mixin APIs. For a complete reference
+      on the methods you will use with `Ember.Set`, please consult these mixins.
+      The most useful ones will be `Ember.Enumerable` and
+      `Ember.MutableEnumerable` which implement most of the common iterator
+      methods you are used to on Array.
+
+      Note that you can also use the `Ember.Copyable` and `Ember.Freezable`
+      APIs on `Ember.Set` as well. Once a set is frozen it can no longer be
+      modified. The benefit of this is that when you call `frozenCopy()` on it,
+      Ember will avoid making copies of the set. This allows you to write
+      code that can know with certainty when the underlying set data will or
+      will not be modified.
+
+      @class Set
+      @namespace Ember
+      @extends Ember.CoreObject
+      @uses Ember.MutableEnumerable
+      @uses Ember.Copyable
+      @uses Ember.Freezable
+      @since Ember 0.9
+    */
+    var Set = CoreObject.extend(MutableEnumerable, Copyable, Freezable,
+      {
+
+      // ..........................................................
+      // IMPLEMENT ENUMERABLE APIS
+      //
+
+      /**
+        This property will change as the number of objects in the set changes.
+
+        @property length
+        @type number
+        @default 0
+      */
+      length: 0,
+
+      /**
+        Clears the set. This is useful if you want to reuse an existing set
+        without having to recreate it.
+
+        ```javascript
+        var colors = new Ember.Set(["red", "green", "blue"]);
+        colors.length;  // 3
+        colors.clear();
+        colors.length;  // 0
+        ```
+
+        @method clear
+        @return {Ember.Set} An empty Set
+      */
+      clear: function() {
+        if (this.isFrozen) { throw new EmberError(FROZEN_ERROR); }
+
+        var len = get(this, 'length');
+        if (len === 0) { return this; }
+
+        var guid;
+
+        this.enumerableContentWillChange(len, 0);
+        propertyWillChange(this, 'firstObject');
+        propertyWillChange(this, 'lastObject');
+
+        for (var i=0; i < len; i++) {
+          guid = guidFor(this[i]);
+          delete this[guid];
+          delete this[i];
+        }
+
+        set(this, 'length', 0);
+
+        propertyDidChange(this, 'firstObject');
+        propertyDidChange(this, 'lastObject');
+        this.enumerableContentDidChange(len, 0);
+
+        return this;
+      },
+
+      /**
+        Returns true if the passed object is also an enumerable that contains the
+        same objects as the receiver.
+
+        ```javascript
+        var colors = ["red", "green", "blue"],
+            same_colors = new Ember.Set(colors);
+
+        same_colors.isEqual(colors);               // true
+        same_colors.isEqual(["purple", "brown"]);  // false
+        ```
+
+        @method isEqual
+        @param {Ember.Set} obj the other object.
+        @return {Boolean}
+      */
+      isEqual: function(obj) {
+        // fail fast
+        if (!Enumerable.detect(obj)) return false;
+
+        var loc = get(this, 'length');
+        if (get(obj, 'length') !== loc) return false;
+
+        while(--loc >= 0) {
+          if (!obj.contains(this[loc])) return false;
+        }
+
+        return true;
+      },
+
+      /**
+        Adds an object to the set. Only non-`null` objects can be added to a set
+        and those can only be added once. If the object is already in the set or
+        the passed value is null this method will have no effect.
+
+        This is an alias for `Ember.MutableEnumerable.addObject()`.
+
+        ```javascript
+        var colors = new Ember.Set();
+        colors.add("blue");     // ["blue"]
+        colors.add("blue");     // ["blue"]
+        colors.add("red");      // ["blue", "red"]
+        colors.add(null);       // ["blue", "red"]
+        colors.add(undefined);  // ["blue", "red"]
+        ```
+
+        @method add
+        @param {Object} obj The object to add.
+        @return {Ember.Set} The set itself.
+      */
+      add: aliasMethod('addObject'),
+
+      /**
+        Removes the object from the set if it is found. If you pass a `null` value
+        or an object that is already not in the set, this method will have no
+        effect. This is an alias for `Ember.MutableEnumerable.removeObject()`.
+
+        ```javascript
+        var colors = new Ember.Set(["red", "green", "blue"]);
+        colors.remove("red");     // ["blue", "green"]
+        colors.remove("purple");  // ["blue", "green"]
+        colors.remove(null);      // ["blue", "green"]
+        ```
+
+        @method remove
+        @param {Object} obj The object to remove
+        @return {Ember.Set} The set itself.
+      */
+      remove: aliasMethod('removeObject'),
+
+      /**
+        Removes the last element from the set and returns it, or `null` if it's empty.
+
+        ```javascript
+        var colors = new Ember.Set(["green", "blue"]);
+        colors.pop();  // "blue"
+        colors.pop();  // "green"
+        colors.pop();  // null
+        ```
+
+        @method pop
+        @return {Object} The removed object from the set or null.
+      */
+      pop: function() {
+        if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
+        var obj = this.length > 0 ? this[this.length-1] : null;
+        this.remove(obj);
+        return obj;
+      },
+
+      /**
+        Inserts the given object on to the end of the set. It returns
+        the set itself.
+
+        This is an alias for `Ember.MutableEnumerable.addObject()`.
+
+        ```javascript
+        var colors = new Ember.Set();
+        colors.push("red");   // ["red"]
+        colors.push("green"); // ["red", "green"]
+        colors.push("blue");  // ["red", "green", "blue"]
+        ```
+
+        @method push
+        @return {Ember.Set} The set itself.
+      */
+      push: aliasMethod('addObject'),
+
+      /**
+        Removes the last element from the set and returns it, or `null` if it's empty.
+
+        This is an alias for `Ember.Set.pop()`.
+
+        ```javascript
+        var colors = new Ember.Set(["green", "blue"]);
+        colors.shift();  // "blue"
+        colors.shift();  // "green"
+        colors.shift();  // null
+        ```
+
+        @method shift
+        @return {Object} The removed object from the set or null.
+      */
+      shift: aliasMethod('pop'),
+
+      /**
+        Inserts the given object on to the end of the set. It returns
+        the set itself.
+
+        This is an alias of `Ember.Set.push()`
+
+        ```javascript
+        var colors = new Ember.Set();
+        colors.unshift("red");    // ["red"]
+        colors.unshift("green");  // ["red", "green"]
+        colors.unshift("blue");   // ["red", "green", "blue"]
+        ```
+
+        @method unshift
+        @return {Ember.Set} The set itself.
+      */
+      unshift: aliasMethod('push'),
+
+      /**
+        Adds each object in the passed enumerable to the set.
+
+        This is an alias of `Ember.MutableEnumerable.addObjects()`
+
+        ```javascript
+        var colors = new Ember.Set();
+        colors.addEach(["red", "green", "blue"]);  // ["red", "green", "blue"]
+        ```
+
+        @method addEach
+        @param {Ember.Enumerable} objects the objects to add.
+        @return {Ember.Set} The set itself.
+      */
+      addEach: aliasMethod('addObjects'),
+
+      /**
+        Removes each object in the passed enumerable to the set.
+
+        This is an alias of `Ember.MutableEnumerable.removeObjects()`
+
+        ```javascript
+        var colors = new Ember.Set(["red", "green", "blue"]);
+        colors.removeEach(["red", "blue"]);  //  ["green"]
+        ```
+
+        @method removeEach
+        @param {Ember.Enumerable} objects the objects to remove.
+        @return {Ember.Set} The set itself.
+      */
+      removeEach: aliasMethod('removeObjects'),
+
+      // ..........................................................
+      // PRIVATE ENUMERABLE SUPPORT
+      //
+
+      init: function(items) {
+        this._super();
+        if (items) this.addObjects(items);
+      },
+
+      // implement Ember.Enumerable
+      nextObject: function(idx) {
+        return this[idx];
+      },
+
+      // more optimized version
+      firstObject: computed(function() {
+        return this.length > 0 ? this[0] : undefined;
+      }),
+
+      // more optimized version
+      lastObject: computed(function() {
+        return this.length > 0 ? this[this.length-1] : undefined;
+      }),
+
+      // implements Ember.MutableEnumerable
+      addObject: function(obj) {
+        if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
+        if (isNone(obj)) return this; // nothing to do
+
+        var guid = guidFor(obj),
+            idx  = this[guid],
+            len  = get(this, 'length'),
+            added ;
+
+        if (idx>=0 && idx<len && (this[idx] === obj)) return this; // added
+
+        added = [obj];
+
+        this.enumerableContentWillChange(null, added);
+        propertyWillChange(this, 'lastObject');
+
+        len = get(this, 'length');
+        this[guid] = len;
+        this[len] = obj;
+        set(this, 'length', len+1);
+
+        propertyDidChange(this, 'lastObject');
+        this.enumerableContentDidChange(null, added);
+
+        return this;
+      },
+
+      // implements Ember.MutableEnumerable
+      removeObject: function(obj) {
+        if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
+        if (isNone(obj)) return this; // nothing to do
+
+        var guid = guidFor(obj),
+            idx  = this[guid],
+            len = get(this, 'length'),
+            isFirst = idx === 0,
+            isLast = idx === len-1,
+            last, removed;
+
+
+        if (idx>=0 && idx<len && (this[idx] === obj)) {
+          removed = [obj];
+
+          this.enumerableContentWillChange(removed, null);
+          if (isFirst) { propertyWillChange(this, 'firstObject'); }
+          if (isLast)  { propertyWillChange(this, 'lastObject'); }
+
+          // swap items - basically move the item to the end so it can be removed
+          if (idx < len-1) {
+            last = this[len-1];
+            this[idx] = last;
+            this[guidFor(last)] = idx;
+          }
+
+          delete this[guid];
+          delete this[len-1];
+          set(this, 'length', len-1);
+
+          if (isFirst) { propertyDidChange(this, 'firstObject'); }
+          if (isLast)  { propertyDidChange(this, 'lastObject'); }
+          this.enumerableContentDidChange(removed, null);
+        }
+
+        return this;
+      },
+
+      // optimized version
+      contains: function(obj) {
+        return this[guidFor(obj)]>=0;
+      },
+
+      copy: function() {
+        var C = this.constructor, ret = new C(), loc = get(this, 'length');
+        set(ret, 'length', loc);
+        while(--loc>=0) {
+          ret[loc] = this[loc];
+          ret[guidFor(this[loc])] = loc;
+        }
+        return ret;
+      },
+
+      toString: function() {
+        var len = this.length, idx, array = [];
+        for(idx = 0; idx < len; idx++) {
+          array[idx] = this[idx];
+        }
+        return fmt("Ember.Set<%@>", [array.join(',')]);
+      }
+
+    });
+
+
+    __exports__["default"] = Set;
+  });
+define("ember-runtime/system/string",
+  ["ember-metal/core","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.STRINGS, Ember.FEATURES
+    var EmberInspect = __dependency2__.inspect;
+
+
+    var STRING_DASHERIZE_REGEXP = (/[ _]/g);
+    var STRING_DASHERIZE_CACHE = {};
+    var STRING_DECAMELIZE_REGEXP = (/([a-z\d])([A-Z])/g);
+    var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
+    var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
+    var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
+
+    function fmt(str, formats) {
+      // first, replace any ORDERED replacements.
+      var idx  = 0; // the current index for non-numerical replacements
+      return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
+        argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
+        s = formats[argIndex];
+        return (s === null) ? '(null)' : (s === undefined) ? '' : EmberInspect(s);
+      }) ;
+    }
+
+    function loc(str, formats) {
+      str = Ember.STRINGS[str] || str;
+      return fmt(str, formats);
+    }
+
+    function w(str) {
+      return str.split(/\s+/);
+    }
+
+    function decamelize(str) {
+      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+    }
+
+    function dasherize(str) {
+      var cache = STRING_DASHERIZE_CACHE,
+          hit   = cache.hasOwnProperty(str),
+          ret;
+
+      if (hit) {
+        return cache[str];
+      } else {
+        ret = decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
+        cache[str] = ret;
+      }
+
+      return ret;
+    }
+
+    function camelize(str) {
+      return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
+        return chr ? chr.toUpperCase() : '';
+      }).replace(/^([A-Z])/, function(match, separator, chr) {
+        return match.toLowerCase();
+      });
+    }
+
+    function classify(str) {
+      var parts = str.split("."),
+          out = [];
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var camelized = camelize(parts[i]);
+        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
+      }
+
+      return out.join(".");
+    }
+
+    function underscore(str) {
+      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
+        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
+    }
+
+    function capitalize(str) {
+      return str.charAt(0).toUpperCase() + str.substr(1);
+    }
+
+    /**
+      Defines the hash of localized strings for the current language. Used by
+      the `Ember.String.loc()` helper. To localize, add string values to this
+      hash.
+
+      @property STRINGS
+      @for Ember
+      @type Hash
+    */
+    Ember.STRINGS = {};
+
+    /**
+      Defines string helper methods including string formatting and localization.
+      Unless `Ember.EXTEND_PROTOTYPES.String` is `false` these methods will also be
+      added to the `String.prototype` as well.
+
+      @class String
+      @namespace Ember
+      @static
+    */
+    var EmberStringUtils = {
+
+      /**
+        Apply formatting options to the string. This will look for occurrences
+        of "%@" in your string and substitute them with the arguments you pass into
+        this method. If you want to control the specific order of replacement,
+        you can add a number after the key as well to indicate which argument
+        you want to insert.
+
+        Ordered insertions are most useful when building loc strings where values
+        you need to insert may appear in different orders.
+
+        ```javascript
+        "Hello %@ %@".fmt('John', 'Doe');     // "Hello John Doe"
+        "Hello %@2, %@1".fmt('John', 'Doe');  // "Hello Doe, John"
+        ```
+
+        @method fmt
+        @param {String} str The string to format
+        @param {Array} formats An array of parameters to interpolate into string.
+        @return {String} formatted string
+      */
+      fmt: fmt,
+
+      /**
+        Formats the passed string, but first looks up the string in the localized
+        strings hash. This is a convenient way to localize text. See
+        `Ember.String.fmt()` for more information on formatting.
+
+        Note that it is traditional but not required to prefix localized string
+        keys with an underscore or other character so you can easily identify
+        localized strings.
+
+        ```javascript
+        Ember.STRINGS = {
+          '_Hello World': 'Bonjour le monde',
+          '_Hello %@ %@': 'Bonjour %@ %@'
+        };
+
+        Ember.String.loc("_Hello World");  // 'Bonjour le monde';
+        Ember.String.loc("_Hello %@ %@", ["John", "Smith"]);  // "Bonjour John Smith";
+        ```
+
+        @method loc
+        @param {String} str The string to format
+        @param {Array} formats Optional array of parameters to interpolate into string.
+        @return {String} formatted string
+      */
+      loc: loc,
+
+      /**
+        Splits a string into separate units separated by spaces, eliminating any
+        empty strings in the process. This is a convenience method for split that
+        is mostly useful when applied to the `String.prototype`.
+
+        ```javascript
+        Ember.String.w("alpha beta gamma").forEach(function(key) {
+          console.log(key);
+        });
+
+        // > alpha
+        // > beta
+        // > gamma
+        ```
+
+        @method w
+        @param {String} str The string to split
+        @return {Array} array containing the split strings
+      */
+      w: w,
+
+      /**
+        Converts a camelized string into all lower case separated by underscores.
+
+        ```javascript
+        'innerHTML'.decamelize();           // 'inner_html'
+        'action_name'.decamelize();        // 'action_name'
+        'css-class-name'.decamelize();     // 'css-class-name'
+        'my favorite items'.decamelize();  // 'my favorite items'
+        ```
+
+        @method decamelize
+        @param {String} str The string to decamelize.
+        @return {String} the decamelized string.
+      */
+      decamelize: decamelize,
+
+      /**
+        Replaces underscores, spaces, or camelCase with dashes.
+
+        ```javascript
+        'innerHTML'.dasherize();          // 'inner-html'
+        'action_name'.dasherize();        // 'action-name'
+        'css-class-name'.dasherize();     // 'css-class-name'
+        'my favorite items'.dasherize();  // 'my-favorite-items'
+        ```
+
+        @method dasherize
+        @param {String} str The string to dasherize.
+        @return {String} the dasherized string.
+      */
+      dasherize: dasherize,
+
+      /**
+        Returns the lowerCamelCase form of a string.
+
+        ```javascript
+        'innerHTML'.camelize();          // 'innerHTML'
+        'action_name'.camelize();        // 'actionName'
+        'css-class-name'.camelize();     // 'cssClassName'
+        'my favorite items'.camelize();  // 'myFavoriteItems'
+        'My Favorite Items'.camelize();  // 'myFavoriteItems'
+        ```
+
+        @method camelize
+        @param {String} str The string to camelize.
+        @return {String} the camelized string.
+      */
+      camelize: camelize,
+
+      /**
+        Returns the UpperCamelCase form of a string.
+
+        ```javascript
+        'innerHTML'.classify();          // 'InnerHTML'
+        'action_name'.classify();        // 'ActionName'
+        'css-class-name'.classify();     // 'CssClassName'
+        'my favorite items'.classify();  // 'MyFavoriteItems'
+        ```
+
+        @method classify
+        @param {String} str the string to classify
+        @return {String} the classified string
+      */
+      classify: classify,
+
+      /**
+        More general than decamelize. Returns the lower\_case\_and\_underscored
+        form of a string.
+
+        ```javascript
+        'innerHTML'.underscore();          // 'inner_html'
+        'action_name'.underscore();        // 'action_name'
+        'css-class-name'.underscore();     // 'css_class_name'
+        'my favorite items'.underscore();  // 'my_favorite_items'
+        ```
+
+        @method underscore
+        @param {String} str The string to underscore.
+        @return {String} the underscored string.
+      */
+      underscore: underscore,
+
+      /**
+        Returns the Capitalized form of a string
+
+        ```javascript
+        'innerHTML'.capitalize()         // 'InnerHTML'
+        'action_name'.capitalize()       // 'Action_name'
+        'css-class-name'.capitalize()    // 'Css-class-name'
+        'my favorite items'.capitalize() // 'My favorite items'
+        ```
+
+        @method capitalize
+        @param {String} str The string to capitalize.
+        @return {String} The capitalized string.
+      */
+      capitalize: capitalize
+    };
+
+    __exports__["default"] = EmberStringUtils;
+    __exports__.fmt = fmt;
+    __exports__.loc = loc;
+    __exports__.w = w;
+    __exports__.decamelize = decamelize;
+    __exports__.dasherize = dasherize;
+    __exports__.camelize = camelize;
+    __exports__.classify = classify;
+    __exports__.underscore = underscore;
+    __exports__.capitalize = capitalize;
+  });
+define("ember-runtime/system/subarray",
+  ["ember-metal/property_get","ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var EmberError = __dependency2__["default"];
+    var EnumerableUtils = __dependency3__["default"];
+
+    var RETAIN = 'r',
+        FILTER = 'f';
+
+    function Operation (type, count) {
+      this.type = type;
+      this.count = count;
+    }
+
+    /**
+      An `Ember.SubArray` tracks an array in a way similar to, but more specialized
+      than, `Ember.TrackedArray`.  It is useful for keeping track of the indexes of
+      items within a filtered array.
+
+      @class SubArray
+      @namespace Ember
+    */
+    function SubArray (length) {
+      if (arguments.length < 1) { length = 0; }
+
+      if (length > 0) {
+        this._operations = [new Operation(RETAIN, length)];
+      } else {
+        this._operations = [];
+      }
+    };
+
+    SubArray.prototype = {
+      /**
+        Track that an item was added to the tracked array.
+
+        @method addItem
+
+        @param {number} index The index of the item in the tracked array.
+        @param {boolean} match `true` iff the item is included in the subarray.
+
+        @return {number} The index of the item in the subarray.
+      */
+      addItem: function(index, match) {
+        var returnValue = -1,
+            itemType = match ? RETAIN : FILTER,
+            self = this;
+
+        this._findOperation(index, function(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
+          var newOperation, splitOperation;
+
+          if (itemType === operation.type) {
+            ++operation.count;
+          } else if (index === rangeStart) {
+            // insert to the left of `operation`
+            self._operations.splice(operationIndex, 0, new Operation(itemType, 1));
+          } else {
+            newOperation = new Operation(itemType, 1);
+            splitOperation = new Operation(operation.type, rangeEnd - index + 1);
+            operation.count = index - rangeStart;
+
+            self._operations.splice(operationIndex + 1, 0, newOperation, splitOperation);
+          }
+
+          if (match) {
+            if (operation.type === RETAIN) {
+              returnValue = seenInSubArray + (index - rangeStart);
+            } else {
+              returnValue = seenInSubArray;
+            }
+          }
+
+          self._composeAt(operationIndex);
+        }, function(seenInSubArray) {
+          self._operations.push(new Operation(itemType, 1));
+
+          if (match) {
+            returnValue = seenInSubArray;
+          }
+
+          self._composeAt(self._operations.length-1);
+        });
+
+        return returnValue;
+      },
+
+      /**
+        Track that an item was removed from the tracked array.
+
+        @method removeItem
+
+        @param {number} index The index of the item in the tracked array.
+
+        @return {number} The index of the item in the subarray, or `-1` if the item
+        was not in the subarray.
+      */
+      removeItem: function(index) {
+        var returnValue = -1,
+            self = this;
+
+        this._findOperation(index, function (operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
+          if (operation.type === RETAIN) {
+            returnValue = seenInSubArray + (index - rangeStart);
+          }
+
+          if (operation.count > 1) {
+            --operation.count;
+          } else {
+            self._operations.splice(operationIndex, 1);
+            self._composeAt(operationIndex);
+          }
+        }, function() {
+          throw new EmberError("Can't remove an item that has never been added.");
+        });
+
+        return returnValue;
+      },
+
+
+      _findOperation: function (index, foundCallback, notFoundCallback) {
+        var operationIndex,
+            len,
+            operation,
+            rangeStart,
+            rangeEnd,
+            seenInSubArray = 0;
+
+        // OPTIMIZE: change to balanced tree
+        // find leftmost operation to the right of `index`
+        for (operationIndex = rangeStart = 0, len = this._operations.length; operationIndex < len; rangeStart = rangeEnd + 1, ++operationIndex) {
+          operation = this._operations[operationIndex];
+          rangeEnd = rangeStart + operation.count - 1;
+
+          if (index >= rangeStart && index <= rangeEnd) {
+            foundCallback(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray);
+            return;
+          } else if (operation.type === RETAIN) {
+            seenInSubArray += operation.count;
+          }
+        }
+
+        notFoundCallback(seenInSubArray);
+      },
+
+      _composeAt: function(index) {
+        var op = this._operations[index],
+            otherOp;
+
+        if (!op) {
+          // Composing out of bounds is a no-op, as when removing the last operation
+          // in the list.
+          return;
+        }
+
+        if (index > 0) {
+          otherOp = this._operations[index-1];
+          if (otherOp.type === op.type) {
+            op.count += otherOp.count;
+            this._operations.splice(index-1, 1);
+            --index;
+          }
+        }
+
+        if (index < this._operations.length-1) {
+          otherOp = this._operations[index+1];
+          if (otherOp.type === op.type) {
+            op.count += otherOp.count;
+            this._operations.splice(index+1, 1);
+          }
+        }
+      },
+
+      toString: function () {
+        var str = "";
+        forEach(this._operations, function (operation) {
+          str += " " + operation.type + ":" + operation.count;
+        });
+        return str.substring(1);
+      }
+    };
+
+    __exports__["default"] = SubArray;
+  });
+define("ember-runtime/system/tracked_array",
+  ["ember-metal/property_get","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var EnumerableUtils = __dependency2__["default"];
+
+    var forEach = EnumerableUtils.forEach,
+        RETAIN = 'r',
+        INSERT = 'i',
+        DELETE = 'd';
+
+
+    /**
+      An `Ember.TrackedArray` tracks array operations.  It's useful when you want to
+      lazily compute the indexes of items in an array after they've been shifted by
+      subsequent operations.
+
+      @class TrackedArray
+      @namespace Ember
+      @param {array} [items=[]] The array to be tracked.  This is used just to get
+      the initial items for the starting state of retain:n.
+    */
+    function TrackedArray(items) {
+      if (arguments.length < 1) { items = []; }
+
+      var length = get(items, 'length');
+
+      if (length) {
+        this._operations = [new ArrayOperation(RETAIN, length, items)];
+      } else {
+        this._operations = [];
+      }
+    }
+
+    TrackedArray.RETAIN = RETAIN;
+    TrackedArray.INSERT = INSERT;
+    TrackedArray.DELETE = DELETE;
+
+    TrackedArray.prototype = {
+
+      /**
+        Track that `newItems` were added to the tracked array at `index`.
+
+        @method addItems
+        @param index
+        @param newItems
+      */
+      addItems: function (index, newItems) {
+        var count = get(newItems, 'length');
+        if (count < 1) { return; }
+
+        var match = this._findArrayOperation(index),
+            arrayOperation = match.operation,
+            arrayOperationIndex = match.index,
+            arrayOperationRangeStart = match.rangeStart,
+            composeIndex,
+            splitIndex,
+            splitItems,
+            splitArrayOperation,
+            newArrayOperation;
+
+        newArrayOperation = new ArrayOperation(INSERT, count, newItems);
+
+        if (arrayOperation) {
+          if (!match.split) {
+            // insert left of arrayOperation
+            this._operations.splice(arrayOperationIndex, 0, newArrayOperation);
+            composeIndex = arrayOperationIndex;
+          } else {
+            this._split(arrayOperationIndex, index - arrayOperationRangeStart, newArrayOperation);
+            composeIndex = arrayOperationIndex + 1;
+          }
+        } else {
+          // insert at end
+          this._operations.push(newArrayOperation);
+          composeIndex = arrayOperationIndex;
+        }
+
+        this._composeInsert(composeIndex);
+      },
+
+      /**
+        Track that `count` items were removed at `index`.
+
+        @method removeItems
+        @param index
+        @param count
+      */
+      removeItems: function (index, count) {
+        if (count < 1) { return; }
+
+        var match = this._findArrayOperation(index),
+            arrayOperation = match.operation,
+            arrayOperationIndex = match.index,
+            arrayOperationRangeStart = match.rangeStart,
+            newArrayOperation,
+            composeIndex;
+
+        newArrayOperation = new ArrayOperation(DELETE, count);
+        if (!match.split) {
+          // insert left of arrayOperation
+          this._operations.splice(arrayOperationIndex, 0, newArrayOperation);
+          composeIndex = arrayOperationIndex;
+        } else {
+          this._split(arrayOperationIndex, index - arrayOperationRangeStart, newArrayOperation);
+          composeIndex = arrayOperationIndex + 1;
+        }
+
+        return this._composeDelete(composeIndex);
+      },
+
+      /**
+        Apply all operations, reducing them to retain:n, for `n`, the number of
+        items in the array.
+
+        `callback` will be called for each operation and will be passed the following arguments:
+
+        * {array} items The items for the given operation
+        * {number} offset The computed offset of the items, ie the index in the
+        array of the first item for this operation.
+        * {string} operation The type of the operation.  One of
+        `Ember.TrackedArray.{RETAIN, DELETE, INSERT}`
+
+        @method apply
+        @param {function} callback
+      */
+      apply: function (callback) {
+        var items = [],
+            offset = 0;
+
+        forEach(this._operations, function (arrayOperation, operationIndex) {
+          callback(arrayOperation.items, offset, arrayOperation.type, operationIndex);
+
+          if (arrayOperation.type !== DELETE) {
+            offset += arrayOperation.count;
+            items = items.concat(arrayOperation.items);
+          }
+        });
+
+        this._operations = [new ArrayOperation(RETAIN, items.length, items)];
+      },
+
+      /**
+        Return an `ArrayOperationMatch` for the operation that contains the item at `index`.
+
+        @method _findArrayOperation
+
+        @param {number} index the index of the item whose operation information
+        should be returned.
+        @private
+      */
+      _findArrayOperation: function (index) {
+        var arrayOperationIndex,
+            len,
+            split = false,
+            arrayOperation,
+            arrayOperationRangeStart,
+            arrayOperationRangeEnd;
+
+        // OPTIMIZE: we could search these faster if we kept a balanced tree.
+        // find leftmost arrayOperation to the right of `index`
+        for (arrayOperationIndex = arrayOperationRangeStart = 0, len = this._operations.length; arrayOperationIndex < len; ++arrayOperationIndex) {
+          arrayOperation = this._operations[arrayOperationIndex];
+
+          if (arrayOperation.type === DELETE) { continue; }
+
+          arrayOperationRangeEnd = arrayOperationRangeStart + arrayOperation.count - 1;
+
+          if (index === arrayOperationRangeStart) {
+            break;
+          } else if (index > arrayOperationRangeStart && index <= arrayOperationRangeEnd) {
+            split = true;
+            break;
+          } else {
+            arrayOperationRangeStart = arrayOperationRangeEnd + 1;
+          }
+        }
+
+        return new ArrayOperationMatch(arrayOperation, arrayOperationIndex, split, arrayOperationRangeStart);
+      },
+
+      _split: function (arrayOperationIndex, splitIndex, newArrayOperation) {
+        var arrayOperation = this._operations[arrayOperationIndex],
+            splitItems = arrayOperation.items.slice(splitIndex),
+            splitArrayOperation = new ArrayOperation(arrayOperation.type, splitItems.length, splitItems);
+
+        // truncate LHS
+        arrayOperation.count = splitIndex;
+        arrayOperation.items = arrayOperation.items.slice(0, splitIndex);
+
+        this._operations.splice(arrayOperationIndex + 1, 0, newArrayOperation, splitArrayOperation);
+      },
+
+      // see SubArray for a better implementation.
+      _composeInsert: function (index) {
+        var newArrayOperation = this._operations[index],
+            leftArrayOperation = this._operations[index-1], // may be undefined
+            rightArrayOperation = this._operations[index+1], // may be undefined
+            leftOp = leftArrayOperation && leftArrayOperation.type,
+            rightOp = rightArrayOperation && rightArrayOperation.type;
+
+        if (leftOp === INSERT) {
+            // merge left
+            leftArrayOperation.count += newArrayOperation.count;
+            leftArrayOperation.items = leftArrayOperation.items.concat(newArrayOperation.items);
+
+          if (rightOp === INSERT) {
+            // also merge right (we have split an insert with an insert)
+            leftArrayOperation.count += rightArrayOperation.count;
+            leftArrayOperation.items = leftArrayOperation.items.concat(rightArrayOperation.items);
+            this._operations.splice(index, 2);
+          } else {
+            // only merge left
+            this._operations.splice(index, 1);
+          }
+        } else if (rightOp === INSERT) {
+          // merge right
+          newArrayOperation.count += rightArrayOperation.count;
+          newArrayOperation.items = newArrayOperation.items.concat(rightArrayOperation.items);
+          this._operations.splice(index + 1, 1);
+        }
+      },
+
+      _composeDelete: function (index) {
+        var arrayOperation = this._operations[index],
+            deletesToGo = arrayOperation.count,
+            leftArrayOperation = this._operations[index-1], // may be undefined
+            leftOp = leftArrayOperation && leftArrayOperation.type,
+            nextArrayOperation,
+            nextOp,
+            nextCount,
+            removeNewAndNextOp = false,
+            removedItems = [];
+
+        if (leftOp === DELETE) {
+          arrayOperation = leftArrayOperation;
+          index -= 1;
+        }
+
+        for (var i = index + 1; deletesToGo > 0; ++i) {
+          nextArrayOperation = this._operations[i];
+          nextOp = nextArrayOperation.type;
+          nextCount = nextArrayOperation.count;
+
+          if (nextOp === DELETE) {
+            arrayOperation.count += nextCount;
+            continue;
+          }
+
+          if (nextCount > deletesToGo) {
+            // d:2 {r,i}:5  we reduce the retain or insert, but it stays
+            removedItems = removedItems.concat(nextArrayOperation.items.splice(0, deletesToGo));
+            nextArrayOperation.count -= deletesToGo;
+
+            // In the case where we truncate the last arrayOperation, we don't need to
+            // remove it; also the deletesToGo reduction is not the entirety of
+            // nextCount
+            i -= 1;
+            nextCount = deletesToGo;
+
+            deletesToGo = 0;
+          } else {
+            if (nextCount === deletesToGo) {
+              // Handle edge case of d:2 i:2 in which case both operations go away
+              // during composition.
+              removeNewAndNextOp = true;
+            }
+            removedItems = removedItems.concat(nextArrayOperation.items);
+            deletesToGo -= nextCount;
+          }
+
+          if (nextOp === INSERT) {
+            // d:2 i:3 will result in delete going away
+            arrayOperation.count -= nextCount;
+          }
+        }
+
+        if (arrayOperation.count > 0) {
+          // compose our new delete with possibly several operations to the right of
+          // disparate types
+          this._operations.splice(index+1, i-1-index);
+        } else {
+          // The delete operation can go away; it has merely reduced some other
+          // operation, as in d:3 i:4; it may also have eliminated that operation,
+          // as in d:3 i:3.
+          this._operations.splice(index, removeNewAndNextOp ? 2 : 1);
+        }
+
+        return removedItems;
+      },
+
+      toString: function () {
+        var str = "";
+        forEach(this._operations, function (operation) {
+          str += " " + operation.type + ":" + operation.count;
+        });
+        return str.substring(1);
+      }
+    };
+
+    /**
+      Internal data structure to represent an array operation.
+
+      @method ArrayOperation
+      @private
+      @param {string} type The type of the operation.  One of
+      `Ember.TrackedArray.{RETAIN, INSERT, DELETE}`
+      @param {number} count The number of items in this operation.
+      @param {array} items The items of the operation, if included.  RETAIN and
+      INSERT include their items, DELETE does not.
+    */
+    function ArrayOperation (operation, count, items) {
+      this.type = operation; // RETAIN | INSERT | DELETE
+      this.count = count;
+      this.items = items;
+    }
+
+    /**
+      Internal data structure used to include information when looking up operations
+      by item index.
+
+      @method ArrayOperationMatch
+      @private
+      @param {ArrayOperation} operation
+      @param {number} index The index of `operation` in the array of operations.
+      @param {boolean} split Whether or not the item index searched for would
+      require a split for a new operation type.
+      @param {number} rangeStart The index of the first item in the operation,
+      with respect to the tracked array.  The index of the last item can be computed
+      from `rangeStart` and `operation.count`.
+    */
+    function ArrayOperationMatch(operation, index, split, rangeStart) {
+      this.operation = operation;
+      this.index = index;
+      this.split = split;
+      this.rangeStart = rangeStart;
+    }
+
+    __exports__["default"] = TrackedArray;
+  });
+})();
+
+(function() {
+define("ember-views",
+  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/view","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    /**
+    Ember Views
+
+    @module ember
+    @submodule ember-views
+    @requires ember-runtime
+    @main ember-views
+    */
+
+    // BEGIN EXPORTS
+    Ember.$ = __dependency2__["default"];
+
+    Ember.ViewTargetActionSupport = __dependency12__["default"];
+    Ember.RenderBuffer = __dependency4__["default"];
+
+    var ViewUtils = Ember.ViewUtils = {};
+    ViewUtils.setInnerHTML = __dependency3__.setInnerHTML;
+    ViewUtils.isSimpleClick = __dependency3__.isSimpleClick;
+
+    Ember.CoreView = __dependency7__.CoreView;
+    Ember.View = __dependency7__.View;
+    Ember.View.states = __dependency6__.states;
+    Ember.View.cloneStates = __dependency6__.cloneStates;
+
+    Ember._ViewCollection = __dependency7__.ViewCollection;
+    Ember.ContainerView = __dependency8__["default"];
+    Ember.CollectionView = __dependency9__["default"];
+    Ember.Component = __dependency10__["default"];
+    Ember.EventDispatcher = __dependency11__["default"];
+    // END EXPORTS
+
+    __exports__["default"] = Ember;
+  });
+define("ember-views/mixins/component_template_deprecation",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.deprecate
+    var get = __dependency2__.get;
+    var Mixin = __dependency3__.Mixin;
+
+    /**
+      The ComponentTemplateDeprecation mixin is used to provide a useful
+      deprecation warning when using either `template` or `templateName` with
+      a component. The `template` and `templateName` properties specified at
+      extend time are moved to `layout` and `layoutName` respectively.
+
+      `Ember.ComponentTemplateDeprecation` is used internally by Ember in
+      `Ember.Component`.
+
+      @class ComponentTemplateDeprecation
+      @namespace Ember
+    */
+    var ComponentTemplateDeprecation = Mixin.create({
+      /**
+        @private
+
+        Moves `templateName` to `layoutName` and `template` to `layout` at extend
+        time if a layout is not also specified.
+
+        Note that this currently modifies the mixin themselves, which is technically
+        dubious but is practically of little consequence. This may change in the
+        future.
+
+        @method willMergeMixin
+        @since 1.4.0
+      */
+      willMergeMixin: function(props) {
+        // must call _super here to ensure that the ActionHandler
+        // mixin is setup properly (moves actions -> _actions)
+        //
+        // Calling super is only OK here since we KNOW that
+        // there is another Mixin loaded first.
+        this._super.apply(this, arguments);
+
+        var deprecatedProperty, replacementProperty,
+            layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
+
+        if (props.templateName && !layoutSpecified) {
+          deprecatedProperty = 'templateName';
+          replacementProperty = 'layoutName';
+
+          props.layoutName = props.templateName;
+          delete props['templateName'];
+        }
+
+        if (props.template && !layoutSpecified) {
+          deprecatedProperty = 'template';
+          replacementProperty = 'layout';
+
+          props.layout = props.template;
+          delete props['template'];
+        }
+
+        if (deprecatedProperty) {
+                  }
+      }
+    });
+
+    __exports__["default"] = ComponentTemplateDeprecation;
+  });
+define("ember-views/mixins/view_target_action_support",
+  ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Mixin = __dependency1__.Mixin;
+    var TargetActionSupport = __dependency2__["default"];
+
+    // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
+    var computed = __dependency3__.computed;
+    var alias = computed.alias;
+
+    /**
+    `Ember.ViewTargetActionSupport` is a mixin that can be included in a
+    view class to add a `triggerAction` method with semantics similar to
+    the Handlebars `{{action}}` helper. It provides intelligent defaults
+    for the action's target: the view's controller; and the context that is
+    sent with the action: the view's context.
+
+    Note: In normal Ember usage, the `{{action}}` helper is usually the best
+    choice. This mixin is most often useful when you are doing more complex
+    event handling in custom View subclasses.
+
+    For example:
+
+    ```javascript
+    App.SaveButtonView = Ember.View.extend(Ember.ViewTargetActionSupport, {
+      action: 'save',
+      click: function() {
+        this.triggerAction(); // Sends the `save` action, along with the current context
+                              // to the current controller
+      }
+    });
+    ```
+
+    The `action` can be provided as properties of an optional object argument
+    to `triggerAction` as well.
+
+    ```javascript
+    App.SaveButtonView = Ember.View.extend(Ember.ViewTargetActionSupport, {
+      click: function() {
+        this.triggerAction({
+          action: 'save'
+        }); // Sends the `save` action, along with the current context
+            // to the current controller
+      }
+    });
+    ```
+
+    @class ViewTargetActionSupport
+    @namespace Ember
+    @extends Ember.TargetActionSupport
+    */
+    var ViewTargetActionSupport = Mixin.create(TargetActionSupport, {
+      /**
+      @property target
+      */
+      target: alias('controller'),
+      /**
+      @property actionContext
+      */
+      actionContext: alias('context')
+    });
+
+    __exports__["default"] = ViewTargetActionSupport;
+  });
+define("ember-views/system/event_dispatcher",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/views/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-views
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var isNone = __dependency4__.isNone;
+    var run = __dependency5__["default"];
+    var typeOf = __dependency6__.typeOf;
+    var fmt = __dependency7__.fmt;
+    var EmberObject = __dependency8__["default"];
+    var jQuery = __dependency9__["default"];
+    var View = __dependency10__.View;
+
+    var ActionHelper;
+
+    //ES6TODO:
+    // find a better way to do Ember.View.views without global state
+
+    /**
+      `Ember.EventDispatcher` handles delegating browser events to their
+      corresponding `Ember.Views.` For example, when you click on a view,
+      `Ember.EventDispatcher` ensures that that view's `mouseDown` method gets
+      called.
+
+      @class EventDispatcher
+      @namespace Ember
+      @private
+      @extends Ember.Object
+    */
+    var EventDispatcher = EmberObject.extend({
+
+      /**
+        The set of events names (and associated handler function names) to be setup
+        and dispatched by the `EventDispatcher`. Custom events can added to this list at setup
+        time, generally via the `Ember.Application.customEvents` hash. Only override this
+        default set to prevent the EventDispatcher from listening on some events all together.
+
+        This set will be modified by `setup` to also include any events added at that time.
+
+        @property events
+        @type Object
+      */
+      events: {
+        touchstart  : 'touchStart',
+        touchmove   : 'touchMove',
+        touchend    : 'touchEnd',
+        touchcancel : 'touchCancel',
+        keydown     : 'keyDown',
+        keyup       : 'keyUp',
+        keypress    : 'keyPress',
+        mousedown   : 'mouseDown',
+        mouseup     : 'mouseUp',
+        contextmenu : 'contextMenu',
+        click       : 'click',
+        dblclick    : 'doubleClick',
+        mousemove   : 'mouseMove',
+        focusin     : 'focusIn',
+        focusout    : 'focusOut',
+        mouseenter  : 'mouseEnter',
+        mouseleave  : 'mouseLeave',
+        submit      : 'submit',
+        input       : 'input',
+        change      : 'change',
+        dragstart   : 'dragStart',
+        drag        : 'drag',
+        dragenter   : 'dragEnter',
+        dragleave   : 'dragLeave',
+        dragover    : 'dragOver',
+        drop        : 'drop',
+        dragend     : 'dragEnd'
+      },
+
+      /**
+        The root DOM element to which event listeners should be attached. Event
+        listeners will be attached to the document unless this is overridden.
+
+        Can be specified as a DOMElement or a selector string.
+
+        The default body is a string since this may be evaluated before document.body
+        exists in the DOM.
+
+        @private
+        @property rootElement
+        @type DOMElement
+        @default 'body'
+      */
+      rootElement: 'body',
+
+      /**
+        Sets up event listeners for standard browser events.
+
+        This will be called after the browser sends a `DOMContentReady` event. By
+        default, it will set up all of the listeners on the document body. If you
+        would like to register the listeners on a different element, set the event
+        dispatcher's `root` property.
+
+        @private
+        @method setup
+        @param addedEvents {Hash}
+      */
+      setup: function(addedEvents, rootElement) {
+        var event, events = get(this, 'events');
+
+        jQuery.extend(events, addedEvents || {});
+
+
+        if (!isNone(rootElement)) {
+          set(this, 'rootElement', rootElement);
+        }
+
+        rootElement = jQuery(get(this, 'rootElement'));
+
+                        
+        rootElement.addClass('ember-application');
+
+        
+        for (event in events) {
+          if (events.hasOwnProperty(event)) {
+            this.setupHandler(rootElement, event, events[event]);
+          }
+        }
+      },
+
+      /**
+        Registers an event listener on the document. If the given event is
+        triggered, the provided event handler will be triggered on the target view.
+
+        If the target view does not implement the event handler, or if the handler
+        returns `false`, the parent view will be called. The event will continue to
+        bubble to each successive parent view until it reaches the top.
+
+        For example, to have the `mouseDown` method called on the target view when
+        a `mousedown` event is received from the browser, do the following:
+
+        ```javascript
+        setupHandler('mousedown', 'mouseDown');
+        ```
+
+        @private
+        @method setupHandler
+        @param {Element} rootElement
+        @param {String} event the browser-originated event to listen to
+        @param {String} eventName the name of the method to call on the view
+      */
+      setupHandler: function(rootElement, event, eventName) {
+        var self = this;
+
+        rootElement.on(event + '.ember', '.ember-view', function(evt, triggeringManager) {
+          var view = View.views[this.id],
+              result = true, manager = null;
+
+          manager = self._findNearestEventManager(view, eventName);
+
+          if (manager && manager !== triggeringManager) {
+            result = self._dispatchEvent(manager, evt, eventName, view);
+          } else if (view) {
+            result = self._bubbleEvent(view, evt, eventName);
+          } else {
+            evt.stopPropagation();
+          }
+
+          return result;
+        });
+
+        rootElement.on(event + '.ember', '[data-ember-action]', function(evt) {
+          //ES6TODO: Needed for ActionHelper (generally not available in ember-views test suite)
+          if (!ActionHelper) { ActionHelper = requireModule("ember-routing/helpers/action")["ActionHelper"]; };
+
+          var actionId = jQuery(evt.currentTarget).attr('data-ember-action'),
+              action   = ActionHelper.registeredActions[actionId];
+
+          // We have to check for action here since in some cases, jQuery will trigger
+          // an event on `removeChild` (i.e. focusout) after we've already torn down the
+          // action handlers for the view.
+          if (action && action.eventName === eventName) {
+            return action.handler(evt);
+          }
+        });
+      },
+
+      _findNearestEventManager: function(view, eventName) {
+        var manager = null;
+
+        while (view) {
+          manager = get(view, 'eventManager');
+          if (manager && manager[eventName]) { break; }
+
+          view = get(view, 'parentView');
+        }
+
+        return manager;
+      },
+
+      _dispatchEvent: function(object, evt, eventName, view) {
+        var result = true;
+
+        var handler = object[eventName];
+        if (typeOf(handler) === 'function') {
+          result = run(object, handler, evt, view);
+          // Do not preventDefault in eventManagers.
+          evt.stopPropagation();
+        }
+        else {
+          result = this._bubbleEvent(view, evt, eventName);
+        }
+
+        return result;
+      },
+
+      _bubbleEvent: function(view, evt, eventName) {
+        return run(view, view.handleEvent, eventName, evt);
+      },
+
+      destroy: function() {
+        var rootElement = get(this, 'rootElement');
+        jQuery(rootElement).off('.ember', '**').removeClass('ember-application');
+        return this._super();
+      }
+    });
+
+    __exports__["default"] = EventDispatcher;
+  });
+define("ember-views/system/ext",
+  ["ember-metal/run_loop"],
+  function(__dependency1__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var run = __dependency1__["default"];
+
+    // Add a new named queue for rendering views that happens
+    // after bindings have synced, and a queue for scheduling actions
+    // that that should occur after view rendering.
+    var queues = run.queues;
+    run._addQueue('render', 'actions');
+    run._addQueue('afterRender', 'render');
+  });
+define("ember-views/system/jquery",
+  ["ember-metal/core","ember-runtime/system/string","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var w = __dependency2__.w;
+
+    // ES6TODO: the functions on EnumerableUtils need their own exports
+    var EnumerableUtils = __dependency3__["default"];
+    var forEach = EnumerableUtils.forEach;
+
+    /**
+    Ember Views
+
+    @module ember
+    @submodule ember-views
+    @requires ember-runtime
+    @main ember-views
+    */
+
+    var jQuery = (Ember.imports && Ember.imports.jQuery) || (this && this.jQuery);
+    if (!jQuery && typeof require === 'function') {
+      jQuery = require('jquery');
+    }
+
+    
+    /**
+    @module ember
+    @submodule ember-views
+    */
+    if (jQuery) {
+      // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
+      var dragEvents = w('dragstart drag dragenter dragleave dragover drop dragend');
+
+      // Copies the `dataTransfer` property from a browser event object onto the
+      // jQuery event object for the specified events
+      forEach(dragEvents, function(eventName) {
+        jQuery.event.fixHooks[eventName] = { props: ['dataTransfer'] };
+      });
+    }
+
+    __exports__["default"] = jQuery;
+  });
+define("ember-views/system/render_buffer",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/system/utils","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var Ember = __dependency1__["default"];
+    // jQuery
+
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var setInnerHTML = __dependency4__.setInnerHTML;
+    var jQuery = __dependency5__["default"];
+
+    function ClassSet() {
+      this.seen = {};
+      this.list = [];
+    };
+
+
+    ClassSet.prototype = {
+      add: function(string) {
+        if (string in this.seen) { return; }
+        this.seen[string] = true;
+
+        this.list.push(string);
+      },
+
+      toDOM: function() {
+        return this.list.join(" ");
+      }
+    };
+
+    var BAD_TAG_NAME_TEST_REGEXP = /[^a-zA-Z0-9\-]/;
+    var BAD_TAG_NAME_REPLACE_REGEXP = /[^a-zA-Z0-9\-]/g;
+
+    function stripTagName(tagName) {
+      if (!tagName) {
+        return tagName;
+      }
+
+      if (!BAD_TAG_NAME_TEST_REGEXP.test(tagName)) {
+        return tagName;
+      }
+
+      return tagName.replace(BAD_TAG_NAME_REPLACE_REGEXP, '');
+    }
+
+    var BAD_CHARS_REGEXP = /&(?!\w+;)|[<>"'`]/g;
+    var POSSIBLE_CHARS_REGEXP = /[&<>"'`]/;
+
+    function escapeAttribute(value) {
+      // Stolen shamelessly from Handlebars
+
+      var escape = {
+        "<": "&lt;",
+        ">": "&gt;",
+        '"': "&quot;",
+        "'": "&#x27;",
+        "`": "&#x60;"
+      };
+
+      var escapeChar = function(chr) {
+        return escape[chr] || "&amp;";
+      };
+
+      var string = value.toString();
+
+      if(!POSSIBLE_CHARS_REGEXP.test(string)) { return string; }
+      return string.replace(BAD_CHARS_REGEXP, escapeChar);
+    }
+
+    // IE 6/7 have bugs around setting names on inputs during creation.
+    // From http://msdn.microsoft.com/en-us/library/ie/ms536389(v=vs.85).aspx:
+    // "To include the NAME attribute at run time on objects created with the createElement method, use the eTag."
+    var canSetNameOnInputs = (function() {
+      var div = document.createElement('div'),
+          el = document.createElement('input');
+
+      el.setAttribute('name', 'foo');
+      div.appendChild(el);
+
+      return !!div.innerHTML.match('foo');
+    })();
+
+    /**
+      `Ember.RenderBuffer` gathers information regarding the view and generates the
+      final representation. `Ember.RenderBuffer` will generate HTML which can be pushed
+      to the DOM.
+
+       ```javascript
+       var buffer = Ember.RenderBuffer('div');
+      ```
+
+      @class RenderBuffer
+      @namespace Ember
+      @constructor
+      @param {String} tagName tag name (such as 'div' or 'p') used for the buffer
+    */
+    var RenderBuffer = function(tagName) {
+      return new _RenderBuffer(tagName);
+    };
+
+    var _RenderBuffer = function(tagName) {
+      this.tagNames = [tagName || null];
+      this.buffer = "";
+    };
+
+    _RenderBuffer.prototype = {
+
+      // The root view's element
+      _element: null,
+
+      _hasElement: true,
+
+      /**
+        An internal set used to de-dupe class names when `addClass()` is
+        used. After each call to `addClass()`, the `classes` property
+        will be updated.
+
+        @private
+        @property elementClasses
+        @type Array
+        @default null
+      */
+      elementClasses: null,
+
+      /**
+        Array of class names which will be applied in the class attribute.
+
+        You can use `setClasses()` to set this property directly. If you
+        use `addClass()`, it will be maintained for you.
+
+        @property classes
+        @type Array
+        @default null
+      */
+      classes: null,
+
+      /**
+        The id in of the element, to be applied in the id attribute.
+
+        You should not set this property yourself, rather, you should use
+        the `id()` method of `Ember.RenderBuffer`.
+
+        @property elementId
+        @type String
+        @default null
+      */
+      elementId: null,
+
+      /**
+        A hash keyed on the name of the attribute and whose value will be
+        applied to that attribute. For example, if you wanted to apply a
+        `data-view="Foo.bar"` property to an element, you would set the
+        elementAttributes hash to `{'data-view':'Foo.bar'}`.
+
+        You should not maintain this hash yourself, rather, you should use
+        the `attr()` method of `Ember.RenderBuffer`.
+
+        @property elementAttributes
+        @type Hash
+        @default {}
+      */
+      elementAttributes: null,
+
+      /**
+        A hash keyed on the name of the properties and whose value will be
+        applied to that property. For example, if you wanted to apply a
+        `checked=true` property to an element, you would set the
+        elementProperties hash to `{'checked':true}`.
+
+        You should not maintain this hash yourself, rather, you should use
+        the `prop()` method of `Ember.RenderBuffer`.
+
+        @property elementProperties
+        @type Hash
+        @default {}
+      */
+      elementProperties: null,
+
+      /**
+        The tagname of the element an instance of `Ember.RenderBuffer` represents.
+
+        Usually, this gets set as the first parameter to `Ember.RenderBuffer`. For
+        example, if you wanted to create a `p` tag, then you would call
+
+        ```javascript
+        Ember.RenderBuffer('p')
+        ```
+
+        @property elementTag
+        @type String
+        @default null
+      */
+      elementTag: null,
+
+      /**
+        A hash keyed on the name of the style attribute and whose value will
+        be applied to that attribute. For example, if you wanted to apply a
+        `background-color:black;` style to an element, you would set the
+        elementStyle hash to `{'background-color':'black'}`.
+
+        You should not maintain this hash yourself, rather, you should use
+        the `style()` method of `Ember.RenderBuffer`.
+
+        @property elementStyle
+        @type Hash
+        @default {}
+      */
+      elementStyle: null,
+
+      /**
+        Nested `RenderBuffers` will set this to their parent `RenderBuffer`
+        instance.
+
+        @property parentBuffer
+        @type Ember._RenderBuffer
+      */
+      parentBuffer: null,
+
+      /**
+        Adds a string of HTML to the `RenderBuffer`.
+
+        @method push
+        @param {String} string HTML to push into the buffer
+        @chainable
+      */
+      push: function(string) {
+        this.buffer += string;
+        return this;
+      },
+
+      /**
+        Adds a class to the buffer, which will be rendered to the class attribute.
+
+        @method addClass
+        @param {String} className Class name to add to the buffer
+        @chainable
+      */
+      addClass: function(className) {
+        // lazily create elementClasses
+        this.elementClasses = (this.elementClasses || new ClassSet());
+        this.elementClasses.add(className);
+        this.classes = this.elementClasses.list;
+
+        return this;
+      },
+
+      setClasses: function(classNames) {
+        this.elementClasses = null;
+        var len = classNames.length, i;
+        for (i = 0; i < len; i++) {
+          this.addClass(classNames[i]);
+        }
+      },
+
+      /**
+        Sets the elementID to be used for the element.
+
+        @method id
+        @param {String} id
+        @chainable
+      */
+      id: function(id) {
+        this.elementId = id;
+        return this;
+      },
+
+      // duck type attribute functionality like jQuery so a render buffer
+      // can be used like a jQuery object in attribute binding scenarios.
+
+      /**
+        Adds an attribute which will be rendered to the element.
+
+        @method attr
+        @param {String} name The name of the attribute
+        @param {String} value The value to add to the attribute
+        @chainable
+        @return {Ember.RenderBuffer|String} this or the current attribute value
+      */
+      attr: function(name, value) {
+        var attributes = this.elementAttributes = (this.elementAttributes || {});
+
+        if (arguments.length === 1) {
+          return attributes[name];
+        } else {
+          attributes[name] = value;
+        }
+
+        return this;
+      },
+
+      /**
+        Remove an attribute from the list of attributes to render.
+
+        @method removeAttr
+        @param {String} name The name of the attribute
+        @chainable
+      */
+      removeAttr: function(name) {
+        var attributes = this.elementAttributes;
+        if (attributes) { delete attributes[name]; }
+
+        return this;
+      },
+
+      /**
+        Adds a property which will be rendered to the element.
+
+        @method prop
+        @param {String} name The name of the property
+        @param {String} value The value to add to the property
+        @chainable
+        @return {Ember.RenderBuffer|String} this or the current property value
+      */
+      prop: function(name, value) {
+        var properties = this.elementProperties = (this.elementProperties || {});
+
+        if (arguments.length === 1) {
+          return properties[name];
+        } else {
+          properties[name] = value;
+        }
+
+        return this;
+      },
+
+      /**
+        Remove an property from the list of properties to render.
+
+        @method removeProp
+        @param {String} name The name of the property
+        @chainable
+      */
+      removeProp: function(name) {
+        var properties = this.elementProperties;
+        if (properties) { delete properties[name]; }
+
+        return this;
+      },
+
+      /**
+        Adds a style to the style attribute which will be rendered to the element.
+
+        @method style
+        @param {String} name Name of the style
+        @param {String} value
+        @chainable
+      */
+      style: function(name, value) {
+        this.elementStyle = (this.elementStyle || {});
+
+        this.elementStyle[name] = value;
+        return this;
+      },
+
+      begin: function(tagName) {
+        this.tagNames.push(tagName || null);
+        return this;
+      },
+
+      pushOpeningTag: function() {
+        var tagName = this.currentTagName();
+        if (!tagName) { return; }
+
+        if (this._hasElement && !this._element && this.buffer.length === 0) {
+          this._element = this.generateElement();
+          return;
+        }
+
+        var buffer = this.buffer,
+            id = this.elementId,
+            classes = this.classes,
+            attrs = this.elementAttributes,
+            props = this.elementProperties,
+            style = this.elementStyle,
+            attr, prop;
+
+        buffer += '<' + stripTagName(tagName);
+
+        if (id) {
+          buffer += ' id="' + escapeAttribute(id) + '"';
+          this.elementId = null;
+        }
+        if (classes) {
+          buffer += ' class="' + escapeAttribute(classes.join(' ')) + '"';
+          this.classes = null;
+          this.elementClasses = null;
+        }
+
+        if (style) {
+          buffer += ' style="';
+
+          for (prop in style) {
+            if (style.hasOwnProperty(prop)) {
+              buffer += prop + ':' + escapeAttribute(style[prop]) + ';';
+            }
+          }
+
+          buffer += '"';
+
+          this.elementStyle = null;
+        }
+
+        if (attrs) {
+          for (attr in attrs) {
+            if (attrs.hasOwnProperty(attr)) {
+              buffer += ' ' + attr + '="' + escapeAttribute(attrs[attr]) + '"';
+            }
+          }
+
+          this.elementAttributes = null;
+        }
+
+        if (props) {
+          for (prop in props) {
+            if (props.hasOwnProperty(prop)) {
+              var value = props[prop];
+              if (value || typeof(value) === 'number') {
+                if (value === true) {
+                  buffer += ' ' + prop + '="' + prop + '"';
+                } else {
+                  buffer += ' ' + prop + '="' + escapeAttribute(props[prop]) + '"';
+                }
+              }
+            }
+          }
+
+          this.elementProperties = null;
+        }
+
+        buffer += '>';
+        this.buffer = buffer;
+      },
+
+      pushClosingTag: function() {
+        var tagName = this.tagNames.pop();
+        if (tagName) { this.buffer += '</' + stripTagName(tagName) + '>'; }
+      },
+
+      currentTagName: function() {
+        return this.tagNames[this.tagNames.length-1];
+      },
+
+      generateElement: function() {
+        var tagName = this.tagNames.pop(), // pop since we don't need to close
+            id = this.elementId,
+            classes = this.classes,
+            attrs = this.elementAttributes,
+            props = this.elementProperties,
+            style = this.elementStyle,
+            styleBuffer = '', attr, prop, tagString;
+
+        if (attrs && attrs.name && !canSetNameOnInputs) {
+          // IE allows passing a tag to createElement. See note on `canSetNameOnInputs` above as well.
+          tagString = '<'+stripTagName(tagName)+' name="'+escapeAttribute(attrs.name)+'">';
+        } else {
+          tagString = tagName;
+        }
+
+        var element = document.createElement(tagString),
+            $element = jQuery(element);
+
+        if (id) {
+          $element.attr('id', id);
+          this.elementId = null;
+        }
+        if (classes) {
+          $element.attr('class', classes.join(' '));
+          this.classes = null;
+          this.elementClasses = null;
+        }
+
+        if (style) {
+          for (prop in style) {
+            if (style.hasOwnProperty(prop)) {
+              styleBuffer += (prop + ':' + style[prop] + ';');
+            }
+          }
+
+          $element.attr('style', styleBuffer);
+
+          this.elementStyle = null;
+        }
+
+        if (attrs) {
+          for (attr in attrs) {
+            if (attrs.hasOwnProperty(attr)) {
+              $element.attr(attr, attrs[attr]);
+            }
+          }
+
+          this.elementAttributes = null;
+        }
+
+        if (props) {
+          for (prop in props) {
+            if (props.hasOwnProperty(prop)) {
+              $element.prop(prop, props[prop]);
+            }
+          }
+
+          this.elementProperties = null;
+        }
+
+        return element;
+      },
+
+      /**
+        @method element
+        @return {DOMElement} The element corresponding to the generated HTML
+          of this buffer
+      */
+      element: function() {
+        var html = this.innerString();
+
+        if (html) {
+          this._element = setInnerHTML(this._element, html);
+        }
+
+        return this._element;
+      },
+
+      /**
+        Generates the HTML content for this buffer.
+
+        @method string
+        @return {String} The generated HTML
+      */
+      string: function() {
+        if (this._hasElement && this._element) {
+          // Firefox versions < 11 do not have support for element.outerHTML.
+          var thisElement = this.element(), outerHTML = thisElement.outerHTML;
+          if (typeof outerHTML === 'undefined') {
+            return jQuery('<div/>').append(thisElement).html();
+          }
+          return outerHTML;
+        } else {
+          return this.innerString();
+        }
+      },
+
+      innerString: function() {
+        return this.buffer;
+      }
+    };
+
+    __exports__["default"] = RenderBuffer;
+  });
+define("ember-views/system/utils",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    /* BEGIN METAMORPH HELPERS */
+
+    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+    // is a "zero-scope" element. This problem can be worked around by making
+    // the first node an invisible text node. We, like Modernizr, use &shy;
+
+    var needsShy = typeof document !== 'undefined' && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "<div></div>";
+      testEl.firstChild.innerHTML = "<script></script>";
+      return testEl.firstChild.innerHTML === '';
+    })();
+
+    // IE 8 (and likely earlier) likes to move whitespace preceeding
+    // a script tag to appear after it. This means that we can
+    // accidentally remove whitespace when updating a morph.
+    var movesWhitespace = typeof document !== 'undefined' && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
+      return testEl.childNodes[0].nodeValue === 'Test:' &&
+              testEl.childNodes[2].nodeValue === ' Value';
+    })();
+
+    // Use this to find children by ID instead of using jQuery
+    var findChildById = function(element, id) {
+      if (element.getAttribute('id') === id) { return element; }
+
+      var len = element.childNodes.length, idx, node, found;
+      for (idx=0; idx<len; idx++) {
+        node = element.childNodes[idx];
+        found = node.nodeType === 1 && findChildById(node, id);
+        if (found) { return found; }
+      }
+    };
+
+    var setInnerHTMLWithoutFix = function(element, html) {
+      if (needsShy) {
+        html = '&shy;' + html;
+      }
+
+      var matches = [];
+      if (movesWhitespace) {
+        // Right now we only check for script tags with ids with the
+        // goal of targeting morphs.
+        html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
+          matches.push([id, spaces]);
+          return tag;
+        });
+      }
+
+      element.innerHTML = html;
+
+      // If we have to do any whitespace adjustments do them now
+      if (matches.length > 0) {
+        var len = matches.length, idx;
+        for (idx=0; idx<len; idx++) {
+          var script = findChildById(element, matches[idx][0]),
+              node = document.createTextNode(matches[idx][1]);
+          script.parentNode.insertBefore(node, script);
+        }
+      }
+
+      if (needsShy) {
+        var shyElement = element.firstChild;
+        while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+          shyElement = shyElement.firstChild;
+        }
+        if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+          shyElement.nodeValue = shyElement.nodeValue.slice(1);
+        }
+      }
+    };
+
+    /* END METAMORPH HELPERS */
+
+
+    var innerHTMLTags = {};
+    var canSetInnerHTML = function(tagName) {
+      if (innerHTMLTags[tagName] !== undefined) {
+        return innerHTMLTags[tagName];
+      }
+
+      var canSet = true;
+
+      // IE 8 and earlier don't allow us to do innerHTML on select
+      if (tagName.toLowerCase() === 'select') {
+        var el = document.createElement('select');
+        setInnerHTMLWithoutFix(el, '<option value="test">Test</option>');
+        canSet = el.options.length === 1;
+      }
+
+      innerHTMLTags[tagName] = canSet;
+
+      return canSet;
+    };
+
+    var setInnerHTML = function(element, html) {
+      var tagName = element.tagName;
+
+      if (canSetInnerHTML(tagName)) {
+        setInnerHTMLWithoutFix(element, html);
+      } else {
+        // Firefox versions < 11 do not have support for element.outerHTML.
+        var outerHTML = element.outerHTML || new XMLSerializer().serializeToString(element);
+        
+        var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0],
+            endTag = '</'+tagName+'>';
+
+        var wrapper = document.createElement('div');
+        setInnerHTMLWithoutFix(wrapper, startTag + html + endTag);
+        element = wrapper.firstChild;
+        while (element.tagName !== tagName) {
+          element = element.nextSibling;
+        }
+      }
+
+      return element;
+    };
+
+    function isSimpleClick(event) {
+      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey,
+          secondaryClick = event.which > 1; // IE9 may return undefined
+
+      return !modifier && !secondaryClick;
+    }
+
+    __exports__.setInnerHTML = setInnerHTML;
+    __exports__.isSimpleClick = isSimpleClick;
+  });
+define("ember-views/views/collection_view",
+  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/view","ember-metal/mixin","ember-runtime/mixins/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+    "use strict";
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var create = __dependency2__.create;
+    var isGlobalPath = __dependency3__.isGlobalPath;
+    var merge = __dependency4__["default"];
+    var get = __dependency5__.get;
+    var set = __dependency6__.set;
+    var fmt = __dependency7__.fmt;
+    var ContainerView = __dependency8__["default"];
+    var CoreView = __dependency9__.CoreView;
+    var View = __dependency9__.View;
+    var observer = __dependency10__.observer;
+    var beforeObserver = __dependency10__.beforeObserver;
+    var EmberArray = __dependency11__["default"];
+
+    /**
+      `Ember.CollectionView` is an `Ember.View` descendent responsible for managing
+      a collection (an array or array-like object) by maintaining a child view object
+      and associated DOM representation for each item in the array and ensuring
+      that child views and their associated rendered HTML are updated when items in
+      the array are added, removed, or replaced.
+
+      ## Setting content
+
+      The managed collection of objects is referenced as the `Ember.CollectionView`
+      instance's `content` property.
+
+      ```javascript
+      someItemsView = Ember.CollectionView.create({
+        content: ['A', 'B','C']
+      })
+      ```
+
+      The view for each item in the collection will have its `content` property set
+      to the item.
+
+      ## Specifying itemViewClass
+
+      By default the view class for each item in the managed collection will be an
+      instance of `Ember.View`. You can supply a different class by setting the
+      `CollectionView`'s `itemViewClass` property.
+
+      Given an empty `<body>` and the following code:
+
+      ```javascript
+      someItemsView = Ember.CollectionView.create({
+        classNames: ['a-collection'],
+        content: ['A','B','C'],
+        itemViewClass: Ember.View.extend({
+          template: Ember.Handlebars.compile("the letter: {{view.content}}")
+        })
+      });
+
+      someItemsView.appendTo('body');
+      ```
+
+      Will result in the following HTML structure
+
+      ```html
+      <div class="ember-view a-collection">
+        <div class="ember-view">the letter: A</div>
+        <div class="ember-view">the letter: B</div>
+        <div class="ember-view">the letter: C</div>
+      </div>
+      ```
+
+      ## Automatic matching of parent/child tagNames
+
+      Setting the `tagName` property of a `CollectionView` to any of
+      "ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
+      in the item views receiving an appropriately matched `tagName` property.
+
+      Given an empty `<body>` and the following code:
+
+      ```javascript
+      anUnorderedListView = Ember.CollectionView.create({
+        tagName: 'ul',
+        content: ['A','B','C'],
+        itemViewClass: Ember.View.extend({
+          template: Ember.Handlebars.compile("the letter: {{view.content}}")
+        })
+      });
+
+      anUnorderedListView.appendTo('body');
+      ```
+
+      Will result in the following HTML structure
+
+      ```html
+      <ul class="ember-view a-collection">
+        <li class="ember-view">the letter: A</li>
+        <li class="ember-view">the letter: B</li>
+        <li class="ember-view">the letter: C</li>
+      </ul>
+      ```
+
+      Additional `tagName` pairs can be provided by adding to
+      `Ember.CollectionView.CONTAINER_MAP `
+
+      ```javascript
+      Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
+      ```
+
+      ## Programmatic creation of child views
+
+      For cases where additional customization beyond the use of a single
+      `itemViewClass` or `tagName` matching is required CollectionView's
+      `createChildView` method can be overidden:
+
+      ```javascript
+      CustomCollectionView = Ember.CollectionView.extend({
+        createChildView: function(viewClass, attrs) {
+          if (attrs.content.kind == 'album') {
+            viewClass = App.AlbumView;
+          } else {
+            viewClass = App.SongView;
+          }
+          return this._super(viewClass, attrs);
+        }
+      });
+      ```
+
+      ## Empty View
+
+      You can provide an `Ember.View` subclass to the `Ember.CollectionView`
+      instance as its `emptyView` property. If the `content` property of a
+      `CollectionView` is set to `null` or an empty array, an instance of this view
+      will be the `CollectionView`s only child.
+
+      ```javascript
+      aListWithNothing = Ember.CollectionView.create({
+        classNames: ['nothing']
+        content: null,
+        emptyView: Ember.View.extend({
+          template: Ember.Handlebars.compile("The collection is empty")
+        })
+      });
+
+      aListWithNothing.appendTo('body');
+      ```
+
+      Will result in the following HTML structure
+
+      ```html
+      <div class="ember-view nothing">
+        <div class="ember-view">
+          The collection is empty
+        </div>
+      </div>
+      ```
+
+      ## Adding and Removing items
+
+      The `childViews` property of a `CollectionView` should not be directly
+      manipulated. Instead, add, remove, replace items from its `content` property.
+      This will trigger appropriate changes to its rendered HTML.
+
+
+      @class CollectionView
+      @namespace Ember
+      @extends Ember.ContainerView
+      @since Ember 0.9
+    */
+    var CollectionView = ContainerView.extend({
+
+      /**
+        A list of items to be displayed by the `Ember.CollectionView`.
+
+        @property content
+        @type Ember.Array
+        @default null
+      */
+      content: null,
+
+      /**
+        This provides metadata about what kind of empty view class this
+        collection would like if it is being instantiated from another
+        system (like Handlebars)
+
+        @private
+        @property emptyViewClass
+      */
+      emptyViewClass: View,
+
+      /**
+        An optional view to display if content is set to an empty array.
+
+        @property emptyView
+        @type Ember.View
+        @default null
+      */
+      emptyView: null,
+
+      /**
+        @property itemViewClass
+        @type Ember.View
+        @default Ember.View
+      */
+      itemViewClass: View,
+
+      /**
+        Setup a CollectionView
+
+        @method init
+      */
+      init: function() {
+        var ret = this._super();
+        this._contentDidChange();
+        return ret;
+      },
+
+      /**
+        Invoked when the content property is about to change. Notifies observers that the
+        entire array content will change.
+
+        @private
+        @method _contentWillChange
+      */
+      _contentWillChange: beforeObserver('content', function() {
+        var content = this.get('content');
+
+        if (content) { content.removeArrayObserver(this); }
+        var len = content ? get(content, 'length') : 0;
+        this.arrayWillChange(content, 0, len);
+      }),
+
+      /**
+        Check to make sure that the content has changed, and if so,
+        update the children directly. This is always scheduled
+        asynchronously, to allow the element to be created before
+        bindings have synchronized and vice versa.
+
+        @private
+        @method _contentDidChange
+      */
+      _contentDidChange: observer('content', function() {
+        var content = get(this, 'content');
+
+        if (content) {
+          this._assertArrayLike(content);
+          content.addArrayObserver(this);
+        }
+
+        var len = content ? get(content, 'length') : 0;
+        this.arrayDidChange(content, 0, null, len);
+      }),
+
+      /**
+        Ensure that the content implements Ember.Array
+
+        @private
+        @method _assertArrayLike
+      */
+      _assertArrayLike: function(content) {
+              },
+
+      /**
+        Removes the content and content observers.
+
+        @method destroy
+      */
+      destroy: function() {
+        if (!this._super()) { return; }
+
+        var content = get(this, 'content');
+        if (content) { content.removeArrayObserver(this); }
+
+        if (this._createdEmptyView) {
+          this._createdEmptyView.destroy();
+        }
+
+        return this;
+      },
+
+      /**
+        Called when a mutation to the underlying content array will occur.
+
+        This method will remove any views that are no longer in the underlying
+        content array.
+
+        Invokes whenever the content array itself will change.
+
+        @method arrayWillChange
+        @param {Array} content the managed collection of objects
+        @param {Number} start the index at which the changes will occurr
+        @param {Number} removed number of object to be removed from content
+      */
+      arrayWillChange: function(content, start, removedCount) {
+        // If the contents were empty before and this template collection has an
+        // empty view remove it now.
+        var emptyView = get(this, 'emptyView');
+        if (emptyView && emptyView instanceof View) {
+          emptyView.removeFromParent();
+        }
+
+        // Loop through child views that correspond with the removed items.
+        // Note that we loop from the end of the array to the beginning because
+        // we are mutating it as we go.
+        var childViews = this._childViews, childView, idx, len;
+
+        len = this._childViews.length;
+
+        var removingAll = removedCount === len;
+
+        if (removingAll) {
+          this.currentState.empty(this);
+          this.invokeRecursively(function(view) {
+            view.removedFromDOM = true;
+          }, false);
+        }
+
+        for (idx = start + removedCount - 1; idx >= start; idx--) {
+          childView = childViews[idx];
+          childView.destroy();
+        }
+      },
+
+      /**
+        Called when a mutation to the underlying content array occurs.
+
+        This method will replay that mutation against the views that compose the
+        `Ember.CollectionView`, ensuring that the view reflects the model.
+
+        This array observer is added in `contentDidChange`.
+
+        @method arrayDidChange
+        @param {Array} content the managed collection of objects
+        @param {Number} start the index at which the changes occurred
+        @param {Number} removed number of object removed from content
+        @param {Number} added number of object added to content
+      */
+      arrayDidChange: function(content, start, removed, added) {
+        var addedViews = [], view, item, idx, len, itemViewClass,
+          emptyView;
+
+        len = content ? get(content, 'length') : 0;
+
+        if (len) {
+          itemViewClass = get(this, 'itemViewClass');
+
+          if ('string' === typeof itemViewClass && isGlobalPath(itemViewClass)) {
+            itemViewClass = get(itemViewClass) || itemViewClass;
+          }
+
+          
+          for (idx = start; idx < start+added; idx++) {
+            item = content.objectAt(idx);
+
+            view = this.createChildView(itemViewClass, {
+              content: item,
+              contentIndex: idx
+            });
+
+            addedViews.push(view);
+          }
+        } else {
+          emptyView = get(this, 'emptyView');
+
+          if (!emptyView) { return; }
+
+          if ('string' === typeof emptyView && isGlobalPath(emptyView)) {
+            emptyView = get(emptyView) || emptyView;
+          }
+
+          emptyView = this.createChildView(emptyView);
+          addedViews.push(emptyView);
+          set(this, 'emptyView', emptyView);
+
+          if (CoreView.detect(emptyView)) {
+            this._createdEmptyView = emptyView;
+          }
+        }
+
+        this.replace(start, 0, addedViews);
+      },
+
+      /**
+        Instantiates a view to be added to the childViews array during view
+        initialization. You generally will not call this method directly unless
+        you are overriding `createChildViews()`. Note that this method will
+        automatically configure the correct settings on the new view instance to
+        act as a child of the parent.
+
+        The tag name for the view will be set to the tagName of the viewClass
+        passed in.
+
+        @method createChildView
+        @param {Class} viewClass
+        @param {Hash} [attrs] Attributes to add
+        @return {Ember.View} new instance
+      */
+      createChildView: function(view, attrs) {
+        view = this._super(view, attrs);
+
+        var itemTagName = get(view, 'tagName');
+
+        if (itemTagName === null || itemTagName === undefined) {
+          itemTagName = CollectionView.CONTAINER_MAP[get(this, 'tagName')];
+          set(view, 'tagName', itemTagName);
+        }
+
+        return view;
+      }
+    });
+
+    /**
+      A map of parent tags to their default child tags. You can add
+      additional parent tags if you want collection views that use
+      a particular parent tag to default to a child tag.
+
+      @property CONTAINER_MAP
+      @type Hash
+      @static
+      @final
+    */
+    CollectionView.CONTAINER_MAP = {
+      ul: 'li',
+      ol: 'li',
+      table: 'tr',
+      thead: 'tr',
+      tbody: 'tr',
+      tfoot: 'tr',
+      tr: 'td',
+      select: 'option'
+    };
+
+    __exports__["default"] = CollectionView;
+  });
+define("ember-views/views/component",
+  ["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.Handlebars
+
+    var ComponentTemplateDeprecation = __dependency2__["default"];
+    var TargetActionSupport = __dependency3__["default"];
+    var View = __dependency4__.View;var get = __dependency5__.get;
+    var set = __dependency6__.set;
+    var isNone = __dependency7__.isNone;
+
+    var computed = __dependency8__.computed;
+
+    var a_slice = Array.prototype.slice;
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    /**
+      An `Ember.Component` is a view that is completely
+      isolated. Property access in its templates go
+      to the view object and actions are targeted at
+      the view object. There is no access to the
+      surrounding context or outer controller; all
+      contextual information must be passed in.
+
+      The easiest way to create an `Ember.Component` is via
+      a template. If you name a template
+      `components/my-foo`, you will be able to use
+      `{{my-foo}}` in other templates, which will make
+      an instance of the isolated component.
+
+      ```handlebars
+      {{app-profile person=currentUser}}
+      ```
+
+      ```handlebars
+      <!-- app-profile template -->
+      <h1>{{person.title}}</h1>
+      <img {{bind-attr src=person.avatar}}>
+      <p class='signature'>{{person.signature}}</p>
+      ```
+
+      You can use `yield` inside a template to
+      include the **contents** of any block attached to
+      the component. The block will be executed in the
+      context of the surrounding context or outer controller:
+
+      ```handlebars
+      {{#app-profile person=currentUser}}
+        <p>Admin mode</p>
+        {{! Executed in the controller's context. }}
+      {{/app-profile}}
+      ```
+
+      ```handlebars
+      <!-- app-profile template -->
+      <h1>{{person.title}}</h1>
+      {{! Executed in the components context. }}
+      {{yield}} {{! block contents }}
+      ```
+
+      If you want to customize the component, in order to
+      handle events or actions, you implement a subclass
+      of `Ember.Component` named after the name of the
+      component. Note that `Component` needs to be appended to the name of
+      your subclass like `AppProfileComponent`.
+
+      For example, you could implement the action
+      `hello` for the `app-profile` component:
+
+      ```javascript
+      App.AppProfileComponent = Ember.Component.extend({
+        actions: {
+          hello: function(name) {
+            console.log("Hello", name);
+          }
+        }
+      });
+      ```
+
+      And then use it in the component's template:
+
+      ```handlebars
+      <!-- app-profile template -->
+
+      <h1>{{person.title}}</h1>
+      {{yield}} <!-- block contents -->
+
+      <button {{action 'hello' person.name}}>
+        Say Hello to {{person.name}}
+      </button>
+      ```
+
+      Components must have a `-` in their name to avoid
+      conflicts with built-in controls that wrap HTML
+      elements. This is consistent with the same
+      requirement in web components.
+
+      @class Component
+      @namespace Ember
+      @extends Ember.View
+    */
+    var Component = View.extend(TargetActionSupport, ComponentTemplateDeprecation, {
+      instrumentName: 'component',
+      instrumentDisplay: computed(function() {
+        if (this._debugContainerKey) {
+          return '{{' + this._debugContainerKey.split(':')[1] + '}}';
+        }
+      }),
+
+      init: function() {
+        this._super();
+        set(this, 'context', this);
+        set(this, 'controller', this);
+      },
+
+      defaultLayout: function(context, options){
+        Ember.Handlebars.helpers['yield'].call(context, options);
+      },
+
+      /**
+      A components template property is set by passing a block
+      during its invocation. It is executed within the parent context.
+
+      Example:
+
+      ```handlebars
+      {{#my-component}}
+        // something that is run in the context
+        // of the parent context
+      {{/my-component}}
+      ```
+
+      Specifying a template directly to a component is deprecated without
+      also specifying the layout property.
+
+      @deprecated
+      @property template
+      */
+      template: computed(function(key, value) {
+        if (value !== undefined) { return value; }
+
+        var templateName = get(this, 'templateName'),
+            template = this.templateForName(templateName, 'template');
+
+        
+        return template || get(this, 'defaultTemplate');
+      }).property('templateName'),
+
+      /**
+      Specifying a components `templateName` is deprecated without also
+      providing the `layout` or `layoutName` properties.
+
+      @deprecated
+      @property templateName
+      */
+      templateName: null,
+
+      // during render, isolate keywords
+      cloneKeywords: function() {
+        return {
+          view: this,
+          controller: this
+        };
+      },
+
+      _yield: function(context, options) {
+        var view = options.data.view,
+            parentView = this._parentView,
+            template = get(this, 'template');
+
+        if (template) {
+          
+          view.appendChild(View, {
+            isVirtual: true,
+            tagName: '',
+            _contextView: parentView,
+            template: template,
+            context: get(parentView, 'context'),
+            controller: get(parentView, 'controller'),
+            templateData: { keywords: parentView.cloneKeywords() }
+          });
+        }
+      },
+
+      /**
+        If the component is currently inserted into the DOM of a parent view, this
+        property will point to the controller of the parent view.
+
+        @property targetObject
+        @type Ember.Controller
+        @default null
+      */
+      targetObject: computed(function(key) {
+        var parentView = get(this, '_parentView');
+        return parentView ? get(parentView, 'controller') : null;
+      }).property('_parentView'),
+
+      /**
+        Triggers a named action on the controller context where the component is used if
+        this controller has registered for notifications of the action.
+
+        For example a component for playing or pausing music may translate click events
+        into action notifications of "play" or "stop" depending on some internal state
+        of the component:
+
+
+        ```javascript
+        App.PlayButtonComponent = Ember.Component.extend({
+          click: function(){
+            if (this.get('isPlaying')) {
+              this.sendAction('play');
+            } else {
+              this.sendAction('stop');
+            }
+          }
+        });
+        ```
+
+        When used inside a template these component actions are configured to
+        trigger actions in the outer application context:
+
+        ```handlebars
+        {{! application.hbs }}
+        {{play-button play="musicStarted" stop="musicStopped"}}
+        ```
+
+        When the component receives a browser `click` event it translate this
+        interaction into application-specific semantics ("play" or "stop") and
+        triggers the specified action name on the controller for the template
+        where the component is used:
+
+
+        ```javascript
+        App.ApplicationController = Ember.Controller.extend({
+          actions: {
+            musicStarted: function(){
+              // called when the play button is clicked
+              // and the music started playing
+            },
+            musicStopped: function(){
+              // called when the play button is clicked
+              // and the music stopped playing
+            }
+          }
+        });
+        ```
+
+        If no action name is passed to `sendAction` a default name of "action"
+        is assumed.
+
+        ```javascript
+        App.NextButtonComponent = Ember.Component.extend({
+          click: function(){
+            this.sendAction();
+          }
+        });
+        ```
+
+        ```handlebars
+        {{! application.hbs }}
+        {{next-button action="playNextSongInAlbum"}}
+        ```
+
+        ```javascript
+        App.ApplicationController = Ember.Controller.extend({
+          actions: {
+            playNextSongInAlbum: function(){
+              ...
+            }
+          }
+        });
+        ```
+
+        @method sendAction
+        @param [action] {String} the action to trigger
+        @param [context] {*} a context to send with the action
+      */
+      sendAction: function(action) {
+        var actionName,
+            contexts = a_slice.call(arguments, 1);
+
+        // Send the default action
+        if (action === undefined) {
+          actionName = get(this, 'action');
+                  } else {
+          actionName = get(this, action);
+                  }
+
+        // If no action name for that action could be found, just abort.
+        if (actionName === undefined) { return; }
+
+        this.triggerAction({
+          action: actionName,
+          actionContext: contexts
+        });
+      }
+    });
+
+    __exports__["default"] = Component;
+  });
+define("ember-views/views/container_view",
+  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.K
+
+    var merge = __dependency2__["default"];
+    var MutableArray = __dependency3__["default"];
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+
+    var View = __dependency6__.View;
+    var ViewCollection = __dependency6__.ViewCollection;
+    var cloneStates = __dependency7__.cloneStates;
+    var EmberViewStates = __dependency7__.states;
+
+    var EmberError = __dependency8__["default"];
+
+    // ES6TODO: functions on EnumerableUtils should get their own export
+    var EnumerableUtils = __dependency9__["default"];
+    var forEach = EnumerableUtils.forEach;
+
+    var computed = __dependency10__.computed;
+    var run = __dependency11__["default"];
+    var defineProperty = __dependency12__.defineProperty;
+    var RenderBuffer = __dependency13__["default"];
+    var observer = __dependency14__.observer;
+    var beforeObserver = __dependency14__.beforeObserver;
+    var A = __dependency15__.A;
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var states = cloneStates(EmberViewStates);
+
+    /**
+      A `ContainerView` is an `Ember.View` subclass that implements `Ember.MutableArray`
+      allowing programmatic management of its child views.
+
+      ## Setting Initial Child Views
+
+      The initial array of child views can be set in one of two ways. You can
+      provide a `childViews` property at creation time that contains instance of
+      `Ember.View`:
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        childViews: [Ember.View.create(), Ember.View.create()]
+      });
+      ```
+
+      You can also provide a list of property names whose values are instances of
+      `Ember.View`:
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        childViews: ['aView', 'bView', 'cView'],
+        aView: Ember.View.create(),
+        bView: Ember.View.create(),
+        cView: Ember.View.create()
+      });
+      ```
+
+      The two strategies can be combined:
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        childViews: ['aView', Ember.View.create()],
+        aView: Ember.View.create()
+      });
+      ```
+
+      Each child view's rendering will be inserted into the container's rendered
+      HTML in the same order as its position in the `childViews` property.
+
+      ## Adding and Removing Child Views
+
+      The container view implements `Ember.MutableArray` allowing programmatic management of its child views.
+
+      To remove a view, pass that view into a `removeObject` call on the container view.
+
+      Given an empty `<body>` the following code
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        classNames: ['the-container'],
+        childViews: ['aView', 'bView'],
+        aView: Ember.View.create({
+          template: Ember.Handlebars.compile("A")
+        }),
+        bView: Ember.View.create({
+          template: Ember.Handlebars.compile("B")
+        })
+      });
+
+      aContainer.appendTo('body');
+      ```
+
+      Results in the HTML
+
+      ```html
+      <div class="ember-view the-container">
+        <div class="ember-view">A</div>
+        <div class="ember-view">B</div>
+      </div>
+      ```
+
+      Removing a view
+
+      ```javascript
+      aContainer.toArray();  // [aContainer.aView, aContainer.bView]
+      aContainer.removeObject(aContainer.get('bView'));
+      aContainer.toArray();  // [aContainer.aView]
+      ```
+
+      Will result in the following HTML
+
+      ```html
+      <div class="ember-view the-container">
+        <div class="ember-view">A</div>
+      </div>
+      ```
+
+      Similarly, adding a child view is accomplished by adding `Ember.View` instances to the
+      container view.
+
+      Given an empty `<body>` the following code
+
+      ```javascript
+      aContainer = Ember.ContainerView.create({
+        classNames: ['the-container'],
+        childViews: ['aView', 'bView'],
+        aView: Ember.View.create({
+          template: Ember.Handlebars.compile("A")
+        }),
+        bView: Ember.View.create({
+          template: Ember.Handlebars.compile("B")
+        })
+      });
+
+      aContainer.appendTo('body');
+      ```
+
+      Results in the HTML
+
+      ```html
+      <div class="ember-view the-container">
+        <div class="ember-view">A</div>
+        <div class="ember-view">B</div>
+      </div>
+      ```
+
+      Adding a view
+
+      ```javascript
+      AnotherViewClass = Ember.View.extend({
+        template: Ember.Handlebars.compile("Another view")
+      });
+
+      aContainer.toArray();  // [aContainer.aView, aContainer.bView]
+      aContainer.pushObject(AnotherViewClass.create());
+      aContainer.toArray(); // [aContainer.aView, aContainer.bView, <AnotherViewClass instance>]
+      ```
+
+      Will result in the following HTML
+
+      ```html
+      <div class="ember-view the-container">
+        <div class="ember-view">A</div>
+        <div class="ember-view">B</div>
+        <div class="ember-view">Another view</div>
+      </div>
+      ```
+
+      ## Templates and Layout
+
+      A `template`, `templateName`, `defaultTemplate`, `layout`, `layoutName` or
+      `defaultLayout` property on a container view will not result in the template
+      or layout being rendered. The HTML contents of a `Ember.ContainerView`'s DOM
+      representation will only be the rendered HTML of its child views.
+
+      @class ContainerView
+      @namespace Ember
+      @extends Ember.View
+    */
+    var ContainerView = View.extend(MutableArray, {
+      states: states,
+
+      init: function() {
+        this._super();
+
+        var childViews = get(this, 'childViews');
+
+        // redefine view's childViews property that was obliterated
+        defineProperty(this, 'childViews', View.childViewsProperty);
+
+        var _childViews = this._childViews;
+
+        forEach(childViews, function(viewName, idx) {
+          var view;
+
+          if ('string' === typeof viewName) {
+            view = get(this, viewName);
+            view = this.createChildView(view);
+            set(this, viewName, view);
+          } else {
+            view = this.createChildView(viewName);
+          }
+
+          _childViews[idx] = view;
+        }, this);
+
+        var currentView = get(this, 'currentView');
+        if (currentView) {
+          if (!_childViews.length) { _childViews = this._childViews = this._childViews.slice(); }
+          _childViews.push(this.createChildView(currentView));
+        }
+      },
+
+      replace: function(idx, removedCount, addedViews) {
+        var addedCount = addedViews ? get(addedViews, 'length') : 0;
+        var self = this;
+        
+        this.arrayContentWillChange(idx, removedCount, addedCount);
+        this.childViewsWillChange(this._childViews, idx, removedCount);
+
+        if (addedCount === 0) {
+          this._childViews.splice(idx, removedCount) ;
+        } else {
+          var args = [idx, removedCount].concat(addedViews);
+          if (addedViews.length && !this._childViews.length) { this._childViews = this._childViews.slice(); }
+          this._childViews.splice.apply(this._childViews, args);
+        }
+
+        this.arrayContentDidChange(idx, removedCount, addedCount);
+        this.childViewsDidChange(this._childViews, idx, removedCount, addedCount);
+
+        return this;
+      },
+
+      objectAt: function(idx) {
+        return this._childViews[idx];
+      },
+
+      length: computed(function () {
+        return this._childViews.length;
+      }).volatile(),
+
+      /**
+        Instructs each child view to render to the passed render buffer.
+
+        @private
+        @method render
+        @param {Ember.RenderBuffer} buffer the buffer to render to
+      */
+      render: function(buffer) {
+        this.forEachChildView(function(view) {
+          view.renderToBuffer(buffer);
+        });
+      },
+
+      instrumentName: 'container',
+
+      /**
+        When a child view is removed, destroy its element so that
+        it is removed from the DOM.
+
+        The array observer that triggers this action is set up in the
+        `renderToBuffer` method.
+
+        @private
+        @method childViewsWillChange
+        @param {Ember.Array} views the child views array before mutation
+        @param {Number} start the start position of the mutation
+        @param {Number} removed the number of child views removed
+      **/
+      childViewsWillChange: function(views, start, removed) {
+        this.propertyWillChange('childViews');
+
+        if (removed > 0) {
+          var changedViews = views.slice(start, start+removed);
+          // transition to preRender before clearing parentView
+          this.currentState.childViewsWillChange(this, views, start, removed);
+          this.initializeViews(changedViews, null, null);
+        }
+      },
+
+      removeChild: function(child) {
+        this.removeObject(child);
+        return this;
+      },
+
+      /**
+        When a child view is added, make sure the DOM gets updated appropriately.
+
+        If the view has already rendered an element, we tell the child view to
+        create an element and insert it into the DOM. If the enclosing container
+        view has already written to a buffer, but not yet converted that buffer
+        into an element, we insert the string representation of the child into the
+        appropriate place in the buffer.
+
+        @private
+        @method childViewsDidChange
+        @param {Ember.Array} views the array of child views after the mutation has occurred
+        @param {Number} start the start position of the mutation
+        @param {Number} removed the number of child views removed
+        @param {Number} added the number of child views added
+      */
+      childViewsDidChange: function(views, start, removed, added) {
+        if (added > 0) {
+          var changedViews = views.slice(start, start+added);
+          this.initializeViews(changedViews, this, get(this, 'templateData'));
+          this.currentState.childViewsDidChange(this, views, start, added);
+        }
+        this.propertyDidChange('childViews');
+      },
+
+      initializeViews: function(views, parentView, templateData) {
+        forEach(views, function(view) {
+          set(view, '_parentView', parentView);
+
+          if (!view.container && parentView) {
+            set(view, 'container', parentView.container);
+          }
+
+          if (!get(view, 'templateData')) {
+            set(view, 'templateData', templateData);
+          }
+        });
+      },
+
+      currentView: null,
+
+      _currentViewWillChange: beforeObserver('currentView', function() {
+        var currentView = get(this, 'currentView');
+        if (currentView) {
+          currentView.destroy();
+        }
+      }),
+
+      _currentViewDidChange: observer('currentView', function() {
+        var currentView = get(this, 'currentView');
+        if (currentView) {
+                    this.pushObject(currentView);
+        }
+      }),
+
+      _ensureChildrenAreInDOM: function () {
+        this.currentState.ensureChildrenAreInDOM(this);
+      }
+    });
+
+    merge(states._default, {
+      childViewsWillChange: Ember.K,
+      childViewsDidChange: Ember.K,
+      ensureChildrenAreInDOM: Ember.K
+    });
+
+    merge(states.inBuffer, {
+      childViewsDidChange: function(parentView, views, start, added) {
+        throw new EmberError('You cannot modify child views while in the inBuffer state');
+      }
+    });
+
+    merge(states.hasElement, {
+      childViewsWillChange: function(view, views, start, removed) {
+        for (var i=start; i<start+removed; i++) {
+          views[i].remove();
+        }
+      },
+
+      childViewsDidChange: function(view, views, start, added) {
+        run.scheduleOnce('render', view, '_ensureChildrenAreInDOM');
+      },
+
+      ensureChildrenAreInDOM: function(view) {
+        var childViews = view._childViews, i, len, childView, previous, buffer, viewCollection = new ViewCollection();
+
+        for (i = 0, len = childViews.length; i < len; i++) {
+          childView = childViews[i];
+
+          if (!buffer) { buffer = RenderBuffer(); buffer._hasElement = false; }
+
+          if (childView.renderToBufferIfNeeded(buffer)) {
+            viewCollection.push(childView);
+          } else if (viewCollection.length) {
+            insertViewCollection(view, viewCollection, previous, buffer);
+            buffer = null;
+            previous = childView;
+            viewCollection.clear();
+          } else {
+            previous = childView;
+          }
+        }
+
+        if (viewCollection.length) {
+          insertViewCollection(view, viewCollection, previous, buffer);
+        }
+      }
+    });
+
+    function insertViewCollection(view, viewCollection, previous, buffer) {
+      viewCollection.triggerRecursively('willInsertElement');
+
+      if (previous) {
+        previous.domManager.after(previous, buffer.string());
+      } else {
+        view.domManager.prepend(view, buffer.string());
+      }
+
+      viewCollection.forEach(function(v) {
+        v.transitionTo('inDOM');
+        v.propertyDidChange('element');
+        v.triggerRecursively('didInsertElement');
+      });
+    }
+
+
+    __exports__["default"] = ContainerView;
+  });
+define("ember-views/views/states",
+  ["ember-metal/platform","ember-metal/merge","ember-views/views/states/default","ember-views/views/states/pre_render","ember-views/views/states/in_buffer","ember-views/views/states/has_element","ember-views/views/states/in_dom","ember-views/views/states/destroying","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+    var merge = __dependency2__["default"];
+    var _default = __dependency3__["default"];
+    var preRender = __dependency4__["default"];
+    var inBuffer = __dependency5__["default"];
+    var hasElement = __dependency6__["default"];
+    var inDOM = __dependency7__["default"];
+    var destroying = __dependency8__["default"];
+
+    function cloneStates(from) {
+      var into = {};
+
+      into._default = {};
+      into.preRender = create(into._default);
+      into.destroying = create(into._default);
+      into.inBuffer = create(into._default);
+      into.hasElement = create(into._default);
+      into.inDOM = create(into.hasElement);
+
+      for (var stateName in from) {
+        if (!from.hasOwnProperty(stateName)) { continue; }
+        merge(into[stateName], from[stateName]);
+      }
+
+      return into;
+    };
+
+    var states = {
+      _default: _default,
+      preRender: preRender,
+      inDOM: inDOM,
+      inBuffer: inBuffer,
+      hasElement: hasElement,
+      destroying: destroying
+    };
+
+    __exports__.cloneStates = cloneStates;
+    __exports__.states = states;
+  });
+define("ember-views/views/states/default",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.K
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var run = __dependency4__["default"];
+    var EmberError = __dependency5__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+    var _default = {
+      // appendChild is only legal while rendering the buffer.
+      appendChild: function() {
+        throw new EmberError("You can't use appendChild outside of the rendering process");
+      },
+
+      $: function() {
+        return undefined;
+      },
+
+      getElement: function() {
+        return null;
+      },
+
+      // Handle events from `Ember.EventDispatcher`
+      handleEvent: function() {
+        return true; // continue event propagation
+      },
+
+      destroyElement: function(view) {
+        set(view, 'element', null);
+        if (view._scheduledInsert) {
+          run.cancel(view._scheduledInsert);
+          view._scheduledInsert = null;
+        }
+        return view;
+      },
+
+      renderToBufferIfNeeded: function () {
+        return false;
+      },
+
+      rerender: Ember.K,
+      invokeObserver: Ember.K
+    };
+
+    __exports__["default"] = _default;
+  });
+define("ember-views/views/states/destroying",
+  ["ember-metal/merge","ember-metal/platform","ember-runtime/system/string","ember-views/views/states/default","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var merge = __dependency1__["default"];
+    var create = __dependency2__.create;
+    var fmt = __dependency3__.fmt;
+    var _default = __dependency4__["default"];
+    var EmberError = __dependency5__["default"];
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var destroyingError = "You can't call %@ on a view being destroyed";
+
+    var destroying = create(_default);
+
+    merge(destroying, {
+      appendChild: function() {
+        throw new EmberError(fmt(destroyingError, ['appendChild']));
+      },
+      rerender: function() {
+        throw new EmberError(fmt(destroyingError, ['rerender']));
+      },
+      destroyElement: function() {
+        throw new EmberError(fmt(destroyingError, ['destroyElement']));
+      },
+      empty: function() {
+        throw new EmberError(fmt(destroyingError, ['empty']));
+      },
+
+      setElement: function() {
+        throw new EmberError(fmt(destroyingError, ["set('element', ...)"]));
+      },
+
+      renderToBufferIfNeeded: function() {
+        return false;
+      },
+
+      // Since element insertion is scheduled, don't do anything if
+      // the view has been destroyed between scheduling and execution
+      insertElement: Ember.K
+    });
+
+    __exports__["default"] = destroying;
+  });
+define("ember-views/views/states/has_element",
+  ["ember-views/views/states/default","ember-metal/run_loop","ember-metal/merge","ember-metal/platform","ember-views/system/jquery","ember-metal/error","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var _default = __dependency1__["default"];
+    var run = __dependency2__["default"];
+    var merge = __dependency3__["default"];
+    var create = __dependency4__.create;
+    var jQuery = __dependency5__["default"];
+    var EmberError = __dependency6__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var get = __dependency7__.get;
+    var set = __dependency8__.set;
+
+    var hasElement = create(_default);
+
+    merge(hasElement, {
+      $: function(view, sel) {
+        var elem = get(view, 'element');
+        return sel ? jQuery(sel, elem) : jQuery(elem);
+      },
+
+      getElement: function(view) {
+        var parent = get(view, 'parentView');
+        if (parent) { parent = get(parent, 'element'); }
+        if (parent) { return view.findElementInParentElement(parent); }
+        return jQuery("#" + get(view, 'elementId'))[0];
+      },
+
+      setElement: function(view, value) {
+        if (value === null) {
+          view.transitionTo('preRender');
+        } else {
+          throw new EmberError("You cannot set an element to a non-null value when the element is already in the DOM.");
+        }
+
+        return value;
+      },
+
+      // once the view has been inserted into the DOM, rerendering is
+      // deferred to allow bindings to synchronize.
+      rerender: function(view) {
+        view.triggerRecursively('willClearRender');
+
+        view.clearRenderedChildren();
+
+        view.domManager.replace(view);
+        return view;
+      },
+
+      // once the view is already in the DOM, destroying it removes it
+      // from the DOM, nukes its element, and puts it back into the
+      // preRender state if inDOM.
+
+      destroyElement: function(view) {
+        view._notifyWillDestroyElement();
+        view.domManager.remove(view);
+        set(view, 'element', null);
+        if (view._scheduledInsert) {
+          run.cancel(view._scheduledInsert);
+          view._scheduledInsert = null;
+        }
+        return view;
+      },
+
+      empty: function(view) {
+        var _childViews = view._childViews, len, idx;
+        if (_childViews) {
+          len = _childViews.length;
+          for (idx = 0; idx < len; idx++) {
+            _childViews[idx]._notifyWillDestroyElement();
+          }
+        }
+        view.domManager.empty(view);
+      },
+
+      // Handle events from `Ember.EventDispatcher`
+      handleEvent: function(view, eventName, evt) {
+        if (view.has(eventName)) {
+          // Handler should be able to re-dispatch events, so we don't
+          // preventDefault or stopPropagation.
+          return view.trigger(eventName, evt);
+        } else {
+          return true; // continue event propagation
+        }
+      },
+
+      invokeObserver: function(target, observer) {
+        observer.call(target);
+      }
+    });
+
+    __exports__["default"] = hasElement;
+  });
+define("ember-views/views/states/in_buffer",
+  ["ember-views/views/states/default","ember-metal/error","ember-metal/core","ember-metal/platform","ember-metal/merge","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var _default = __dependency1__["default"];
+    var EmberError = __dependency2__["default"];
+
+    var Ember = __dependency3__["default"];
+    // Ember.assert
+    var create = __dependency4__.create;
+    var merge = __dependency5__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var inBuffer = create(_default);
+
+    merge(inBuffer, {
+      $: function(view, sel) {
+        // if we don't have an element yet, someone calling this.$() is
+        // trying to update an element that isn't in the DOM. Instead,
+        // rerender the view to allow the render method to reflect the
+        // changes.
+        view.rerender();
+        return Ember.$();
+      },
+
+      // when a view is rendered in a buffer, rerendering it simply
+      // replaces the existing buffer with a new one
+      rerender: function(view) {
+        throw new EmberError("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
+      },
+
+      // when a view is rendered in a buffer, appending a child
+      // view will render that view and append the resulting
+      // buffer into its buffer.
+      appendChild: function(view, childView, options) {
+        var buffer = view.buffer, _childViews = view._childViews;
+
+        childView = view.createChildView(childView, options);
+        if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
+        _childViews.push(childView);
+
+        childView.renderToBuffer(buffer);
+
+        view.propertyDidChange('childViews');
+
+        return childView;
+      },
+
+      // when a view is rendered in a buffer, destroying the
+      // element will simply destroy the buffer and put the
+      // state back into the preRender state.
+      destroyElement: function(view) {
+        view.clearBuffer();
+        var viewCollection = view._notifyWillDestroyElement();
+        viewCollection.transitionTo('preRender', false);
+
+        return view;
+      },
+
+      empty: function() {
+              },
+
+      renderToBufferIfNeeded: function (view, buffer) {
+        return false;
+      },
+
+      // It should be impossible for a rendered view to be scheduled for
+      // insertion.
+      insertElement: function() {
+        throw new EmberError("You can't insert an element that has already been rendered");
+      },
+
+      setElement: function(view, value) {
+        if (value === null) {
+          view.transitionTo('preRender');
+        } else {
+          view.clearBuffer();
+          view.transitionTo('hasElement');
+        }
+
+        return value;
+      },
+
+      invokeObserver: function(target, observer) {
+        observer.call(target);
+      }
+    });
+
+    __exports__["default"] = inBuffer;
+  });
+define("ember-views/views/states/in_dom",
+  ["ember-metal/core","ember-metal/platform","ember-metal/merge","ember-metal/error","ember-views/views/states/has_element","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var create = __dependency2__.create;
+    var merge = __dependency3__["default"];
+    var EmberError = __dependency4__["default"];
+
+    var hasElement = __dependency5__["default"];
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var inDOM = create(hasElement);
+
+    var View;
+
+    merge(inDOM, {
+      enter: function(view) {
+        if (!View) { View = requireModule('ember-views/views/view')["View"]; } // ES6TODO: this sucks. Have to avoid cycles...
+
+        // Register the view for event handling. This hash is used by
+        // Ember.EventDispatcher to dispatch incoming events.
+        if (!view.isVirtual) {
+                    View.views[view.elementId] = view;
+        }
+
+        view.addBeforeObserver('elementId', function() {
+          throw new EmberError("Changing a view's elementId after creation is not allowed");
+        });
+      },
+
+      exit: function(view) {
+        if (!View) { View = requireModule('ember-views/views/view')["View"]; } // ES6TODO: this sucks. Have to avoid cycles...
+
+        if (!this.isVirtual) delete View.views[view.elementId];
+      },
+
+      insertElement: function(view, fn) {
+        throw new EmberError("You can't insert an element into the DOM that has already been inserted");
+      }
+    });
+
+    __exports__["default"] = inDOM;
+  });
+define("ember-views/views/states/pre_render",
+  ["ember-views/views/states/default","ember-metal/platform","ember-metal/merge","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var _default = __dependency1__["default"];
+    var create = __dependency2__.create;
+    var merge = __dependency3__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+    var preRender = create(_default);
+
+    merge(preRender, {
+      // a view leaves the preRender state once its element has been
+      // created (createElement).
+      insertElement: function(view, fn) {
+        view.createElement();
+        var viewCollection = view.viewHierarchyCollection();
+
+        viewCollection.trigger('willInsertElement');
+
+        fn.call(view);
+
+        // We transition to `inDOM` if the element exists in the DOM
+        var element = view.get('element');
+        if (document.body.contains(element)) {
+          viewCollection.transitionTo('inDOM', false);
+          viewCollection.trigger('didInsertElement');
+        }
+      },
+
+      renderToBufferIfNeeded: function(view, buffer) {
+        view.renderToBuffer(buffer);
+        return true;
+      },
+
+      empty: Ember.K,
+
+      setElement: function(view, value) {
+        if (value !== null) {
+          view.transitionTo('hasElement');
+        }
+        return value;
+      }
+    });
+
+    __exports__["default"] = preRender;
+  });
+define("ember-views/views/view",
+  ["ember-metal/core","ember-metal/error","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-views/system/render_buffer","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","container/container","ember-runtime/system/native_array","ember-metal/instrumentation","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/views/states","ember-views/system/jquery","ember-views/system/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __exports__) {
+    "use strict";
+    // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
+    // Ember.K, jQuery, Ember.lookup,
+    // Ember.ContainerView circular dependency
+    // Ember.ENV
+    var Ember = __dependency1__["default"];
+
+    var EmberError = __dependency2__["default"];
+    var EmberObject = __dependency3__["default"];
+    var Evented = __dependency4__["default"];
+    var ActionHandler = __dependency5__["default"];
+    var RenderBuffer = __dependency6__["default"];
+    var get = __dependency7__.get;
+    var set = __dependency8__.set;
+    var setProperties = __dependency9__["default"];
+    var run = __dependency10__["default"];
+    var addObserver = __dependency11__.addObserver;
+    var removeObserver = __dependency11__.removeObserver;
+
+    var defineProperty = __dependency12__.defineProperty;
+    var guidFor = __dependency13__.guidFor;
+    var meta = __dependency13__.meta;
+    var computed = __dependency14__.computed;
+    var observer = __dependency15__.observer;
+
+    var typeOf = __dependency13__.typeOf;
+    var isArray = __dependency13__.isArray;
+    var isNone = __dependency16__.isNone;
+    var Mixin = __dependency15__.Mixin;
+    var Container = __dependency17__["default"];
+    var A = __dependency18__.A;
+
+    var instrument = __dependency19__.instrument;
+
+    var dasherize = __dependency20__.dasherize;
+
+    // ES6TODO: functions on EnumerableUtils should get their own export
+    var EnumerableUtils = __dependency21__["default"];
+    var a_forEach = EnumerableUtils.forEach,
+        a_addObject = EnumerableUtils.addObject,
+        a_removeObject = EnumerableUtils.removeObject;
+
+    var beforeObserver = __dependency15__.beforeObserver;
+    var copy = __dependency22__["default"];
+    var isGlobalPath = __dependency23__.isGlobalPath;
+
+    var propertyWillChange = __dependency24__.propertyWillChange;
+    var propertyDidChange = __dependency24__.propertyDidChange;
+
+    var cloneStates = __dependency25__.cloneStates;
+    var states = __dependency25__.states;
+    var jQuery = __dependency26__["default"];
+     // for the side effect of extending Ember.run.queues
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    var ContainerView;
+
+    function nullViewsBuffer(view) {
+      view.buffer = null;
+
+    }
+
+    function clearCachedElement(view) {
+      meta(view).cache.element = undefined;
+    }
+
+    var childViewsProperty = computed(function() {
+      var childViews = this._childViews, ret = A(), view = this;
+
+      a_forEach(childViews, function(view) {
+        var currentChildViews;
+        if (view.isVirtual) {
+          if (currentChildViews = get(view, 'childViews')) {
+            ret.pushObjects(currentChildViews);
+          }
+        } else {
+          ret.push(view);
+        }
+      });
+
+      ret.replace = function (idx, removedCount, addedViews) {
+        if (!ContainerView) { ContainerView = requireModule('ember-views/views/container_view')['default']; } // ES6TODO: stupid circular dep
+
+        if (view instanceof ContainerView) {
+                    return view.replace(idx, removedCount, addedViews);
+        }
+        throw new EmberError("childViews is immutable");
+      };
+
+      return ret;
+    });
+
+    
+    /**
+      Global hash of shared templates. This will automatically be populated
+      by the build tools so that you can store your Handlebars templates in
+      separate files that get loaded into JavaScript at buildtime.
+
+      @property TEMPLATES
+      @for Ember
+      @type Hash
+    */
+    Ember.TEMPLATES = {};
+
+    /**
+      `Ember.CoreView` is an abstract class that exists to give view-like behavior
+      to both Ember's main view class `Ember.View` and other classes like
+      `Ember._SimpleMetamorphView` that don't need the fully functionaltiy of
+      `Ember.View`.
+
+      Unless you have specific needs for `CoreView`, you will use `Ember.View`
+      in your applications.
+
+      @class CoreView
+      @namespace Ember
+      @extends Ember.Object
+      @uses Ember.Evented
+      @uses Ember.ActionHandler
+    */
+
+    var CoreView = EmberObject.extend(Evented, ActionHandler, {
+      isView: true,
+
+      states: cloneStates(states),
+
+      init: function() {
+        this._super();
+        this.transitionTo('preRender');
+        this._isVisible = get(this, 'isVisible');
+      },
+
+      /**
+        If the view is currently inserted into the DOM of a parent view, this
+        property will point to the parent of the view.
+
+        @property parentView
+        @type Ember.View
+        @default null
+      */
+      parentView: computed('_parentView', function() {
+        var parent = this._parentView;
+
+        if (parent && parent.isVirtual) {
+          return get(parent, 'parentView');
+        } else {
+          return parent;
+        }
+      }),
+
+      state: null,
+
+      _parentView: null,
+
+      // return the current view, not including virtual views
+      concreteView: computed('parentView', function() {
+        if (!this.isVirtual) { return this; }
+        else { return get(this, 'parentView.concreteView'); }
+      }),
+
+      instrumentName: 'core_view',
+
+      instrumentDetails: function(hash) {
+        hash.object = this.toString();
+        hash.containerKey = this._debugContainerKey;
+        hash.view = this;
+      },
+
+      /**
+        Invoked by the view system when this view needs to produce an HTML
+        representation. This method will create a new render buffer, if needed,
+        then apply any default attributes, such as class names and visibility.
+        Finally, the `render()` method is invoked, which is responsible for
+        doing the bulk of the rendering.
+
+        You should not need to override this method; instead, implement the
+        `template` property, or if you need more control, override the `render`
+        method.
+
+        @method renderToBuffer
+        @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
+          passed, a default buffer, using the current view's `tagName`, will
+          be used.
+        @private
+      */
+      renderToBuffer: function(parentBuffer, bufferOperation) {
+        var name = 'render.' + this.instrumentName,
+            details = {};
+
+        this.instrumentDetails(details);
+
+        return instrument(name, details, function instrumentRenderToBuffer() {
+          return this._renderToBuffer(parentBuffer, bufferOperation);
+        }, this);
+      },
+
+      _renderToBuffer: function(parentBuffer, bufferOperation) {
+        // If this is the top-most view, start a new buffer. Otherwise,
+        // create a new buffer relative to the original using the
+        // provided buffer operation (for example, `insertAfter` will
+        // insert a new buffer after the "parent buffer").
+        var tagName = this.tagName;
+
+        if (tagName === null || tagName === undefined) {
+          tagName = 'div';
+        }
+
+        var buffer = this.buffer = parentBuffer && parentBuffer.begin(tagName) || RenderBuffer(tagName);
+        this.transitionTo('inBuffer', false);
+
+        this.beforeRender(buffer);
+        this.render(buffer);
+        this.afterRender(buffer);
+
+        return buffer;
+      },
+
+      /**
+        Override the default event firing from `Ember.Evented` to
+        also call methods with the given name.
+
+        @method trigger
+        @param name {String}
+        @private
+      */
+      trigger: function(name) {
+        this._super.apply(this, arguments);
+        var method = this[name];
+        if (method) {
+          var args = [], i, l;
+          for (i = 1, l = arguments.length; i < l; i++) {
+            args.push(arguments[i]);
+          }
+          return method.apply(this, args);
+        }
+      },
+
+      deprecatedSendHandles: function(actionName) {
+        return !!this[actionName];
+      },
+
+      deprecatedSend: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+                        this[actionName].apply(this, args);
+        return;
+      },
+
+      has: function(name) {
+        return typeOf(this[name]) === 'function' || this._super(name);
+      },
+
+      destroy: function() {
+        var parent = this._parentView;
+
+        if (!this._super()) { return; }
+
+        // destroy the element -- this will avoid each child view destroying
+        // the element over and over again...
+        if (!this.removedFromDOM) { this.destroyElement(); }
+
+        // remove from parent if found. Don't call removeFromParent,
+        // as removeFromParent will try to remove the element from
+        // the DOM again.
+        if (parent) { parent.removeChild(this); }
+
+        this.transitionTo('destroying', false);
+
+        return this;
+      },
+
+      clearRenderedChildren: Ember.K,
+      triggerRecursively: Ember.K,
+      invokeRecursively: Ember.K,
+      transitionTo: Ember.K,
+      destroyElement: Ember.K
+    });
+
+    var ViewCollection = function(initialViews) {
+      var views = this.views = initialViews || [];
+      this.length = views.length;
+    };
+
+    ViewCollection.prototype = {
+      length: 0,
+
+      trigger: function(eventName) {
+        var views = this.views, view;
+        for (var i = 0, l = views.length; i < l; i++) {
+          view = views[i];
+          if (view.trigger) { view.trigger(eventName); }
+        }
+      },
+
+      triggerRecursively: function(eventName) {
+        var views = this.views;
+        for (var i = 0, l = views.length; i < l; i++) {
+          views[i].triggerRecursively(eventName);
+        }
+      },
+
+      invokeRecursively: function(fn) {
+        var views = this.views, view;
+
+        for (var i = 0, l = views.length; i < l; i++) {
+          view = views[i];
+          fn(view);
+        }
+      },
+
+      transitionTo: function(state, children) {
+        var views = this.views;
+        for (var i = 0, l = views.length; i < l; i++) {
+          views[i].transitionTo(state, children);
+        }
+      },
+
+      push: function() {
+        this.length += arguments.length;
+        var views = this.views;
+        return views.push.apply(views, arguments);
+      },
+
+      objectAt: function(idx) {
+        return this.views[idx];
+      },
+
+      forEach: function(callback) {
+        var views = this.views;
+        return a_forEach(views, callback);
+      },
+
+      clear: function() {
+        this.length = 0;
+        this.views.length = 0;
+      }
+    };
+
+    var EMPTY_ARRAY = [];
+
+    /**
+      `Ember.View` is the class in Ember responsible for encapsulating templates of
+      HTML content, combining templates with data to render as sections of a page's
+      DOM, and registering and responding to user-initiated events.
+
+      ## HTML Tag
+
+      The default HTML tag name used for a view's DOM representation is `div`. This
+      can be customized by setting the `tagName` property. The following view
+      class:
+
+      ```javascript
+      ParagraphView = Ember.View.extend({
+        tagName: 'em'
+      });
+      ```
+
+      Would result in instances with the following HTML:
+
+      ```html
+      <em id="ember1" class="ember-view"></em>
+      ```
+
+      ## HTML `class` Attribute
+
+      The HTML `class` attribute of a view's tag can be set by providing a
+      `classNames` property that is set to an array of strings:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNames: ['my-class', 'my-other-class']
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view my-class my-other-class"></div>
+      ```
+
+      `class` attribute values can also be set by providing a `classNameBindings`
+      property set to an array of properties names for the view. The return value
+      of these properties will be added as part of the value for the view's `class`
+      attribute. These properties can be computed properties:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['propertyA', 'propertyB'],
+        propertyA: 'from-a',
+        propertyB: function() {
+          if (someLogic) { return 'from-b'; }
+        }.property()
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view from-a from-b"></div>
+      ```
+
+      If the value of a class name binding returns a boolean the property name
+      itself will be used as the class name if the property is true. The class name
+      will not be added if the value is `false` or `undefined`.
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['hovered'],
+        hovered: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view hovered"></div>
+      ```
+
+      When using boolean class name bindings you can supply a string value other
+      than the property name for use as the `class` HTML attribute by appending the
+      preferred value after a ":" character when defining the binding:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['awesome:so-very-cool'],
+        awesome: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view so-very-cool"></div>
+      ```
+
+      Boolean value class name bindings whose property names are in a
+      camelCase-style format will be converted to a dasherized format:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['isUrgent'],
+        isUrgent: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view is-urgent"></div>
+      ```
+
+      Class name bindings can also refer to object values that are found by
+      traversing a path relative to the view itself:
+
+      ```javascript
+      MyView = Ember.View.extend({
+        classNameBindings: ['messages.empty']
+        messages: Ember.Object.create({
+          empty: true
+        })
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view empty"></div>
+      ```
+
+      If you want to add a class name for a property which evaluates to true and
+      and a different class name if it evaluates to false, you can pass a binding
+      like this:
+
+      ```javascript
+      // Applies 'enabled' class when isEnabled is true and 'disabled' when isEnabled is false
+      Ember.View.extend({
+        classNameBindings: ['isEnabled:enabled:disabled']
+        isEnabled: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view enabled"></div>
+      ```
+
+      When isEnabled is `false`, the resulting HTML reprensentation looks like
+      this:
+
+      ```html
+      <div id="ember1" class="ember-view disabled"></div>
+      ```
+
+      This syntax offers the convenience to add a class if a property is `false`:
+
+      ```javascript
+      // Applies no class when isEnabled is true and class 'disabled' when isEnabled is false
+      Ember.View.extend({
+        classNameBindings: ['isEnabled::disabled']
+        isEnabled: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view"></div>
+      ```
+
+      When the `isEnabled` property on the view is set to `false`, it will result
+      in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view disabled"></div>
+      ```
+
+      Updates to the the value of a class name binding will result in automatic
+      update of the  HTML `class` attribute in the view's rendered HTML
+      representation. If the value becomes `false` or `undefined` the class name
+      will be removed.
+
+      Both `classNames` and `classNameBindings` are concatenated properties. See
+      [Ember.Object](/api/classes/Ember.Object.html) documentation for more
+      information about concatenated properties.
+
+      ## HTML Attributes
+
+      The HTML attribute section of a view's tag can be set by providing an
+      `attributeBindings` property set to an array of property names on the view.
+      The return value of these properties will be used as the value of the view's
+      HTML associated attribute:
+
+      ```javascript
+      AnchorView = Ember.View.extend({
+        tagName: 'a',
+        attributeBindings: ['href'],
+        href: 'http://google.com'
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <a id="ember1" class="ember-view" href="http://google.com"></a>
+      ```
+      
+      One property can be mapped on to another by placing a ":" between 
+      the source property and the destination property:
+      
+      ```javascript
+      AnchorView = Ember.View.extend({
+        tagName: 'a',
+        attributeBindings: ['url:href'],
+        url: 'http://google.com'
+      });
+      ```
+      
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <a id="ember1" class="ember-view" href="http://google.com"></a>
+      ```
+      
+      If the return value of an `attributeBindings` monitored property is a boolean
+      the property will follow HTML's pattern of repeating the attribute's name as
+      its value:
+
+      ```javascript
+      MyTextInput = Ember.View.extend({
+        tagName: 'input',
+        attributeBindings: ['disabled'],
+        disabled: true
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <input id="ember1" class="ember-view" disabled="disabled" />
+      ```
+
+      `attributeBindings` can refer to computed properties:
+
+      ```javascript
+      MyTextInput = Ember.View.extend({
+        tagName: 'input',
+        attributeBindings: ['disabled'],
+        disabled: function() {
+          if (someLogic) {
+            return true;
+          } else {
+            return false;
+          }
+        }.property()
+      });
+      ```
+
+      Updates to the the property of an attribute binding will result in automatic
+      update of the  HTML attribute in the view's rendered HTML representation.
+
+      `attributeBindings` is a concatenated property. See [Ember.Object](/api/classes/Ember.Object.html)
+      documentation for more information about concatenated properties.
+
+      ## Templates
+
+      The HTML contents of a view's rendered representation are determined by its
+      template. Templates can be any function that accepts an optional context
+      parameter and returns a string of HTML that will be inserted within the
+      view's tag. Most typically in Ember this function will be a compiled
+      `Ember.Handlebars` template.
+
+      ```javascript
+      AView = Ember.View.extend({
+        template: Ember.Handlebars.compile('I am the template')
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view">I am the template</div>
+      ```
+
+      Within an Ember application is more common to define a Handlebars templates as
+      part of a page:
+
+      ```html
+      <script type='text/x-handlebars' data-template-name='some-template'>
+        Hello
+      </script>
+      ```
+
+      And associate it by name using a view's `templateName` property:
+
+      ```javascript
+      AView = Ember.View.extend({
+        templateName: 'some-template'
+      });
+      ```
+
+      If you have nested resources, your Handlebars template will look like this:
+
+      ```html
+      <script type='text/x-handlebars' data-template-name='posts/new'>
+        <h1>New Post</h1>
+      </script>
+      ```
+
+      And `templateName` property:
+
+      ```javascript
+      AView = Ember.View.extend({
+        templateName: 'posts/new'
+      });
+      ```
+
+      Using a value for `templateName` that does not have a Handlebars template
+      with a matching `data-template-name` attribute will throw an error.
+
+      For views classes that may have a template later defined (e.g. as the block
+      portion of a `{{view}}` Handlebars helper call in another template or in
+      a subclass), you can provide a `defaultTemplate` property set to compiled
+      template function. If a template is not later provided for the view instance
+      the `defaultTemplate` value will be used:
+
+      ```javascript
+      AView = Ember.View.extend({
+        defaultTemplate: Ember.Handlebars.compile('I was the default'),
+        template: null,
+        templateName: null
+      });
+      ```
+
+      Will result in instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view">I was the default</div>
+      ```
+
+      If a `template` or `templateName` is provided it will take precedence over
+      `defaultTemplate`:
+
+      ```javascript
+      AView = Ember.View.extend({
+        defaultTemplate: Ember.Handlebars.compile('I was the default')
+      });
+
+      aView = AView.create({
+        template: Ember.Handlebars.compile('I was the template, not default')
+      });
+      ```
+
+      Will result in the following HTML representation when rendered:
+
+      ```html
+      <div id="ember1" class="ember-view">I was the template, not default</div>
+      ```
+
+      ## View Context
+
+      The default context of the compiled template is the view's controller:
+
+      ```javascript
+      AView = Ember.View.extend({
+        template: Ember.Handlebars.compile('Hello {{excitedGreeting}}')
+      });
+
+      aController = Ember.Object.create({
+        firstName: 'Barry',
+        excitedGreeting: function() {
+          return this.get("content.firstName") + "!!!"
+        }.property()
+      });
+
+      aView = AView.create({
+        controller: aController,
+      });
+      ```
+
+      Will result in an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view">Hello Barry!!!</div>
+      ```
+
+      A context can also be explicitly supplied through the view's `context`
+      property. If the view has neither `context` nor `controller` properties, the
+      `parentView`'s context will be used.
+
+      ## Layouts
+
+      Views can have a secondary template that wraps their main template. Like
+      primary templates, layouts can be any function that  accepts an optional
+      context parameter and returns a string of HTML that will be inserted inside
+      view's tag. Views whose HTML element is self closing (e.g. `<input />`)
+      cannot have a layout and this property will be ignored.
+
+      Most typically in Ember a layout will be a compiled `Ember.Handlebars`
+      template.
+
+      A view's layout can be set directly with the `layout` property or reference
+      an existing Handlebars template by name with the `layoutName` property.
+
+      A template used as a layout must contain a single use of the Handlebars
+      `{{yield}}` helper. The HTML contents of a view's rendered `template` will be
+      inserted at this location:
+
+      ```javascript
+      AViewWithLayout = Ember.View.extend({
+        layout: Ember.Handlebars.compile("<div class='my-decorative-class'>{{yield}}</div>")
+        template: Ember.Handlebars.compile("I got wrapped"),
+      });
+      ```
+
+      Will result in view instances with an HTML representation of:
+
+      ```html
+      <div id="ember1" class="ember-view">
+        <div class="my-decorative-class">
+          I got wrapped
+        </div>
+      </div>
+      ```
+
+      See [Ember.Handlebars.helpers.yield](/api/classes/Ember.Handlebars.helpers.html#method_yield)
+      for more information.
+
+      ## Responding to Browser Events
+
+      Views can respond to user-initiated events in one of three ways: method
+      implementation, through an event manager, and through `{{action}}` helper use
+      in their template or layout.
+
+      ### Method Implementation
+
+      Views can respond to user-initiated events by implementing a method that
+      matches the event name. A `jQuery.Event` object will be passed as the
+      argument to this method.
+
+      ```javascript
+      AView = Ember.View.extend({
+        click: function(event) {
+          // will be called when when an instance's
+          // rendered element is clicked
+        }
+      });
+      ```
+
+      ### Event Managers
+
+      Views can define an object as their `eventManager` property. This object can
+      then implement methods that match the desired event names. Matching events
+      that occur on the view's rendered HTML or the rendered HTML of any of its DOM
+      descendants will trigger this method. A `jQuery.Event` object will be passed
+      as the first argument to the method and an  `Ember.View` object as the
+      second. The `Ember.View` will be the view whose rendered HTML was interacted
+      with. This may be the view with the `eventManager` property or one of its
+      descendent views.
+
+      ```javascript
+      AView = Ember.View.extend({
+        eventManager: Ember.Object.create({
+          doubleClick: function(event, view) {
+            // will be called when when an instance's
+            // rendered element or any rendering
+            // of this views's descendent
+            // elements is clicked
+          }
+        })
+      });
+      ```
+
+      An event defined for an event manager takes precedence over events of the
+      same name handled through methods on the view.
+
+      ```javascript
+      AView = Ember.View.extend({
+        mouseEnter: function(event) {
+          // will never trigger.
+        },
+        eventManager: Ember.Object.create({
+          mouseEnter: function(event, view) {
+            // takes precedence over AView#mouseEnter
+          }
+        })
+      });
+      ```
+
+      Similarly a view's event manager will take precedence for events of any views
+      rendered as a descendent. A method name that matches an event name will not
+      be called if the view instance was rendered inside the HTML representation of
+      a view that has an `eventManager` property defined that handles events of the
+      name. Events not handled by the event manager will still trigger method calls
+      on the descendent.
+
+      ```javascript
+      OuterView = Ember.View.extend({
+        template: Ember.Handlebars.compile("outer {{#view InnerView}}inner{{/view}} outer"),
+        eventManager: Ember.Object.create({
+          mouseEnter: function(event, view) {
+            // view might be instance of either
+            // OuterView or InnerView depending on
+            // where on the page the user interaction occured
+          }
+        })
+      });
+
+      InnerView = Ember.View.extend({
+        click: function(event) {
+          // will be called if rendered inside
+          // an OuterView because OuterView's
+          // eventManager doesn't handle click events
+        },
+        mouseEnter: function(event) {
+          // will never be called if rendered inside
+          // an OuterView.
+        }
+      });
+      ```
+
+      ### Handlebars `{{action}}` Helper
+
+      See [Handlebars.helpers.action](/api/classes/Ember.Handlebars.helpers.html#method_action).
+
+      ### Event Names
+
+      All of the event handling approaches described above respond to the same set
+      of events. The names of the built-in events are listed below. (The hash of
+      built-in events exists in `Ember.EventDispatcher`.) Additional, custom events
+      can be registered by using `Ember.Application.customEvents`.
+
+      Touch events:
+
+      * `touchStart`
+      * `touchMove`
+      * `touchEnd`
+      * `touchCancel`
+
+      Keyboard events
+
+      * `keyDown`
+      * `keyUp`
+      * `keyPress`
+
+      Mouse events
+
+      * `mouseDown`
+      * `mouseUp`
+      * `contextMenu`
+      * `click`
+      * `doubleClick`
+      * `mouseMove`
+      * `focusIn`
+      * `focusOut`
+      * `mouseEnter`
+      * `mouseLeave`
+
+      Form events:
+
+      * `submit`
+      * `change`
+      * `focusIn`
+      * `focusOut`
+      * `input`
+
+      HTML5 drag and drop events:
+
+      * `dragStart`
+      * `drag`
+      * `dragEnter`
+      * `dragLeave`
+      * `dragOver`
+      * `dragEnd`
+      * `drop`
+
+      ## Handlebars `{{view}}` Helper
+
+      Other `Ember.View` instances can be included as part of a view's template by
+      using the `{{view}}` Handlebars helper. See [Ember.Handlebars.helpers.view](/api/classes/Ember.Handlebars.helpers.html#method_view)
+      for additional information.
+
+      @class View
+      @namespace Ember
+      @extends Ember.CoreView
+    */
+    var View = CoreView.extend({
+
+      concatenatedProperties: ['classNames', 'classNameBindings', 'attributeBindings'],
+
+      /**
+        @property isView
+        @type Boolean
+        @default true
+        @static
+      */
+      isView: true,
+
+      // ..........................................................
+      // TEMPLATE SUPPORT
+      //
+
+      /**
+        The name of the template to lookup if no template is provided.
+
+        By default `Ember.View` will lookup a template with this name in
+        `Ember.TEMPLATES` (a shared global object).
+
+        @property templateName
+        @type String
+        @default null
+      */
+      templateName: null,
+
+      /**
+        The name of the layout to lookup if no layout is provided.
+
+        By default `Ember.View` will lookup a template with this name in
+        `Ember.TEMPLATES` (a shared global object).
+
+        @property layoutName
+        @type String
+        @default null
+      */
+      layoutName: null,
+
+      /**
+        Used to identify this view during debugging
+
+        @property instrumentDisplay
+        @type String
+      */
+      instrumentDisplay: computed(function() {
+        if (this.helperName) {
+          return '{{' + this.helperName + '}}';
+        }
+      }),
+
+      /**
+        The template used to render the view. This should be a function that
+        accepts an optional context parameter and returns a string of HTML that
+        will be inserted into the DOM relative to its parent view.
+
+        In general, you should set the `templateName` property instead of setting
+        the template yourself.
+
+        @property template
+        @type Function
+      */
+      template: computed('templateName', function(key, value) {
+        if (value !== undefined) { return value; }
+
+        var templateName = get(this, 'templateName'),
+            template = this.templateForName(templateName, 'template');
+
+        
+        return template || get(this, 'defaultTemplate');
+      }),
+
+      /**
+        The controller managing this view. If this property is set, it will be
+        made available for use by the template.
+
+        @property controller
+        @type Object
+      */
+      controller: computed('_parentView', function(key) {
+        var parentView = get(this, '_parentView');
+        return parentView ? get(parentView, 'controller') : null;
+      }),
+
+      /**
+        A view may contain a layout. A layout is a regular template but
+        supersedes the `template` property during rendering. It is the
+        responsibility of the layout template to retrieve the `template`
+        property from the view (or alternatively, call `Handlebars.helpers.yield`,
+        `{{yield}}`) to render it in the correct location.
+
+        This is useful for a view that has a shared wrapper, but which delegates
+        the rendering of the contents of the wrapper to the `template` property
+        on a subclass.
+
+        @property layout
+        @type Function
+      */
+      layout: computed(function(key) {
+        var layoutName = get(this, 'layoutName'),
+            layout = this.templateForName(layoutName, 'layout');
+
+        
+        return layout || get(this, 'defaultLayout');
+      }).property('layoutName'),
+
+      _yield: function(context, options) {
+        var template = get(this, 'template');
+        if (template) { template(context, options); }
+      },
+
+      templateForName: function(name, type) {
+        if (!name) { return; }
+        
+        // the defaultContainer is deprecated
+        var container = this.container || (Container && Container.defaultContainer);
+        return container && container.lookup('template:' + name);
+      },
+
+      /**
+        The object from which templates should access properties.
+
+        This object will be passed to the template function each time the render
+        method is called, but it is up to the individual function to decide what
+        to do with it.
+
+        By default, this will be the view's controller.
+
+        @property context
+        @type Object
+      */
+      context: computed(function(key, value) {
+        if (arguments.length === 2) {
+          set(this, '_context', value);
+          return value;
+        } else {
+          return get(this, '_context');
+        }
+      }).volatile(),
+
+      /**
+        Private copy of the view's template context. This can be set directly
+        by Handlebars without triggering the observer that causes the view
+        to be re-rendered.
+
+        The context of a view is looked up as follows:
+
+        1. Supplied context (usually by Handlebars)
+        2. Specified controller
+        3. `parentView`'s context (for a child of a ContainerView)
+
+        The code in Handlebars that overrides the `_context` property first
+        checks to see whether the view has a specified controller. This is
+        something of a hack and should be revisited.
+
+        @property _context
+        @private
+      */
+      _context: computed(function(key) {
+        var parentView, controller;
+
+        if (controller = get(this, 'controller')) {
+          return controller;
+        }
+
+        parentView = this._parentView;
+        if (parentView) {
+          return get(parentView, '_context');
+        }
+
+        return null;
+      }),
+
+      /**
+        If a value that affects template rendering changes, the view should be
+        re-rendered to reflect the new value.
+
+        @method _contextDidChange
+        @private
+      */
+      _contextDidChange: observer('context', function() {
+        this.rerender();
+      }),
+
+      /**
+        If `false`, the view will appear hidden in DOM.
+
+        @property isVisible
+        @type Boolean
+        @default null
+      */
+      isVisible: true,
+
+      /**
+        Array of child views. You should never edit this array directly.
+        Instead, use `appendChild` and `removeFromParent`.
+
+        @property childViews
+        @type Array
+        @default []
+        @private
+      */
+      childViews: childViewsProperty,
+
+      _childViews: EMPTY_ARRAY,
+
+      // When it's a virtual view, we need to notify the parent that their
+      // childViews will change.
+      _childViewsWillChange: beforeObserver('childViews', function() {
+        if (this.isVirtual) {
+          var parentView = get(this, 'parentView');
+          if (parentView) { propertyWillChange(parentView, 'childViews'); }
+        }
+      }),
+
+      // When it's a virtual view, we need to notify the parent that their
+      // childViews did change.
+      _childViewsDidChange: observer('childViews', function() {
+        if (this.isVirtual) {
+          var parentView = get(this, 'parentView');
+          if (parentView) { propertyDidChange(parentView, 'childViews'); }
+        }
+      }),
+
+      /**
+        Return the nearest ancestor that is an instance of the provided
+        class.
+
+        @method nearestInstanceOf
+        @param {Class} klass Subclass of Ember.View (or Ember.View itself)
+        @return Ember.View
+        @deprecated
+      */
+      nearestInstanceOf: function(klass) {
+                var view = get(this, 'parentView');
+
+        while (view) {
+          if (view instanceof klass) { return view; }
+          view = get(view, 'parentView');
+        }
+      },
+
+      /**
+        Return the nearest ancestor that is an instance of the provided
+        class or mixin.
+
+        @method nearestOfType
+        @param {Class,Mixin} klass Subclass of Ember.View (or Ember.View itself),
+               or an instance of Ember.Mixin.
+        @return Ember.View
+      */
+      nearestOfType: function(klass) {
+        var view = get(this, 'parentView'),
+            isOfType = klass instanceof Mixin ?
+                       function(view) { return klass.detect(view); } :
+                       function(view) { return klass.detect(view.constructor); };
+
+        while (view) {
+          if (isOfType(view)) { return view; }
+          view = get(view, 'parentView');
+        }
+      },
+
+      /**
+        Return the nearest ancestor that has a given property.
+
+        @method nearestWithProperty
+        @param {String} property A property name
+        @return Ember.View
+      */
+      nearestWithProperty: function(property) {
+        var view = get(this, 'parentView');
+
+        while (view) {
+          if (property in view) { return view; }
+          view = get(view, 'parentView');
+        }
+      },
+
+      /**
+        Return the nearest ancestor whose parent is an instance of
+        `klass`.
+
+        @method nearestChildOf
+        @param {Class} klass Subclass of Ember.View (or Ember.View itself)
+        @return Ember.View
+      */
+      nearestChildOf: function(klass) {
+        var view = get(this, 'parentView');
+
+        while (view) {
+          if (get(view, 'parentView') instanceof klass) { return view; }
+          view = get(view, 'parentView');
+        }
+      },
+
+      /**
+        When the parent view changes, recursively invalidate `controller`
+
+        @method _parentViewDidChange
+        @private
+      */
+      _parentViewDidChange: observer('_parentView', function() {
+        if (this.isDestroying) { return; }
+
+        this.trigger('parentViewDidChange');
+
+        if (get(this, 'parentView.controller') && !get(this, 'controller')) {
+          this.notifyPropertyChange('controller');
+        }
+      }),
+
+      _controllerDidChange: observer('controller', function() {
+        if (this.isDestroying) { return; }
+
+        this.rerender();
+
+        this.forEachChildView(function(view) {
+          view.propertyDidChange('controller');
+        });
+      }),
+
+      cloneKeywords: function() {
+        var templateData = get(this, 'templateData');
+
+        var keywords = templateData ? copy(templateData.keywords) : {};
+        set(keywords, 'view', get(this, 'concreteView'));
+        set(keywords, '_view', this);
+        set(keywords, 'controller', get(this, 'controller'));
+
+        return keywords;
+      },
+
+      /**
+        Called on your view when it should push strings of HTML into a
+        `Ember.RenderBuffer`. Most users will want to override the `template`
+        or `templateName` properties instead of this method.
+
+        By default, `Ember.View` will look for a function in the `template`
+        property and invoke it with the value of `context`. The value of
+        `context` will be the view's controller unless you override it.
+
+        @method render
+        @param {Ember.RenderBuffer} buffer The render buffer
+      */
+      render: function(buffer) {
+        // If this view has a layout, it is the responsibility of the
+        // the layout to render the view's template. Otherwise, render the template
+        // directly.
+        var template = get(this, 'layout') || get(this, 'template');
+
+        if (template) {
+          var context = get(this, 'context');
+          var keywords = this.cloneKeywords();
+          var output;
+
+          var data = {
+            view: this,
+            buffer: buffer,
+            isRenderData: true,
+            keywords: keywords,
+            insideGroup: get(this, 'templateData.insideGroup')
+          };
+
+          // Invoke the template with the provided template context, which
+          // is the view's controller by default. A hash of data is also passed that provides
+          // the template with access to the view and render buffer.
+
+                    // The template should write directly to the render buffer instead
+          // of returning a string.
+          output = template(context, { data: data });
+
+          // If the template returned a string instead of writing to the buffer,
+          // push the string onto the buffer.
+          if (output !== undefined) { buffer.push(output); }
+        }
+      },
+
+      /**
+        Renders the view again. This will work regardless of whether the
+        view is already in the DOM or not. If the view is in the DOM, the
+        rendering process will be deferred to give bindings a chance
+        to synchronize.
+
+        If children were added during the rendering process using `appendChild`,
+        `rerender` will remove them, because they will be added again
+        if needed by the next `render`.
+
+        In general, if the display of your view changes, you should modify
+        the DOM element directly instead of manually calling `rerender`, which can
+        be slow.
+
+        @method rerender
+      */
+      rerender: function() {
+        return this.currentState.rerender(this);
+      },
+
+      clearRenderedChildren: function() {
+        var lengthBefore = this.lengthBeforeRender,
+            lengthAfter  = this.lengthAfterRender;
+
+        // If there were child views created during the last call to render(),
+        // remove them under the assumption that they will be re-created when
+        // we re-render.
+
+        // VIEW-TODO: Unit test this path.
+        var childViews = this._childViews;
+        for (var i=lengthAfter-1; i>=lengthBefore; i--) {
+          if (childViews[i]) { childViews[i].destroy(); }
+        }
+      },
+
+      /**
+        Iterates over the view's `classNameBindings` array, inserts the value
+        of the specified property into the `classNames` array, then creates an
+        observer to update the view's element if the bound property ever changes
+        in the future.
+
+        @method _applyClassNameBindings
+        @private
+      */
+      _applyClassNameBindings: function(classBindings) {
+        var classNames = this.classNames,
+        elem, newClass, dasherizedClass;
+
+        // Loop through all of the configured bindings. These will be either
+        // property names ('isUrgent') or property paths relative to the view
+        // ('content.isUrgent')
+        a_forEach(classBindings, function(binding) {
+
+          
+          // Variable in which the old class value is saved. The observer function
+          // closes over this variable, so it knows which string to remove when
+          // the property changes.
+          var oldClass;
+          // Extract just the property name from bindings like 'foo:bar'
+          var parsedPath = View._parsePropertyPath(binding);
+
+          // Set up an observer on the context. If the property changes, toggle the
+          // class name.
+          var observer = function() {
+            // Get the current value of the property
+            newClass = this._classStringForProperty(binding);
+            elem = this.$();
+
+            // If we had previously added a class to the element, remove it.
+            if (oldClass) {
+              elem.removeClass(oldClass);
+              // Also remove from classNames so that if the view gets rerendered,
+              // the class doesn't get added back to the DOM.
+              classNames.removeObject(oldClass);
+            }
+
+            // If necessary, add a new class. Make sure we keep track of it so
+            // it can be removed in the future.
+            if (newClass) {
+              elem.addClass(newClass);
+              oldClass = newClass;
+            } else {
+              oldClass = null;
+            }
+          };
+
+          // Get the class name for the property at its current value
+          dasherizedClass = this._classStringForProperty(binding);
+
+          if (dasherizedClass) {
+            // Ensure that it gets into the classNames array
+            // so it is displayed when we render.
+            a_addObject(classNames, dasherizedClass);
+
+            // Save a reference to the class name so we can remove it
+            // if the observer fires. Remember that this variable has
+            // been closed over by the observer.
+            oldClass = dasherizedClass;
+          }
+
+          this.registerObserver(this, parsedPath.path, observer);
+          // Remove className so when the view is rerendered,
+          // the className is added based on binding reevaluation
+          this.one('willClearRender', function() {
+            if (oldClass) {
+              classNames.removeObject(oldClass);
+              oldClass = null;
+            }
+          });
+
+        }, this);
+      },
+
+      _unspecifiedAttributeBindings: null,
+
+      /**
+        Iterates through the view's attribute bindings, sets up observers for each,
+        then applies the current value of the attributes to the passed render buffer.
+
+        @method _applyAttributeBindings
+        @param {Ember.RenderBuffer} buffer
+        @private
+      */
+      _applyAttributeBindings: function(buffer, attributeBindings) {
+        var attributeValue,
+            unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+
+        a_forEach(attributeBindings, function(binding) {
+          var split = binding.split(':'),
+              property = split[0],
+              attributeName = split[1] || property;
+
+          if (property in this) {
+            this._setupAttributeBindingObservation(property, attributeName);
+
+            // Determine the current value and add it to the render buffer
+            // if necessary.
+            attributeValue = get(this, property);
+            View.applyAttributeBindings(buffer, attributeName, attributeValue);
+          } else {
+            unspecifiedAttributeBindings[property] = attributeName;
+          }
+        }, this);
+
+        // Lazily setup setUnknownProperty after attributeBindings are initially applied
+        this.setUnknownProperty = this._setUnknownProperty;
+      },
+
+      _setupAttributeBindingObservation: function(property, attributeName) {
+        var attributeValue, elem;
+
+        // Create an observer to add/remove/change the attribute if the
+        // JavaScript property changes.
+        var observer = function() {
+          elem = this.$();
+
+          attributeValue = get(this, property);
+
+          View.applyAttributeBindings(elem, attributeName, attributeValue);
+        };
+
+        this.registerObserver(this, property, observer);
+      },
+
+      /**
+        We're using setUnknownProperty as a hook to setup attributeBinding observers for
+        properties that aren't defined on a view at initialization time.
+
+        Note: setUnknownProperty will only be called once for each property.
+
+        @method setUnknownProperty
+        @param key
+        @param value
+        @private
+      */
+      setUnknownProperty: null, // Gets defined after initialization by _applyAttributeBindings
+
+      _setUnknownProperty: function(key, value) {
+        var attributeName = this._unspecifiedAttributeBindings && this._unspecifiedAttributeBindings[key];
+        if (attributeName) {
+          this._setupAttributeBindingObservation(key, attributeName);
+        }
+
+        defineProperty(this, key);
+        return set(this, key, value);
+      },
+
+      /**
+        Given a property name, returns a dasherized version of that
+        property name if the property evaluates to a non-falsy value.
+
+        For example, if the view has property `isUrgent` that evaluates to true,
+        passing `isUrgent` to this method will return `"is-urgent"`.
+
+        @method _classStringForProperty
+        @param property
+        @private
+      */
+      _classStringForProperty: function(property) {
+        var parsedPath = View._parsePropertyPath(property);
+        var path = parsedPath.path;
+
+        var val = get(this, path);
+        if (val === undefined && isGlobalPath(path)) {
+          val = get(Ember.lookup, path);
+        }
+
+        return View._classStringForValue(path, val, parsedPath.className, parsedPath.falsyClassName);
+      },
+
+      // ..........................................................
+      // ELEMENT SUPPORT
+      //
+
+      /**
+        Returns the current DOM element for the view.
+
+        @property element
+        @type DOMElement
+      */
+      element: computed('_parentView', function(key, value) {
+        if (value !== undefined) {
+          return this.currentState.setElement(this, value);
+        } else {
+          return this.currentState.getElement(this);
+        }
+      }),
+
+      /**
+        Returns a jQuery object for this view's element. If you pass in a selector
+        string, this method will return a jQuery object, using the current element
+        as its buffer.
+
+        For example, calling `view.$('li')` will return a jQuery object containing
+        all of the `li` elements inside the DOM element of this view.
+
+        @method $
+        @param {String} [selector] a jQuery-compatible selector string
+        @return {jQuery} the jQuery object for the DOM node
+      */
+      $: function(sel) {
+        return this.currentState.$(this, sel);
+      },
+
+      mutateChildViews: function(callback) {
+        var childViews = this._childViews,
+            idx = childViews.length,
+            view;
+
+        while(--idx >= 0) {
+          view = childViews[idx];
+          callback(this, view, idx);
+        }
+
+        return this;
+      },
+
+      forEachChildView: function(callback) {
+        var childViews = this._childViews;
+
+        if (!childViews) { return this; }
+
+        var len = childViews.length,
+            view, idx;
+
+        for (idx = 0; idx < len; idx++) {
+          view = childViews[idx];
+          callback(view);
+        }
+
+        return this;
+      },
+
+      /**
+        Appends the view's element to the specified parent element.
+
+        If the view does not have an HTML representation yet, `createElement()`
+        will be called automatically.
+
+        Note that this method just schedules the view to be appended; the DOM
+        element will not be appended to the given element until all bindings have
+        finished synchronizing.
+
+        This is not typically a function that you will need to call directly when
+        building your application. You might consider using `Ember.ContainerView`
+        instead. If you do need to use `appendTo`, be sure that the target element
+        you are providing is associated with an `Ember.Application` and does not
+        have an ancestor element that is associated with an Ember view.
+
+        @method appendTo
+        @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
+        @return {Ember.View} receiver
+      */
+      appendTo: function(target) {
+        // Schedule the DOM element to be created and appended to the given
+        // element after bindings have synchronized.
+        this._insertElementLater(function() {
+                              this.$().appendTo(target);
+        });
+
+        return this;
+      },
+
+      /**
+        Replaces the content of the specified parent element with this view's
+        element. If the view does not have an HTML representation yet,
+        `createElement()` will be called automatically.
+
+        Note that this method just schedules the view to be appended; the DOM
+        element will not be appended to the given element until all bindings have
+        finished synchronizing
+
+        @method replaceIn
+        @param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object
+        @return {Ember.View} received
+      */
+      replaceIn: function(target) {
+                
+        this._insertElementLater(function() {
+          jQuery(target).empty();
+          this.$().appendTo(target);
+        });
+
+        return this;
+      },
+
+      /**
+        Schedules a DOM operation to occur during the next render phase. This
+        ensures that all bindings have finished synchronizing before the view is
+        rendered.
+
+        To use, pass a function that performs a DOM operation.
+
+        Before your function is called, this view and all child views will receive
+        the `willInsertElement` event. After your function is invoked, this view
+        and all of its child views will receive the `didInsertElement` event.
+
+        ```javascript
+        view._insertElementLater(function() {
+          this.createElement();
+          this.$().appendTo('body');
+        });
+        ```
+
+        @method _insertElementLater
+        @param {Function} fn the function that inserts the element into the DOM
+        @private
+      */
+      _insertElementLater: function(fn) {
+        this._scheduledInsert = run.scheduleOnce('render', this, '_insertElement', fn);
+      },
+
+      _insertElement: function (fn) {
+        this._scheduledInsert = null;
+        this.currentState.insertElement(this, fn);
+      },
+
+      /**
+        Appends the view's element to the document body. If the view does
+        not have an HTML representation yet, `createElement()` will be called
+        automatically.
+
+        If your application uses the `rootElement` property, you must append
+        the view within that element. Rendering views outside of the `rootElement`
+        is not supported.
+
+        Note that this method just schedules the view to be appended; the DOM
+        element will not be appended to the document body until all bindings have
+        finished synchronizing.
+
+        @method append
+        @return {Ember.View} receiver
+      */
+      append: function() {
+        return this.appendTo(document.body);
+      },
+
+      /**
+        Removes the view's element from the element to which it is attached.
+
+        @method remove
+        @return {Ember.View} receiver
+      */
+      remove: function() {
+        // What we should really do here is wait until the end of the run loop
+        // to determine if the element has been re-appended to a different
+        // element.
+        // In the interim, we will just re-render if that happens. It is more
+        // important than elements get garbage collected.
+        if (!this.removedFromDOM) { this.destroyElement(); }
+        this.invokeRecursively(function(view) {
+          if (view.clearRenderedChildren) { view.clearRenderedChildren(); }
+        });
+      },
+
+      elementId: null,
+
+      /**
+        Attempts to discover the element in the parent element. The default
+        implementation looks for an element with an ID of `elementId` (or the
+        view's guid if `elementId` is null). You can override this method to
+        provide your own form of lookup. For example, if you want to discover your
+        element using a CSS class name instead of an ID.
+
+        @method findElementInParentElement
+        @param {DOMElement} parentElement The parent's DOM element
+        @return {DOMElement} The discovered element
+      */
+      findElementInParentElement: function(parentElem) {
+        var id = "#" + this.elementId;
+        return jQuery(id)[0] || jQuery(id, parentElem)[0];
+      },
+
+      /**
+        Creates a DOM representation of the view and all of its
+        child views by recursively calling the `render()` method.
+
+        After the element has been created, `didInsertElement` will
+        be called on this view and all of its child views.
+
+        @method createElement
+        @return {Ember.View} receiver
+      */
+      createElement: function() {
+        if (get(this, 'element')) { return this; }
+
+        var buffer = this.renderToBuffer();
+        set(this, 'element', buffer.element());
+
+        return this;
+      },
+
+      /**
+        Called when a view is going to insert an element into the DOM.
+
+        @event willInsertElement
+      */
+      willInsertElement: Ember.K,
+
+      /**
+        Called when the element of the view has been inserted into the DOM
+        or after the view was re-rendered. Override this function to do any
+        set up that requires an element in the document body.
+
+        @event didInsertElement
+      */
+      didInsertElement: Ember.K,
+
+      /**
+        Called when the view is about to rerender, but before anything has
+        been torn down. This is a good opportunity to tear down any manual
+        observers you have installed based on the DOM state
+
+        @event willClearRender
+      */
+      willClearRender: Ember.K,
+
+      /**
+        Run this callback on the current view (unless includeSelf is false) and recursively on child views.
+
+        @method invokeRecursively
+        @param fn {Function}
+        @param includeSelf {Boolean} Includes itself if true.
+        @private
+      */
+      invokeRecursively: function(fn, includeSelf) {
+        var childViews = (includeSelf === false) ? this._childViews : [this];
+        var currentViews, view, currentChildViews;
+
+        while (childViews.length) {
+          currentViews = childViews.slice();
+          childViews = [];
+
+          for (var i=0, l=currentViews.length; i<l; i++) {
+            view = currentViews[i];
+            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
+            fn(view);
+            if (currentChildViews) {
+              childViews.push.apply(childViews, currentChildViews);
+            }
+          }
+        }
+      },
+
+      triggerRecursively: function(eventName) {
+        var childViews = [this], currentViews, view, currentChildViews;
+
+        while (childViews.length) {
+          currentViews = childViews.slice();
+          childViews = [];
+
+          for (var i=0, l=currentViews.length; i<l; i++) {
+            view = currentViews[i];
+            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
+            if (view.trigger) { view.trigger(eventName); }
+            if (currentChildViews) {
+              childViews.push.apply(childViews, currentChildViews);
+            }
+
+          }
+        }
+      },
+
+      viewHierarchyCollection: function() {
+        var currentView, viewCollection = new ViewCollection([this]);
+
+        for (var i = 0; i < viewCollection.length; i++) {
+          currentView = viewCollection.objectAt(i);
+          if (currentView._childViews) {
+            viewCollection.push.apply(viewCollection, currentView._childViews);
+          }
+        }
+
+        return viewCollection;
+      },
+
+      /**
+        Destroys any existing element along with the element for any child views
+        as well. If the view does not currently have a element, then this method
+        will do nothing.
+
+        If you implement `willDestroyElement()` on your view, then this method will
+        be invoked on your view before your element is destroyed to give you a
+        chance to clean up any event handlers, etc.
+
+        If you write a `willDestroyElement()` handler, you can assume that your
+        `didInsertElement()` handler was called earlier for the same element.
+
+        You should not call or override this method yourself, but you may
+        want to implement the above callbacks.
+
+        @method destroyElement
+        @return {Ember.View} receiver
+      */
+      destroyElement: function() {
+        return this.currentState.destroyElement(this);
+      },
+
+      /**
+        Called when the element of the view is going to be destroyed. Override
+        this function to do any teardown that requires an element, like removing
+        event listeners.
+
+        @event willDestroyElement
+      */
+      willDestroyElement: Ember.K,
+
+      /**
+        Triggers the `willDestroyElement` event (which invokes the
+        `willDestroyElement()` method if it exists) on this view and all child
+        views.
+
+        Before triggering `willDestroyElement`, it first triggers the
+        `willClearRender` event recursively.
+
+        @method _notifyWillDestroyElement
+        @private
+      */
+      _notifyWillDestroyElement: function() {
+        var viewCollection = this.viewHierarchyCollection();
+        viewCollection.trigger('willClearRender');
+        viewCollection.trigger('willDestroyElement');
+        return viewCollection;
+      },
+
+      /**
+        If this view's element changes, we need to invalidate the caches of our
+        child views so that we do not retain references to DOM elements that are
+        no longer needed.
+
+        @method _elementDidChange
+        @private
+      */
+      _elementDidChange: observer('element', function() {
+        this.forEachChildView(clearCachedElement);
+      }),
+
+      /**
+        Called when the parentView property has changed.
+
+        @event parentViewDidChange
+      */
+      parentViewDidChange: Ember.K,
+
+      instrumentName: 'view',
+
+      instrumentDetails: function(hash) {
+        hash.template = get(this, 'templateName');
+        this._super(hash);
+      },
+
+      _renderToBuffer: function(parentBuffer, bufferOperation) {
+        this.lengthBeforeRender = this._childViews.length;
+        var buffer = this._super(parentBuffer, bufferOperation);
+        this.lengthAfterRender = this._childViews.length;
+
+        return buffer;
+      },
+
+      renderToBufferIfNeeded: function (buffer) {
+        return this.currentState.renderToBufferIfNeeded(this, buffer);
+      },
+
+      beforeRender: function(buffer) {
+        this.applyAttributesToBuffer(buffer);
+        buffer.pushOpeningTag();
+      },
+
+      afterRender: function(buffer) {
+        buffer.pushClosingTag();
+      },
+
+      applyAttributesToBuffer: function(buffer) {
+        // Creates observers for all registered class name and attribute bindings,
+        // then adds them to the element.
+        var classNameBindings = get(this, 'classNameBindings');
+        if (classNameBindings.length) {
+          this._applyClassNameBindings(classNameBindings);
+        }
+
+        // Pass the render buffer so the method can apply attributes directly.
+        // This isn't needed for class name bindings because they use the
+        // existing classNames infrastructure.
+        var attributeBindings = get(this, 'attributeBindings');
+        if (attributeBindings.length) {
+          this._applyAttributeBindings(buffer, attributeBindings);
+        }
+
+        buffer.setClasses(this.classNames);
+        buffer.id(this.elementId);
+
+        var role = get(this, 'ariaRole');
+        if (role) {
+          buffer.attr('role', role);
+        }
+
+        if (get(this, 'isVisible') === false) {
+          buffer.style('display', 'none');
+        }
+      },
+
+      // ..........................................................
+      // STANDARD RENDER PROPERTIES
+      //
+
+      /**
+        Tag name for the view's outer element. The tag name is only used when an
+        element is first created. If you change the `tagName` for an element, you
+        must destroy and recreate the view element.
+
+        By default, the render buffer will use a `<div>` tag for views.
+
+        @property tagName
+        @type String
+        @default null
+      */
+
+      // We leave this null by default so we can tell the difference between
+      // the default case and a user-specified tag.
+      tagName: null,
+
+      /**
+        The WAI-ARIA role of the control represented by this view. For example, a
+        button may have a role of type 'button', or a pane may have a role of
+        type 'alertdialog'. This property is used by assistive software to help
+        visually challenged users navigate rich web applications.
+
+        The full list of valid WAI-ARIA roles is available at:
+        [http://www.w3.org/TR/wai-aria/roles#roles_categorization](http://www.w3.org/TR/wai-aria/roles#roles_categorization)
+
+        @property ariaRole
+        @type String
+        @default null
+      */
+      ariaRole: null,
+
+      /**
+        Standard CSS class names to apply to the view's outer element. This
+        property automatically inherits any class names defined by the view's
+        superclasses as well.
+
+        @property classNames
+        @type Array
+        @default ['ember-view']
+      */
+      classNames: ['ember-view'],
+
+      /**
+        A list of properties of the view to apply as class names. If the property
+        is a string value, the value of that string will be applied as a class
+        name.
+
+        ```javascript
+        // Applies the 'high' class to the view element
+        Ember.View.extend({
+          classNameBindings: ['priority']
+          priority: 'high'
+        });
+        ```
+
+        If the value of the property is a Boolean, the name of that property is
+        added as a dasherized class name.
+
+        ```javascript
+        // Applies the 'is-urgent' class to the view element
+        Ember.View.extend({
+          classNameBindings: ['isUrgent']
+          isUrgent: true
+        });
+        ```
+
+        If you would prefer to use a custom value instead of the dasherized
+        property name, you can pass a binding like this:
+
+        ```javascript
+        // Applies the 'urgent' class to the view element
+        Ember.View.extend({
+          classNameBindings: ['isUrgent:urgent']
+          isUrgent: true
+        });
+        ```
+
+        This list of properties is inherited from the view's superclasses as well.
+
+        @property classNameBindings
+        @type Array
+        @default []
+      */
+      classNameBindings: EMPTY_ARRAY,
+
+      /**
+        A list of properties of the view to apply as attributes. If the property is
+        a string value, the value of that string will be applied as the attribute.
+
+        ```javascript
+        // Applies the type attribute to the element
+        // with the value "button", like <div type="button">
+        Ember.View.extend({
+          attributeBindings: ['type'],
+          type: 'button'
+        });
+        ```
+
+        If the value of the property is a Boolean, the name of that property is
+        added as an attribute.
+
+        ```javascript
+        // Renders something like <div enabled="enabled">
+        Ember.View.extend({
+          attributeBindings: ['enabled'],
+          enabled: true
+        });
+        ```
+
+        @property attributeBindings
+      */
+      attributeBindings: EMPTY_ARRAY,
+
+      // .......................................................
+      // CORE DISPLAY METHODS
+      //
+
+      /**
+        Setup a view, but do not finish waking it up.
+
+        * configure `childViews`
+        * register the view with the global views hash, which is used for event
+          dispatch
+
+        @method init
+        @private
+      */
+      init: function() {
+        this.elementId = this.elementId || guidFor(this);
+
+        this._super();
+
+        // setup child views. be sure to clone the child views array first
+        this._childViews = this._childViews.slice();
+
+                this.classNameBindings = A(this.classNameBindings.slice());
+
+                this.classNames = A(this.classNames.slice());
+      },
+
+      appendChild: function(view, options) {
+        return this.currentState.appendChild(this, view, options);
+      },
+
+      /**
+        Removes the child view from the parent view.
+
+        @method removeChild
+        @param {Ember.View} view
+        @return {Ember.View} receiver
+      */
+      removeChild: function(view) {
+        // If we're destroying, the entire subtree will be
+        // freed, and the DOM will be handled separately,
+        // so no need to mess with childViews.
+        if (this.isDestroying) { return; }
+
+        // update parent node
+        set(view, '_parentView', null);
+
+        // remove view from childViews array.
+        var childViews = this._childViews;
+
+        a_removeObject(childViews, view);
+
+        this.propertyDidChange('childViews'); // HUH?! what happened to will change?
+
+        return this;
+      },
+
+      /**
+        Removes all children from the `parentView`.
+
+        @method removeAllChildren
+        @return {Ember.View} receiver
+      */
+      removeAllChildren: function() {
+        return this.mutateChildViews(function(parentView, view) {
+          parentView.removeChild(view);
+        });
+      },
+
+      destroyAllChildren: function() {
+        return this.mutateChildViews(function(parentView, view) {
+          view.destroy();
+        });
+      },
+
+      /**
+        Removes the view from its `parentView`, if one is found. Otherwise
+        does nothing.
+
+        @method removeFromParent
+        @return {Ember.View} receiver
+      */
+      removeFromParent: function() {
+        var parent = this._parentView;
+
+        // Remove DOM element from parent
+        this.remove();
+
+        if (parent) { parent.removeChild(this); }
+        return this;
+      },
+
+      /**
+        You must call `destroy` on a view to destroy the view (and all of its
+        child views). This will remove the view from any parent node, then make
+        sure that the DOM element managed by the view can be released by the
+        memory manager.
+
+        @method destroy
+      */
+      destroy: function() {
+        var childViews = this._childViews,
+            // get parentView before calling super because it'll be destroyed
+            nonVirtualParentView = get(this, 'parentView'),
+            viewName = this.viewName,
+            childLen, i;
+
+        if (!this._super()) { return; }
+
+        childLen = childViews.length;
+        for (i=childLen-1; i>=0; i--) {
+          childViews[i].removedFromDOM = true;
+        }
+
+        // remove from non-virtual parent view if viewName was specified
+        if (viewName && nonVirtualParentView) {
+          nonVirtualParentView.set(viewName, null);
+        }
+
+        childLen = childViews.length;
+        for (i=childLen-1; i>=0; i--) {
+          childViews[i].destroy();
+        }
+
+        return this;
+      },
+
+      /**
+        Instantiates a view to be added to the childViews array during view
+        initialization. You generally will not call this method directly unless
+        you are overriding `createChildViews()`. Note that this method will
+        automatically configure the correct settings on the new view instance to
+        act as a child of the parent.
+
+        @method createChildView
+        @param {Class|String} viewClass
+        @param {Hash} [attrs] Attributes to add
+        @return {Ember.View} new instance
+      */
+      createChildView: function(view, attrs) {
+        if (!view) {
+          throw new TypeError("createChildViews first argument must exist");
+        }
+
+        if (view.isView && view._parentView === this && view.container === this.container) {
+          return view;
+        }
+
+        attrs = attrs || {};
+        attrs._parentView = this;
+
+        if (CoreView.detect(view)) {
+          attrs.templateData = attrs.templateData || get(this, 'templateData');
+
+          attrs.container = this.container;
+          view = view.create(attrs);
+
+          // don't set the property on a virtual view, as they are invisible to
+          // consumers of the view API
+          if (view.viewName) {
+            set(get(this, 'concreteView'), view.viewName, view);
+          }
+        } else if ('string' === typeof view) {
+          var fullName = 'view:' + view;
+          var ViewKlass = this.container.lookupFactory(fullName);
+
+          
+          attrs.templateData = get(this, 'templateData');
+          view = ViewKlass.create(attrs);
+        } else {
+                    attrs.container = this.container;
+
+          if (!get(view, 'templateData')) {
+            attrs.templateData = get(this, 'templateData');
+          }
+
+          setProperties(view, attrs);
+
+        }
+
+        return view;
+      },
+
+      becameVisible: Ember.K,
+      becameHidden: Ember.K,
+
+      /**
+        When the view's `isVisible` property changes, toggle the visibility
+        element of the actual DOM element.
+
+        @method _isVisibleDidChange
+        @private
+      */
+      _isVisibleDidChange: observer('isVisible', function() {
+        if (this._isVisible === get(this, 'isVisible')) { return ; }
+        run.scheduleOnce('render', this, this._toggleVisibility);
+      }),
+
+      _toggleVisibility: function() {
+        var $el = this.$();
+        if (!$el) { return; }
+
+        var isVisible = get(this, 'isVisible');
+
+        if (this._isVisible === isVisible) { return ; }
+
+        $el.toggle(isVisible);
+
+        this._isVisible = isVisible;
+
+        if (this._isAncestorHidden()) { return; }
+
+        if (isVisible) {
+          this._notifyBecameVisible();
+        } else {
+          this._notifyBecameHidden();
+        }
+      },
+
+      _notifyBecameVisible: function() {
+        this.trigger('becameVisible');
+
+        this.forEachChildView(function(view) {
+          var isVisible = get(view, 'isVisible');
+
+          if (isVisible || isVisible === null) {
+            view._notifyBecameVisible();
+          }
+        });
+      },
+
+      _notifyBecameHidden: function() {
+        this.trigger('becameHidden');
+        this.forEachChildView(function(view) {
+          var isVisible = get(view, 'isVisible');
+
+          if (isVisible || isVisible === null) {
+            view._notifyBecameHidden();
+          }
+        });
+      },
+
+      _isAncestorHidden: function() {
+        var parent = get(this, 'parentView');
+
+        while (parent) {
+          if (get(parent, 'isVisible') === false) { return true; }
+
+          parent = get(parent, 'parentView');
+        }
+
+        return false;
+      },
+
+      clearBuffer: function() {
+        this.invokeRecursively(nullViewsBuffer);
+      },
+
+      transitionTo: function(state, children) {
+        var priorState = this.currentState,
+            currentState = this.currentState = this.states[state];
+        this.state = state;
+
+        if (priorState && priorState.exit) { priorState.exit(this); }
+        if (currentState.enter) { currentState.enter(this); }
+        if (state === 'inDOM') { meta(this).cache.element = undefined; }
+
+        if (children !== false) {
+          this.forEachChildView(function(view) {
+            view.transitionTo(state);
+          });
+        }
+      },
+
+      // .......................................................
+      // EVENT HANDLING
+      //
+
+      /**
+        Handle events from `Ember.EventDispatcher`
+
+        @method handleEvent
+        @param eventName {String}
+        @param evt {Event}
+        @private
+      */
+      handleEvent: function(eventName, evt) {
+        return this.currentState.handleEvent(this, eventName, evt);
+      },
+
+      registerObserver: function(root, path, target, observer) {
+        if (!observer && 'function' === typeof target) {
+          observer = target;
+          target = null;
+        }
+
+        if (!root || typeof root !== 'object') {
+          return;
+        }
+
+        var view = this,
+            stateCheckedObserver = function() {
+              view.currentState.invokeObserver(this, observer);
+            },
+            scheduledObserver = function() {
+              run.scheduleOnce('render', this, stateCheckedObserver);
+            };
+
+        addObserver(root, path, target, scheduledObserver);
+
+        this.one('willClearRender', function() {
+          removeObserver(root, path, target, scheduledObserver);
+        });
+      }
+
+    });
+
+    /*
+      Describe how the specified actions should behave in the various
+      states that a view can exist in. Possible states:
+
+      * preRender: when a view is first instantiated, and after its
+        element was destroyed, it is in the preRender state
+      * inBuffer: once a view has been rendered, but before it has
+        been inserted into the DOM, it is in the inBuffer state
+      * hasElement: the DOM representation of the view is created,
+        and is ready to be inserted
+      * inDOM: once a view has been inserted into the DOM it is in
+        the inDOM state. A view spends the vast majority of its
+        existence in this state.
+      * destroyed: once a view has been destroyed (using the destroy
+        method), it is in this state. No further actions can be invoked
+        on a destroyed view.
+    */
+
+      // in the destroyed state, everything is illegal
+
+      // before rendering has begun, all legal manipulations are noops.
+
+      // inside the buffer, legal manipulations are done on the buffer
+
+      // once the view has been inserted into the DOM, legal manipulations
+      // are done on the DOM element.
+
+    function notifyMutationListeners() {
+      run.once(View, 'notifyMutationListeners');
+    }
+
+    var DOMManager = {
+      prepend: function(view, html) {
+        view.$().prepend(html);
+        notifyMutationListeners();
+      },
+
+      after: function(view, html) {
+        view.$().after(html);
+        notifyMutationListeners();
+      },
+
+      html: function(view, html) {
+        view.$().html(html);
+        notifyMutationListeners();
+      },
+
+      replace: function(view) {
+        var element = get(view, 'element');
+
+        set(view, 'element', null);
+
+        view._insertElementLater(function() {
+          jQuery(element).replaceWith(get(view, 'element'));
+          notifyMutationListeners();
+        });
+      },
+
+      remove: function(view) {
+        view.$().remove();
+        notifyMutationListeners();
+      },
+
+      empty: function(view) {
+        view.$().empty();
+        notifyMutationListeners();
+      }
+    };
+
+    View.reopen({
+      domManager: DOMManager
+    });
+
+    View.reopenClass({
+
+      /**
+        Parse a path and return an object which holds the parsed properties.
+
+        For example a path like "content.isEnabled:enabled:disabled" will return the
+        following object:
+
+        ```javascript
+        {
+          path: "content.isEnabled",
+          className: "enabled",
+          falsyClassName: "disabled",
+          classNames: ":enabled:disabled"
+        }
+        ```
+
+        @method _parsePropertyPath
+        @static
+        @private
+      */
+      _parsePropertyPath: function(path) {
+        var split = path.split(':'),
+            propertyPath = split[0],
+            classNames = "",
+            className,
+            falsyClassName;
+
+        // check if the property is defined as prop:class or prop:trueClass:falseClass
+        if (split.length > 1) {
+          className = split[1];
+          if (split.length === 3) { falsyClassName = split[2]; }
+
+          classNames = ':' + className;
+          if (falsyClassName) { classNames += ":" + falsyClassName; }
+        }
+
+        return {
+          path: propertyPath,
+          classNames: classNames,
+          className: (className === '') ? undefined : className,
+          falsyClassName: falsyClassName
+        };
+      },
+
+      /**
+        Get the class name for a given value, based on the path, optional
+        `className` and optional `falsyClassName`.
+
+        - if a `className` or `falsyClassName` has been specified:
+          - if the value is truthy and `className` has been specified,
+            `className` is returned
+          - if the value is falsy and `falsyClassName` has been specified,
+            `falsyClassName` is returned
+          - otherwise `null` is returned
+        - if the value is `true`, the dasherized last part of the supplied path
+          is returned
+        - if the value is not `false`, `undefined` or `null`, the `value`
+          is returned
+        - if none of the above rules apply, `null` is returned
+
+        @method _classStringForValue
+        @param path
+        @param val
+        @param className
+        @param falsyClassName
+        @static
+        @private
+      */
+      _classStringForValue: function(path, val, className, falsyClassName) {
+        if(isArray(val)) {
+          val = get(val, 'length') !== 0;  
+        }
+        
+        // When using the colon syntax, evaluate the truthiness or falsiness
+        // of the value to determine which className to return
+        if (className || falsyClassName) {
+          if (className && !!val) {
+            return className;
+
+          } else if (falsyClassName && !val) {
+            return falsyClassName;
+
+          } else {
+            return null;
+          }
+
+        // If value is a Boolean and true, return the dasherized property
+        // name.
+        } else if (val === true) {
+          // Normalize property path to be suitable for use
+          // as a class name. For exaple, content.foo.barBaz
+          // becomes bar-baz.
+          var parts = path.split('.');
+          return dasherize(parts[parts.length-1]);
+
+        // If the value is not false, undefined, or null, return the current
+        // value of the property.
+        } else if (val !== false && val != null) {
+          return val;
+
+        // Nothing to display. Return null so that the old class is removed
+        // but no new class is added.
+        } else {
+          return null;
+        }
+      }
+    });
+
+    var mutation = EmberObject.extend(Evented).create();
+
+    View.addMutationListener = function(callback) {
+      mutation.on('change', callback);
+    };
+
+    View.removeMutationListener = function(callback) {
+      mutation.off('change', callback);
+    };
+
+    View.notifyMutationListeners = function() {
+      mutation.trigger('change');
+    };
+
+    /**
+      Global views hash
+
+      @property views
+      @static
+      @type Hash
+    */
+    View.views = {};
+
+    // If someone overrides the child views computed property when
+    // defining their class, we want to be able to process the user's
+    // supplied childViews and then restore the original computed property
+    // at view initialization time. This happens in Ember.ContainerView's init
+    // method.
+    View.childViewsProperty = childViewsProperty;
+
+    View.applyAttributeBindings = function(elem, name, value) {
+      var type = typeOf(value);
+
+      // if this changes, also change the logic in ember-handlebars/lib/helpers/binding.js
+      if (name !== 'value' && (type === 'string' || (type === 'number' && !isNaN(value)))) {
+        if (value !== elem.attr(name)) {
+          elem.attr(name, value);
+        }
+      } else if (name === 'value' || type === 'boolean') {
+        if (isNone(value) || value === false) {
+          // `null`, `undefined` or `false` should remove attribute
+          elem.removeAttr(name);
+          elem.prop(name, '');
+        } else if (value !== elem.prop(name)) {
+          // value should always be properties
+          elem.prop(name, value);
+        }
+      } else if (!value) {
+        elem.removeAttr(name);
+      }
+    };
+
+    __exports__.CoreView = CoreView;
+    __exports__.View = View;
+    __exports__.ViewCollection = ViewCollection;
+  });
+})();
+
+(function() {
+define("metamorph",
+  [],
+  function() {
+    "use strict";
+    // ==========================================================================
+    // Project:   metamorph
+    // Copyright: ©2014 Tilde, Inc. All rights reserved.
+    // ==========================================================================
+
+    var K = function() {},
+        guid = 0,
+        disableRange = (function(){
+          if ('undefined' !== typeof MetamorphENV) {
+            return MetamorphENV.DISABLE_RANGE_API;
+          } else if ('undefined' !== ENV) {
+            return ENV.DISABLE_RANGE_API;
+          } else {
+            return false;
+          }
+        })(),
+
+        // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
+        supportsRange = (!disableRange) && typeof document !== 'undefined' && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+
+        // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+        // is a "zero-scope" element. This problem can be worked around by making
+        // the first node an invisible text node. We, like Modernizr, use &shy;
+        needsShy = typeof document !== 'undefined' && (function() {
+          var testEl = document.createElement('div');
+          testEl.innerHTML = "<div></div>";
+          testEl.firstChild.innerHTML = "<script></script>";
+          return testEl.firstChild.innerHTML === '';
+        })(),
+
+
+        // IE 8 (and likely earlier) likes to move whitespace preceeding
+        // a script tag to appear after it. This means that we can
+        // accidentally remove whitespace when updating a morph.
+        movesWhitespace = document && (function() {
+          var testEl = document.createElement('div');
+          testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
+          return testEl.childNodes[0].nodeValue === 'Test:' &&
+                  testEl.childNodes[2].nodeValue === ' Value';
+        })();
+
+    // Constructor that supports either Metamorph('foo') or new
+    // Metamorph('foo');
+    //
+    // Takes a string of HTML as the argument.
+
+    var Metamorph = function(html) {
+      var self;
+
+      if (this instanceof Metamorph) {
+        self = this;
+      } else {
+        self = new K();
+      }
+
+      self.innerHTML = html;
+      var myGuid = 'metamorph-'+(guid++);
+      self.start = myGuid + '-start';
+      self.end = myGuid + '-end';
+
+      return self;
+    };
+
+    K.prototype = Metamorph.prototype;
+
+    var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
+
+    outerHTMLFunc = function() {
+      return this.startTag() + this.innerHTML + this.endTag();
+    };
+
+    startTagFunc = function() {
+      /*
+       * We replace chevron by its hex code in order to prevent escaping problems.
+       * Check this thread for more explaination:
+       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
+       */
+      return "<script id='" + this.start + "' type='text/x-placeholder'>\x3C/script>";
+    };
+
+    endTagFunc = function() {
+      /*
+       * We replace chevron by its hex code in order to prevent escaping problems.
+       * Check this thread for more explaination:
+       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
+       */
+      return "<script id='" + this.end + "' type='text/x-placeholder'>\x3C/script>";
+    };
+
+    // If we have the W3C range API, this process is relatively straight forward.
+    if (supportsRange) {
+
+      // Get a range for the current morph. Optionally include the starting and
+      // ending placeholders.
+      rangeFor = function(morph, outerToo) {
+        var range = document.createRange();
+        var before = document.getElementById(morph.start);
+        var after = document.getElementById(morph.end);
+
+        if (outerToo) {
+          range.setStartBefore(before);
+          range.setEndAfter(after);
+        } else {
+          range.setStartAfter(before);
+          range.setEndBefore(after);
+        }
+
+        return range;
+      };
+
+      htmlFunc = function(html, outerToo) {
+        // get a range for the current metamorph object
+        var range = rangeFor(this, outerToo);
+
+        // delete the contents of the range, which will be the
+        // nodes between the starting and ending placeholder.
+        range.deleteContents();
+
+        // create a new document fragment for the HTML
+        var fragment = range.createContextualFragment(html);
+
+        // insert the fragment into the range
+        range.insertNode(fragment);
+      };
+
+      /**
+      * @public
+      *
+      * Remove this object (including starting and ending
+      * placeholders).
+      *
+      * @method remove
+      */
+      removeFunc = function() {
+        // get a range for the current metamorph object including
+        // the starting and ending placeholders.
+        var range = rangeFor(this, true);
+
+        // delete the entire range.
+        range.deleteContents();
+      };
+
+      appendToFunc = function(node) {
+        var range = document.createRange();
+        range.setStart(node);
+        range.collapse(false);
+        var frag = range.createContextualFragment(this.outerHTML());
+        node.appendChild(frag);
+      };
+
+      afterFunc = function(html) {
+        var range = document.createRange();
+        var after = document.getElementById(this.end);
+
+        range.setStartAfter(after);
+        range.setEndAfter(after);
+
+        var fragment = range.createContextualFragment(html);
+        range.insertNode(fragment);
+      };
+
+      prependFunc = function(html) {
+        var range = document.createRange();
+        var start = document.getElementById(this.start);
+
+        range.setStartAfter(start);
+        range.setEndAfter(start);
+
+        var fragment = range.createContextualFragment(html);
+        range.insertNode(fragment);
+      };
+
+    } else {
+      /*
+       * This code is mostly taken from jQuery, with one exception. In jQuery's case, we
+       * have some HTML and we need to figure out how to convert it into some nodes.
+       *
+       * In this case, jQuery needs to scan the HTML looking for an opening tag and use
+       * that as the key for the wrap map. In our case, we know the parent node, and
+       * can use its type as the key for the wrap map.
+       **/
+      var wrapMap = {
+        select: [ 1, "<select multiple='multiple'>", "</select>" ],
+        fieldset: [ 1, "<fieldset>", "</fieldset>" ],
+        table: [ 1, "<table>", "</table>" ],
+        tbody: [ 2, "<table><tbody>", "</tbody></table>" ],
+        tr: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+        colgroup: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+        map: [ 1, "<map>", "</map>" ],
+        _default: [ 0, "", "" ]
+      };
+
+      var findChildById = function(element, id) {
+        if (element.getAttribute('id') === id) { return element; }
+
+        var len = element.childNodes.length, idx, node, found;
+        for (idx=0; idx<len; idx++) {
+          node = element.childNodes[idx];
+          found = node.nodeType === 1 && findChildById(node, id);
+          if (found) { return found; }
+        }
+      };
+
+      var setInnerHTML = function(element, html) {
+        var matches = [];
+        if (movesWhitespace) {
+          // Right now we only check for script tags with ids with the
+          // goal of targeting morphs.
+          html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
+            matches.push([id, spaces]);
+            return tag;
+          });
+        }
+
+        element.innerHTML = html;
+
+        // If we have to do any whitespace adjustments do them now
+        if (matches.length > 0) {
+          var len = matches.length, idx;
+          for (idx=0; idx<len; idx++) {
+            var script = findChildById(element, matches[idx][0]),
+                node = document.createTextNode(matches[idx][1]);
+            script.parentNode.insertBefore(node, script);
+          }
+        }
+      };
+
+      /*
+       * Given a parent node and some HTML, generate a set of nodes. Return the first
+       * node, which will allow us to traverse the rest using nextSibling.
+       *
+       * We need to do this because innerHTML in IE does not really parse the nodes.
+       */
+      var firstNodeFor = function(parentNode, html) {
+        var arr = wrapMap[parentNode.tagName.toLowerCase()] || wrapMap._default;
+        var depth = arr[0], start = arr[1], end = arr[2];
+
+        if (needsShy) { html = '&shy;'+html; }
+
+        var element = document.createElement('div');
+
+        setInnerHTML(element, start + html + end);
+
+        for (var i=0; i<=depth; i++) {
+          element = element.firstChild;
+        }
+
+        // Look for &shy; to remove it.
+        if (needsShy) {
+          var shyElement = element;
+
+          // Sometimes we get nameless elements with the shy inside
+          while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+            shyElement = shyElement.firstChild;
+          }
+
+          // At this point it's the actual unicode character.
+          if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+            shyElement.nodeValue = shyElement.nodeValue.slice(1);
+          }
+        }
+
+        return element;
+      };
+
+      /*
+       * In some cases, Internet Explorer can create an anonymous node in
+       * the hierarchy with no tagName. You can create this scenario via:
+       *
+       *     div = document.createElement("div");
+       *     div.innerHTML = "<table>&shy<script></script><tr><td>hi</td></tr></table>";
+       *     div.firstChild.firstChild.tagName //=> ""
+       *
+       * If our script markers are inside such a node, we need to find that
+       * node and use *it* as the marker.
+       */
+      var realNode = function(start) {
+        while (start.parentNode.tagName === "") {
+          start = start.parentNode;
+        }
+
+        return start;
+      };
+
+      /*
+       * When automatically adding a tbody, Internet Explorer inserts the
+       * tbody immediately before the first <tr>. Other browsers create it
+       * before the first node, no matter what.
+       *
+       * This means the the following code:
+       *
+       *     div = document.createElement("div");
+       *     div.innerHTML = "<table><script id='first'></script><tr><td>hi</td></tr><script id='last'></script></table>
+       *
+       * Generates the following DOM in IE:
+       *
+       *     + div
+       *       + table
+       *         - script id='first'
+       *         + tbody
+       *           + tr
+       *             + td
+       *               - "hi"
+       *           - script id='last'
+       *
+       * Which means that the two script tags, even though they were
+       * inserted at the same point in the hierarchy in the original
+       * HTML, now have different parents.
+       *
+       * This code reparents the first script tag by making it the tbody's
+       * first child.
+       *
+       */
+      var fixParentage = function(start, end) {
+        if (start.parentNode !== end.parentNode) {
+          end.parentNode.insertBefore(start, end.parentNode.firstChild);
+        }
+      };
+
+      htmlFunc = function(html, outerToo) {
+        // get the real starting node. see realNode for details.
+        var start = realNode(document.getElementById(this.start));
+        var end = document.getElementById(this.end);
+        var parentNode = end.parentNode;
+        var node, nextSibling, last;
+
+        // make sure that the start and end nodes share the same
+        // parent. If not, fix it.
+        fixParentage(start, end);
+
+        // remove all of the nodes after the starting placeholder and
+        // before the ending placeholder.
+        node = start.nextSibling;
+        while (node) {
+          nextSibling = node.nextSibling;
+          last = node === end;
+
+          // if this is the last node, and we want to remove it as well,
+          // set the `end` node to the next sibling. This is because
+          // for the rest of the function, we insert the new nodes
+          // before the end (note that insertBefore(node, null) is
+          // the same as appendChild(node)).
+          //
+          // if we do not want to remove it, just break.
+          if (last) {
+            if (outerToo) { end = node.nextSibling; } else { break; }
+          }
+
+          node.parentNode.removeChild(node);
+
+          // if this is the last node and we didn't break before
+          // (because we wanted to remove the outer nodes), break
+          // now.
+          if (last) { break; }
+
+          node = nextSibling;
+        }
+
+        // get the first node for the HTML string, even in cases like
+        // tables and lists where a simple innerHTML on a div would
+        // swallow some of the content.
+        node = firstNodeFor(start.parentNode, html);
+
+        if (outerToo) {
+          start.parentNode.removeChild(start);
+        }
+
+        // copy the nodes for the HTML between the starting and ending
+        // placeholder.
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, end);
+          node = nextSibling;
+        }
+      };
+
+      // remove the nodes in the DOM representing this metamorph.
+      //
+      // this includes the starting and ending placeholders.
+      removeFunc = function() {
+        var start = realNode(document.getElementById(this.start));
+        var end = document.getElementById(this.end);
+
+        this.html('');
+        start.parentNode.removeChild(start);
+        end.parentNode.removeChild(end);
+      };
+
+      appendToFunc = function(parentNode) {
+        var node = firstNodeFor(parentNode, this.outerHTML());
+        var nextSibling;
+
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.appendChild(node);
+          node = nextSibling;
+        }
+      };
+
+      afterFunc = function(html) {
+        // get the real starting node. see realNode for details.
+        var end = document.getElementById(this.end);
+        var insertBefore = end.nextSibling;
+        var parentNode = end.parentNode;
+        var nextSibling;
+        var node;
+
+        // get the first node for the HTML string, even in cases like
+        // tables and lists where a simple innerHTML on a div would
+        // swallow some of the content.
+        node = firstNodeFor(parentNode, html);
+
+        // copy the nodes for the HTML between the starting and ending
+        // placeholder.
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, insertBefore);
+          node = nextSibling;
+        }
+      };
+
+      prependFunc = function(html) {
+        var start = document.getElementById(this.start);
+        var parentNode = start.parentNode;
+        var nextSibling;
+        var node;
+
+        node = firstNodeFor(parentNode, html);
+        var insertBefore = start.nextSibling;
+
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, insertBefore);
+          node = nextSibling;
+        }
+      };
+    }
+
+    Metamorph.prototype.html = function(html) {
+      this.checkRemoved();
+      if (html === undefined) { return this.innerHTML; }
+
+      htmlFunc.call(this, html);
+
+      this.innerHTML = html;
+    };
+
+    Metamorph.prototype.replaceWith = function(html) {
+      this.checkRemoved();
+      htmlFunc.call(this, html, true);
+    };
+
+    Metamorph.prototype.remove = removeFunc;
+    Metamorph.prototype.outerHTML = outerHTMLFunc;
+    Metamorph.prototype.appendTo = appendToFunc;
+    Metamorph.prototype.after = afterFunc;
+    Metamorph.prototype.prepend = prependFunc;
+    Metamorph.prototype.startTag = startTagFunc;
+    Metamorph.prototype.endTag = endTagFunc;
+
+    Metamorph.prototype.isRemoved = function() {
+      var before = document.getElementById(this.start);
+      var after = document.getElementById(this.end);
+
+      return !before || !after;
+    };
+
+    Metamorph.prototype.checkRemoved = function() {
+      if (this.isRemoved()) {
+        throw new Error("Cannot perform operations on a Metamorph that is not in the DOM.");
+      }
+    };
+
+    return Metamorph;
+  });
+
+})();
+
+(function() {
+define("ember-handlebars-compiler",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars-compiler
+    */
+
+    var Ember = __dependency1__["default"];
+
+    // ES6Todo: you'll need to import debugger once debugger is es6'd.
+    if (typeof Ember.assert === 'undefined')   { Ember.assert = function(){}; };
+    if (typeof Ember.FEATURES === 'undefined') { Ember.FEATURES = { isEnabled: function(){} }; };
+
+    var objectCreate = Object.create || function(parent) {
+      function F() {}
+      F.prototype = parent;
+      return new F();
+    };
+
+    // set up for circular references later
+    var View, Component;
+
+    // ES6Todo: when ember-debug is es6'ed import this.
+    // var emberAssert = Ember.assert;
+    var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
+    if (!Handlebars && typeof require === 'function') {
+      Handlebars = require('handlebars');
+    }
+
+    
+    
+    /**
+      Prepares the Handlebars templating library for use inside Ember's view
+      system.
+
+      The `Ember.Handlebars` object is the standard Handlebars library, extended to
+      use Ember's `get()` method instead of direct property access, which allows
+      computed properties to be used inside templates.
+
+      To create an `Ember.Handlebars` template, call `Ember.Handlebars.compile()`.
+      This will return a function that can be used by `Ember.View` for rendering.
+
+      @class Handlebars
+      @namespace Ember
+    */
+    var EmberHandlebars = Ember.Handlebars = objectCreate(Handlebars);
+
+    /**
+      Register a bound helper or custom view helper.
+
+      ## Simple bound helper example
+
+      ```javascript
+      Ember.Handlebars.helper('capitalize', function(value) {
+        return value.toUpperCase();
+      });
+      ```
+
+      The above bound helper can be used inside of templates as follows:
+
+      ```handlebars
+      {{capitalize name}}
+      ```
+
+      In this case, when the `name` property of the template's context changes,
+      the rendered value of the helper will update to reflect this change.
+
+      For more examples of bound helpers, see documentation for
+      `Ember.Handlebars.registerBoundHelper`.
+
+      ## Custom view helper example
+
+      Assuming a view subclass named `App.CalendarView` were defined, a helper
+      for rendering instances of this view could be registered as follows:
+
+      ```javascript
+      Ember.Handlebars.helper('calendar', App.CalendarView):
+      ```
+
+      The above bound helper can be used inside of templates as follows:
+
+      ```handlebars
+      {{calendar}}
+      ```
+
+      Which is functionally equivalent to:
+
+      ```handlebars
+      {{view App.CalendarView}}
+      ```
+
+      Options in the helper will be passed to the view in exactly the same
+      manner as with the `view` helper.
+
+      @method helper
+      @for Ember.Handlebars
+      @param {String} name
+      @param {Function|Ember.View} function or view class constructor
+      @param {String} dependentKeys*
+    */
+    EmberHandlebars.helper = function(name, value) {
+      if (!View) { View = requireModule('ember-views/views/view')['View']; } // ES6TODO: stupid circular dep
+      if (!Component) { Component = requireModule('ember-views/views/component')['default']; } // ES6TODO: stupid circular dep
+
+      
+      if (View.detect(value)) {
+        EmberHandlebars.registerHelper(name, EmberHandlebars.makeViewHelper(value));
+      } else {
+        EmberHandlebars.registerBoundHelper.apply(null, arguments);
+      }
+    };
+
+    /**
+      Returns a helper function that renders the provided ViewClass.
+
+      Used internally by Ember.Handlebars.helper and other methods
+      involving helper/component registration.
+
+      @private
+      @method makeViewHelper
+      @for Ember.Handlebars
+      @param {Function} ViewClass view class constructor
+      @since 1.2.0
+    */
+    EmberHandlebars.makeViewHelper = function(ViewClass) {
+      return function(options) {
+                return EmberHandlebars.helpers.view.call(this, ViewClass, options);
+      };
+    };
+
+    /**
+    @class helpers
+    @namespace Ember.Handlebars
+    */
+    EmberHandlebars.helpers = objectCreate(Handlebars.helpers);
+
+    /**
+      Override the the opcode compiler and JavaScript compiler for Handlebars.
+
+      @class Compiler
+      @namespace Ember.Handlebars
+      @private
+      @constructor
+    */
+    EmberHandlebars.Compiler = function() {};
+
+    // Handlebars.Compiler doesn't exist in runtime-only
+    if (Handlebars.Compiler) {
+      EmberHandlebars.Compiler.prototype = objectCreate(Handlebars.Compiler.prototype);
+    }
+
+    EmberHandlebars.Compiler.prototype.compiler = EmberHandlebars.Compiler;
+
+    /**
+      @class JavaScriptCompiler
+      @namespace Ember.Handlebars
+      @private
+      @constructor
+    */
+    EmberHandlebars.JavaScriptCompiler = function() {};
+
+    // Handlebars.JavaScriptCompiler doesn't exist in runtime-only
+    if (Handlebars.JavaScriptCompiler) {
+      EmberHandlebars.JavaScriptCompiler.prototype = objectCreate(Handlebars.JavaScriptCompiler.prototype);
+      EmberHandlebars.JavaScriptCompiler.prototype.compiler = EmberHandlebars.JavaScriptCompiler;
+    }
+
+
+    EmberHandlebars.JavaScriptCompiler.prototype.namespace = "Ember.Handlebars";
+
+    EmberHandlebars.JavaScriptCompiler.prototype.initializeBuffer = function() {
+      return "''";
+    };
+
+    /**
+      Override the default buffer for Ember Handlebars. By default, Handlebars
+      creates an empty String at the beginning of each invocation and appends to
+      it. Ember's Handlebars overrides this to append to a single shared buffer.
+
+      @private
+      @method appendToBuffer
+      @param string {String}
+    */
+    EmberHandlebars.JavaScriptCompiler.prototype.appendToBuffer = function(string) {
+      return "data.buffer.push("+string+");";
+    };
+
+    // Hacks ahead:
+    // Handlebars presently has a bug where the `blockHelperMissing` hook
+    // doesn't get passed the name of the missing helper name, but rather
+    // gets passed the value of that missing helper evaluated on the current
+    // context, which is most likely `undefined` and totally useless.
+    //
+    // So we alter the compiled template function to pass the name of the helper
+    // instead, as expected.
+    //
+    // This can go away once the following is closed:
+    // https://github.com/wycats/handlebars.js/issues/634
+
+    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
+        BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
+        INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+
+    EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
+      var helperInvocation = source[source.length - 1],
+          helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
+          matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+
+      source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
+    };
+
+    var stringifyBlockHelperMissing = EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation;
+
+    var originalBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.blockValue;
+    EmberHandlebars.JavaScriptCompiler.prototype.blockValue = function() {
+      originalBlockValue.apply(this, arguments);
+      stringifyBlockHelperMissing(this.source);
+    };
+
+    var originalAmbiguousBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue;
+    EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue = function() {
+      originalAmbiguousBlockValue.apply(this, arguments);
+      stringifyBlockHelperMissing(this.source);
+    };
+
+    /**
+      Rewrite simple mustaches from `{{foo}}` to `{{bind "foo"}}`. This means that
+      all simple mustaches in Ember's Handlebars will also set up an observer to
+      keep the DOM up to date when the underlying property changes.
+
+      @private
+      @method mustache
+      @for Ember.Handlebars.Compiler
+      @param mustache
+    */
+    EmberHandlebars.Compiler.prototype.mustache = function(mustache) {
+      if (!(mustache.params.length || mustache.hash)) {
+        var id = new Handlebars.AST.IdNode([{ part: '_triageMustache' }]);
+
+        // Update the mustache node to include a hash value indicating whether the original node
+        // was escaped. This will allow us to properly escape values when the underlying value
+        // changes and we need to re-render the value.
+        if (!mustache.escaped) {
+          mustache.hash = mustache.hash || new Handlebars.AST.HashNode([]);
+          mustache.hash.pairs.push(["unescaped", new Handlebars.AST.StringNode("true")]);
+        }
+        mustache = new Handlebars.AST.MustacheNode([id].concat([mustache.id]), mustache.hash, !mustache.escaped);
+      }
+
+      return Handlebars.Compiler.prototype.mustache.call(this, mustache);
+    };
+
+    /**
+      Used for precompilation of Ember Handlebars templates. This will not be used
+      during normal app execution.
+
+      @method precompile
+      @for Ember.Handlebars
+      @static
+      @param {String} string The template to precompile
+      @param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
+                                compiled template should be returned as an Object or a String
+    */
+    EmberHandlebars.precompile = function(string, asObject) {
+      var ast = Handlebars.parse(string);
+
+      var options = {
+        knownHelpers: {
+          action: true,
+          unbound: true,
+          'bind-attr': true,
+          template: true,
+          view: true,
+          _triageMustache: true
+        },
+        data: true,
+        stringParams: true
+      };
+
+      asObject = asObject === undefined ? true : asObject;
+
+      var environment = new EmberHandlebars.Compiler().compile(ast, options);
+      return new EmberHandlebars.JavaScriptCompiler().compile(environment, options, undefined, asObject);
+    };
+
+    // We don't support this for Handlebars runtime-only
+    if (Handlebars.compile) {
+      /**
+        The entry point for Ember Handlebars. This replaces the default
+        `Handlebars.compile` and turns on template-local data and String
+        parameters.
+
+        @method compile
+        @for Ember.Handlebars
+        @static
+        @param {String} string The template to compile
+        @return {Function}
+      */
+      EmberHandlebars.compile = function(string) {
+        var ast = Handlebars.parse(string);
+        var options = { data: true, stringParams: true };
+        var environment = new EmberHandlebars.Compiler().compile(ast, options);
+        var templateSpec = new EmberHandlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
+
+        var template = EmberHandlebars.template(templateSpec);
+        template.isMethod = false; //Make sure we don't wrap templates with ._super
+
+        return template;
+      };
+    }
+
+    __exports__["default"] = EmberHandlebars;
+  });
+})();
+
+(function() {
+define("ember-handlebars/component_lookup",
+  ["ember-runtime/system/object","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var EmberObject = __dependency1__["default"];
+
+    var ComponentLookup = EmberObject.extend({
+      lookupFactory: function(name, container) {
+
+        container = container || this.container;
+
+        var fullName = 'component:' + name,
+            templateFullName = 'template:components/' + name,
+            templateRegistered = container && container.has(templateFullName);
+
+        if (templateRegistered) {
+          container.injection(fullName, 'layout', templateFullName);
+        }
+
+        var Component = container.lookupFactory(fullName);
+
+        // Only treat as a component if either the component
+        // or a template has been registered.
+        if (templateRegistered || Component) {
+          if (!Component) {
+            container.register(fullName, Ember.Component);
+            Component = container.lookupFactory(fullName);
+          }
+          return Component;
+        }
+      }
+    });
+
+    __exports__["default"] = ComponentLookup;
+  });
+define("ember-handlebars/controls",
+  ["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Checkbox = __dependency1__["default"];
+    var TextField = __dependency2__["default"];
+    var TextArea = __dependency3__["default"];
+
+    var Ember = __dependency4__["default"];
+    // Ember.assert
+    // var emberAssert = Ember.assert;
+
+    var EmberHandlebars = __dependency5__["default"];
+    var helpers = EmberHandlebars.helpers;
+    /**
+    @module ember
+    @submodule ember-handlebars-compiler
+    */
+
+    /**
+
+      The `{{input}}` helper inserts an HTML `<input>` tag into the template,
+      with a `type` value of either `text` or `checkbox`. If no `type` is provided,
+      `text` will be the default value applied. The attributes of `{{input}}`
+      match those of the native HTML tag as closely as possible for these two types.
+
+      ## Use as text field
+      An `{{input}}` with no `type` or a `type` of `text` will render an HTML text input.
+      The following HTML attributes can be set via the helper:
+
+     <table>
+      <tr><td>`readonly`</td><td>`required`</td><td>`autofocus`</td></tr>
+      <tr><td>`value`</td><td>`placeholder`</td><td>`disabled`</td></tr>
+      <tr><td>`size`</td><td>`tabindex`</td><td>`maxlength`</td></tr>
+      <tr><td>`name`</td><td>`min`</td><td>`max`</td></tr>
+      <tr><td>`pattern`</td><td>`accept`</td><td>`autocomplete`</td></tr>
+      <tr><td>`autosave`</td><td>`formaction`</td><td>`formenctype`</td></tr>
+      <tr><td>`formmethod`</td><td>`formnovalidate`</td><td>`formtarget`</td></tr>
+      <tr><td>`height`</td><td>`inputmode`</td><td>`multiple`</td></tr>
+      <tr><td>`step`</td><td>`width`</td><td>`form`</td></tr>
+      <tr><td>`selectionDirection`</td><td>`spellcheck`</td><td>&nbsp;</td></tr>
+     </table>
+
+
+      When set to a quoted string, these values will be directly applied to the HTML
+      element. When left unquoted, these values will be bound to a property on the
+      template's current rendering context (most typically a controller instance).
+
+      ## Unbound:
+
+      ```handlebars
+      {{input value="http://www.facebook.com"}}
+      ```
+
+
+      ```html
+      <input type="text" value="http://www.facebook.com"/>
+      ```
+
+      ## Bound:
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        firstName: "Stanley",
+        entryNotAllowed: true
+      });
+      ```
+
+
+      ```handlebars
+      {{input type="text" value=firstName disabled=entryNotAllowed size="50"}}
+      ```
+
+
+      ```html
+      <input type="text" value="Stanley" disabled="disabled" size="50"/>
+      ```
+
+      ## Extension
+
+      Internally, `{{input type="text"}}` creates an instance of `Ember.TextField`, passing
+      arguments from the helper to `Ember.TextField`'s `create` method. You can extend the
+      capabilities of text inputs in your applications by reopening this class. For example,
+      if you are building a Bootstrap project where `data-*` attributes are used, you
+      can add one to the `TextField`'s `attributeBindings` property:
+
+
+      ```javascript
+      Ember.TextField.reopen({
+        attributeBindings: ['data-error']
+      });
+      ```
+
+      Keep in mind when writing `Ember.TextField` subclasses that `Ember.TextField`
+      itself extends `Ember.Component`, meaning that it does NOT inherit
+      the `controller` of the parent view.
+
+      See more about [Ember components](api/classes/Ember.Component.html)
+
+
+      ## Use as checkbox
+
+      An `{{input}}` with a `type` of `checkbox` will render an HTML checkbox input.
+      The following HTML attributes can be set via the helper:
+
+    * `checked`
+    * `disabled`
+    * `tabindex`
+    * `indeterminate`
+    * `name`
+    * `autofocus`
+    * `form`
+
+
+      When set to a quoted string, these values will be directly applied to the HTML
+      element. When left unquoted, these values will be bound to a property on the
+      template's current rendering context (most typically a controller instance).
+
+      ## Unbound:
+
+      ```handlebars
+      {{input type="checkbox" name="isAdmin"}}
+      ```
+
+      ```html
+      <input type="checkbox" name="isAdmin" />
+      ```
+
+      ## Bound:
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        isAdmin: true
+      });
+      ```
+
+
+      ```handlebars
+      {{input type="checkbox" checked=isAdmin }}
+      ```
+
+
+      ```html
+      <input type="checkbox" checked="checked" />
+      ```
+
+      ## Extension
+
+      Internally, `{{input type="checkbox"}}` creates an instance of `Ember.Checkbox`, passing
+      arguments from the helper to `Ember.Checkbox`'s `create` method. You can extend the
+      capablilties of checkbox inputs in your applications by reopening this class. For example,
+      if you wanted to add a css class to all checkboxes in your application:
+
+
+      ```javascript
+      Ember.Checkbox.reopen({
+        classNames: ['my-app-checkbox']
+      });
+      ```
+
+
+      @method input
+      @for Ember.Handlebars.helpers
+      @param {Hash} options
+    */
+    function inputHelper(options) {
+      
+      var hash = options.hash,
+          types = options.hashTypes,
+          inputType = hash.type,
+          onEvent = hash.on;
+
+      delete hash.type;
+      delete hash.on;
+
+      if (inputType === 'checkbox') {
+                return helpers.view.call(this, Checkbox, options);
+      } else {
+        if (inputType) { hash.type = inputType; }
+        hash.onEvent = onEvent || 'enter';
+        return helpers.view.call(this, TextField, options);
+      }
+    }
+
+    /**
+      `{{textarea}}` inserts a new instance of `<textarea>` tag into the template.
+      The attributes of `{{textarea}}` match those of the native HTML tags as
+      closely as possible.
+
+      The following HTML attributes can be set:
+
+        * `value`
+        * `name`
+        * `rows`
+        * `cols`
+        * `placeholder`
+        * `disabled`
+        * `maxlength`
+        * `tabindex`
+        * `selectionEnd`
+        * `selectionStart`
+        * `selectionDirection`
+        * `wrap`
+        * `readonly`
+        * `autofocus`
+        * `form`
+        * `spellcheck`
+        * `required`
+
+      When set to a quoted string, these value will be directly applied to the HTML
+      element. When left unquoted, these values will be bound to a property on the
+      template's current rendering context (most typically a controller instance).
+
+      Unbound:
+
+      ```handlebars
+      {{textarea value="Lots of static text that ISN'T bound"}}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <textarea class="ember-text-area">
+        Lots of static text that ISN'T bound
+      </textarea>
+      ```
+
+      Bound:
+
+      In the following example, the `writtenWords` property on `App.ApplicationController`
+      will be updated live as the user types 'Lots of text that IS bound' into
+      the text area of their browser's window.
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        writtenWords: "Lots of text that IS bound"
+      });
+      ```
+
+      ```handlebars
+      {{textarea value=writtenWords}}
+      ```
+
+       Would result in the following HTML:
+
+      ```html
+      <textarea class="ember-text-area">
+        Lots of text that IS bound
+      </textarea>
+      ```
+
+      If you wanted a one way binding between the text area and a div tag
+      somewhere else on your screen, you could use `Ember.computed.oneWay`:
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        writtenWords: "Lots of text that IS bound",
+        outputWrittenWords: Ember.computed.oneWay("writtenWords")
+      });
+      ```
+
+      ```handlebars
+      {{textarea value=writtenWords}}
+
+      <div>
+        {{outputWrittenWords}}
+      </div>
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <textarea class="ember-text-area">
+        Lots of text that IS bound
+      </textarea>
+
+      <-- the following div will be updated in real time as you type -->
+
+      <div>
+        Lots of text that IS bound
+      </div>
+      ```
+
+      Finally, this example really shows the power and ease of Ember when two
+      properties are bound to eachother via `Ember.computed.alias`. Type into
+      either text area box and they'll both stay in sync. Note that
+      `Ember.computed.alias` costs more in terms of performance, so only use it when
+      your really binding in both directions:
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        writtenWords: "Lots of text that IS bound",
+        twoWayWrittenWords: Ember.computed.alias("writtenWords")
+      });
+      ```
+
+      ```handlebars
+      {{textarea value=writtenWords}}
+      {{textarea value=twoWayWrittenWords}}
+      ```
+
+      ```html
+      <textarea id="ember1" class="ember-text-area">
+        Lots of text that IS bound
+      </textarea>
+
+      <-- both updated in real time -->
+
+      <textarea id="ember2" class="ember-text-area">
+        Lots of text that IS bound
+      </textarea>
+      ```
+
+      ## Extension
+
+      Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
+      arguments from the helper to `Ember.TextArea`'s `create` method. You can
+      extend the capabilities of text areas in your application by reopening this
+      class. For example, if you are building a Bootstrap project where `data-*` 
+      attributes are used, you can globally add support for a `data-*` attribute
+      on all `{{textarea}}`s' in your app by reopening `Ember.TextArea` or
+      `Ember.TextSupport` and adding it to the `attributeBindings` concatenated
+      property:
+
+      ```javascript
+      Ember.TextArea.reopen({
+        attributeBindings: ['data-error']
+      });
+      ```
+
+      Keep in mind when writing `Ember.TextArea` subclasses that `Ember.TextArea`
+      itself extends `Ember.Component`, meaning that it does NOT inherit
+      the `controller` of the parent view.
+
+      See more about [Ember components](api/classes/Ember.Component.html)
+
+      @method textarea
+      @for Ember.Handlebars.helpers
+      @param {Hash} options
+    */
+    function textareaHelper(options) {
+      
+      var hash = options.hash,
+          types = options.hashTypes;
+
+      return helpers.view.call(this, TextArea, options);
+    }
+
+    __exports__.inputHelper = inputHelper;
+    __exports__.textareaHelper = textareaHelper;
+  });
+define("ember-handlebars/controls/checkbox",
+  ["ember-metal/property_get","ember-metal/property_set","ember-views/views/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var View = __dependency3__.View;
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    /**
+      The internal class used to create text inputs when the `{{input}}`
+      helper is used with `type` of `checkbox`.
+
+      See [handlebars.helpers.input](/api/classes/Ember.Handlebars.helpers.html#method_input)  for usage details.
+
+      ## Direct manipulation of `checked`
+
+      The `checked` attribute of an `Ember.Checkbox` object should always be set
+      through the Ember object or by interacting with its rendered element
+      representation via the mouse, keyboard, or touch. Updating the value of the
+      checkbox via jQuery will result in the checked value of the object and its
+      element losing synchronization.
+
+      ## Layout and LayoutName properties
+
+      Because HTML `input` elements are self closing `layout` and `layoutName`
+      properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+      layout section for more information.
+
+      @class Checkbox
+      @namespace Ember
+      @extends Ember.View
+    */
+    var Checkbox = View.extend({
+      instrumentDisplay: '{{input type="checkbox"}}',
+
+      classNames: ['ember-checkbox'],
+
+      tagName: 'input',
+
+      attributeBindings: ['type', 'checked', 'indeterminate', 'disabled', 'tabindex', 'name',
+                          'autofocus', 'required', 'form'],
+
+      type: "checkbox",
+      checked: false,
+      disabled: false,
+      indeterminate: false,
+
+      init: function() {
+        this._super();
+        this.on("change", this, this._updateElementValue);
+      },
+
+      didInsertElement: function() {
+        this._super();
+        get(this, 'element').indeterminate = !!get(this, 'indeterminate');
+      },
+
+      _updateElementValue: function() {
+        set(this, 'checked', this.$().prop('checked'));
+      }
+    });
+
+    __exports__["default"] = Checkbox;
+  });
+define("ember-handlebars/controls/select",
+  ["ember-handlebars-compiler","ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    /*jshint eqeqeq:false newcap:false */
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var EmberHandlebars = __dependency1__["default"];
+    var EnumerableUtils = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var View = __dependency5__.View;
+    var CollectionView = __dependency6__["default"];
+    var isArray = __dependency7__.isArray;
+    var isNone = __dependency8__["default"];
+    var computed = __dependency9__.computed;
+    var A = __dependency10__.A;
+    var observer = __dependency11__.observer;
+    var defineProperty = __dependency12__.defineProperty;
+
+    var indexOf = EnumerableUtils.indexOf,
+        indexesOf = EnumerableUtils.indexesOf,
+        forEach = EnumerableUtils.forEach,
+        replace = EnumerableUtils.replace,
+        precompileTemplate = EmberHandlebars.compile;
+
+    var SelectOption = View.extend({
+      instrumentDisplay: 'Ember.SelectOption',
+
+      tagName: 'option',
+      attributeBindings: ['value', 'selected'],
+
+      defaultTemplate: function(context, options) {
+        options = { data: options.data, hash: {} };
+        EmberHandlebars.helpers.bind.call(context, "view.label", options);
+      },
+
+      init: function() {
+        this.labelPathDidChange();
+        this.valuePathDidChange();
+
+        this._super();
+      },
+
+      selected: computed(function() {
+        var content = get(this, 'content'),
+            selection = get(this, 'parentView.selection');
+        if (get(this, 'parentView.multiple')) {
+          return selection && indexOf(selection, content.valueOf()) > -1;
+        } else {
+          // Primitives get passed through bindings as objects... since
+          // `new Number(4) !== 4`, we use `==` below
+          return content == selection;
+        }
+      }).property('content', 'parentView.selection'),
+
+      labelPathDidChange: observer('parentView.optionLabelPath', function() {
+        var labelPath = get(this, 'parentView.optionLabelPath');
+
+        if (!labelPath) { return; }
+
+        defineProperty(this, 'label', computed(function() {
+          return get(this, labelPath);
+        }).property(labelPath));
+      }),
+
+      valuePathDidChange: observer('parentView.optionValuePath', function() {
+        var valuePath = get(this, 'parentView.optionValuePath');
+
+        if (!valuePath) { return; }
+
+        defineProperty(this, 'value', computed(function() {
+          return get(this, valuePath);
+        }).property(valuePath));
+      })
+    });
+
+    var SelectOptgroup = CollectionView.extend({
+      instrumentDisplay: 'Ember.SelectOptgroup',
+
+      tagName: 'optgroup',
+      attributeBindings: ['label'],
+
+      selectionBinding: 'parentView.selection',
+      multipleBinding: 'parentView.multiple',
+      optionLabelPathBinding: 'parentView.optionLabelPath',
+      optionValuePathBinding: 'parentView.optionValuePath',
+
+      itemViewClassBinding: 'parentView.optionView'
+    });
+
+    /**
+      The `Ember.Select` view class renders a
+      [select](https://developer.mozilla.org/en/HTML/Element/select) HTML element,
+      allowing the user to choose from a list of options.
+
+      The text and `value` property of each `<option>` element within the
+      `<select>` element are populated from the objects in the `Element.Select`'s
+      `content` property. The underlying data object of the selected `<option>` is
+      stored in the `Element.Select`'s `value` property.
+
+      ## The Content Property (array of strings)
+
+      The simplest version of an `Ember.Select` takes an array of strings as its
+      `content` property. The string will be used as both the `value` property and
+      the inner text of each `<option>` element inside the rendered `<select>`.
+
+      Example:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        names: ["Yehuda", "Tom"]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select content=names}}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <select class="ember-select">
+        <option value="Yehuda">Yehuda</option>
+        <option value="Tom">Tom</option>
+      </select>
+      ```
+
+      You can control which `<option>` is selected through the `Ember.Select`'s
+      `value` property:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        selectedName: 'Tom',
+        names: ["Yehuda", "Tom"]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=names
+             value=selectedName
+      }}
+      ```
+
+      Would result in the following HTML with the `<option>` for 'Tom' selected:
+
+      ```html
+      <select class="ember-select">
+        <option value="Yehuda">Yehuda</option>
+        <option value="Tom" selected="selected">Tom</option>
+      </select>
+      ```
+
+      A user interacting with the rendered `<select>` to choose "Yehuda" would
+      update the value of `selectedName` to "Yehuda".
+
+      ## The Content Property (array of Objects)
+
+      An `Ember.Select` can also take an array of JavaScript or Ember objects as
+      its `content` property.
+
+      When using objects you need to tell the `Ember.Select` which property should
+      be accessed on each object to supply the `value` attribute of the `<option>`
+      and which property should be used to supply the element text.
+
+      The `optionValuePath` option is used to specify the path on each object to
+      the desired property for the `value` attribute. The `optionLabelPath`
+      specifies the path on each object to the desired property for the
+      element's text. Both paths must reference each object itself as `content`:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        programmers: [
+          {firstName: "Yehuda", id: 1},
+          {firstName: "Tom",    id: 2}
+        ]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=programmers
+             optionValuePath="content.id"
+             optionLabelPath="content.firstName"}}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <select class="ember-select">
+        <option value="1">Yehuda</option>
+        <option value="2">Tom</option>
+      </select>
+      ```
+
+      The `value` attribute of the selected `<option>` within an `Ember.Select`
+      can be bound to a property on another object:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        programmers: [
+          {firstName: "Yehuda", id: 1},
+          {firstName: "Tom",    id: 2}
+        ],
+        currentProgrammer: {
+          id: 2
+        }
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=programmers
+             optionValuePath="content.id"
+             optionLabelPath="content.firstName"
+             value=currentProgrammer.id}}
+      ```
+
+      Would result in the following HTML with a selected option:
+
+      ```html
+      <select class="ember-select">
+        <option value="1">Yehuda</option>
+        <option value="2" selected="selected">Tom</option>
+      </select>
+      ```
+
+      Interacting with the rendered element by selecting the first option
+      ('Yehuda') will update the `id` of `currentProgrammer`
+      to match the `value` property of the newly selected `<option>`.
+
+      Alternatively, you can control selection through the underlying objects
+      used to render each object by binding the `selection` option. When the selected
+      `<option>` is changed, the property path provided to `selection`
+      will be updated to match the content object of the rendered `<option>`
+      element:
+
+      ```javascript
+
+      var yehuda = {firstName: "Yehuda", id: 1, bff4eva: 'tom'}
+      var tom = {firstName: "Tom", id: 2, bff4eva: 'yehuda'};
+
+      App.ApplicationController = Ember.ObjectController.extend({
+        selectedPerson: tom,
+        programmers: [
+          yehuda,
+          tom
+        ]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=programmers
+             optionValuePath="content.id"
+             optionLabelPath="content.firstName"
+             selection=selectedPerson}}
+      ```
+
+      Would result in the following HTML with a selected option:
+
+      ```html
+      <select class="ember-select">
+        <option value="1">Yehuda</option>
+        <option value="2" selected="selected">Tom</option>
+      </select>
+      ```
+
+      Interacting with the rendered element by selecting the first option
+      ('Yehuda') will update the `selectedPerson` to match the object of
+      the newly selected `<option>`. In this case it is the first object
+      in the `programmers`
+
+      ## Supplying a Prompt
+
+      A `null` value for the `Ember.Select`'s `value` or `selection` property
+      results in there being no `<option>` with a `selected` attribute:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        selectedProgrammer: null,
+        programmers: [
+          "Yehuda",
+          "Tom"
+        ]
+      });
+      ```
+
+      ``` handlebars
+      {{view Ember.Select
+             content=programmers
+             value=selectedProgrammer
+      }}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <select class="ember-select">
+        <option value="Yehuda">Yehuda</option>
+        <option value="Tom">Tom</option>
+      </select>
+      ```
+
+      Although `selectedProgrammer` is `null` and no `<option>`
+      has a `selected` attribute the rendered HTML will display the
+      first item as though it were selected. You can supply a string
+      value for the `Ember.Select` to display when there is no selection
+      with the `prompt` option:
+
+      ```javascript
+      App.ApplicationController = Ember.ObjectController.extend({
+        selectedProgrammer: null,
+        programmers: [
+          "Yehuda",
+          "Tom"
+        ]
+      });
+      ```
+
+      ```handlebars
+      {{view Ember.Select
+             content=programmers
+             value=selectedProgrammer
+             prompt="Please select a name"
+      }}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+      <select class="ember-select">
+        <option>Please select a name</option>
+        <option value="Yehuda">Yehuda</option>
+        <option value="Tom">Tom</option>
+      </select>
+      ```
+
+      @class Select
+      @namespace Ember
+      @extends Ember.View
+    */
+    var Select = View.extend({
+      instrumentDisplay: 'Ember.Select',
+
+      tagName: 'select',
+      classNames: ['ember-select'],
+      defaultTemplate: Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) {
+this.compilerInfo = [4,'>= 1.0.0'];
+helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {};
+  var buffer = '', stack1, escapeExpression=this.escapeExpression, self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = '', stack1;
+  data.buffer.push("<option value=\"\">");
+  stack1 = helpers._triageMustache.call(depth0, "view.prompt", {hash:{},hashTypes:{},hashContexts:{},contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  data.buffer.push("</option>");
+  return buffer;
+  }
+
+function program3(depth0,data) {
+  
+  var stack1;
+  stack1 = helpers.each.call(depth0, "view.groupedContent", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(4, program4, data),contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  else { data.buffer.push(''); }
+  }
+function program4(depth0,data) {
+  
+  
+  data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.groupView", {hash:{
+    'content': ("content"),
+    'label': ("label")
+  },hashTypes:{'content': "ID",'label': "ID"},hashContexts:{'content': depth0,'label': depth0},contexts:[depth0],types:["ID"],data:data})));
+  }
+
+function program6(depth0,data) {
+  
+  var stack1;
+  stack1 = helpers.each.call(depth0, "view.content", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(7, program7, data),contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  else { data.buffer.push(''); }
+  }
+function program7(depth0,data) {
+  
+  
+  data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.optionView", {hash:{
+    'content': ("")
+  },hashTypes:{'content': "ID"},hashContexts:{'content': depth0},contexts:[depth0],types:["ID"],data:data})));
+  }
+
+  stack1 = helpers['if'].call(depth0, "view.prompt", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(1, program1, data),contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  stack1 = helpers['if'].call(depth0, "view.optionGroupPath", {hash:{},hashTypes:{},hashContexts:{},inverse:self.program(6, program6, data),fn:self.program(3, program3, data),contexts:[depth0],types:["ID"],data:data});
+  if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+  return buffer;
+  
+}),
+      attributeBindings: ['multiple', 'disabled', 'tabindex', 'name', 'required', 'autofocus',
+                          'form', 'size'],
+
+      /**
+        The `multiple` attribute of the select element. Indicates whether multiple
+        options can be selected.
+
+        @property multiple
+        @type Boolean
+        @default false
+      */
+      multiple: false,
+
+      /**
+        The `disabled` attribute of the select element. Indicates whether
+        the element is disabled from interactions.
+
+        @property disabled
+        @type Boolean
+        @default false
+      */
+      disabled: false,
+
+      /**
+        The `required` attribute of the select element. Indicates whether
+        a selected option is required for form validation.
+
+        @property required
+        @type Boolean
+        @default false
+        @since 1.5.0
+      */
+      required: false,
+
+      /**
+        The list of options.
+
+        If `optionLabelPath` and `optionValuePath` are not overridden, this should
+        be a list of strings, which will serve simultaneously as labels and values.
+
+        Otherwise, this should be a list of objects. For instance:
+
+        ```javascript
+        Ember.Select.create({
+          content: A([
+              { id: 1, firstName: 'Yehuda' },
+              { id: 2, firstName: 'Tom' }
+            ]),
+          optionLabelPath: 'content.firstName',
+          optionValuePath: 'content.id'
+        });
+        ```
+
+        @property content
+        @type Array
+        @default null
+      */
+      content: null,
+
+      /**
+        When `multiple` is `false`, the element of `content` that is currently
+        selected, if any.
+
+        When `multiple` is `true`, an array of such elements.
+
+        @property selection
+        @type Object or Array
+        @default null
+      */
+      selection: null,
+
+      /**
+        In single selection mode (when `multiple` is `false`), value can be used to
+        get the current selection's value or set the selection by it's value.
+
+        It is not currently supported in multiple selection mode.
+
+        @property value
+        @type String
+        @default null
+      */
+      value: computed(function(key, value) {
+        if (arguments.length === 2) { return value; }
+        var valuePath = get(this, 'optionValuePath').replace(/^content\.?/, '');
+        return valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection');
+      }).property('selection'),
+
+      /**
+        If given, a top-most dummy option will be rendered to serve as a user
+        prompt.
+
+        @property prompt
+        @type String
+        @default null
+      */
+      prompt: null,
+
+      /**
+        The path of the option labels. See [content](/api/classes/Ember.Select.html#property_content).
+
+        @property optionLabelPath
+        @type String
+        @default 'content'
+      */
+      optionLabelPath: 'content',
+
+      /**
+        The path of the option values. See [content](/api/classes/Ember.Select.html#property_content).
+
+        @property optionValuePath
+        @type String
+        @default 'content'
+      */
+      optionValuePath: 'content',
+
+      /**
+        The path of the option group.
+        When this property is used, `content` should be sorted by `optionGroupPath`.
+
+        @property optionGroupPath
+        @type String
+        @default null
+      */
+      optionGroupPath: null,
+
+      /**
+        The view class for optgroup.
+
+        @property groupView
+        @type Ember.View
+        @default Ember.SelectOptgroup
+      */
+      groupView: SelectOptgroup,
+
+      groupedContent: computed(function() {
+        var groupPath = get(this, 'optionGroupPath');
+        var groupedContent = A();
+        var content = get(this, 'content') || [];
+
+        forEach(content, function(item) {
+          var label = get(item, groupPath);
+
+          if (get(groupedContent, 'lastObject.label') !== label) {
+            groupedContent.pushObject({
+              label: label,
+              content: A()
+            });
+          }
+
+          get(groupedContent, 'lastObject.content').push(item);
+        });
+
+        return groupedContent;
+      }).property('optionGroupPath', 'content.@each'),
+
+      /**
+        The view class for option.
+
+        @property optionView
+        @type Ember.View
+        @default Ember.SelectOption
+      */
+      optionView: SelectOption,
+
+      _change: function() {
+        if (get(this, 'multiple')) {
+          this._changeMultiple();
+        } else {
+          this._changeSingle();
+        }
+      },
+
+      selectionDidChange: observer('selection.@each', function() {
+        var selection = get(this, 'selection');
+        if (get(this, 'multiple')) {
+          if (!isArray(selection)) {
+            set(this, 'selection', A([selection]));
+            return;
+          }
+          this._selectionDidChangeMultiple();
+        } else {
+          this._selectionDidChangeSingle();
+        }
+      }),
+
+      valueDidChange: observer('value', function() {
+        var content = get(this, 'content'),
+            value = get(this, 'value'),
+            valuePath = get(this, 'optionValuePath').replace(/^content\.?/, ''),
+            selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection')),
+            selection;
+
+        if (value !== selectedValue) {
+          selection = content ? content.find(function(obj) {
+            return value === (valuePath ? get(obj, valuePath) : obj);
+          }) : null;
+
+          this.set('selection', selection);
+        }
+      }),
+
+
+      _triggerChange: function() {
+        var selection = get(this, 'selection');
+        var value = get(this, 'value');
+
+        if (!isNone(selection)) { this.selectionDidChange(); }
+        if (!isNone(value)) { this.valueDidChange(); }
+
+        this._change();
+      },
+
+      _changeSingle: function() {
+        var selectedIndex = this.$()[0].selectedIndex,
+            content = get(this, 'content'),
+            prompt = get(this, 'prompt');
+
+        if (!content || !get(content, 'length')) { return; }
+        if (prompt && selectedIndex === 0) { set(this, 'selection', null); return; }
+
+        if (prompt) { selectedIndex -= 1; }
+        set(this, 'selection', content.objectAt(selectedIndex));
+      },
+
+
+      _changeMultiple: function() {
+        var options = this.$('option:selected'),
+            prompt = get(this, 'prompt'),
+            offset = prompt ? 1 : 0,
+            content = get(this, 'content'),
+            selection = get(this, 'selection');
+
+        if (!content) { return; }
+        if (options) {
+          var selectedIndexes = options.map(function() {
+            return this.index - offset;
+          }).toArray();
+          var newSelection = content.objectsAt(selectedIndexes);
+
+          if (isArray(selection)) {
+            replace(selection, 0, get(selection, 'length'), newSelection);
+          } else {
+            set(this, 'selection', newSelection);
+          }
+        }
+      },
+
+      _selectionDidChangeSingle: function() {
+        var el = this.get('element');
+        if (!el) { return; }
+
+        var content = get(this, 'content'),
+            selection = get(this, 'selection'),
+            selectionIndex = content ? indexOf(content, selection) : -1,
+            prompt = get(this, 'prompt');
+
+        if (prompt) { selectionIndex += 1; }
+        if (el) { el.selectedIndex = selectionIndex; }
+      },
+
+      _selectionDidChangeMultiple: function() {
+        var content = get(this, 'content'),
+            selection = get(this, 'selection'),
+            selectedIndexes = content ? indexesOf(content, selection) : [-1],
+            prompt = get(this, 'prompt'),
+            offset = prompt ? 1 : 0,
+            options = this.$('option'),
+            adjusted;
+
+        if (options) {
+          options.each(function() {
+            adjusted = this.index > -1 ? this.index - offset : -1;
+            this.selected = indexOf(selectedIndexes, adjusted) > -1;
+          });
+        }
+      },
+
+      init: function() {
+        this._super();
+        this.on("didInsertElement", this, this._triggerChange);
+        this.on("change", this, this._change);
+      }
+    });
+
+    __exports__["default"] = Select
+    __exports__.Select = Select;
+    __exports__.SelectOption = SelectOption;
+    __exports__.SelectOptgroup = SelectOptgroup;
+  });
+define("ember-handlebars/controls/text_area",
+  ["ember-metal/property_get","ember-views/views/component","ember-handlebars/controls/text_support","ember-metal/mixin","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+    var get = __dependency1__.get;
+    var Component = __dependency2__["default"];
+    var TextSupport = __dependency3__["default"];
+    var observer = __dependency4__.observer;
+
+    /**
+      The internal class used to create textarea element when the `{{textarea}}`
+      helper is used.
+
+      See [handlebars.helpers.textarea](/api/classes/Ember.Handlebars.helpers.html#method_textarea)  for usage details.
+
+      ## Layout and LayoutName properties
+
+      Because HTML `textarea` elements do not contain inner HTML the `layout` and
+      `layoutName` properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+      layout section for more information.
+
+      @class TextArea
+      @namespace Ember
+      @extends Ember.Component
+      @uses Ember.TextSupport
+    */
+    var TextArea = Component.extend(TextSupport, {
+      instrumentDisplay: '{{textarea}}',
+
+      classNames: ['ember-text-area'],
+
+      tagName: "textarea",
+      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap'],
+      rows: null,
+      cols: null,
+
+      _updateElementValue: observer('value', function() {
+        // We do this check so cursor position doesn't get affected in IE
+        var value = get(this, 'value'),
+            $el = this.$();
+        if ($el && value !== $el.val()) {
+          $el.val(value);
+        }
+      }),
+
+      init: function() {
+        this._super();
+        this.on("didInsertElement", this, this._updateElementValue);
+      }
+
+    });
+
+    __exports__["default"] = TextArea;
+  });
+define("ember-handlebars/controls/text_field",
+  ["ember-metal/property_get","ember-metal/property_set","ember-views/views/component","ember-handlebars/controls/text_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var Component = __dependency3__["default"];
+    var TextSupport = __dependency4__["default"];
+
+    /**
+
+      The internal class used to create text inputs when the `{{input}}`
+      helper is used with `type` of `text`.
+
+      See [Handlebars.helpers.input](/api/classes/Ember.Handlebars.helpers.html#method_input)  for usage details.
+
+      ## Layout and LayoutName properties
+
+      Because HTML `input` elements are self closing `layout` and `layoutName`
+      properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+      layout section for more information.
+
+      @class TextField
+      @namespace Ember
+      @extends Ember.Component
+      @uses Ember.TextSupport
+    */
+    var TextField = Component.extend(TextSupport, {
+      instrumentDisplay: '{{input type="text"}}',
+
+      classNames: ['ember-text-field'],
+      tagName: "input",
+      attributeBindings: ['type', 'value', 'size', 'pattern', 'name', 'min', 'max',
+                          'accept', 'autocomplete', 'autosave', 'formaction',
+                          'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
+                          'height', 'inputmode', 'list', 'multiple', 'pattern', 'step',
+                          'width'],
+
+      /**
+        The `value` attribute of the input element. As the user inputs text, this
+        property is updated live.
+
+        @property value
+        @type String
+        @default ""
+      */
+      value: "",
+
+      /**
+        The `type` attribute of the input element.
+
+        @property type
+        @type String
+        @default "text"
+      */
+      type: "text",
+
+      /**
+        The `size` of the text field in characters.
+
+        @property size
+        @type String
+        @default null
+      */
+      size: null,
+
+      /**
+        The `pattern` attribute of input element.
+
+        @property pattern
+        @type String
+        @default null
+      */
+      pattern: null,
+
+      /**
+        The `min` attribute of input element used with `type="number"` or `type="range"`.
+
+        @property min
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      min: null,
+
+      /**
+        The `max` attribute of input element used with `type="number"` or `type="range"`.
+
+        @property max
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      max: null
+    });
+
+    __exports__["default"] = TextField;
+  });
+define("ember-handlebars/controls/text_support",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/target_action_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var Mixin = __dependency3__.Mixin;
+    var TargetActionSupport = __dependency4__["default"];
+
+    /**
+      Shared mixin used by `Ember.TextField` and `Ember.TextArea`.
+
+      @class TextSupport
+      @namespace Ember
+      @uses Ember.TargetActionSupport
+      @extends Ember.Mixin
+      @private
+    */
+    var TextSupport = Mixin.create(TargetActionSupport, {
+      value: "",
+
+      attributeBindings: ['placeholder', 'disabled', 'maxlength', 'tabindex', 'readonly',
+                          'autofocus', 'form', 'selectionDirection', 'spellcheck', 'required',
+                          'title', 'autocapitalize', 'autocorrect'],
+      placeholder: null,
+      disabled: false,
+      maxlength: null,
+
+      init: function() {
+        this._super();
+        this.on("focusOut", this, this._elementValueDidChange);
+        this.on("change", this, this._elementValueDidChange);
+        this.on("paste", this, this._elementValueDidChange);
+        this.on("cut", this, this._elementValueDidChange);
+        this.on("input", this, this._elementValueDidChange);
+        this.on("keyUp", this, this.interpretKeyEvents);
+      },
+
+      /**
+        The action to be sent when the user presses the return key.
+
+        This is similar to the `{{action}}` helper, but is fired when
+        the user presses the return key when editing a text field, and sends
+        the value of the field as the context.
+
+        @property action
+        @type String
+        @default null
+      */
+      action: null,
+
+      /**
+        The event that should send the action.
+
+        Options are:
+
+        * `enter`: the user pressed enter
+        * `keyPress`: the user pressed a key
+
+        @property onEvent
+        @type String
+        @default enter
+      */
+      onEvent: 'enter',
+
+      /**
+        Whether they `keyUp` event that triggers an `action` to be sent continues
+        propagating to other views.
+
+        By default, when the user presses the return key on their keyboard and
+        the text field has an `action` set, the action will be sent to the view's
+        controller and the key event will stop propagating.
+
+        If you would like parent views to receive the `keyUp` event even after an
+        action has been dispatched, set `bubbles` to true.
+
+        @property bubbles
+        @type Boolean
+        @default false
+      */
+      bubbles: false,
+
+      interpretKeyEvents: function(event) {
+        var map = TextSupport.KEY_EVENTS;
+        var method = map[event.keyCode];
+
+        this._elementValueDidChange();
+        if (method) { return this[method](event); }
+      },
+
+      _elementValueDidChange: function() {
+        set(this, 'value', this.$().val());
+      },
+
+      /**
+        The action to be sent when the user inserts a new line.
+
+        Called by the `Ember.TextSupport` mixin on keyUp if keycode matches 13.
+        Uses sendAction to send the `enter` action to the controller.
+
+        @method insertNewline
+        @param {Event} event
+      */
+      insertNewline: function(event) {
+        sendAction('enter', this, event);
+        sendAction('insert-newline', this, event);
+      },
+
+      /**
+        Called when the user hits escape.
+
+        Called by the `Ember.TextSupport` mixin on keyUp if keycode matches 27.
+        Uses sendAction to send the `escape-press` action to the controller.
+
+        @method cancel
+        @param {Event} event
+      */
+      cancel: function(event) {
+        sendAction('escape-press', this, event);
+      },
+
+      /**
+        Called when the text area is focused.
+
+        @method focusIn
+        @param {Event} event
+      */
+      focusIn: function(event) {
+        sendAction('focus-in', this, event);
+      },
+
+      /**
+        Called when the text area is blurred.
+
+        @method focusOut
+        @param {Event} event
+      */
+      focusOut: function(event) {
+        sendAction('focus-out', this, event);
+      },
+
+      /**
+        The action to be sent when the user presses a key. Enabled by setting
+        the `onEvent` property to `keyPress`.
+
+        Uses sendAction to send the `keyPress` action to the controller.
+
+        @method keyPress
+        @param {Event} event
+      */
+      keyPress: function(event) {
+        sendAction('key-press', this, event);
+      }
+
+    });
+
+    TextSupport.KEY_EVENTS = {
+      13: 'insertNewline',
+      27: 'cancel'
+    };
+
+    // In principle, this shouldn't be necessary, but the legacy
+    // sendAction semantics for TextField are different from
+    // the component semantics so this method normalizes them.
+    function sendAction(eventName, view, event) {
+      var action = get(view, eventName),
+          on = get(view, 'onEvent'),
+          value = get(view, 'value');
+
+      // back-compat support for keyPress as an event name even though
+      // it's also a method name that consumes the event (and therefore
+      // incompatible with sendAction semantics).
+      if (on === eventName || (on === 'keyPress' && eventName === 'key-press')) {
+        view.sendAction('action', value);
+      }
+
+      view.sendAction(eventName, value);
+
+      if (action || on === eventName) {
+        if(!get(view, 'bubbles')) {
+          event.stopPropagation();
+        }
+      }
+    }
+
+    __exports__["default"] = TextSupport;
+  });
+define("ember-handlebars/ext",
+  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/binding","ember-metal/error","ember-metal/mixin","ember-metal/is_empty","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
+    // var emberAssert = Ember.assert;
+
+    var fmt = __dependency2__.fmt;
+
+    var EmberHandlebars = __dependency3__["default"];
+    var helpers = EmberHandlebars.helpers;
+
+    var get = __dependency4__.get;
+    var isGlobalPath = __dependency5__.isGlobalPath;
+    var EmberError = __dependency6__["default"];
+    var IS_BINDING = __dependency7__.IS_BINDING;
+
+    // late bound via requireModule because of circular dependencies.
+    var resolveHelper,
+        SimpleHandlebarsView;
+
+    var isEmpty = __dependency8__["default"];
+
+    var slice = [].slice, originalTemplate = EmberHandlebars.template;
+
+    /**
+      If a path starts with a reserved keyword, returns the root
+      that should be used.
+
+      @private
+      @method normalizePath
+      @for Ember
+      @param root {Object}
+      @param path {String}
+      @param data {Hash}
+    */
+    function normalizePath(root, path, data) {
+      var keywords = (data && data.keywords) || {},
+          keyword, isKeyword;
+
+      // Get the first segment of the path. For example, if the
+      // path is "foo.bar.baz", returns "foo".
+      keyword = path.split('.', 1)[0];
+
+      // Test to see if the first path is a keyword that has been
+      // passed along in the view's data hash. If so, we will treat
+      // that object as the new root.
+      if (keywords.hasOwnProperty(keyword)) {
+        // Look up the value in the template's data hash.
+        root = keywords[keyword];
+        isKeyword = true;
+
+        // Handle cases where the entire path is the reserved
+        // word. In that case, return the object itself.
+        if (path === keyword) {
+          path = '';
+        } else {
+          // Strip the keyword from the path and look up
+          // the remainder from the newly found root.
+          path = path.substr(keyword.length+1);
+        }
+      }
+
+      return { root: root, path: path, isKeyword: isKeyword };
+    };
+
+
+    /**
+      Lookup both on root and on window. If the path starts with
+      a keyword, the corresponding object will be looked up in the
+      template's data hash and used to resolve the path.
+
+      @method get
+      @for Ember.Handlebars
+      @param {Object} root The object to look up the property on
+      @param {String} path The path to be lookedup
+      @param {Object} options The template's option hash
+    */
+    function handlebarsGet(root, path, options) {
+      var data = options && options.data,
+          normalizedPath = normalizePath(root, path, data),
+          value;
+
+      
+        root = normalizedPath.root;
+        path = normalizedPath.path;
+
+        value = get(root, path);
+
+        if (value === undefined && root !== Ember.lookup && isGlobalPath(path)) {
+          value = get(Ember.lookup, path);
+        }
+      
+
+      return value;
+    }
+
+    /**
+      This method uses `Ember.Handlebars.get` to lookup a value, then ensures
+      that the value is escaped properly.
+
+      If `unescaped` is a truthy value then the escaping will not be performed.
+
+      @method getEscaped
+      @for Ember.Handlebars
+      @param {Object} root The object to look up the property on
+      @param {String} path The path to be lookedup
+      @param {Object} options The template's option hash
+      @since 1.4.0
+    */
+    function getEscaped(root, path, options) {
+      var result = handlebarsGet(root, path, options);
+
+      if (result === null || result === undefined) {
+        result = "";
+      } else if (!(result instanceof Handlebars.SafeString)) {
+        result = String(result);
+      }
+      if (!options.hash.unescaped){
+        result = Handlebars.Utils.escapeExpression(result);
+      }
+
+      return result;
+    };
+
+    function resolveParams(context, params, options) {
+      var resolvedParams = [], types = options.types, param, type;
+
+      for (var i=0, l=params.length; i<l; i++) {
+        param = params[i];
+        type = types[i];
+
+        if (type === 'ID') {
+          resolvedParams.push(handlebarsGet(context, param, options));
+        } else {
+          resolvedParams.push(param);
+        }
+      }
+
+      return resolvedParams;
+    };
+
+    function resolveHash(context, hash, options) {
+      var resolvedHash = {}, types = options.hashTypes, type;
+
+      for (var key in hash) {
+        if (!hash.hasOwnProperty(key)) { continue; }
+
+        type = types[key];
+
+        if (type === 'ID') {
+          resolvedHash[key] = handlebarsGet(context, hash[key], options);
+        } else {
+          resolvedHash[key] = hash[key];
+        }
+      }
+
+      return resolvedHash;
+    };
+
+    /**
+      Registers a helper in Handlebars that will be called if no property with the
+      given name can be found on the current context object, and no helper with
+      that name is registered.
+
+      This throws an exception with a more helpful error message so the user can
+      track down where the problem is happening.
+
+      @private
+      @method helperMissing
+      @for Ember.Handlebars.helpers
+      @param {String} path
+      @param {Hash} options
+    */
+    function helperMissingHelper(path) {
+      if (!resolveHelper) { resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper']; } // ES6TODO: stupid circular dep
+
+      var error, view = "";
+
+      var options = arguments[arguments.length - 1];
+
+      var helper = resolveHelper(options.data.view.container, path);
+
+      if (helper) {
+        return helper.apply(this, slice.call(arguments, 1));
+      }
+
+      error = "%@ Handlebars error: Could not find property '%@' on object %@.";
+      if (options.data) {
+        view = options.data.view;
+      }
+      throw new EmberError(fmt(error, [view, path, this]));
+    }
+
+    /**
+      Registers a helper in Handlebars that will be called if no property with the
+      given name can be found on the current context object, and no helper with
+      that name is registered.
+
+      This throws an exception with a more helpful error message so the user can
+      track down where the problem is happening.
+
+      @private
+      @method helperMissing
+      @for Ember.Handlebars.helpers
+      @param {String} path
+      @param {Hash} options
+    */
+    function blockHelperMissingHelper(path) {
+      if (!resolveHelper) { resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper']; } // ES6TODO: stupid circular dep
+
+      var options = arguments[arguments.length - 1];
+
+      
+      var helper = resolveHelper(options.data.view.container, path);
+
+      if (helper) {
+        return helper.apply(this, slice.call(arguments, 1));
+      } else {
+        return helpers.helperMissing.call(this, path);
+      }
+    }
+
+    /**
+      Register a bound handlebars helper. Bound helpers behave similarly to regular
+      handlebars helpers, with the added ability to re-render when the underlying data
+      changes.
+
+      ## Simple example
+
+      ```javascript
+      Ember.Handlebars.registerBoundHelper('capitalize', function(value) {
+        return Ember.String.capitalize(value);
+      });
+      ```
+
+      The above bound helper can be used inside of templates as follows:
+
+      ```handlebars
+      {{capitalize name}}
+      ```
+
+      In this case, when the `name` property of the template's context changes,
+      the rendered value of the helper will update to reflect this change.
+
+      ## Example with options
+
+      Like normal handlebars helpers, bound helpers have access to the options
+      passed into the helper call.
+
+      ```javascript
+      Ember.Handlebars.registerBoundHelper('repeat', function(value, options) {
+        var count = options.hash.count;
+        var a = [];
+        while(a.length < count) {
+            a.push(value);
+        }
+        return a.join('');
+      });
+      ```
+
+      This helper could be used in a template as follows:
+
+      ```handlebars
+      {{repeat text count=3}}
+      ```
+
+      ## Example with bound options
+
+      Bound hash options are also supported. Example:
+
+      ```handlebars
+      {{repeat text count=numRepeats}}
+      ```
+
+      In this example, count will be bound to the value of
+      the `numRepeats` property on the context. If that property
+      changes, the helper will be re-rendered.
+
+      ## Example with extra dependencies
+
+      The `Ember.Handlebars.registerBoundHelper` method takes a variable length
+      third parameter which indicates extra dependencies on the passed in value.
+      This allows the handlebars helper to update when these dependencies change.
+
+      ```javascript
+      Ember.Handlebars.registerBoundHelper('capitalizeName', function(value) {
+        return value.get('name').toUpperCase();
+      }, 'name');
+      ```
+
+      ## Example with multiple bound properties
+
+      `Ember.Handlebars.registerBoundHelper` supports binding to
+      multiple properties, e.g.:
+
+      ```javascript
+      Ember.Handlebars.registerBoundHelper('concatenate', function() {
+        var values = Array.prototype.slice.call(arguments, 0, -1);
+        return values.join('||');
+      });
+      ```
+
+      Which allows for template syntax such as `{{concatenate prop1 prop2}}` or
+      `{{concatenate prop1 prop2 prop3}}`. If any of the properties change,
+      the helper will re-render.  Note that dependency keys cannot be
+      using in conjunction with multi-property helpers, since it is ambiguous
+      which property the dependent keys would belong to.
+
+      ## Use with unbound helper
+
+      The `{{unbound}}` helper can be used with bound helper invocations
+      to render them in their unbound form, e.g.
+
+      ```handlebars
+      {{unbound capitalize name}}
+      ```
+
+      In this example, if the name property changes, the helper
+      will not re-render.
+
+      ## Use with blocks not supported
+
+      Bound helpers do not support use with Handlebars blocks or
+      the addition of child views of any kind.
+
+      @method registerBoundHelper
+      @for Ember.Handlebars
+      @param {String} name
+      @param {Function} function
+      @param {String} dependentKeys*
+    */
+    function registerBoundHelper(name, fn) {
+      var boundHelperArgs = slice.call(arguments, 1),
+          boundFn = makeBoundHelper.apply(this, boundHelperArgs);
+      EmberHandlebars.registerHelper(name, boundFn);
+    };
+
+    /**
+      A helper function used by `registerBoundHelper`. Takes the
+      provided Handlebars helper function fn and returns it in wrapped
+      bound helper form.
+
+      The main use case for using this outside of `registerBoundHelper`
+      is for registering helpers on the container:
+
+      ```js
+      var boundHelperFn = Ember.Handlebars.makeBoundHelper(function(word) {
+        return word.toUpperCase();
+      });
+
+      container.register('helper:my-bound-helper', boundHelperFn);
+      ```
+
+      In the above example, if the helper function hadn't been wrapped in
+      `makeBoundHelper`, the registered helper would be unbound.
+
+      @method makeBoundHelper
+      @for Ember.Handlebars
+      @param {Function} function
+      @param {String} dependentKeys*
+      @since 1.2.0
+    */
+    function makeBoundHelper(fn) {
+      if (!SimpleHandlebarsView) { SimpleHandlebarsView = requireModule('ember-handlebars/views/handlebars_bound_view')['SimpleHandlebarsView']; } // ES6TODO: stupid circular dep
+
+      var dependentKeys = slice.call(arguments, 1);
+
+      function helper() {
+        var properties = slice.call(arguments, 0, -1),
+          numProperties = properties.length,
+          options = arguments[arguments.length - 1],
+          normalizedProperties = [],
+          data = options.data,
+          types = data.isUnbound ? slice.call(options.types, 1) : options.types,
+          hash = options.hash,
+          view = data.view,
+          contexts = options.contexts,
+          currentContext = (contexts && contexts.length) ? contexts[0] : this,
+          prefixPathForDependentKeys = '',
+          loc, len, hashOption,
+          boundOption, property,
+          normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
+
+        
+        // Detect bound options (e.g. countBinding="otherCount")
+        var boundOptions = hash.boundOptions = {};
+        for (hashOption in hash) {
+          if (IS_BINDING.test(hashOption)) {
+            // Lop off 'Binding' suffix.
+            boundOptions[hashOption.slice(0, -7)] = hash[hashOption];
+          }
+        }
+
+        // Expose property names on data.properties object.
+        var watchedProperties = [];
+        data.properties = [];
+        for (loc = 0; loc < numProperties; ++loc) {
+          data.properties.push(properties[loc]);
+          if (types[loc] === 'ID') {
+            var normalizedProp = normalizePath(currentContext, properties[loc], data);
+            normalizedProperties.push(normalizedProp);
+            watchedProperties.push(normalizedProp);
+          } else {
+            if(data.isUnbound) {
+              normalizedProperties.push({path: properties[loc]});
+            }else {
+              normalizedProperties.push(null);
+            }
+          }
+        }
+
+        // Handle case when helper invocation is preceded by `unbound`, e.g.
+        // {{unbound myHelper foo}}
+        if (data.isUnbound) {
+          return evaluateUnboundHelper(this, fn, normalizedProperties, options);
+        }
+
+        var bindView = new SimpleHandlebarsView(null, null, !options.hash.unescaped, options.data);
+
+        // Override SimpleHandlebarsView's method for generating the view's content.
+        bindView.normalizedValue = function() {
+          var args = [], boundOption;
+
+          // Copy over bound hash options.
+          for (boundOption in boundOptions) {
+            if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
+            property = normalizePath(currentContext, boundOptions[boundOption], data);
+            bindView.path = property.path;
+            bindView.pathRoot = property.root;
+            hash[boundOption] = normalizedValue.call(bindView);
+          }
+
+          for (loc = 0; loc < numProperties; ++loc) {
+            property = normalizedProperties[loc];
+            if (property) {
+              bindView.path = property.path;
+              bindView.pathRoot = property.root;
+              args.push(normalizedValue.call(bindView));
+            } else {
+              args.push(properties[loc]);
+            }
+          }
+          args.push(options);
+
+          // Run the supplied helper function.
+          return fn.apply(currentContext, args);
+        };
+
+        view.appendChild(bindView);
+
+        // Assemble list of watched properties that'll re-render this helper.
+        for (boundOption in boundOptions) {
+          if (boundOptions.hasOwnProperty(boundOption)) {
+            watchedProperties.push(normalizePath(currentContext, boundOptions[boundOption], data));
+          }
+        }
+
+        // Observe each property.
+        for (loc = 0, len = watchedProperties.length; loc < len; ++loc) {
+          property = watchedProperties[loc];
+          view.registerObserver(property.root, property.path, bindView, bindView.rerender);
+        }
+
+        if (types[0] !== 'ID' || normalizedProperties.length === 0) {
+          return;
+        }
+
+        // Add dependent key observers to the first param
+        var normalized = normalizedProperties[0],
+            pathRoot = normalized.root,
+            path = normalized.path;
+
+        if(!isEmpty(path)) {
+          prefixPathForDependentKeys = path + '.';
+        }
+        for (var i=0, l=dependentKeys.length; i<l; i++) {
+          view.registerObserver(pathRoot, prefixPathForDependentKeys + dependentKeys[i], bindView, bindView.rerender);
+        }
+      }
+
+      helper._rawFunction = fn;
+      return helper;
+    };
+
+    /**
+      Renders the unbound form of an otherwise bound helper function.
+
+      @private
+      @method evaluateUnboundHelper
+      @param {Function} fn
+      @param {Object} context
+      @param {Array} normalizedProperties
+      @param {String} options
+    */
+    function evaluateUnboundHelper(context, fn, normalizedProperties, options) {
+      var args = [],
+       hash = options.hash,
+       boundOptions = hash.boundOptions,
+       types = slice.call(options.types, 1),
+       loc,
+       len,
+       property,
+       propertyType,
+       boundOption;
+
+      for (boundOption in boundOptions) {
+        if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
+        hash[boundOption] = handlebarsGet(context, boundOptions[boundOption], options);
+      }
+
+      for(loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
+        property = normalizedProperties[loc];
+        propertyType = types[loc];
+        if(propertyType === "ID") {
+          args.push(handlebarsGet(property.root, property.path, options));
+        } else {
+          args.push(property.path);
+        }
+      }
+      args.push(options);
+      return fn.apply(context, args);
+    }
+
+    /**
+      Overrides Handlebars.template so that we can distinguish
+      user-created, top-level templates from inner contexts.
+
+      @private
+      @method template
+      @for Ember.Handlebars
+      @param {String} spec
+    */
+    function template(spec) {
+      var t = originalTemplate(spec);
+      t.isTop = true;
+      return t;
+    };
+
+    __exports__.normalizePath = normalizePath;
+    __exports__.template = template;
+    __exports__.makeBoundHelper = makeBoundHelper;
+    __exports__.registerBoundHelper = registerBoundHelper;
+    __exports__.resolveHash = resolveHash;
+    __exports__.resolveParams = resolveParams;
+    __exports__.handlebarsGet = handlebarsGet;
+    __exports__.getEscaped = getEscaped;
+    __exports__.evaluateUnboundHelper = evaluateUnboundHelper;
+    __exports__.helperMissingHelper = helperMissingHelper;
+    __exports__.blockHelperMissingHelper = blockHelperMissingHelper;
+  });
+define("ember-handlebars/helpers/binding",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-metal/utils","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-handlebars/views/handlebars_bound_view","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-runtime/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.warn, uuid
+    // var emberAssert = Ember.assert, Ember.warn = Ember.warn;
+
+    var EmberHandlebars = __dependency2__["default"];
+    var helpers = EmberHandlebars.helpers;
+    var SafeString = EmberHandlebars.SafeString;
+
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var fmt = __dependency5__.fmt;
+    var apply = __dependency6__.apply;
+    var o_create = __dependency7__.create;
+    var isNone = __dependency8__["default"];
+    var EnumerableUtils = __dependency9__["default"];
+    var forEach = __dependency10__.forEach;
+    var View = __dependency11__.View;
+    var run = __dependency12__["default"];
+    var _HandlebarsBoundView = __dependency13__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency13__.SimpleHandlebarsView;
+    var removeObserver = __dependency14__.removeObserver;
+    var isGlobalPath = __dependency15__.isGlobalPath;
+    var emberBind = __dependency15__.bind;
+    var guidFor = __dependency6__.guidFor;
+    var typeOf = __dependency6__.typeOf;
+    var jQuery = __dependency16__["default"];
+    var isArray = __dependency6__.isArray;
+    var normalizePath = __dependency17__.normalizePath;
+    var handlebarsGet = __dependency17__.handlebarsGet;
+    var getEscaped = __dependency17__.getEscaped;
+    var handlebarsGetEscaped = __dependency17__.getEscaped;
+    var keys = __dependency18__["default"];
+
+    function exists(value) {
+      return !isNone(value);
+    }
+
+    var WithView = _HandlebarsBoundView.extend({
+      init: function() {
+        var controller;
+
+        apply(this, this._super, arguments);
+
+        var keywords        = this.templateData.keywords;
+        var keywordName     = this.templateHash.keywordName;
+        var keywordPath     = this.templateHash.keywordPath;
+        var controllerName  = this.templateHash.controller;
+        var preserveContext = this.preserveContext;
+
+        if (controllerName) {
+          var previousContext = this.previousContext;
+          controller = this.container.lookupFactory('controller:'+controllerName).create({
+            parentController: previousContext,
+            target: previousContext
+          });
+
+          this._generatedController = controller;
+
+          if (!preserveContext) {
+            this.set('controller', controller);
+
+            this.valueNormalizerFunc = function(result) {
+                controller.set('model', result);
+                return controller;
+            };
+          } else {
+            var controllerPath = jQuery.expando + guidFor(controller);
+            keywords[controllerPath] = controller;
+            emberBind(keywords, controllerPath + '.model', keywordPath);
+            keywordPath = controllerPath;
+          }
+        }
+
+        if (preserveContext) {
+          emberBind(keywords, keywordName, keywordPath);
+        }
+
+      },
+      willDestroy: function() {
+        this._super();
+
+        if (this._generatedController) {
+          this._generatedController.destroy();
+        }
+      }
+    });
+
+    // Binds a property into the DOM. This will create a hook in DOM that the
+    // KVO system will look for and update if the property changes.
+    function bind(property, options, preserveContext, shouldDisplay, valueNormalizer, childProperties) {
+      var data = options.data,
+          fn = options.fn,
+          inverse = options.inverse,
+          view = data.view,
+          normalized, observer, i;
+
+      // we relied on the behavior of calling without
+      // context to mean this === window, but when running
+      // "use strict", it's possible for this to === undefined;
+      var currentContext = this || window;
+
+      normalized = normalizePath(currentContext, property, data);
+
+      // Set up observers for observable objects
+      if ('object' === typeof this) {
+        if (data.insideGroup) {
+          observer = function() {
+            run.once(view, 'rerender');
+          };
+
+          var template, context, result = handlebarsGet(currentContext, property, options);
+
+          result = valueNormalizer ? valueNormalizer(result) : result;
+
+          context = preserveContext ? currentContext : result;
+          if (shouldDisplay(result)) {
+            template = fn;
+          } else if (inverse) {
+            template = inverse;
+          }
+
+          template(context, { data: options.data });
+        } else {
+          var viewClass = _HandlebarsBoundView;
+          var viewOptions = {
+            preserveContext: preserveContext,
+            shouldDisplayFunc: shouldDisplay,
+            valueNormalizerFunc: valueNormalizer,
+            displayTemplate: fn,
+            inverseTemplate: inverse,
+            path: property,
+            pathRoot: currentContext,
+            previousContext: currentContext,
+            isEscaped: !options.hash.unescaped,
+            templateData: options.data,
+            templateHash: options.hash,
+            helperName: options.helperName
+          };
+
+          if (options.isWithHelper) {
+            viewClass = WithView;
+          }
+
+          // Create the view that will wrap the output of this template/property
+          // and add it to the nearest view's childViews array.
+          // See the documentation of Ember._HandlebarsBoundView for more.
+          var bindView = view.createChildView(viewClass, viewOptions);
+
+          view.appendChild(bindView);
+
+          observer = function() {
+            run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
+          };
+        }
+
+        // Observes the given property on the context and
+        // tells the Ember._HandlebarsBoundView to re-render. If property
+        // is an empty string, we are printing the current context
+        // object ({{this}}) so updating it is not our responsibility.
+        if (normalized.path !== '') {
+          view.registerObserver(normalized.root, normalized.path, observer);
+          if (childProperties) {
+            for (i=0; i<childProperties.length; i++) {
+              view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
+            }
+          }
+        }
+      } else {
+        // The object is not observable, so just render it out and
+        // be done with it.
+        data.buffer.push(handlebarsGetEscaped(currentContext, property, options));
+      }
+    }
+
+    function simpleBind(currentContext, property, options) {
+      var data = options.data,
+          view = data.view,
+          normalized, observer, pathRoot, output;
+
+      normalized = normalizePath(currentContext, property, data);
+      pathRoot = normalized.root;
+
+      // Set up observers for observable objects
+      if (pathRoot && ('object' === typeof pathRoot)) {
+        if (data.insideGroup) {
+          observer = function() {
+            run.once(view, 'rerender');
+          };
+
+          output = handlebarsGetEscaped(currentContext, property, options);
+
+          data.buffer.push(output);
+        } else {
+          var bindView = new SimpleHandlebarsView(
+            property, currentContext, !options.hash.unescaped, options.data
+          );
+
+          bindView._parentView = view;
+          view.appendChild(bindView);
+
+          observer = function() {
+            run.scheduleOnce('render', bindView, 'rerender');
+          };
+        }
+
+        // Observes the given property on the context and
+        // tells the Ember._HandlebarsBoundView to re-render. If property
+        // is an empty string, we are printing the current context
+        // object ({{this}}) so updating it is not our responsibility.
+        if (normalized.path !== '') {
+          view.registerObserver(normalized.root, normalized.path, observer);
+        }
+      } else {
+        // The object is not observable, so just render it out and
+        // be done with it.
+        output = handlebarsGetEscaped(currentContext, property, options);
+        data.buffer.push(output);
+      }
+    }
+
+    function shouldDisplayIfHelperContent(result) {
+      var truthy = result && get(result, 'isTruthy');
+      if (typeof truthy === 'boolean') { return truthy; }
+
+      if (isArray(result)) {
+        return get(result, 'length') !== 0;
+      } else {
+        return !!result;
+      }
+    }
+
+    /**
+      '_triageMustache' is used internally select between a binding, helper, or component for
+      the given context. Until this point, it would be hard to determine if the
+      mustache is a property reference or a regular helper reference. This triage
+      helper resolves that.
+
+      This would not be typically invoked by directly.
+
+      @private
+      @method _triageMustache
+      @for Ember.Handlebars.helpers
+      @param {String} property Property/helperID to triage
+      @param {Object} options hash of template/rendering options
+      @return {String} HTML string
+    */
+    function _triageMustacheHelper(property, options) {
+      
+      var helper = EmberHandlebars.resolveHelper(options.data.view.container, property);
+      if (helper) {
+        return helper.call(this, options);
+      }
+
+      return helpers.bind.call(this, property, options);
+    }
+
+    /**
+      Used to lookup/resolve handlebars helpers. The lookup order is:
+
+      * Look for a registered helper
+      * If a dash exists in the name:
+        * Look for a helper registed in the container
+        * Use Ember.ComponentLookup to find an Ember.Component that resolves
+          to the given name
+
+      @private
+      @method resolveHelper
+      @param {Container} container
+      @param {String} name the name of the helper to lookup
+      @return {Handlebars Helper}
+    */
+    function resolveHelper(container, name) {
+      if (helpers[name]) {
+        return helpers[name];
+      }
+
+      if (!container || name.indexOf('-') === -1) {
+        return;
+      }
+
+      var helper = container.lookup('helper:' + name);
+      if (!helper) {
+        var componentLookup = container.lookup('component-lookup:main');
+        
+        var Component = componentLookup.lookupFactory(name, container);
+        if (Component) {
+          helper = EmberHandlebars.makeViewHelper(Component);
+          container.register('helper:' + name, helper);
+        }
+      }
+      return helper;
+    }
+
+
+    /**
+      `bind` can be used to display a value, then update that value if it
+      changes. For example, if you wanted to print the `title` property of
+      `content`:
+
+      ```handlebars
+      {{bind "content.title"}}
+      ```
+
+      This will return the `title` property as a string, then create a new observer
+      at the specified path. If it changes, it will update the value in DOM. Note
+      that if you need to support IE7 and IE8 you must modify the model objects
+      properties using `Ember.get()` and `Ember.set()` for this to work as it
+      relies on Ember's KVO system. For all other browsers this will be handled for
+      you automatically.
+
+      @private
+      @method bind
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+    */
+    function bindHelper(property, options) {
+      
+      var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
+
+      if (!options.fn) {
+        return simpleBind(context, property, options);
+      }
+
+      options.helperName = 'bind';
+
+      return bind.call(context, property, options, false, exists);
+    }
+
+    /**
+      Use the `boundIf` helper to create a conditional that re-evaluates
+      whenever the truthiness of the bound value changes.
+
+      ```handlebars
+      {{#boundIf "content.shouldDisplayTitle"}}
+        {{content.title}}
+      {{/boundIf}}
+      ```
+
+      @private
+      @method boundIf
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+    */
+    function boundIfHelper(property, fn) {
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
+
+      fn.helperName = fn.helperName || 'boundIf';
+
+      return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, ['isTruthy', 'length']);
+    }
+
+
+    /**
+      @private
+
+      Use the `unboundIf` helper to create a conditional that evaluates once.
+
+      ```handlebars
+      {{#unboundIf "content.shouldDisplayTitle"}}
+        {{content.title}}
+      {{/unboundIf}}
+      ```
+
+      @method unboundIf
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+      @since 1.4.0
+    */
+    function unboundIfHelper(property, fn) {
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this,
+          data = fn.data,
+          template = fn.fn,
+          inverse = fn.inverse,
+          normalized, propertyValue, result;
+
+      normalized = normalizePath(context, property, data);
+      propertyValue = handlebarsGet(context, property, fn);
+
+      if (!shouldDisplayIfHelperContent(propertyValue)) {
+        template = inverse;
+      }
+
+      template(context, { data: data });
+    }
+
+    /**
+      Use the `{{with}}` helper when you want to scope context. Take the following code as an example:
+
+      ```handlebars
+      <h5>{{user.name}}</h5>
+
+      <div class="role">
+        <h6>{{user.role.label}}</h6>
+        <span class="role-id">{{user.role.id}}</span>
+
+        <p class="role-desc">{{user.role.description}}</p>
+      </div>
+      ```
+
+      `{{with}}` can be our best friend in these cases,
+      instead of writing `user.role.*` over and over, we use `{{#with user.role}}`.
+      Now the context within the `{{#with}} .. {{/with}}` block is `user.role` so you can do the following:
+
+      ```handlebars
+      <h5>{{user.name}}</h5>
+
+      <div class="role">
+        {{#with user.role}}
+          <h6>{{label}}</h6>
+          <span class="role-id">{{id}}</span>
+
+          <p class="role-desc">{{description}}</p>
+        {{/with}}
+      </div>
+      ```
+
+      ### `as` operator
+
+      This operator aliases the scope to a new name. It's helpful for semantic clarity and to retain
+      default scope or to reference from another `{{with}}` block.
+
+      ```handlebars
+      // posts might not be
+      {{#with user.posts as blogPosts}}
+        <div class="notice">
+          There are {{blogPosts.length}} blog posts written by {{user.name}}.
+        </div>
+
+        {{#each post in blogPosts}}
+          <li>{{post.title}}</li>
+        {{/each}}
+      {{/with}}
+      ```
+
+      Without the `as` operator, it would be impossible to reference `user.name` in the example above.
+
+      NOTE: The alias should not reuse a name from the bound property path.
+      For example: `{{#with foo.bar as foo}}` is not supported because it attempts to alias using
+      the first part of the property path, `foo`. Instead, use `{{#with foo.bar as baz}}`.
+
+      ### `controller` option
+
+      Adding `controller='something'` instructs the `{{with}}` helper to create and use an instance of
+      the specified controller with the new context as its content.
+
+      This is very similar to using an `itemController` option with the `{{each}}` helper.
+
+      ```handlebars
+      {{#with users.posts controller='userBlogPosts'}}
+        {{!- The current context is wrapped in our controller instance }}
+      {{/with}}
+      ```
+
+      In the above example, the template provided to the `{{with}}` block is now wrapped in the
+      `userBlogPost` controller, which provides a very elegant way to decorate the context with custom
+      functions/properties.
+
+      @method with
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function withHelper(context, options) {
+      var bindContext, preserveContext, controller, helperName = 'with';
+
+      if (arguments.length === 4) {
+        var keywordName, path, rootPath, normalized, contextPath;
+
+                options = arguments[3];
+        keywordName = arguments[2];
+        path = arguments[0];
+
+        if (path) {
+          helperName += ' ' + path + ' as ' + keywordName;
+        }
+
+        
+        var localizedOptions = o_create(options);
+        localizedOptions.data = o_create(options.data);
+        localizedOptions.data.keywords = o_create(options.data.keywords || {});
+
+        if (isGlobalPath(path)) {
+          contextPath = path;
+        } else {
+          normalized = normalizePath(this, path, options.data);
+          path = normalized.path;
+          rootPath = normalized.root;
+
+          // This is a workaround for the fact that you cannot bind separate objects
+          // together. When we implement that functionality, we should use it here.
+          var contextKey = jQuery.expando + guidFor(rootPath);
+          localizedOptions.data.keywords[contextKey] = rootPath;
+          // if the path is '' ("this"), just bind directly to the current context
+          contextPath = path ? contextKey + '.' + path : contextKey;
+        }
+
+        localizedOptions.hash.keywordName = keywordName;
+        localizedOptions.hash.keywordPath = contextPath;
+
+        bindContext = this;
+        context = path;
+        options = localizedOptions;
+        preserveContext = true;
+      } else {
+                
+        helperName += ' ' + context;
+        bindContext = options.contexts[0];
+        preserveContext = false;
+      }
+
+      options.helperName = helperName;
+      options.isWithHelper = true;
+
+      return bind.call(bindContext, context, options, preserveContext, exists);
+    }
+    /**
+      See [boundIf](/api/classes/Ember.Handlebars.helpers.html#method_boundIf)
+      and [unboundIf](/api/classes/Ember.Handlebars.helpers.html#method_unboundIf)
+
+      @method if
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function ifHelper(context, options) {
+            
+      options.helperName = options.helperName || ('if ' + context);
+
+      if (options.data.isUnbound) {
+        return helpers.unboundIf.call(options.contexts[0], context, options);
+      } else {
+        return helpers.boundIf.call(options.contexts[0], context, options);
+      }
+    }
+
+    /**
+      @method unless
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function unlessHelper(context, options) {
+            
+      var fn = options.fn, inverse = options.inverse, helperName = 'unless';
+
+      if (context) {
+        helperName += ' ' + context;
+      }
+
+      options.fn = inverse;
+      options.inverse = fn;
+
+      options.helperName = options.helperName || helperName;
+
+      if (options.data.isUnbound) {
+        return helpers.unboundIf.call(options.contexts[0], context, options);
+      } else {
+        return helpers.boundIf.call(options.contexts[0], context, options);
+      }
+    }
+
+    /**
+      `bind-attr` allows you to create a binding between DOM element attributes and
+      Ember objects. For example:
+
+      ```handlebars
+      <img {{bind-attr src="imageUrl" alt="imageTitle"}}>
+      ```
+
+      The above handlebars template will fill the `<img>`'s `src` attribute will
+      the value of the property referenced with `"imageUrl"` and its `alt`
+      attribute with the value of the property referenced with `"imageTitle"`.
+
+      If the rendering context of this template is the following object:
+
+      ```javascript
+      {
+        imageUrl: 'http://lolcats.info/haz-a-funny',
+        imageTitle: 'A humorous image of a cat'
+      }
+      ```
+
+      The resulting HTML output will be:
+
+      ```html
+      <img src="http://lolcats.info/haz-a-funny" alt="A humorous image of a cat">
+      ```
+
+      `bind-attr` cannot redeclare existing DOM element attributes. The use of `src`
+      in the following `bind-attr` example will be ignored and the hard coded value
+      of `src="/failwhale.gif"` will take precedence:
+
+      ```handlebars
+      <img src="/failwhale.gif" {{bind-attr src="imageUrl" alt="imageTitle"}}>
+      ```
+
+      ### `bind-attr` and the `class` attribute
+
+      `bind-attr` supports a special syntax for handling a number of cases unique
+      to the `class` DOM element attribute. The `class` attribute combines
+      multiple discrete values into a single attribute as a space-delimited
+      list of strings. Each string can be:
+
+      * a string return value of an object's property.
+      * a boolean return value of an object's property
+      * a hard-coded value
+
+      A string return value works identically to other uses of `bind-attr`. The
+      return value of the property will become the value of the attribute. For
+      example, the following view and template:
+
+      ```javascript
+        AView = View.extend({
+          someProperty: function() {
+            return "aValue";
+          }.property()
+        })
+      ```
+
+      ```handlebars
+      <img {{bind-attr class="view.someProperty}}>
+      ```
+
+      Result in the following rendered output:
+
+      ```html
+      <img class="aValue">
+      ```
+
+      A boolean return value will insert a specified class name if the property
+      returns `true` and remove the class name if the property returns `false`.
+
+      A class name is provided via the syntax
+      `somePropertyName:class-name-if-true`.
+
+      ```javascript
+      AView = View.extend({
+        someBool: true
+      })
+      ```
+
+      ```handlebars
+      <img {{bind-attr class="view.someBool:class-name-if-true"}}>
+      ```
+
+      Result in the following rendered output:
+
+      ```html
+      <img class="class-name-if-true">
+      ```
+
+      An additional section of the binding can be provided if you want to
+      replace the existing class instead of removing it when the boolean
+      value changes:
+
+      ```handlebars
+      <img {{bind-attr class="view.someBool:class-name-if-true:class-name-if-false"}}>
+      ```
+
+      A hard-coded value can be used by prepending `:` to the desired
+      class name: `:class-name-to-always-apply`.
+
+      ```handlebars
+      <img {{bind-attr class=":class-name-to-always-apply"}}>
+      ```
+
+      Results in the following rendered output:
+
+      ```html
+      <img class="class-name-to-always-apply">
+      ```
+
+      All three strategies - string return value, boolean return value, and
+      hard-coded value – can be combined in a single declaration:
+
+      ```handlebars
+      <img {{bind-attr class=":class-name-to-always-apply view.someBool:class-name-if-true view.someProperty"}}>
+      ```
+
+      @method bind-attr
+      @for Ember.Handlebars.helpers
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function bindAttrHelper(options) {
+      var attrs = options.hash;
+
+      
+      var view = options.data.view;
+      var ret = [];
+
+      // we relied on the behavior of calling without
+      // context to mean this === window, but when running
+      // "use strict", it's possible for this to === undefined;
+      var ctx = this || window;
+
+      // Generate a unique id for this element. This will be added as a
+      // data attribute to the element so it can be looked up when
+      // the bound property changes.
+      var dataId = ++Ember.uuid;
+
+      // Handle classes differently, as we can bind multiple classes
+      var classBindings = attrs['class'];
+      if (classBindings != null) {
+        var classResults = bindClasses(ctx, classBindings, view, dataId, options);
+
+        ret.push('class="' + Handlebars.Utils.escapeExpression(classResults.join(' ')) + '"');
+        delete attrs['class'];
+      }
+
+      var attrKeys = keys(attrs);
+
+      // For each attribute passed, create an observer and emit the
+      // current value of the property as an attribute.
+      forEach.call(attrKeys, function(attr) {
+        var path = attrs[attr],
+            normalized;
+
+        
+        normalized = normalizePath(ctx, path, options.data);
+
+        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options),
+            type = typeOf(value);
+
+        
+        var observer, invoker;
+
+        observer = function observer() {
+          var result = handlebarsGet(ctx, path, options);
+
+          
+          var elem = view.$("[data-bindattr-" + dataId + "='" + dataId + "']");
+
+          // If we aren't able to find the element, it means the element
+          // to which we were bound has been removed from the view.
+          // In that case, we can assume the template has been re-rendered
+          // and we need to clean up the observer.
+          if (!elem || elem.length === 0) {
+            removeObserver(normalized.root, normalized.path, invoker);
+            return;
+          }
+
+          View.applyAttributeBindings(elem, attr, result);
+        };
+
+        // Add an observer to the view for when the property changes.
+        // When the observer fires, find the element using the
+        // unique data id and update the attribute to the new value.
+        // Note: don't add observer when path is 'this' or path
+        // is whole keyword e.g. {{#each x in list}} ... {{bind-attr attr="x"}}
+        if (path !== 'this' && !(normalized.isKeyword && normalized.path === '' )) {
+          view.registerObserver(normalized.root, normalized.path, observer);
+        }
+
+        // if this changes, also change the logic in ember-views/lib/views/view.js
+        if ((type === 'string' || (type === 'number' && !isNaN(value)))) {
+          ret.push(attr + '="' + Handlebars.Utils.escapeExpression(value) + '"');
+        } else if (value && type === 'boolean') {
+          // The developer controls the attr name, so it should always be safe
+          ret.push(attr + '="' + attr + '"');
+        }
+      }, this);
+
+      // Add the unique identifier
+      // NOTE: We use all lower-case since Firefox has problems with mixed case in SVG
+      ret.push('data-bindattr-' + dataId + '="' + dataId + '"');
+      return new SafeString(ret.join(' '));
+    }
+
+    /**
+      See `bind-attr`
+
+      @method bindAttr
+      @for Ember.Handlebars.helpers
+      @deprecated
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function bindAttrHelperDeprecated() {
+            return helpers['bind-attr'].apply(this, arguments);
+    }
+
+    /**
+      Helper that, given a space-separated string of property paths and a context,
+      returns an array of class names. Calling this method also has the side
+      effect of setting up observers at those property paths, such that if they
+      change, the correct class name will be reapplied to the DOM element.
+
+      For example, if you pass the string "fooBar", it will first look up the
+      "fooBar" value of the context. If that value is true, it will add the
+      "foo-bar" class to the current element (i.e., the dasherized form of
+      "fooBar"). If the value is a string, it will add that string as the class.
+      Otherwise, it will not add any new class name.
+
+      @private
+      @method bindClasses
+      @for Ember.Handlebars
+      @param {Ember.Object} context The context from which to lookup properties
+      @param {String} classBindings A string, space-separated, of class bindings
+        to use
+      @param {View} view The view in which observers should look for the
+        element to update
+      @param {Srting} bindAttrId Optional bindAttr id used to lookup elements
+      @return {Array} An array of class names to add
+    */
+    function bindClasses(context, classBindings, view, bindAttrId, options) {
+      var ret = [], newClass, value, elem;
+
+      // Helper method to retrieve the property from the context and
+      // determine which class string to return, based on whether it is
+      // a Boolean or not.
+      var classStringForPath = function(root, parsedPath, options) {
+        var val,
+            path = parsedPath.path;
+
+        if (path === 'this') {
+          val = root;
+        } else if (path === '') {
+          val = true;
+        } else {
+          val = handlebarsGet(root, path, options);
+        }
+
+        return View._classStringForValue(path, val, parsedPath.className, parsedPath.falsyClassName);
+      };
+
+      // For each property passed, loop through and setup
+      // an observer.
+      forEach.call(classBindings.split(' '), function(binding) {
+
+        // Variable in which the old class value is saved. The observer function
+        // closes over this variable, so it knows which string to remove when
+        // the property changes.
+        var oldClass;
+
+        var observer, invoker;
+
+        var parsedPath = View._parsePropertyPath(binding),
+            path = parsedPath.path,
+            pathRoot = context,
+            normalized;
+
+        if (path !== '' && path !== 'this') {
+          normalized = normalizePath(context, path, options.data);
+
+          pathRoot = normalized.root;
+          path = normalized.path;
+        }
+
+        // Set up an observer on the context. If the property changes, toggle the
+        // class name.
+        observer = function() {
+          // Get the current value of the property
+          newClass = classStringForPath(context, parsedPath, options);
+          elem = bindAttrId ? view.$("[data-bindattr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
+
+          // If we can't find the element anymore, a parent template has been
+          // re-rendered and we've been nuked. Remove the observer.
+          if (!elem || elem.length === 0) {
+            removeObserver(pathRoot, path, invoker);
+          } else {
+            // If we had previously added a class to the element, remove it.
+            if (oldClass) {
+              elem.removeClass(oldClass);
+            }
+
+            // If necessary, add a new class. Make sure we keep track of it so
+            // it can be removed in the future.
+            if (newClass) {
+              elem.addClass(newClass);
+              oldClass = newClass;
+            } else {
+              oldClass = null;
+            }
+          }
+        };
+
+        if (path !== '' && path !== 'this') {
+          view.registerObserver(pathRoot, path, observer);
+        }
+
+        // We've already setup the observer; now we just need to figure out the
+        // correct behavior right now on the first pass through.
+        value = classStringForPath(context, parsedPath, options);
+
+        if (value) {
+          ret.push(value);
+
+          // Make sure we save the current value so that it can be removed if the
+          // observer fires.
+          oldClass = value;
+        }
+      });
+
+      return ret;
+    };
+
+    __exports__.bind = bind;
+    __exports__._triageMustacheHelper = _triageMustacheHelper;
+    __exports__.resolveHelper = resolveHelper;
+    __exports__.bindHelper = bindHelper;
+    __exports__.boundIfHelper = boundIfHelper;
+    __exports__.unboundIfHelper = unboundIfHelper;
+    __exports__.withHelper = withHelper;
+    __exports__.ifHelper = ifHelper;
+    __exports__.unlessHelper = unlessHelper;
+    __exports__.bindAttrHelper = bindAttrHelper;
+    __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
+    __exports__.bindClasses = bindClasses;
+  });
+define("ember-handlebars/helpers/collection",
+  ["ember-metal/core","ember-metal/utils","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-handlebars/ext","ember-handlebars/helpers/view","ember-metal/computed","ember-views/views/collection_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert, Ember.deprecate
+    var inspect = __dependency2__.inspect;
+
+    // var emberAssert = Ember.assert;
+        // emberDeprecate = Ember.deprecate;
+
+    var EmberHandlebars = __dependency3__["default"];
+    var helpers = EmberHandlebars.helpers;
+
+    var fmt = __dependency4__.fmt;
+    var get = __dependency5__.get;
+    var handlebarsGet = __dependency6__.handlebarsGet;
+    var ViewHelper = __dependency7__.ViewHelper;
+    var computed = __dependency8__.computed;
+    var CollectionView = __dependency9__["default"];
+
+    var alias = computed.alias;
+    /**
+      `{{collection}}` is a `Ember.Handlebars` helper for adding instances of
+      `Ember.CollectionView` to a template. See [Ember.CollectionView](/api/classes/Ember.CollectionView.html)
+       for additional information on how a `CollectionView` functions.
+
+      `{{collection}}`'s primary use is as a block helper with a `contentBinding`
+      option pointing towards an `Ember.Array`-compatible object. An `Ember.View`
+      instance will be created for each item in its `content` property. Each view
+      will have its own `content` property set to the appropriate item in the
+      collection.
+
+      The provided block will be applied as the template for each item's view.
+
+      Given an empty `<body>` the following template:
+
+      ```handlebars
+      {{#collection contentBinding="App.items"}}
+        Hi {{view.content.name}}
+      {{/collection}}
+      ```
+
+      And the following application code
+
+      ```javascript
+      App = Ember.Application.create()
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ]
+      ```
+
+      Will result in the HTML structure below
+
+      ```html
+      <div class="ember-view">
+        <div class="ember-view">Hi Dave</div>
+        <div class="ember-view">Hi Mary</div>
+        <div class="ember-view">Hi Sara</div>
+      </div>
+      ```
+
+      ### Blockless use in a collection
+
+      If you provide an `itemViewClass` option that has its own `template` you can
+      omit the block.
+
+      The following template:
+
+      ```handlebars
+      {{collection contentBinding="App.items" itemViewClass="App.AnItemView"}}
+      ```
+
+      And application code
+
+      ```javascript
+      App = Ember.Application.create();
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ];
+
+      App.AnItemView = Ember.View.extend({
+        template: Ember.Handlebars.compile("Greetings {{view.content.name}}")
+      });
+      ```
+
+      Will result in the HTML structure below
+
+      ```html
+      <div class="ember-view">
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
+      </div>
+      ```
+
+      ### Specifying a CollectionView subclass
+
+      By default the `{{collection}}` helper will create an instance of
+      `Ember.CollectionView`. You can supply a `Ember.CollectionView` subclass to
+      the helper by passing it as the first argument:
+
+      ```handlebars
+      {{#collection App.MyCustomCollectionClass contentBinding="App.items"}}
+        Hi {{view.content.name}}
+      {{/collection}}
+      ```
+
+      ### Forwarded `item.*`-named Options
+
+      As with the `{{view}}`, helper options passed to the `{{collection}}` will be
+      set on the resulting `Ember.CollectionView` as properties. Additionally,
+      options prefixed with `item` will be applied to the views rendered for each
+      item (note the camelcasing):
+
+      ```handlebars
+      {{#collection contentBinding="App.items"
+                    itemTagName="p"
+                    itemClassNames="greeting"}}
+        Howdy {{view.content.name}}
+      {{/collection}}
+      ```
+
+      Will result in the following HTML structure:
+
+      ```html
+      <div class="ember-view">
+        <p class="ember-view greeting">Howdy Dave</p>
+        <p class="ember-view greeting">Howdy Mary</p>
+        <p class="ember-view greeting">Howdy Sara</p>
+      </div>
+      ```
+
+      @method collection
+      @for Ember.Handlebars.helpers
+      @param {String} path
+      @param {Hash} options
+      @return {String} HTML string
+      @deprecated Use `{{each}}` helper instead.
+    */
+    function collectionHelper(path, options) {
+      
+      // If no path is provided, treat path param as options.
+      if (path && path.data && path.data.isRenderData) {
+        options = path;
+        path = undefined;
+              } else {
+              }
+
+      var fn = options.fn;
+      var data = options.data;
+      var inverse = options.inverse;
+      var view = options.data.view;
+
+
+      var controller, container;
+      // If passed a path string, convert that into an object.
+      // Otherwise, just default to the standard class.
+      var collectionClass;
+      if (path) {
+        controller = data.keywords.controller;
+        container = controller && controller.container;
+        collectionClass = handlebarsGet(this, path, options) || container.lookupFactory('view:' + path);
+              }
+      else {
+        collectionClass = CollectionView;
+      }
+
+      var hash = options.hash, itemHash = {}, match;
+
+      // Extract item view class if provided else default to the standard class
+      var collectionPrototype = collectionClass.proto(), itemViewClass;
+
+      if (hash.itemView) {
+        controller = data.keywords.controller;
+                container = controller.container;
+        itemViewClass = container.lookupFactory('view:' + hash.itemView);
+              } else if (hash.itemViewClass) {
+        itemViewClass = handlebarsGet(collectionPrototype, hash.itemViewClass, options);
+      } else {
+        itemViewClass = collectionPrototype.itemViewClass;
+      }
+
+      
+      delete hash.itemViewClass;
+      delete hash.itemView;
+
+      // Go through options passed to the {{collection}} helper and extract options
+      // that configure item views instead of the collection itself.
+      for (var prop in hash) {
+        if (hash.hasOwnProperty(prop)) {
+          match = prop.match(/^item(.)(.*)$/);
+
+          if (match && prop !== 'itemController') {
+            // Convert itemShouldFoo -> shouldFoo
+            itemHash[match[1].toLowerCase() + match[2]] = hash[prop];
+            // Delete from hash as this will end up getting passed to the
+            // {{view}} helper method.
+            delete hash[prop];
+          }
+        }
+      }
+
+      if (fn) {
+        itemHash.template = fn;
+        delete options.fn;
+      }
+
+      var emptyViewClass;
+      if (inverse && inverse !== EmberHandlebars.VM.noop) {
+        emptyViewClass = get(collectionPrototype, 'emptyViewClass');
+        emptyViewClass = emptyViewClass.extend({
+              template: inverse,
+              tagName: itemHash.tagName
+        });
+      } else if (hash.emptyViewClass) {
+        emptyViewClass = handlebarsGet(this, hash.emptyViewClass, options);
+      }
+      if (emptyViewClass) { hash.emptyView = emptyViewClass; }
+
+      if (hash.keyword) {
+        itemHash._context = this;
+      } else {
+        itemHash._context = alias('content');
+      }
+
+      var viewOptions = ViewHelper.propertiesFromHTMLOptions({ data: data, hash: itemHash }, this);
+      hash.itemViewClass = itemViewClass.extend(viewOptions);
+
+      options.helperName = options.helperName || 'collection';
+
+      return helpers.view.call(this, collectionClass, options);
+    }
+
+    __exports__["default"] = collectionHelper;
+  });
+define("ember-handlebars/helpers/debug",
+  ["ember-metal/core","ember-metal/utils","ember-metal/logger","ember-metal/property_get","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /*jshint debug:true*/
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.FEATURES,
+    var inspect = __dependency2__.inspect;
+    var Logger = __dependency3__["default"];
+
+    var get = __dependency4__.get;
+    var normalizePath = __dependency5__.normalizePath;
+    var handlebarsGet = __dependency5__.handlebarsGet;
+
+    var a_slice = [].slice;
+
+    /**
+      `log` allows you to output the value of variables in the current rendering
+      context. `log` also accepts primitive types such as strings or numbers.
+
+      ```handlebars
+      {{log "myVariable:" myVariable }}
+      ```
+
+      @method log
+      @for Ember.Handlebars.helpers
+      @param {String} property
+    */
+    function logHelper() {
+      var params = a_slice.call(arguments, 0, -1),
+          options = arguments[arguments.length - 1],
+          logger = Logger.log,
+          values = [],
+          allowPrimitives = true;
+
+      for (var i = 0; i < params.length; i++) {
+        var type = options.types[i];
+
+        if (type === 'ID' || !allowPrimitives) {
+          var context = (options.contexts && options.contexts[i]) || this,
+              normalized = normalizePath(context, params[i], options.data);
+
+          if (normalized.path === 'this') {
+            values.push(normalized.root);
+          } else {
+            values.push(handlebarsGet(normalized.root, normalized.path, options));
+          }
+        } else {
+          values.push(params[i]);
+        }
+      }
+
+      logger.apply(logger, values);
+    };
+
+    /**
+      Execute the `debugger` statement in the current context.
+
+      ```handlebars
+      {{debugger}}
+      ```
+
+      Before invoking the `debugger` statement, there
+      are a few helpful variables defined in the
+      body of this helper that you can inspect while
+      debugging that describe how and where this
+      helper was invoked:
+
+      - templateContext: this is most likely a controller
+        from which this template looks up / displays properties
+      - typeOfTemplateContext: a string description of
+        what the templateContext is
+
+      For example, if you're wondering why a value `{{foo}}`
+      isn't rendering as expected within a template, you
+      could place a `{{debugger}}` statement, and when
+      the `debugger;` breakpoint is hit, you can inspect
+      `templateContext`, determine if it's the object you
+      expect, and/or evaluate expressions in the console
+      to perform property lookups on the `templateContext`:
+
+      ```
+        > templateContext.get('foo') // -> "<value of {{foo}}>"
+      ```
+
+      @method debugger
+      @for Ember.Handlebars.helpers
+      @param {String} property
+    */
+    function debuggerHelper(options) {
+
+      // These are helpful values you can inspect while debugging.
+      var templateContext = this;
+      var typeOfTemplateContext = inspect(templateContext);
+
+      debugger;
+    }
+
+    __exports__.logHelper = logHelper;
+    __exports__.debuggerHelper = debuggerHelper;
+  });
+define("ember-handlebars/helpers/each",
+  ["ember-metal/core","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-metal/property_set","ember-handlebars/views/metamorph_view","ember-views/views/collection_view","ember-metal/binding","ember-runtime/controllers/controller","ember-runtime/controllers/array_controller","ember-runtime/mixins/array","ember-runtime/copy","ember-metal/run_loop","ember-metal/observer","ember-metal/events","ember-handlebars/ext","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+    "use strict";
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert;, Ember.K
+    // var emberAssert = Ember.assert,
+    var K = Ember.K;
+
+    var EmberHandlebars = __dependency2__["default"];
+    var helpers = EmberHandlebars.helpers;
+
+    var fmt = __dependency3__.fmt;
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+    var _Metamorph = __dependency6__._Metamorph;
+    var _MetamorphView = __dependency6__._MetamorphView;
+    var CollectionView = __dependency7__["default"];
+    var Binding = __dependency8__.Binding;
+    var ControllerMixin = __dependency9__.ControllerMixin;
+    var ArrayController = __dependency10__["default"];
+    var EmberArray = __dependency11__["default"];
+    var copy = __dependency12__["default"];
+    var run = __dependency13__["default"];
+    var addObserver = __dependency14__.addObserver;
+    var removeObserver = __dependency14__.removeObserver;
+    var addBeforeObserver = __dependency14__.addBeforeObserver;
+    var removeBeforeObserver = __dependency14__.removeBeforeObserver;
+    var on = __dependency15__.on;
+    var handlebarsGet = __dependency16__.handlebarsGet;
+    var computed = __dependency17__.computed;
+
+    var handlebarsGet = __dependency16__.handlebarsGet;
+
+    var EachView = CollectionView.extend(_Metamorph, {
+
+      init: function() {
+        var itemController = get(this, 'itemController');
+        var binding;
+
+        if (itemController) {
+          var controller = get(this, 'controller.container').lookupFactory('controller:array').create({
+            _isVirtual: true,
+            parentController: get(this, 'controller'),
+            itemController: itemController,
+            target: get(this, 'controller'),
+            _eachView: this
+          });
+
+          this.disableContentObservers(function() {
+            set(this, 'content', controller);
+            binding = new Binding('content', '_eachView.dataSource').oneWay();
+            binding.connect(controller);
+          });
+
+          set(this, '_arrayController', controller);
+        } else {
+          this.disableContentObservers(function() {
+            binding = new Binding('content', 'dataSource').oneWay();
+            binding.connect(this);
+          });
+        }
+
+        return this._super();
+      },
+
+      _assertArrayLike: function(content) {
+                      },
+
+      disableContentObservers: function(callback) {
+        removeBeforeObserver(this, 'content', null, '_contentWillChange');
+        removeObserver(this, 'content', null, '_contentDidChange');
+
+        callback.call(this);
+
+        addBeforeObserver(this, 'content', null, '_contentWillChange');
+        addObserver(this, 'content', null, '_contentDidChange');
+      },
+
+      itemViewClass: _MetamorphView,
+      emptyViewClass: _MetamorphView,
+
+      createChildView: function(view, attrs) {
+        view = this._super(view, attrs);
+
+        // At the moment, if a container view subclass wants
+        // to insert keywords, it is responsible for cloning
+        // the keywords hash. This will be fixed momentarily.
+        var keyword = get(this, 'keyword');
+        var content = get(view, 'content');
+
+        if (keyword) {
+          var data = get(view, 'templateData');
+
+          data = copy(data);
+          data.keywords = view.cloneKeywords();
+          set(view, 'templateData', data);
+
+          // In this case, we do not bind, because the `content` of
+          // a #each item cannot change.
+          data.keywords[keyword] = content;
+        }
+
+        // If {{#each}} is looping over an array of controllers,
+        // point each child view at their respective controller.
+        if (content && content.isController) {
+          set(view, 'controller', content);
+        }
+
+        return view;
+      },
+
+      destroy: function() {
+        if (!this._super()) { return; }
+
+        var arrayController = get(this, '_arrayController');
+
+        if (arrayController) {
+          arrayController.destroy();
+        }
+
+        return this;
+      }
+    });
+
+    // Defeatureify doesn't seem to like nested functions that need to be removed
+    function _addMetamorphCheck() {
+      EachView.reopen({
+        _checkMetamorph: on('didInsertElement', function() {
+                  })
+      });
+    }
+
+    // until ember-debug is es6ed
+    var runInDebug = function(f){f()};
+    
+    var GroupedEach = EmberHandlebars.GroupedEach = function(context, path, options) {
+      var self = this,
+          normalized = EmberHandlebars.normalizePath(context, path, options.data);
+
+      this.context = context;
+      this.path = path;
+      this.options = options;
+      this.template = options.fn;
+      this.containingView = options.data.view;
+      this.normalizedRoot = normalized.root;
+      this.normalizedPath = normalized.path;
+      this.content = this.lookupContent();
+
+      this.addContentObservers();
+      this.addArrayObservers();
+
+      this.containingView.on('willClearRender', function() {
+        self.destroy();
+      });
+    };
+
+    GroupedEach.prototype = {
+      contentWillChange: function() {
+        this.removeArrayObservers();
+      },
+
+      contentDidChange: function() {
+        this.content = this.lookupContent();
+        this.addArrayObservers();
+        this.rerenderContainingView();
+      },
+
+      contentArrayWillChange: K,
+
+      contentArrayDidChange: function() {
+        this.rerenderContainingView();
+      },
+
+      lookupContent: function() {
+        return handlebarsGet(this.normalizedRoot, this.normalizedPath, this.options);
+      },
+
+      addArrayObservers: function() {
+        if (!this.content) { return; }
+
+        this.content.addArrayObserver(this, {
+          willChange: 'contentArrayWillChange',
+          didChange: 'contentArrayDidChange'
+        });
+      },
+
+      removeArrayObservers: function() {
+        if (!this.content) { return; }
+
+        this.content.removeArrayObserver(this, {
+          willChange: 'contentArrayWillChange',
+          didChange: 'contentArrayDidChange'
+        });
+      },
+
+      addContentObservers: function() {
+        addBeforeObserver(this.normalizedRoot, this.normalizedPath, this, this.contentWillChange);
+        addObserver(this.normalizedRoot, this.normalizedPath, this, this.contentDidChange);
+      },
+
+      removeContentObservers: function() {
+        removeBeforeObserver(this.normalizedRoot, this.normalizedPath, this.contentWillChange);
+        removeObserver(this.normalizedRoot, this.normalizedPath, this.contentDidChange);
+      },
+
+      render: function() {
+        if (!this.content) { return; }
+
+        var content = this.content,
+            contentLength = get(content, 'length'),
+            data = this.options.data,
+            template = this.template;
+
+        data.insideEach = true;
+        for (var i = 0; i < contentLength; i++) {
+          template(content.objectAt(i), { data: data });
+        }
+      },
+
+      rerenderContainingView: function() {
+        var self = this;
+        run.scheduleOnce('render', this, function() {
+          // It's possible it's been destroyed after we enqueued a re-render call.
+          if (!self.destroyed) {
+            self.containingView.rerender();
+          }
+        });
+      },
+
+      destroy: function() {
+        this.removeContentObservers();
+        if (this.content) {
+          this.removeArrayObservers();
+        }
+        this.destroyed = true;
+      }
+    };
+
+    /**
+      The `{{#each}}` helper loops over elements in a collection, rendering its
+      block once for each item. It is an extension of the base Handlebars `{{#each}}`
+      helper:
+
+      ```javascript
+      Developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
+      ```
+
+      ```handlebars
+      {{#each Developers}}
+        {{name}}
+      {{/each}}
+      ```
+
+      `{{each}}` supports an alternative syntax with element naming:
+
+      ```handlebars
+      {{#each person in Developers}}
+        {{person.name}}
+      {{/each}}
+      ```
+
+      When looping over objects that do not have properties, `{{this}}` can be used
+      to render the object:
+
+      ```javascript
+      DeveloperNames = ['Yehuda', 'Tom', 'Paul']
+      ```
+
+      ```handlebars
+      {{#each DeveloperNames}}
+        {{this}}
+      {{/each}}
+      ```
+      ### {{else}} condition
+      `{{#each}}` can have a matching `{{else}}`. The contents of this block will render
+      if the collection is empty.
+
+      ```
+      {{#each person in Developers}}
+        {{person.name}}
+      {{else}}
+        <p>Sorry, nobody is available for this task.</p>
+      {{/each}}
+      ```
+      ### Specifying a View class for items
+      If you provide an `itemViewClass` option that references a view class
+      with its own `template` you can omit the block.
+
+      The following template:
+
+      ```handlebars
+      {{#view App.MyView }}
+        {{each view.items itemViewClass="App.AnItemView"}}
+      {{/view}}
+      ```
+
+      And application code
+
+      ```javascript
+      App = Ember.Application.create({
+        MyView: Ember.View.extend({
+          items: [
+            Ember.Object.create({name: 'Dave'}),
+            Ember.Object.create({name: 'Mary'}),
+            Ember.Object.create({name: 'Sara'})
+          ]
+        })
+      });
+
+      App.AnItemView = Ember.View.extend({
+        template: Ember.Handlebars.compile("Greetings {{name}}")
+      });
+      ```
+
+      Will result in the HTML structure below
+
+      ```html
+      <div class="ember-view">
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
+      </div>
+      ```
+
+      If an `itemViewClass` is defined on the helper, and therefore the helper is not
+      being used as a block, an `emptyViewClass` can also be provided optionally.
+      The `emptyViewClass` will match the behavior of the `{{else}}` condition
+      described above. That is, the `emptyViewClass` will render if the collection
+      is empty.
+
+      ### Representing each item with a Controller.
+      By default the controller lookup within an `{{#each}}` block will be
+      the controller of the template where the `{{#each}}` was used. If each
+      item needs to be presented by a custom controller you can provide a
+      `itemController` option which references a controller by lookup name.
+      Each item in the loop will be wrapped in an instance of this controller
+      and the item itself will be set to the `content` property of that controller.
+
+      This is useful in cases where properties of model objects need transformation
+      or synthesis for display:
+
+      ```javascript
+      App.DeveloperController = Ember.ObjectController.extend({
+        isAvailableForHire: function() {
+          return !this.get('content.isEmployed') && this.get('content.isSeekingWork');
+        }.property('isEmployed', 'isSeekingWork')
+      })
+      ```
+
+      ```handlebars
+      {{#each person in developers itemController="developer"}}
+        {{person.name}} {{#if person.isAvailableForHire}}Hire me!{{/if}}
+      {{/each}}
+      ```
+
+      Each itemController will receive a reference to the current controller as
+      a `parentController` property.
+
+      ### (Experimental) Grouped Each
+
+      When used in conjunction with the experimental [group helper](https://github.com/emberjs/group-helper),
+      you can inform Handlebars to re-render an entire group of items instead of
+      re-rendering them one at a time (in the event that they are changed en masse
+      or an item is added/removed).
+
+      ```handlebars
+      {{#group}}
+        {{#each people}}
+          {{firstName}} {{lastName}}
+        {{/each}}
+      {{/group}}
+      ```
+
+      This can be faster than the normal way that Handlebars re-renders items
+      in some cases.
+
+      If for some reason you have a group with more than one `#each`, you can make
+      one of the collections be updated in normal (non-grouped) fashion by setting
+      the option `groupedRows=true` (counter-intuitive, I know).
+
+      For example,
+
+      ```handlebars
+      {{dealershipName}}
+
+      {{#group}}
+        {{#each dealers}}
+          {{firstName}} {{lastName}}
+        {{/each}}
+
+        {{#each car in cars groupedRows=true}}
+          {{car.make}} {{car.model}} {{car.color}}
+        {{/each}}
+      {{/group}}
+      ```
+      Any change to `dealershipName` or the `dealers` collection will cause the
+      entire group to be re-rendered. However, changes to the `cars` collection
+      will be re-rendered individually (as normal).
+
+      Note that `group` behavior is also disabled by specifying an `itemViewClass`.
+
+      @method each
+      @for Ember.Handlebars.helpers
+      @param [name] {String} name for item (used with `in`)
+      @param [path] {String} path
+      @param [options] {Object} Handlebars key/value pairs of options
+      @param [options.itemViewClass] {String} a path to a view class used for each item
+      @param [options.itemController] {String} name of a controller to be created for each item
+      @param [options.groupedRows] {boolean} enable normal item-by-item rendering when inside a `#group` helper
+    */
+    function eachHelper(path, options) {
+      var ctx, helperName = 'each';
+
+      if (arguments.length === 4) {
+        
+        var keywordName = arguments[0];
+
+
+        options = arguments[3];
+        path = arguments[2];
+
+        helperName += ' ' + keywordName + ' in ' + path;
+
+        if (path === '') { path = "this"; }
+
+        options.hash.keyword = keywordName;
+
+      } else if (arguments.length === 1) {
+        options = path;
+        path = 'this';
+      } else {
+        helperName += ' ' + path;
+      }
+
+      options.hash.dataSourceBinding = path;
+      // Set up emptyView as a metamorph with no tag
+      //options.hash.emptyViewClass = Ember._MetamorphView;
+
+      // can't rely on this default behavior when use strict
+      ctx = this || window;
+
+      options.helperName = options.helperName || helperName;
+
+      if (options.data.insideGroup && !options.hash.groupedRows && !options.hash.itemViewClass) {
+        new GroupedEach(ctx, path, options).render();
+      } else {
+        // ES6TODO: figure out how to do this without global lookup.
+        return helpers.collection.call(ctx, 'Ember.Handlebars.EachView', options);
+      }
+    }
+
+    __exports__.EachView = EachView;
+    __exports__.GroupedEach = GroupedEach;
+    __exports__.eachHelper = eachHelper;
+  });
+define("ember-handlebars/helpers/loc",
+  ["ember-runtime/system/string","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var loc = __dependency1__.loc;
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    // ES6TODO:
+    // Pretty sure this can be expressed as
+    // var locHelper EmberStringUtils.loc ?
+
+    /**
+      Calls [Ember.String.loc](/api/classes/Ember.String.html#method_loc) with the
+      provided string.
+
+      This is a convenient way to localize text. For example:
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="home">
+        {{loc "welcome"}}
+      </script>
+      ```
+
+      Take note that `"welcome"` is a string and not an object
+      reference.
+
+      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to 
+      set up localized string references.
+
+      @method loc
+      @for Ember.Handlebars.helpers
+      @param {String} str The string to format
+      @see {Ember.String#loc}
+    */
+    function locHelper(str) {
+      return loc(str);
+    }
+
+    __exports__["default"] = locHelper;
+  });
+define("ember-handlebars/helpers/partial",
+  ["ember-metal/core","ember-metal/is_none","ember-handlebars/ext","ember-handlebars/helpers/binding","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    // var emberAssert = Ember.assert;
+
+    var isNone = __dependency2__.isNone;
+    var handlebarsGet = __dependency3__.handlebarsGet;
+    var bind = __dependency4__.bind;
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    /**
+      The `partial` helper renders another template without
+      changing the template context:
+
+      ```handlebars
+      {{foo}}
+      {{partial "nav"}}
+      ```
+
+      The above example template will render a template named
+      "_nav", which has the same context as the parent template
+      it's rendered into, so if the "_nav" template also referenced
+      `{{foo}}`, it would print the same thing as the `{{foo}}`
+      in the above example.
+
+      If a "_nav" template isn't found, the `partial` helper will
+      fall back to a template named "nav".
+
+      ## Bound template names
+
+      The parameter supplied to `partial` can also be a path
+      to a property containing a template name, e.g.:
+
+      ```handlebars
+      {{partial someTemplateName}}
+      ```
+
+      The above example will look up the value of `someTemplateName`
+      on the template context (e.g. a controller) and use that
+      value as the name of the template to render. If the resolved
+      value is falsy, nothing will be rendered. If `someTemplateName`
+      changes, the partial will be re-rendered using the new template
+      name.
+
+      ## Setting the partial's context with `with`
+
+      The `partial` helper can be used in conjunction with the `with`
+      helper to set a context that will be used by the partial:
+
+      ```handlebars
+      {{#with currentUser}}
+        {{partial "user_info"}}
+      {{/with}}
+      ```
+
+      @method partial
+      @for Ember.Handlebars.helpers
+      @param {String} partialName the name of the template to render minus the leading underscore
+    */
+
+    function partialHelper(name, options) {
+
+      var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
+
+      options.helperName = options.helperName || 'partial';
+
+      if (options.types[0] === "ID") {
+        // Helper was passed a property path; we need to
+        // create a binding that will re-render whenever
+        // this property changes.
+        options.fn = function(context, fnOptions) {
+          var partialName = handlebarsGet(context, name, fnOptions);
+          renderPartial(context, partialName, fnOptions);
+        };
+
+        return bind.call(context, name, options, true, exists);
+      } else {
+        // Render the partial right into parent template.
+        renderPartial(context, name, options);
+      }
+    }
+
+    function exists(value) {
+      return !isNone(value);
+    }
+
+    function renderPartial(context, name, options) {
+      var nameParts = name.split("/");
+      var lastPart = nameParts[nameParts.length - 1];
+
+      nameParts[nameParts.length - 1] = "_" + lastPart;
+
+      var view = options.data.view;
+      var underscoredName = nameParts.join("/");
+      var template = view.templateForName(underscoredName);
+      var deprecatedTemplate = !template && view.templateForName(name);
+
+      
+      template = template || deprecatedTemplate;
+
+      template(context, { data: options.data });
+    }
+
+    __exports__["default"] = partialHelper;
+  });
+define("ember-handlebars/helpers/shared",
+  ["ember-handlebars/ext","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var handlebarsGet = __dependency1__.handlebarsGet;
+
+    function resolvePaths(options) {
+      var ret = [],
+          contexts = options.contexts,
+          roots = options.roots,
+          data = options.data;
+
+      for (var i=0, l=contexts.length; i<l; i++) {
+        ret.push( handlebarsGet(roots[i], contexts[i], { data: data }) );
+      }
+
+      return ret;
+    }
+
+    __exports__["default"] = resolvePaths;
+  });
+define("ember-handlebars/helpers/template",
+  ["ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // var emberDeprecate = Ember.deprecate;
+
+    var EmberHandlebars = __dependency2__["default"];
+    var helpers = EmberHandlebars.helpers;
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    /**
+      `template` allows you to render a template from inside another template.
+      This allows you to re-use the same template in multiple places. For example:
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="logged_in_user">
+        {{#with loggedInUser}}
+          Last Login: {{lastLogin}}
+          User Info: {{template "user_info"}}
+        {{/with}}
+      </script>
+      ```
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="user_info">
+        Name: <em>{{name}}</em>
+        Karma: <em>{{karma}}</em>
+      </script>
+      ```
+
+      ```handlebars
+      {{#if isUser}}
+        {{template "user_info"}}
+      {{else}}
+        {{template "unlogged_user_info"}}
+      {{/if}}
+      ```
+
+      This helper looks for templates in the global `Ember.TEMPLATES` hash. If you
+      add `<script>` tags to your page with the `data-template-name` attribute set,
+      they will be compiled and placed in this hash automatically.
+
+      You can also manually register templates by adding them to the hash:
+
+      ```javascript
+      Ember.TEMPLATES["my_cool_template"] = Ember.Handlebars.compile('<b>{{user}}</b>');
+      ```
+
+      @deprecated
+      @method template
+      @for Ember.Handlebars.helpers
+      @param {String} templateName the template to render
+    */
+    function templateHelper(name, options) {
+      
+      options.helperName = options.helperName || 'template';
+
+      return helpers.partial.apply(this, arguments);
+    }
+
+    __exports__["default"] = templateHelper;
+  });
+define("ember-handlebars/helpers/unbound",
+  ["ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /*globals Handlebars */
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var EmberHandlebars = __dependency1__["default"];
+    var helpers = EmberHandlebars.helpers;
+
+    var resolveHelper = __dependency2__.resolveHelper;
+    var handlebarsGet = __dependency3__.handlebarsGet;
+
+    var slice = [].slice;
+
+    /**
+      `unbound` allows you to output a property without binding. *Important:* The
+      output will not be updated if the property changes. Use with caution.
+
+      ```handlebars
+      <div>{{unbound somePropertyThatDoesntChange}}</div>
+      ```
+
+      `unbound` can also be used in conjunction with a bound helper to
+      render it in its unbound form:
+
+      ```handlebars
+      <div>{{unbound helperName somePropertyThatDoesntChange}}</div>
+      ```
+
+      @method unbound
+      @for Ember.Handlebars.helpers
+      @param {String} property
+      @return {String} HTML string
+    */
+    function unboundHelper(property, fn) {
+      var options = arguments[arguments.length - 1],
+          container = options.data.view.container,
+          helper, context, out, ctx;
+
+      ctx = this;
+      if (arguments.length > 2) {
+        // Unbound helper call.
+        options.data.isUnbound = true;
+        helper = resolveHelper(container, property) || helpers.helperMissing;
+        out = helper.apply(ctx, slice.call(arguments, 1));
+        delete options.data.isUnbound;
+        return out;
+      }
+
+      context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : ctx;
+      return handlebarsGet(context, property, fn);
+    }
+
+    __exports__["default"] = unboundHelper;
+  });
+define("ember-handlebars/helpers/view",
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-handlebars/ext","ember-runtime/system/string","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+    "use strict";
+    /*globals Handlebars */
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.warn, Ember.assert
+    // var emberWarn = Ember.warn, emberAssert = Ember.assert;
+
+    var EmberObject = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var IS_BINDING = __dependency5__.IS_BINDING;
+    var jQuery = __dependency6__["default"];
+    var View = __dependency7__.View;
+    var isGlobalPath = __dependency8__.isGlobalPath;
+    var normalizePath = __dependency9__.normalizePath;
+    var handlebarsGet = __dependency9__.handlebarsGet;
+    var EmberString = __dependency10__["default"];
+
+
+    var LOWERCASE_A_Z = /^[a-z]/,
+        VIEW_PREFIX = /^view\./;
+
+    function makeBindings(thisContext, options) {
+      var hash = options.hash,
+          hashType = options.hashTypes;
+
+      for (var prop in hash) {
+        if (hashType[prop] === 'ID') {
+
+          var value = hash[prop];
+
+          if (IS_BINDING.test(prop)) {
+                      } else {
+            hash[prop + 'Binding'] = value;
+            hashType[prop + 'Binding'] = 'STRING';
+            delete hash[prop];
+            delete hashType[prop];
+          }
+        }
+      }
+
+      if (hash.hasOwnProperty('idBinding')) {
+        // id can't be bound, so just perform one-time lookup.
+        hash.id = handlebarsGet(thisContext, hash.idBinding, options);
+        hashType.id = 'STRING';
+        delete hash.idBinding;
+        delete hashType.idBinding;
+      }
+    }
+
+    var ViewHelper = EmberObject.create({
+
+      propertiesFromHTMLOptions: function(options) {
+        var hash = options.hash, data = options.data;
+        var extensions = {},
+            classes = hash['class'],
+            dup = false;
+
+        if (hash.id) {
+          extensions.elementId = hash.id;
+          dup = true;
+        }
+
+        if (hash.tag) {
+          extensions.tagName = hash.tag;
+          dup = true;
+        }
+
+        if (classes) {
+          classes = classes.split(' ');
+          extensions.classNames = classes;
+          dup = true;
+        }
+
+        if (hash.classBinding) {
+          extensions.classNameBindings = hash.classBinding.split(' ');
+          dup = true;
+        }
+
+        if (hash.classNameBindings) {
+          if (extensions.classNameBindings === undefined) extensions.classNameBindings = [];
+          extensions.classNameBindings = extensions.classNameBindings.concat(hash.classNameBindings.split(' '));
+          dup = true;
+        }
+
+        if (hash.attributeBindings) {
+                    extensions.attributeBindings = null;
+          dup = true;
+        }
+
+        if (dup) {
+          hash = jQuery.extend({}, hash);
+          delete hash.id;
+          delete hash.tag;
+          delete hash['class'];
+          delete hash.classBinding;
+        }
+
+        // Set the proper context for all bindings passed to the helper. This applies to regular attribute bindings
+        // as well as class name bindings. If the bindings are local, make them relative to the current context
+        // instead of the view.
+        var path;
+
+        // Evaluate the context of regular attribute bindings:
+        for (var prop in hash) {
+          if (!hash.hasOwnProperty(prop)) { continue; }
+
+          // Test if the property ends in "Binding"
+          if (IS_BINDING.test(prop) && typeof hash[prop] === 'string') {
+            path = this.contextualizeBindingPath(hash[prop], data);
+            if (path) { hash[prop] = path; }
+          }
+        }
+
+        // Evaluate the context of class name bindings:
+        if (extensions.classNameBindings) {
+          for (var b in extensions.classNameBindings) {
+            var full = extensions.classNameBindings[b];
+            if (typeof full === 'string') {
+              // Contextualize the path of classNameBinding so this:
+              //
+              //     classNameBinding="isGreen:green"
+              //
+              // is converted to this:
+              //
+              //     classNameBinding="_parentView.context.isGreen:green"
+              var parsedPath = View._parsePropertyPath(full);
+              path = this.contextualizeBindingPath(parsedPath.path, data);
+              if (path) { extensions.classNameBindings[b] = path + parsedPath.classNames; }
+            }
+          }
+        }
+
+        return jQuery.extend(hash, extensions);
+      },
+
+      // Transform bindings from the current context to a context that can be evaluated within the view.
+      // Returns null if the path shouldn't be changed.
+      //
+      // TODO: consider the addition of a prefix that would allow this method to return `path`.
+      contextualizeBindingPath: function(path, data) {
+        var normalized = normalizePath(null, path, data);
+        if (normalized.isKeyword) {
+          return 'templateData.keywords.' + path;
+        } else if (isGlobalPath(path)) {
+          return null;
+        } else if (path === 'this' || path === '') {
+          return '_parentView.context';
+        } else {
+          return '_parentView.context.' + path;
+        }
+      },
+
+      helper: function(thisContext, path, options) {
+        var data = options.data,
+            fn = options.fn,
+            newView;
+
+        makeBindings(thisContext, options);
+
+        if ('string' === typeof path) {
+
+          // TODO: this is a lame conditional, this should likely change
+          // but something along these lines will likely need to be added
+          // as deprecation warnings
+          //
+          if (options.types[0] === 'STRING' && LOWERCASE_A_Z.test(path) && !VIEW_PREFIX.test(path)) {
+                        newView = data.view.container.lookupFactory('view:' + path);
+          } else {
+            newView = handlebarsGet(thisContext, path, options);
+          }
+
+                  } else {
+          newView = path;
+        }
+
+        
+        var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
+        var currentView = data.view;
+        viewOptions.templateData = data;
+        var newViewProto = newView.proto ? newView.proto() : newView;
+
+        if (fn) {
+                    viewOptions.template = fn;
+        }
+
+        // We only want to override the `_context` computed property if there is
+        // no specified controller. See View#_context for more information.
+        if (!newViewProto.controller && !newViewProto.controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
+          viewOptions._context = thisContext;
+        }
+
+        // for instrumentation
+        if (options.helperName) {
+          viewOptions.helperName = options.helperName;
+        }
+
+        currentView.appendChild(newView, viewOptions);
+      }
+    });
+
+    /**
+      `{{view}}` inserts a new instance of `Ember.View` into a template passing its
+      options to the `Ember.View`'s `create` method and using the supplied block as
+      the view's own template.
+
+      An empty `<body>` and the following template:
+
+      ```handlebars
+      A span:
+      {{#view tagName="span"}}
+        hello.
+      {{/view}}
+      ```
+
+      Will result in HTML structure:
+
+      ```html
+      <body>
+        <!-- Note: the handlebars template script
+             also results in a rendered Ember.View
+             which is the outer <div> here -->
+
+        <div class="ember-view">
+          A span:
+          <span id="ember1" class="ember-view">
+            Hello.
+          </span>
+        </div>
+      </body>
+      ```
+
+      ### `parentView` setting
+
+      The `parentView` property of the new `Ember.View` instance created through
+      `{{view}}` will be set to the `Ember.View` instance of the template where
+      `{{view}}` was called.
+
+      ```javascript
+      aView = Ember.View.create({
+        template: Ember.Handlebars.compile("{{#view}} my parent: {{parentView.elementId}} {{/view}}")
+      });
+
+      aView.appendTo('body');
+      ```
+
+      Will result in HTML structure:
+
+      ```html
+      <div id="ember1" class="ember-view">
+        <div id="ember2" class="ember-view">
+          my parent: ember1
+        </div>
+      </div>
+      ```
+
+      ### Setting CSS id and class attributes
+
+      The HTML `id` attribute can be set on the `{{view}}`'s resulting element with
+      the `id` option. This option will _not_ be passed to `Ember.View.create`.
+
+      ```handlebars
+      {{#view tagName="span" id="a-custom-id"}}
+        hello.
+      {{/view}}
+      ```
+
+      Results in the following HTML structure:
+
+      ```html
+      <div class="ember-view">
+        <span id="a-custom-id" class="ember-view">
+          hello.
+        </span>
+      </div>
+      ```
+
+      The HTML `class` attribute can be set on the `{{view}}`'s resulting element
+      with the `class` or `classNameBindings` options. The `class` option will
+      directly set the CSS `class` attribute and will not be passed to
+      `Ember.View.create`. `classNameBindings` will be passed to `create` and use
+      `Ember.View`'s class name binding functionality:
+
+      ```handlebars
+      {{#view tagName="span" class="a-custom-class"}}
+        hello.
+      {{/view}}
+      ```
+
+      Results in the following HTML structure:
+
+      ```html
+      <div class="ember-view">
+        <span id="ember2" class="ember-view a-custom-class">
+          hello.
+        </span>
+      </div>
+      ```
+
+      ### Supplying a different view class
+
+      `{{view}}` can take an optional first argument before its supplied options to
+      specify a path to a custom view class.
+
+      ```handlebars
+      {{#view "MyApp.CustomView"}}
+        hello.
+      {{/view}}
+      ```
+
+      The first argument can also be a relative path accessible from the current
+      context.
+
+      ```javascript
+      MyApp = Ember.Application.create({});
+      MyApp.OuterView = Ember.View.extend({
+        innerViewClass: Ember.View.extend({
+          classNames: ['a-custom-view-class-as-property']
+        }),
+        template: Ember.Handlebars.compile('{{#view "view.innerViewClass"}} hi {{/view}}')
+      });
+
+      MyApp.OuterView.create().appendTo('body');
+      ```
+
+      Will result in the following HTML:
+
+      ```html
+      <div id="ember1" class="ember-view">
+        <div id="ember2" class="ember-view a-custom-view-class-as-property">
+          hi
+        </div>
+      </div>
+      ```
+
+      ### Blockless use
+
+      If you supply a custom `Ember.View` subclass that specifies its own template
+      or provide a `templateName` option to `{{view}}` it can be used without
+      supplying a block. Attempts to use both a `templateName` option and supply a
+      block will throw an error.
+
+      ```handlebars
+      {{view "MyApp.ViewWithATemplateDefined"}}
+      ```
+
+      ### `viewName` property
+
+      You can supply a `viewName` option to `{{view}}`. The `Ember.View` instance
+      will be referenced as a property of its parent view by this name.
+
+      ```javascript
+      aView = Ember.View.create({
+        template: Ember.Handlebars.compile('{{#view viewName="aChildByName"}} hi {{/view}}')
+      });
+
+      aView.appendTo('body');
+      aView.get('aChildByName') // the instance of Ember.View created by {{view}} helper
+      ```
+
+      @method view
+      @for Ember.Handlebars.helpers
+      @param {String} path
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function viewHelper(path, options) {
+      
+      // If no path is provided, treat path param as options.
+      // ES6TODO: find a way to do this without global lookup
+      if (path && path.data && path.data.isRenderData) {
+        options = path;
+        path = "Ember.View";
+      }
+
+      options.helperName = options.helperName || 'view';
+
+      return ViewHelper.helper(this, path, options);
+    }
+
+    __exports__.ViewHelper = ViewHelper;
+    __exports__.viewHelper = viewHelper;
+  });
+define("ember-handlebars/helpers/yield",
+  ["ember-metal/core","ember-metal/property_get","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // var emberAssert = Ember.assert;
+
+    var get = __dependency2__.get;
+
+    /**
+      `{{yield}}` denotes an area of a template that will be rendered inside
+      of another template. It has two main uses:
+
+      ### Use with `layout`
+      When used in a Handlebars template that is assigned to an `Ember.View`
+      instance's `layout` property Ember will render the layout template first,
+      inserting the view's own rendered output at the `{{yield}}` location.
+
+      An empty `<body>` and the following application code:
+
+      ```javascript
+      AView = Ember.View.extend({
+        classNames: ['a-view-with-layout'],
+        layout: Ember.Handlebars.compile('<div class="wrapper">{{yield}}</div>'),
+        template: Ember.Handlebars.compile('<span>I am wrapped</span>')
+      });
+
+      aView = AView.create();
+      aView.appendTo('body');
+      ```
+
+      Will result in the following HTML output:
+
+      ```html
+      <body>
+        <div class='ember-view a-view-with-layout'>
+          <div class="wrapper">
+            <span>I am wrapped</span>
+          </div>
+        </div>
+      </body>
+      ```
+
+      The `yield` helper cannot be used outside of a template assigned to an
+      `Ember.View`'s `layout` property and will throw an error if attempted.
+
+      ```javascript
+      BView = Ember.View.extend({
+        classNames: ['a-view-with-layout'],
+        template: Ember.Handlebars.compile('{{yield}}')
+      });
+
+      bView = BView.create();
+      bView.appendTo('body');
+
+      // throws
+      // Uncaught Error: assertion failed:
+      // You called yield in a template that was not a layout
+      ```
+
+      ### Use with Ember.Component
+      When designing components `{{yield}}` is used to denote where, inside the component's
+      template, an optional block passed to the component should render:
+
+      ```handlebars
+      <!-- application.hbs -->
+      {{#labeled-textfield value=someProperty}}
+        First name:
+      {{/labeled-textfield}}
+      ```
+
+      ```handlebars
+      <!-- components/labeled-textfield.hbs -->
+      <label>
+        {{yield}} {{input value=value}}
+      </label>
+      ```
+
+      Result:
+
+      ```html
+      <label>
+        First name: <input type="text" />
+      </label>
+      ```
+
+      @method yield
+      @for Ember.Handlebars.helpers
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function yieldHelper(options) {
+      var view = options.data.view;
+
+      while (view && !get(view, 'layout')) {
+        if (view._contextView) {
+          view = view._contextView;
+        } else {
+          view = get(view, '_parentView');
+        }
+      }
+
+      
+      view._yield(this, options);
+    }
+
+    __exports__["default"] = yieldHelper;
+  });
+define("ember-handlebars/loader",
+  ["ember-handlebars/component_lookup","ember-views/system/jquery","ember-metal/error","ember-runtime/system/lazy_load","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /*globals Handlebars */
+
+    var ComponentLookup = __dependency1__["default"];
+    var jQuery = __dependency2__["default"];
+    var EmberError = __dependency3__["default"];
+    var onLoad = __dependency4__.onLoad;
+
+    var EmberHandlebars = __dependency5__["default"];
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    /**
+      Find templates stored in the head tag as script tags and make them available
+      to `Ember.CoreView` in the global `Ember.TEMPLATES` object. This will be run
+      as as jQuery DOM-ready callback.
+
+      Script tags with `text/x-handlebars` will be compiled
+      with Ember's Handlebars and are suitable for use as a view's template.
+      Those with type `text/x-raw-handlebars` will be compiled with regular
+      Handlebars and are suitable for use in views' computed properties.
+
+      @private
+      @method bootstrap
+      @for Ember.Handlebars
+      @static
+      @param ctx
+    */
+    function bootstrap(ctx) {
+      var selectors = 'script[type="text/x-handlebars"], script[type="text/x-raw-handlebars"]';
+
+      jQuery(selectors, ctx)
+        .each(function() {
+        // Get a reference to the script tag
+        var script = jQuery(this);
+
+        var compile = (script.attr('type') === 'text/x-raw-handlebars') ?
+                      jQuery.proxy(Handlebars.compile, Handlebars) :
+                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars),
+          // Get the name of the script, used by Ember.View's templateName property.
+          // First look for data-template-name attribute, then fall back to its
+          // id if no name is found.
+          templateName = script.attr('data-template-name') || script.attr('id') || 'application',
+          template = compile(script.html());
+
+        // Check if template of same name already exists
+        if (Ember.TEMPLATES[templateName] !== undefined) {
+          throw new EmberError('Template named "' + templateName  + '" already exists.');
+        }
+
+        // For templates which have a name, we save them and then remove them from the DOM
+        Ember.TEMPLATES[templateName] = template;
+
+        // Remove script tag from DOM
+        script.remove();
+      });
+    };
+
+    function _bootstrap() {
+      bootstrap( jQuery(document) );
+    }
+
+    function registerComponentLookup(container) {
+      container.register('component-lookup:main', ComponentLookup);
+    }
+
+    /*
+      We tie this to application.load to ensure that we've at least
+      attempted to bootstrap at the point that the application is loaded.
+
+      We also tie this to document ready since we're guaranteed that all
+      the inline templates are present at this point.
+
+      There's no harm to running this twice, since we remove the templates
+      from the DOM after processing.
+    */
+
+    onLoad('Ember.Application', function(Application) {
+      Application.initializer({
+        name: 'domTemplates',
+        initialize: _bootstrap
+      });
+
+      Application.initializer({
+        name: 'registerComponentLookup',
+        after: 'domTemplates',
+        initialize: registerComponentLookup
+      });
+    });
+
+    __exports__["default"] = bootstrap;
+  });
+define("ember-handlebars",
+  ["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/shared","ember-handlebars/helpers/binding","ember-handlebars/helpers/collection","ember-handlebars/helpers/view","ember-handlebars/helpers/unbound","ember-handlebars/helpers/debug","ember-handlebars/helpers/each","ember-handlebars/helpers/template","ember-handlebars/helpers/partial","ember-handlebars/helpers/yield","ember-handlebars/helpers/loc","ember-handlebars/controls/checkbox","ember-handlebars/controls/select","ember-handlebars/controls/text_area","ember-handlebars/controls/text_field","ember-handlebars/controls/text_support","ember-handlebars/controls","ember-handlebars/component_lookup","ember-handlebars/views/handlebars_bound_view","ember-handlebars/views/metamorph_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
+    "use strict";
+    var EmberHandlebars = __dependency1__["default"];
+    var Ember = __dependency2__["default"];
+    // to add to globals
+
+    var runLoadHooks = __dependency3__.runLoadHooks;
+    var bootstrap = __dependency4__["default"];
+
+    var normalizePath = __dependency5__.normalizePath;
+    var template = __dependency5__.template;
+    var makeBoundHelper = __dependency5__.makeBoundHelper;
+    var registerBoundHelper = __dependency5__.registerBoundHelper;
+    var resolveHash = __dependency5__.resolveHash;
+    var resolveParams = __dependency5__.resolveParams;
+    var getEscaped = __dependency5__.getEscaped;
+    var handlebarsGet = __dependency5__.handlebarsGet;
+    var evaluateUnboundHelper = __dependency5__.evaluateUnboundHelper;
+    var helperMissingHelper = __dependency5__.helperMissingHelper;
+    var blockHelperMissingHelper = __dependency5__.blockHelperMissingHelper;
+
+
+    // side effect of extending StringUtils of htmlSafe
+
+    var resolvePaths = __dependency7__["default"];
+    var bind = __dependency8__.bind;
+    var _triageMustacheHelper = __dependency8__._triageMustacheHelper;
+    var resolveHelper = __dependency8__.resolveHelper;
+    var bindHelper = __dependency8__.bindHelper;
+    var boundIfHelper = __dependency8__.boundIfHelper;
+    var unboundIfHelper = __dependency8__.unboundIfHelper;
+    var withHelper = __dependency8__.withHelper;
+    var ifHelper = __dependency8__.ifHelper;
+    var unlessHelper = __dependency8__.unlessHelper;
+    var bindAttrHelper = __dependency8__.bindAttrHelper;
+    var bindAttrHelperDeprecated = __dependency8__.bindAttrHelperDeprecated;
+    var bindClasses = __dependency8__.bindClasses;
+
+    var collectionHelper = __dependency9__["default"];
+    var ViewHelper = __dependency10__.ViewHelper;
+    var viewHelper = __dependency10__.viewHelper;
+    var unboundHelper = __dependency11__["default"];
+    var logHelper = __dependency12__.logHelper;
+    var debuggerHelper = __dependency12__.debuggerHelper;
+    var EachView = __dependency13__.EachView;
+    var GroupedEach = __dependency13__.GroupedEach;
+    var eachHelper = __dependency13__.eachHelper;
+
+    var templateHelper = __dependency14__["default"];
+    var partialHelper = __dependency15__["default"];
+    var yieldHelper = __dependency16__["default"];
+    var locHelper = __dependency17__["default"];
+
+
+    var Checkbox = __dependency18__["default"];
+    var Select = __dependency19__.Select;
+    var SelectOption = __dependency19__.SelectOption;
+    var SelectOptgroup = __dependency19__.SelectOptgroup;
+    var TextArea = __dependency20__["default"];
+    var TextField = __dependency21__["default"];
+    var TextSupport = __dependency22__["default"];
+    var TextSupport = __dependency22__["default"];
+    var inputHelper = __dependency23__.inputHelper;
+    var textareaHelper = __dependency23__.textareaHelper;var ComponentLookup = __dependency24__["default"];
+    var _HandlebarsBoundView = __dependency25__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency25__.SimpleHandlebarsView;
+    var _SimpleMetamorphView = __dependency26__._SimpleMetamorphView;
+    var _MetamorphView = __dependency26__._MetamorphView;
+    var _Metamorph = __dependency26__._Metamorph;
+
+    /**
+    Ember Handlebars
+
+    @module ember
+    @submodule ember-handlebars
+    @requires ember-views
+    */
+
+    // Ember.Handlebars.Globals
+    EmberHandlebars.bootstrap = bootstrap;
+    EmberHandlebars.template = template;
+    EmberHandlebars.makeBoundHelper = makeBoundHelper;
+    EmberHandlebars.registerBoundHelper = registerBoundHelper;
+    EmberHandlebars.resolveHash = resolveHash;
+    EmberHandlebars.resolveParams = resolveParams;
+    EmberHandlebars.resolveHelper = resolveHelper;
+    EmberHandlebars.get = handlebarsGet;
+    EmberHandlebars.getEscaped = getEscaped;
+    EmberHandlebars.evaluateUnboundHelper = evaluateUnboundHelper;
+    EmberHandlebars.bind = bind;
+    EmberHandlebars.bindClasses = bindClasses;
+    EmberHandlebars.EachView = EachView;
+    EmberHandlebars.GroupedEach = GroupedEach;
+    EmberHandlebars.resolvePaths = resolvePaths;
+    EmberHandlebars.ViewHelper = ViewHelper;
+    EmberHandlebars.normalizePath = normalizePath;
+
+
+    // Ember Globals
+    Ember.Handlebars = EmberHandlebars;
+    Ember.ComponentLookup = ComponentLookup;
+    Ember._SimpleHandlebarsView = SimpleHandlebarsView;
+    Ember._HandlebarsBoundView = _HandlebarsBoundView;
+    Ember._SimpleMetamorphView = _SimpleMetamorphView;
+    Ember._MetamorphView = _MetamorphView;
+    Ember._Metamorph = _Metamorph;
+    Ember.TextSupport = TextSupport;
+    Ember.Checkbox = Checkbox;
+    Ember.Select = Select;
+    Ember.SelectOption = SelectOption;
+    Ember.SelectOptgroup = SelectOptgroup;
+    Ember.TextArea = TextArea;
+    Ember.TextField = TextField;
+    Ember.TextSupport = TextSupport;
+
+    // register helpers
+    EmberHandlebars.registerHelper('helperMissing', helperMissingHelper);
+    EmberHandlebars.registerHelper('blockHelperMissing', blockHelperMissingHelper);
+    EmberHandlebars.registerHelper('bind', bindHelper);
+    EmberHandlebars.registerHelper('boundIf', boundIfHelper);
+    EmberHandlebars.registerHelper('_triageMustache', _triageMustacheHelper);
+    EmberHandlebars.registerHelper('unboundIf', unboundIfHelper);
+    EmberHandlebars.registerHelper('with', withHelper);
+    EmberHandlebars.registerHelper('if', ifHelper);
+    EmberHandlebars.registerHelper('unless', unlessHelper);
+    EmberHandlebars.registerHelper('bind-attr', bindAttrHelper);
+    EmberHandlebars.registerHelper('bindAttr', bindAttrHelperDeprecated);
+    EmberHandlebars.registerHelper('collection', collectionHelper);
+    EmberHandlebars.registerHelper("log", logHelper);
+    EmberHandlebars.registerHelper("debugger", debuggerHelper);
+    EmberHandlebars.registerHelper("each", eachHelper);
+    EmberHandlebars.registerHelper("loc", locHelper);
+    EmberHandlebars.registerHelper("partial", partialHelper);
+    EmberHandlebars.registerHelper("template", templateHelper);
+    EmberHandlebars.registerHelper("yield", yieldHelper);
+    EmberHandlebars.registerHelper("view", viewHelper);
+    EmberHandlebars.registerHelper("unbound", unboundHelper);
+    EmberHandlebars.registerHelper("input", inputHelper);
+    EmberHandlebars.registerHelper("textarea", textareaHelper);
+
+    // run load hooks
+    runLoadHooks('Ember.Handlebars', EmberHandlebars);
+
+    __exports__["default"] = EmberHandlebars;
+  });
+define("ember-handlebars/string",
+  ["ember-runtime/system/string","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    // required so we can extend this object.
+    var EmberStringUtils = __dependency1__["default"];
+
+    /**
+      Mark a string as safe for unescaped output with Handlebars. If you
+      return HTML from a Handlebars helper, use this function to
+      ensure Handlebars does not escape the HTML.
+
+      ```javascript
+      Ember.String.htmlSafe('<div>someString</div>')
+      ```
+
+      @method htmlSafe
+      @for Ember.String
+      @static
+      @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
+    */
+    function htmlSafe(str) {
+      return new Handlebars.SafeString(str);
+    };
+
+    EmberStringUtils.htmlSafe = htmlSafe;
+    if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
+
+      /**
+        Mark a string as being safe for unescaped output with Handlebars.
+
+        ```javascript
+        '<div>someString</div>'.htmlSafe()
+        ```
+
+        See [Ember.String.htmlSafe](/api/classes/Ember.String.html#method_htmlSafe).
+
+        @method htmlSafe
+        @for String
+        @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
+      */
+      String.prototype.htmlSafe = function() {
+        return htmlSafe(this);
+      };
+    }
+
+    __exports__["default"] = htmlSafe;
+  });
+define("ember-handlebars/views/handlebars_bound_view",
+  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-views/views/view","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+    "use strict";
+    /*globals Handlebars */
+    /*jshint newcap:false*/
+
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var EmberHandlebars = __dependency1__["default"];
+    // EmberHandlebars.SafeString;
+    var SafeString = EmberHandlebars.SafeString;
+
+    var Ember = __dependency2__["default"];
+    // Ember.K
+    var K = Ember.K
+
+    var Metamorph = requireModule('metamorph');
+
+    var EmberError = __dependency3__["default"];
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+    var merge = __dependency6__["default"];
+    var run = __dependency7__["default"];
+    var computed = __dependency8__.computed;
+    var View = __dependency9__.View;
+    var cloneStates = __dependency10__.cloneStates;
+    var states = __dependency10__.states;
+    var viewStates = states;
+
+    var _MetamorphView = __dependency11__._MetamorphView;
+    var handlebarsGet = __dependency12__.handlebarsGet;
+
+    function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
+      this.path = path;
+      this.pathRoot = pathRoot;
+      this.isEscaped = isEscaped;
+      this.templateData = templateData;
+
+      this.morph = Metamorph();
+      this.state = 'preRender';
+      this.updateId = null;
+      this._parentView = null;
+      this.buffer = null;
+    }
+
+    SimpleHandlebarsView.prototype = {
+      isVirtual: true,
+      isView: true,
+
+      destroy: function () {
+        if (this.updateId) {
+          run.cancel(this.updateId);
+          this.updateId = null;
+        }
+        if (this._parentView) {
+          this._parentView.removeChild(this);
+        }
+        this.morph = null;
+        this.state = 'destroyed';
+      },
+
+      propertyWillChange: K,
+
+      propertyDidChange: K,
+
+      normalizedValue: function() {
+        var path = this.path,
+            pathRoot = this.pathRoot,
+            result, templateData;
+
+        // Use the pathRoot as the result if no path is provided. This
+        // happens if the path is `this`, which gets normalized into
+        // a `pathRoot` of the current Handlebars context and a path
+        // of `''`.
+        if (path === '') {
+          result = pathRoot;
+        } else {
+          templateData = this.templateData;
+          result = handlebarsGet(pathRoot, path, { data: templateData });
+        }
+
+        return result;
+      },
+
+      renderToBuffer: function(buffer) {
+        var string = '';
+
+        string += this.morph.startTag();
+        string += this.render();
+        string += this.morph.endTag();
+
+        buffer.push(string);
+      },
+
+      render: function() {
+        // If not invoked via a triple-mustache ({{{foo}}}), escape
+        // the content of the template.
+        var escape = this.isEscaped;
+        var result = this.normalizedValue();
+
+        if (result === null || result === undefined) {
+          result = "";
+        } else if (!(result instanceof SafeString)) {
+          result = String(result);
+        }
+
+        if (escape) { result = Handlebars.Utils.escapeExpression(result); }
+        return result;
+      },
+
+      rerender: function() {
+        switch(this.state) {
+          case 'preRender':
+          case 'destroyed':
+            break;
+          case 'inBuffer':
+            throw new EmberError("Something you did tried to replace an {{expression}} before it was inserted into the DOM.");
+          case 'hasElement':
+          case 'inDOM':
+            this.updateId = run.scheduleOnce('render', this, 'update');
+            break;
+        }
+
+        return this;
+      },
+
+      update: function () {
+        this.updateId = null;
+        this.morph.html(this.render());
+      },
+
+      transitionTo: function(state) {
+        this.state = state;
+      }
+    };
+
+    var states = cloneStates(viewStates);
+
+    merge(states._default, {
+      rerenderIfNeeded: K
+    });
+
+    merge(states.inDOM, {
+      rerenderIfNeeded: function(view) {
+        if (view.normalizedValue() !== view._lastNormalizedValue) {
+          view.rerender();
+        }
+      }
+    });
+
+    /**
+      `Ember._HandlebarsBoundView` is a private view created by the Handlebars
+      `{{bind}}` helpers that is used to keep track of bound properties.
+
+      Every time a property is bound using a `{{mustache}}`, an anonymous subclass
+      of `Ember._HandlebarsBoundView` is created with the appropriate sub-template
+      and context set up. When the associated property changes, just the template
+      for this view will re-render.
+
+      @class _HandlebarsBoundView
+      @namespace Ember
+      @extends Ember._MetamorphView
+      @private
+    */
+    var _HandlebarsBoundView = _MetamorphView.extend({
+      states: states,
+      instrumentName: 'boundHandlebars',
+
+      /**
+        The function used to determine if the `displayTemplate` or
+        `inverseTemplate` should be rendered. This should be a function that takes
+        a value and returns a Boolean.
+
+        @property shouldDisplayFunc
+        @type Function
+        @default null
+      */
+      shouldDisplayFunc: null,
+
+      /**
+        Whether the template rendered by this view gets passed the context object
+        of its parent template, or gets passed the value of retrieving `path`
+        from the `pathRoot`.
+
+        For example, this is true when using the `{{#if}}` helper, because the
+        template inside the helper should look up properties relative to the same
+        object as outside the block. This would be `false` when used with `{{#with
+        foo}}` because the template should receive the object found by evaluating
+        `foo`.
+
+        @property preserveContext
+        @type Boolean
+        @default false
+      */
+      preserveContext: false,
+
+      /**
+        If `preserveContext` is true, this is the object that will be used
+        to render the template.
+
+        @property previousContext
+        @type Object
+      */
+      previousContext: null,
+
+      /**
+        The template to render when `shouldDisplayFunc` evaluates to `true`.
+
+        @property displayTemplate
+        @type Function
+        @default null
+      */
+      displayTemplate: null,
+
+      /**
+        The template to render when `shouldDisplayFunc` evaluates to `false`.
+
+        @property inverseTemplate
+        @type Function
+        @default null
+      */
+      inverseTemplate: null,
+
+
+      /**
+        The path to look up on `pathRoot` that is passed to
+        `shouldDisplayFunc` to determine which template to render.
+
+        In addition, if `preserveContext` is `false,` the object at this path will
+        be passed to the template when rendering.
+
+        @property path
+        @type String
+        @default null
+      */
+      path: null,
+
+      /**
+        The object from which the `path` will be looked up. Sometimes this is the
+        same as the `previousContext`, but in cases where this view has been
+        generated for paths that start with a keyword such as `view` or
+        `controller`, the path root will be that resolved object.
+
+        @property pathRoot
+        @type Object
+      */
+      pathRoot: null,
+
+      normalizedValue: function() {
+        var path = get(this, 'path'),
+            pathRoot  = get(this, 'pathRoot'),
+            valueNormalizer = get(this, 'valueNormalizerFunc'),
+            result, templateData;
+
+        // Use the pathRoot as the result if no path is provided. This
+        // happens if the path is `this`, which gets normalized into
+        // a `pathRoot` of the current Handlebars context and a path
+        // of `''`.
+        if (path === '') {
+          result = pathRoot;
+        } else {
+          templateData = get(this, 'templateData');
+          result = handlebarsGet(pathRoot, path, { data: templateData });
+        }
+
+        return valueNormalizer ? valueNormalizer(result) : result;
+      },
+
+      rerenderIfNeeded: function() {
+        this.currentState.rerenderIfNeeded(this);
+      },
+
+      /**
+        Determines which template to invoke, sets up the correct state based on
+        that logic, then invokes the default `Ember.View` `render` implementation.
+
+        This method will first look up the `path` key on `pathRoot`,
+        then pass that value to the `shouldDisplayFunc` function. If that returns
+        `true,` the `displayTemplate` function will be rendered to DOM. Otherwise,
+        `inverseTemplate`, if specified, will be rendered.
+
+        For example, if this `Ember._HandlebarsBoundView` represented the `{{#with
+        foo}}` helper, it would look up the `foo` property of its context, and
+        `shouldDisplayFunc` would always return true. The object found by looking
+        up `foo` would be passed to `displayTemplate`.
+
+        @method render
+        @param {Ember.RenderBuffer} buffer
+      */
+      render: function(buffer) {
+        // If not invoked via a triple-mustache ({{{foo}}}), escape
+        // the content of the template.
+        var escape = get(this, 'isEscaped');
+
+        var shouldDisplay = get(this, 'shouldDisplayFunc'),
+            preserveContext = get(this, 'preserveContext'),
+            context = get(this, 'previousContext');
+
+        var inverseTemplate = get(this, 'inverseTemplate'),
+            displayTemplate = get(this, 'displayTemplate');
+
+        var result = this.normalizedValue();
+        this._lastNormalizedValue = result;
+
+        // First, test the conditional to see if we should
+        // render the template or not.
+        if (shouldDisplay(result)) {
+          set(this, 'template', displayTemplate);
+
+          // If we are preserving the context (for example, if this
+          // is an #if block, call the template with the same object.
+          if (preserveContext) {
+            set(this, '_context', context);
+          } else {
+          // Otherwise, determine if this is a block bind or not.
+          // If so, pass the specified object to the template
+            if (displayTemplate) {
+              set(this, '_context', result);
+            } else {
+            // This is not a bind block, just push the result of the
+            // expression to the render context and return.
+              if (result === null || result === undefined) {
+                result = "";
+              } else if (!(result instanceof SafeString)) {
+                result = String(result);
+              }
+
+              if (escape) { result = Handlebars.Utils.escapeExpression(result); }
+              buffer.push(result);
+              return;
+            }
+          }
+        } else if (inverseTemplate) {
+          set(this, 'template', inverseTemplate);
+
+          if (preserveContext) {
+            set(this, '_context', context);
+          } else {
+            set(this, '_context', result);
+          }
+        } else {
+          set(this, 'template', function() { return ''; });
+        }
+
+        return this._super(buffer);
+      }
+    });
+
+    __exports__._HandlebarsBoundView = _HandlebarsBoundView;
+    __exports__.SimpleHandlebarsView = SimpleHandlebarsView;
+  });
+define("ember-handlebars/views/metamorph_view",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    /*jshint newcap:false*/
+    var Ember = __dependency1__["default"];
+    // Ember.deprecate
+    // var emberDeprecate = Ember.deprecate;
+
+    var get = __dependency2__.get;
+    var set = __dependency3__["default"];
+
+    var CoreView = __dependency4__.CoreView;
+    var View = __dependency4__.View;
+    var Mixin = __dependency5__.Mixin;
+    var run = __dependency6__["default"];
+
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Metamorph = requireModule('metamorph');
+
+    function notifyMutationListeners() {
+      run.once(View, 'notifyMutationListeners');
+    }
+
+    // DOMManager should just abstract dom manipulation between jquery and metamorph
+    var DOMManager = {
+      remove: function(view) {
+        view.morph.remove();
+        notifyMutationListeners();
+      },
+
+      prepend: function(view, html) {
+        view.morph.prepend(html);
+        notifyMutationListeners();
+      },
+
+      after: function(view, html) {
+        view.morph.after(html);
+        notifyMutationListeners();
+      },
+
+      html: function(view, html) {
+        view.morph.html(html);
+        notifyMutationListeners();
+      },
+
+      // This is messed up.
+      replace: function(view) {
+        var morph = view.morph;
+
+        view.transitionTo('preRender');
+
+        run.schedule('render', this, function renderMetamorphView() {
+          if (view.isDestroying) { return; }
+
+          view.clearRenderedChildren();
+          var buffer = view.renderToBuffer();
+
+          view.invokeRecursively(function(view) {
+            view.propertyWillChange('element');
+          });
+          view.triggerRecursively('willInsertElement');
+
+          morph.replaceWith(buffer.string());
+          view.transitionTo('inDOM');
+
+          view.invokeRecursively(function(view) {
+            view.propertyDidChange('element');
+          });
+          view.triggerRecursively('didInsertElement');
+
+          notifyMutationListeners();
+        });
+      },
+
+      empty: function(view) {
+        view.morph.html("");
+        notifyMutationListeners();
+      }
+    };
+
+    // The `morph` and `outerHTML` properties are internal only
+    // and not observable.
+
+    /**
+      @class _Metamorph
+      @namespace Ember
+      @private
+    */
+    var _Metamorph = Mixin.create({
+      isVirtual: true,
+      tagName: '',
+
+      instrumentName: 'metamorph',
+
+      init: function() {
+        this._super();
+        this.morph = Metamorph();
+              },
+
+      beforeRender: function(buffer) {
+        buffer.push(this.morph.startTag());
+        buffer.pushOpeningTag();
+      },
+
+      afterRender: function(buffer) {
+        buffer.pushClosingTag();
+        buffer.push(this.morph.endTag());
+      },
+
+      createElement: function() {
+        var buffer = this.renderToBuffer();
+        this.outerHTML = buffer.string();
+        this.clearBuffer();
+      },
+
+      domManager: DOMManager
+    });
+
+    /**
+      @class _MetamorphView
+      @namespace Ember
+      @extends Ember.View
+      @uses Ember._Metamorph
+      @private
+    */
+    var _MetamorphView = View.extend(_Metamorph);
+
+    /**
+      @class _SimpleMetamorphView
+      @namespace Ember
+      @extends Ember.CoreView
+      @uses Ember._Metamorph
+      @private
+    */
+    var _SimpleMetamorphView = CoreView.extend(_Metamorph);
+
+    __exports__._SimpleMetamorphView = _SimpleMetamorphView;
+    __exports__._MetamorphView = _MetamorphView;
+    __exports__._Metamorph = _Metamorph;
+  });
+})();
+
+(function() {
+define("ember-routing/ext/controller",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-runtime/controllers/controller","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, deprecate
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EnumerableUtils = __dependency4__["default"];
+    var map = EnumerableUtils.map;
+
+    var ControllerMixin = __dependency5__.ControllerMixin;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+
+    ControllerMixin.reopen({
+      /**
+        Transition the application into another route. The route may
+        be either a single route or route path:
+
+        ```javascript
+        aController.transitionToRoute('blogPosts');
+        aController.transitionToRoute('blogPosts.recentEntries');
+        ```
+
+        Optionally supply a model for the route in question. The model
+        will be serialized into the URL using the `serialize` hook of
+        the route:
+
+        ```javascript
+        aController.transitionToRoute('blogPost', aPost);
+        ```
+
+        If a literal is passed (such as a number or a string), it will
+        be treated as an identifier instead. In this case, the `model`
+        hook of the route will be triggered:
+
+        ```javascript
+        aController.transitionToRoute('blogPost', 1);
+        ```
+
+        Multiple models will be applied last to first recursively up the
+        resource tree.
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('blogPost', {path:':blogPostId'}, function(){
+            this.resource('blogComment', {path: ':blogCommentId'});
+          });
+        });
+
+        aController.transitionToRoute('blogComment', aPost, aComment);
+        aController.transitionToRoute('blogComment', 1, 13);
+        ```
+
+        It is also possible to pass a URL (a string that starts with a
+        `/`). This is intended for testing and debugging purposes and
+        should rarely be used in production code.
+
+        ```javascript
+        aController.transitionToRoute('/');
+        aController.transitionToRoute('/blog/post/1/comment/13');
+        ```
+
+        See also [replaceRoute](/api/classes/Ember.ControllerMixin.html#method_replaceRoute).
+
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used
+        while transitioning to the route.
+        @for Ember.ControllerMixin
+        @method transitionToRoute
+      */
+      transitionToRoute: function() {
+        // target may be either another controller or a router
+        var target = get(this, 'target'),
+            method = target.transitionToRoute || target.transitionTo;
+        return method.apply(target, arguments);
+      },
+
+      /**
+        @deprecated
+        @for Ember.ControllerMixin
+        @method transitionTo
+      */
+      transitionTo: function() {
+                return this.transitionToRoute.apply(this, arguments);
+      },
+
+      /**
+        Transition into another route while replacing the current URL, if possible.
+        This will replace the current history entry instead of adding a new one.
+        Beside that, it is identical to `transitionToRoute` in all other respects.
+
+        ```javascript
+        aController.replaceRoute('blogPosts');
+        aController.replaceRoute('blogPosts.recentEntries');
+        ```
+
+        Optionally supply a model for the route in question. The model
+        will be serialized into the URL using the `serialize` hook of
+        the route:
+
+        ```javascript
+        aController.replaceRoute('blogPost', aPost);
+        ```
+
+        If a literal is passed (such as a number or a string), it will
+        be treated as an identifier instead. In this case, the `model`
+        hook of the route will be triggered:
+
+        ```javascript
+        aController.replaceRoute('blogPost', 1);
+        ```
+
+        Multiple models will be applied last to first recursively up the
+        resource tree.
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('blogPost', {path:':blogPostId'}, function(){
+            this.resource('blogComment', {path: ':blogCommentId'});
+          });
+        });
+
+        aController.replaceRoute('blogComment', aPost, aComment);
+        aController.replaceRoute('blogComment', 1, 13);
+        ```
+
+        It is also possible to pass a URL (a string that starts with a
+        `/`). This is intended for testing and debugging purposes and
+        should rarely be used in production code.
+
+        ```javascript
+        aController.replaceRoute('/');
+        aController.replaceRoute('/blog/post/1/comment/13');
+        ```
+
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used
+        while transitioning to the route.
+        @for Ember.ControllerMixin
+        @method replaceRoute
+      */
+      replaceRoute: function() {
+        // target may be either another controller or a router
+        var target = get(this, 'target'),
+            method = target.replaceRoute || target.replaceWith;
+        return method.apply(target, arguments);
+      },
+
+      /**
+        @deprecated
+        @for Ember.ControllerMixin
+        @method replaceWith
+      */
+      replaceWith: function() {
+                return this.replaceRoute.apply(this, arguments);
+      }
+    });
+
+    
+    __exports__["default"] = ControllerMixin;
+  });
+define("ember-routing/ext/run_loop",
+  ["ember-metal/run_loop"],
+  function(__dependency1__) {
+    "use strict";
+    var run = __dependency1__["default"];
+
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    // Add a new named queue after the 'actions' queue (where RSVP promises
+    // resolve), which is used in router transitions to prevent unnecessary
+    // loading state entry if all context promises resolve on the
+    // 'actions' queue first.
+
+    var queues = run.queues;
+    run._addQueue('routerTransitions', 'actions');
+  });
+define("ember-routing/ext/view",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-views/views/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var run = __dependency3__["default"];
+    var EmberView = __dependency4__.View;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    EmberView.reopen({
+
+      /**
+        Sets the private `_outlets` object on the view.
+
+        @method init
+       */
+      init: function() {
+        set(this, '_outlets', {});
+        this._super();
+      },
+
+      /**
+        Manually fill any of a view's `{{outlet}}` areas with the
+        supplied view.
+
+        Example
+
+        ```javascript
+        var MyView = Ember.View.extend({
+          template: Ember.Handlebars.compile('Child view: {{outlet "main"}} ')
+        });
+        var myView = MyView.create();
+        myView.appendTo('body');
+        // The html for myView now looks like:
+        // <div id="ember228" class="ember-view">Child view: </div>
+
+        var FooView = Ember.View.extend({
+          template: Ember.Handlebars.compile('<h1>Foo</h1> ')
+        });
+        var fooView = FooView.create();
+        myView.connectOutlet('main', fooView);
+        // The html for myView now looks like:
+        // <div id="ember228" class="ember-view">Child view:
+        //   <div id="ember234" class="ember-view"><h1>Foo</h1> </div>
+        // </div>
+        ```
+        @method connectOutlet
+        @param  {String} outletName A unique name for the outlet
+        @param  {Object} view       An Ember.View
+       */
+      connectOutlet: function(outletName, view) {
+        if (this._pendingDisconnections) {
+          delete this._pendingDisconnections[outletName];
+        }
+
+        if (this._hasEquivalentView(outletName, view)) {
+          view.destroy();
+          return;
+        }
+
+        var outlets = get(this, '_outlets'),
+            container = get(this, 'container'),
+            router = container && container.lookup('router:main'),
+            renderedName = get(view, 'renderedName');
+
+        set(outlets, outletName, view);
+
+        if (router && renderedName) {
+          router._connectActiveView(renderedName, view);
+        }
+      },
+
+      /**
+        Determines if the view has already been created by checking if
+        the view has the same constructor, template, and context as the
+        view in the `_outlets` object.
+
+        @private
+        @method _hasEquivalentView
+        @param  {String} outletName The name of the outlet we are checking
+        @param  {Object} view       An Ember.View
+        @return {Boolean}
+       */
+      _hasEquivalentView: function(outletName, view) {
+        var existingView = get(this, '_outlets.'+outletName);
+        return existingView &&
+          existingView.constructor === view.constructor &&
+          existingView.get('template') === view.get('template') &&
+          existingView.get('context') === view.get('context');
+      },
+
+      /**
+        Removes an outlet from the view.
+
+        Example
+
+        ```javascript
+        var MyView = Ember.View.extend({
+          template: Ember.Handlebars.compile('Child view: {{outlet "main"}} ')
+        });
+        var myView = MyView.create();
+        myView.appendTo('body');
+        // myView's html:
+        // <div id="ember228" class="ember-view">Child view: </div>
+
+        var FooView = Ember.View.extend({
+          template: Ember.Handlebars.compile('<h1>Foo</h1> ')
+        });
+        var fooView = FooView.create();
+        myView.connectOutlet('main', fooView);
+        // myView's html:
+        // <div id="ember228" class="ember-view">Child view:
+        //   <div id="ember234" class="ember-view"><h1>Foo</h1> </div>
+        // </div>
+
+        myView.disconnectOutlet('main');
+        // myView's html:
+        // <div id="ember228" class="ember-view">Child view: </div>
+        ```
+
+        @method disconnectOutlet
+        @param  {String} outletName The name of the outlet to be removed
+       */
+      disconnectOutlet: function(outletName) {
+        if (!this._pendingDisconnections) {
+          this._pendingDisconnections = {};
+        }
+        this._pendingDisconnections[outletName] = true;
+        run.once(this, '_finishDisconnections');
+      },
+
+      /**
+        Gets an outlet that is pending disconnection and then
+        nullifys the object on the `_outlet` object.
+
+        @private
+        @method _finishDisconnections
+       */
+      _finishDisconnections: function() {
+        if (this.isDestroyed) return; // _outlets will be gone anyway
+        var outlets = get(this, '_outlets');
+        var pendingDisconnections = this._pendingDisconnections;
+        this._pendingDisconnections = null;
+
+        for (var outletName in pendingDisconnections) {
+          set(outlets, outletName, null);
+        }
+      }
+    });
+
+    __exports__["default"] = EmberView;
+  });
+define("ember-routing/helpers/action",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/run_loop","ember-views/system/utils","ember-handlebars","ember-routing/system/router","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Handlebars, uuid, FEATURES, assert, deprecate
+    var get = __dependency2__.get;
+    var forEach = __dependency3__.forEach;
+    var run = __dependency4__["default"];
+
+    var isSimpleClick = __dependency5__.isSimpleClick;
+    var EmberHandlebars = __dependency6__["default"];
+    var EmberRouter = __dependency7__["default"];
+
+
+    var EmberHandlebars = __dependency6__["default"];
+    var handlebarsGet = __dependency8__.handlebarsGet;
+    var viewHelper = __dependency9__.viewHelper;
+    var resolveParams = __dependency10__.resolveParams;
+    var resolvePath = __dependency10__.resolvePath;
+
+    // requireModule('ember-handlebars');
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    var SafeString = EmberHandlebars.SafeString,
+        a_slice = Array.prototype.slice;
+
+    function args(options, actionName) {
+      var ret = [];
+      if (actionName) { ret.push(actionName); }
+
+      var types = options.options.types.slice(1),
+          data = options.options.data;
+
+      return ret.concat(resolveParams(options.context, options.params, { types: types, data: data }));
+    }
+
+    var ActionHelper = {
+      registeredActions: {}
+    };
+
+    var keys = ["alt", "shift", "meta", "ctrl"];
+
+    var POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
+
+    var isAllowedEvent = function(event, allowedKeys) {
+      if (typeof allowedKeys === "undefined") {
+        if (POINTER_EVENT_TYPE_REGEX.test(event.type)) {
+          return isSimpleClick(event);
+        } else {
+          allowedKeys = '';
+        }
+      }
+
+      if (allowedKeys.indexOf("any") >= 0) {
+        return true;
+      }
+
+      var allowed = true;
+
+      forEach.call(keys, function(key) {
+        if (event[key + "Key"] && allowedKeys.indexOf(key) === -1) {
+          allowed = false;
+        }
+      });
+
+      return allowed;
+    };
+
+    ActionHelper.registerAction = function(actionNameOrPath, options, allowedKeys) {
+      var actionId = ++Ember.uuid;
+
+      ActionHelper.registeredActions[actionId] = {
+        eventName: options.eventName,
+        handler: function handleRegisteredAction(event) {
+          if (!isAllowedEvent(event, allowedKeys)) { return true; }
+
+          if (options.preventDefault !== false) {
+            event.preventDefault();
+          }
+
+          if (options.bubbles === false) {
+            event.stopPropagation();
+          }
+
+          var target = options.target,
+              parameters = options.parameters,
+              actionName;
+
+          if (target.target) {
+            target = handlebarsGet(target.root, target.target, target.options);
+          } else {
+            target = target.root;
+          }
+
+          if (options.boundProperty) {
+            actionName = resolveParams(parameters.context, [actionNameOrPath], { types: ['ID'], data: parameters.options.data })[0];
+
+            if(typeof actionName === 'undefined' || typeof actionName === 'function') {
+                            actionName = actionNameOrPath;
+            }
+          }
+
+          if (!actionName) {
+            actionName = actionNameOrPath;
+          }
+
+          run(function runRegisteredAction() {
+            if (target.send) {
+              target.send.apply(target, args(parameters, actionName));
+            } else {
+                            target[actionName].apply(target, args(parameters));
+            }
+          });
+        }
+      };
+
+      options.view.on('willClearRender', function() {
+        delete ActionHelper.registeredActions[actionId];
+      });
+
+      return actionId;
+    };
+
+    /**
+      The `{{action}}` helper registers an HTML element within a template for DOM
+      event handling and forwards that interaction to the templates's controller
+      or supplied `target` option (see 'Specifying a Target').
+
+      If the controller does not implement the event, the event is sent
+      to the current route, and it bubbles up the route hierarchy from there.
+
+      User interaction with that element will invoke the supplied action name on
+      the appropriate target. Specifying a non-quoted action name will result in
+      a bound property lookup at the time the event will be triggered.
+
+      Given the following application Handlebars template on the page
+
+      ```handlebars
+      <div {{action 'anActionName'}}>
+        click me
+      </div>
+      ```
+
+      And application code
+
+      ```javascript
+      App.ApplicationController = Ember.Controller.extend({
+        actions: {
+          anActionName: function() {
+          }
+        }
+      });
+      ```
+
+      Will result in the following rendered HTML
+
+      ```html
+      <div class="ember-view">
+        <div data-ember-action="1">
+          click me
+        </div>
+      </div>
+      ```
+
+      Clicking "click me" will trigger the `anActionName` action of the
+      `App.ApplicationController`. In this case, no additional parameters will be passed.
+
+      If you provide additional parameters to the helper:
+
+      ```handlebars
+      <button {{action 'edit' post}}>Edit</button>
+      ```
+
+      Those parameters will be passed along as arguments to the JavaScript
+      function implementing the action.
+
+      ### Event Propagation
+
+      Events triggered through the action helper will automatically have
+      `.preventDefault()` called on them. You do not need to do so in your event
+      handlers. If you need to allow event propagation (to handle file inputs for
+      example) you can supply the `preventDefault=false` option to the `{{action}}` helper:
+
+      ```handlebars
+      <div {{action "sayHello" preventDefault=false}}>
+        <input type="file" />
+        <input type="checkbox" />
+      </div>
+      ```
+
+      To disable bubbling, pass `bubbles=false` to the helper:
+
+      ```handlebars
+      <button {{action 'edit' post bubbles=false}}>Edit</button>
+      ```
+
+      If you need the default handler to trigger you should either register your
+      own event handler, or use event methods on your view class. See [Ember.View](/api/classes/Ember.View.html)
+      'Responding to Browser Events' for more information.
+
+      ### Specifying DOM event type
+
+      By default the `{{action}}` helper registers for DOM `click` events. You can
+      supply an `on` option to the helper to specify a different DOM event name:
+
+      ```handlebars
+      <div {{action "anActionName" on="doubleClick"}}>
+        click me
+      </div>
+      ```
+
+      See `Ember.View` 'Responding to Browser Events' for a list of
+      acceptable DOM event names.
+
+      NOTE: Because `{{action}}` depends on Ember's event dispatch system it will
+      only function if an `Ember.EventDispatcher` instance is available. An
+      `Ember.EventDispatcher` instance will be created when a new `Ember.Application`
+      is created. Having an instance of `Ember.Application` will satisfy this
+      requirement.
+
+      ### Specifying whitelisted modifier keys
+
+      By default the `{{action}}` helper will ignore click event with pressed modifier
+      keys. You can supply an `allowedKeys` option to specify which keys should not be ignored.
+
+      ```handlebars
+      <div {{action "anActionName" allowedKeys="alt"}}>
+        click me
+      </div>
+      ```
+
+      This way the `{{action}}` will fire when clicking with the alt key pressed down.
+
+      Alternatively, supply "any" to the `allowedKeys` option to accept any combination of modifier keys.
+
+      ```handlebars
+      <div {{action "anActionName" allowedKeys="any"}}>
+        click me with any key pressed
+      </div>
+      ```
+
+      ### Specifying a Target
+
+      There are several possible target objects for `{{action}}` helpers:
+
+      In a typical Ember application, where views are managed through use of the
+      `{{outlet}}` helper, actions will bubble to the current controller, then
+      to the current route, and then up the route hierarchy.
+
+      Alternatively, a `target` option can be provided to the helper to change
+      which object will receive the method call. This option must be a path
+      to an object, accessible in the current context:
+
+      ```handlebars
+      {{! the application template }}
+      <div {{action "anActionName" target=view}}>
+        click me
+      </div>
+      ```
+
+      ```javascript
+      App.ApplicationView = Ember.View.extend({
+        actions: {
+          anActionName: function(){}
+        }
+      });
+
+      ```
+
+      ### Additional Parameters
+
+      You may specify additional parameters to the `{{action}}` helper. These
+      parameters are passed along as the arguments to the JavaScript function
+      implementing the action.
+
+      ```handlebars
+      {{#each person in people}}
+        <div {{action "edit" person}}>
+          click me
+        </div>
+      {{/each}}
+      ```
+
+      Clicking "click me" will trigger the `edit` method on the current controller
+      with the value of `person` as a parameter.
+
+      @method action
+      @for Ember.Handlebars.helpers
+      @param {String} actionName
+      @param {Object} [context]*
+      @param {Hash} options
+    */
+    function actionHelper(actionName) {
+      var options = arguments[arguments.length - 1],
+          contexts = a_slice.call(arguments, 1, -1);
+
+      var hash = options.hash,
+          controller = options.data.keywords.controller;
+
+      // create a hash to pass along to registerAction
+      var action = {
+        eventName: hash.on || "click",
+        parameters: {
+          context: this,
+          options: options,
+          params: contexts
+        },
+        view: options.data.view,
+        bubbles: hash.bubbles,
+        preventDefault: hash.preventDefault,
+        target: { options: options },
+        boundProperty: options.types[0] === "ID"
+      };
+
+      if (hash.target) {
+        action.target.root = this;
+        action.target.target = hash.target;
+      } else if (controller) {
+        action.target.root = controller;
+      }
+
+      var actionId = ActionHelper.registerAction(actionName, action, hash.allowedKeys);
+      return new SafeString('data-ember-action="' + actionId + '"');
+    };
+
+    __exports__.ActionHelper = ActionHelper;
+    __exports__.actionHelper = actionHelper;
+  });
+define("ember-routing/helpers/link_to",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/keys","ember-views/system/utils","ember-views/views/view","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, Logger, Handlebars, warn, assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var merge = __dependency4__["default"];
+    var run = __dependency5__["default"];
+    var computed = __dependency6__.computed;
+
+    var onLoad = __dependency7__.onLoad;
+    var fmt = __dependency8__.fmt;
+    var EmberObject = __dependency9__["default"];
+    var keys = __dependency10__["default"];
+    var isSimpleClick = __dependency11__.isSimpleClick;
+    var EmberView = __dependency12__.View;
+    var EmberHandlebars = __dependency13__["default"];
+    var viewHelper = __dependency14__.viewHelper;
+    var EmberRouter = __dependency15__["default"];
+    var resolveParams = __dependency16__.resolveParams;
+    var resolvePaths = __dependency16__.resolvePaths;
+
+    // requireModule('ember-handlebars');
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    var slice = [].slice;
+
+    requireModule('ember-handlebars');
+
+    var numberOfContextsAcceptedByHandler = function(handler, handlerInfos) {
+      var req = 0;
+      for (var i = 0, l = handlerInfos.length; i < l; i++) {
+        req = req + handlerInfos[i].names.length;
+        if (handlerInfos[i].handler === handler)
+          break;
+      }
+
+      // query params adds an additional context
+            return req;
+    };
+
+    var QueryParams = EmberObject.extend({
+      values: null
+    });
+
+    function computeQueryParams(linkView, stripDefaultValues) {
+      var helperParameters = linkView.parameters,
+          queryParamsObject = get(linkView, 'queryParamsObject'),
+          suppliedParams = {};
+
+      if (queryParamsObject) {
+        merge(suppliedParams, queryParamsObject.values);
+      }
+
+      var resolvedParams = get(linkView, 'resolvedParams'),
+          router = get(linkView, 'router'),
+          routeName = resolvedParams[0],
+          paramsForRoute = router._queryParamsFor(routeName),
+          qps = paramsForRoute.qps,
+          paramsForRecognizer = {};
+
+      // We need to collect all non-default query params for this route.
+      for (var i = 0, len = qps.length; i < len; ++i) {
+        var qp = qps[i];
+
+        // Check if the link-to provides a value for this qp.
+        var providedType = null, value;
+        if (qp.prop in suppliedParams) {
+          value = suppliedParams[qp.prop];
+          providedType = queryParamsObject.types[qp.prop];
+          delete suppliedParams[qp.prop];
+        } else if (qp.urlKey in suppliedParams) {
+          value = suppliedParams[qp.urlKey];
+          providedType = queryParamsObject.types[qp.urlKey];
+          delete suppliedParams[qp.urlKey];
+        }
+
+        if (providedType) {
+          if (providedType === 'ID') {
+            var normalizedPath = EmberHandlebars.normalizePath(helperParameters.context, value, helperParameters.options.data);
+            value = EmberHandlebars.get(normalizedPath.root, normalizedPath.path, helperParameters.options);
+          }
+
+          value = qp.route.serializeQueryParam(value, qp.urlKey, qp.type);
+        } else {
+          value = qp.svalue;
+        }
+
+        if (stripDefaultValues && value === qp.sdef) {
+          continue;
+        }
+
+        paramsForRecognizer[qp.urlKey] = value;
+      }
+
+      return paramsForRecognizer;
+    }
+
+    function routeArgsWithoutDefaultQueryParams(linkView) {
+      var routeArgs = linkView.get('routeArgs');
+
+      if (!routeArgs[routeArgs.length-1].queryParams) {
+        return routeArgs;
+      }
+
+      routeArgs = routeArgs.slice();
+      routeArgs[routeArgs.length-1] = {
+        queryParams: computeQueryParams(linkView, true)
+      };
+      return routeArgs;
+    }
+
+    function getResolvedPaths(options) {
+
+      var types = options.options.types,
+          data = options.options.data;
+
+      return resolvePaths(options.context, options.params, { types: types, data: data });
+    }
+
+    /**
+      `Ember.LinkView` renders an element whose `click` event triggers a
+      transition of the application's instance of `Ember.Router` to
+      a supplied route by name.
+
+      Instances of `LinkView` will most likely be created through
+      the `link-to` Handlebars helper, but properties of this class
+      can be overridden to customize application-wide behavior.
+
+      @class LinkView
+      @namespace Ember
+      @extends Ember.View
+      @see {Handlebars.helpers.link-to}
+    **/
+    var LinkView = Ember.LinkView = EmberView.extend({
+      tagName: 'a',
+      currentWhen: null,
+
+      /**
+        Sets the `title` attribute of the `LinkView`'s HTML element.
+
+        @property title
+        @default null
+      **/
+      title: null,
+
+      /**
+        Sets the `rel` attribute of the `LinkView`'s HTML element.
+
+        @property rel
+        @default null
+      **/
+      rel: null,
+
+      /**
+        The CSS class to apply to `LinkView`'s element when its `active`
+        property is `true`.
+
+        @property activeClass
+        @type String
+        @default active
+      **/
+      activeClass: 'active',
+
+      /**
+        The CSS class to apply to `LinkView`'s element when its `loading`
+        property is `true`.
+
+        @property loadingClass
+        @type String
+        @default loading
+      **/
+      loadingClass: 'loading',
+
+      /**
+        The CSS class to apply to a `LinkView`'s element when its `disabled`
+        property is `true`.
+
+        @property disabledClass
+        @type String
+        @default disabled
+      **/
+      disabledClass: 'disabled',
+      _isDisabled: false,
+
+      /**
+        Determines whether the `LinkView` will trigger routing via
+        the `replaceWith` routing strategy.
+
+        @property replace
+        @type Boolean
+        @default false
+      **/
+      replace: false,
+
+      /**
+        By default the `{{link-to}}` helper will bind to the `href` and
+        `title` attributes. It's discourage that you override these defaults,
+        however you can push onto the array if needed.
+
+        @property attributeBindings
+        @type Array | String
+        @default ['href', 'title', 'rel']
+       **/
+      attributeBindings: ['href', 'title', 'rel'],
+
+      /**
+        By default the `{{link-to}}` helper will bind to the `active`, `loading`, and
+        `disabled` classes. It is discouraged to override these directly.
+
+        @property classNameBindings
+        @type Array
+        @default ['active', 'loading', 'disabled']
+       **/
+      classNameBindings: ['active', 'loading', 'disabled'],
+
+      /**
+        By default the `{{link-to}}` helper responds to the `click` event. You
+        can override this globally by setting this property to your custom
+        event name.
+
+        This is particularly useful on mobile when one wants to avoid the 300ms
+        click delay using some sort of custom `tap` event.
+
+        @property eventName
+        @type String
+        @default click
+      */
+      eventName: 'click',
+
+      // this is doc'ed here so it shows up in the events
+      // section of the API documentation, which is where
+      // people will likely go looking for it.
+      /**
+        Triggers the `LinkView`'s routing behavior. If
+        `eventName` is changed to a value other than `click`
+        the routing behavior will trigger on that custom event
+        instead.
+
+        @event click
+      **/
+
+      /**
+        An overridable method called when LinkView objects are instantiated.
+
+        Example:
+
+        ```javascript
+        App.MyLinkView = Ember.LinkView.extend({
+          init: function() {
+            this._super();
+            Ember.Logger.log('Event is ' + this.get('eventName'));
+          }
+        });
+        ```
+
+        NOTE: If you do override `init` for a framework class like `Ember.View` or
+        `Ember.ArrayController`, be sure to call `this._super()` in your
+        `init` declaration! If you don't, Ember may not have an opportunity to
+        do important setup work, and you'll see strange behavior in your
+        application.
+
+        @method init
+      */
+      init: function() {
+        this._super.apply(this, arguments);
+
+        // Map desired event name to invoke function
+        var eventName = get(this, 'eventName');
+        this.on(eventName, this, this._invoke);
+      },
+
+      /**
+        This method is invoked by observers installed during `init` that fire
+        whenever the params change
+
+        @private
+        @method _paramsChanged
+        @since 1.3.0
+       */
+      _paramsChanged: function() {
+        this.notifyPropertyChange('resolvedParams');
+      },
+
+      /**
+       This is called to setup observers that will trigger a rerender.
+
+       @private
+       @method _setupPathObservers
+       @since 1.3.0
+      **/
+      _setupPathObservers: function(){
+        var helperParameters = this.parameters,
+            linkTextPath     = helperParameters.options.linkTextPath,
+            paths = getResolvedPaths(helperParameters),
+            length = paths.length,
+            path, i, normalizedPath;
+
+        if (linkTextPath) {
+          normalizedPath = EmberHandlebars.normalizePath(helperParameters.context, linkTextPath, helperParameters.options.data);
+          this.registerObserver(normalizedPath.root, normalizedPath.path, this, this.rerender);
+        }
+
+        for(i=0; i < length; i++) {
+          path = paths[i];
+          if (null === path) {
+            // A literal value was provided, not a path, so nothing to observe.
+            continue;
+          }
+
+          normalizedPath = EmberHandlebars.normalizePath(helperParameters.context, path, helperParameters.options.data);
+          this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
+        }
+
+        var queryParamsObject = this.queryParamsObject;
+        if (queryParamsObject) {
+          var values = queryParamsObject.values;
+
+          // Install observers for all of the hash options
+          // provided in the (query-params) subexpression.
+          for (var k in values) {
+            if (!values.hasOwnProperty(k)) { continue; }
+
+            if (queryParamsObject.types[k] === 'ID') {
+              normalizedPath = EmberHandlebars.normalizePath(helperParameters.context, values[k], helperParameters.options.data);
+              this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
+            }
+          }
+        }
+      },
+
+      afterRender: function(){
+        this._super.apply(this, arguments);
+        this._setupPathObservers();
+      },
+
+      /**
+        Even though this isn't a virtual view, we want to treat it as if it is
+        so that you can access the parent with {{view.prop}}
+
+        @private
+        @method concreteView
+      **/
+      concreteView: computed(function() {
+        return get(this, 'parentView');
+      }).property('parentView'),
+
+      /**
+
+        Accessed as a classname binding to apply the `LinkView`'s `disabledClass`
+        CSS `class` to the element when the link is disabled.
+
+        When `true` interactions with the element will not trigger route changes.
+        @property disabled
+      */
+      disabled: computed(function computeLinkViewDisabled(key, value) {
+        if (value !== undefined) { this.set('_isDisabled', value); }
+
+        return value ? get(this, 'disabledClass') : false;
+      }),
+
+      /**
+        Accessed as a classname binding to apply the `LinkView`'s `activeClass`
+        CSS `class` to the element when the link is active.
+
+        A `LinkView` is considered active when its `currentWhen` property is `true`
+        or the application's current route is the route the `LinkView` would trigger
+        transitions into.
+
+        @property active
+      **/
+      active: computed(function computeLinkViewActive() {
+        if (get(this, 'loading')) { return false; }
+
+        var router = get(this, 'router'),
+            routeArgs = get(this, 'routeArgs'),
+            contexts = routeArgs.slice(1),
+            resolvedParams = get(this, 'resolvedParams'),
+            currentWhen = this.currentWhen || routeArgs[0],
+            maximumContexts = numberOfContextsAcceptedByHandler(currentWhen, router.router.recognizer.handlersFor(currentWhen));
+
+        // if we don't have enough contexts revert back to full route name
+        // this is because the leaf route will use one of the contexts
+        if (contexts.length > maximumContexts)
+          currentWhen = routeArgs[0];
+
+        var isActive = router.isActive.apply(router, [currentWhen].concat(contexts));
+
+        if (isActive) { return get(this, 'activeClass'); }
+      }).property('resolvedParams', 'routeArgs'),
+
+      /**
+        Accessed as a classname binding to apply the `LinkView`'s `loadingClass`
+        CSS `class` to the element when the link is loading.
+
+        A `LinkView` is considered loading when it has at least one
+        parameter whose value is currently null or undefined. During
+        this time, clicking the link will perform no transition and
+        emit a warning that the link is still in a loading state.
+
+        @property loading
+      **/
+      loading: computed(function computeLinkViewLoading() {
+        if (!get(this, 'routeArgs')) { return get(this, 'loadingClass'); }
+      }).property('routeArgs'),
+
+      /**
+        Returns the application's main router from the container.
+
+        @private
+        @property router
+      **/
+      router: computed(function() {
+        return get(this, 'controller').container.lookup('router:main');
+      }),
+
+      /**
+        Event handler that invokes the link, activating the associated route.
+
+        @private
+        @method _invoke
+        @param {Event} event
+      */
+      _invoke: function(event) {
+        if (!isSimpleClick(event)) { return true; }
+
+        if (this.preventDefault !== false) { event.preventDefault(); }
+        if (this.bubbles === false) { event.stopPropagation(); }
+
+        if (get(this, '_isDisabled')) { return false; }
+
+        if (get(this, 'loading')) {
+          Ember.Logger.warn("This link-to is in an inactive loading state because at least one of its parameters presently has a null/undefined value, or the provided route name is invalid.");
+          return false;
+        }
+
+        var router = get(this, 'router'),
+            routeArgs = get(this, 'routeArgs');
+
+        var transition;
+        if (get(this, 'replace')) {
+          transition = router.replaceWith.apply(router, routeArgs);
+        } else {
+          transition = router.transitionTo.apply(router, routeArgs);
+        }
+
+        // Schedule eager URL update, but after we've given the transition
+        // a chance to synchronously redirect.
+        // We need to always generate the URL instead of using the href because
+        // the href will include any rootURL set, but the router expects a URL
+        // without it! Note that we don't use the first level router because it
+        // calls location.formatURL(), which also would add the rootURL!
+        var url = router.router.generate.apply(router.router, routeArgsWithoutDefaultQueryParams(this));
+        run.scheduleOnce('routerTransitions', this, this._eagerUpdateUrl, transition, url);
+      },
+
+      /**
+        @private
+        @method _eagerUpdateUrl
+        @param transition
+        @param href
+       */
+      _eagerUpdateUrl: function(transition, href) {
+        if (!transition.isActive || !transition.urlMethod) {
+          // transition was aborted, already ran to completion,
+          // or it has a null url-updated method.
+          return;
+        }
+
+        if (href.indexOf('#') === 0) {
+          href = href.slice(1);
+        }
+
+        // Re-use the routerjs hooks set up by the Ember router.
+        var routerjs = get(this, 'router.router');
+        if (transition.urlMethod === 'update') {
+          routerjs.updateURL(href);
+        } else if (transition.urlMethod === 'replace') {
+          routerjs.replaceURL(href);
+        }
+
+        // Prevent later update url refire.
+        transition.method(null);
+      },
+
+      /**
+        Computed property that returns an array of the
+        resolved parameters passed to the `link-to` helper,
+        e.g.:
+
+        ```hbs
+        {{link-to a b '123' c}}
+        ```
+
+        will generate a `resolvedParams` of:
+
+        ```js
+        [aObject, bObject, '123', cObject]
+        ```
+
+        @private
+        @property
+        @return {Array}
+       */
+      resolvedParams: computed(function() {
+        var parameters = this.parameters,
+            options = parameters.options,
+            types = options.types,
+            data = options.data;
+
+        if (parameters.params.length === 0) {
+          var appController = this.container.lookup('controller:application');
+          return [get(appController, 'currentRouteName')];
+        } else {
+          return resolveParams(parameters.context, parameters.params, { types: types, data: data });
+        }
+      }).property('router.url'),
+
+      /**
+        Computed property that returns the current route name and
+        any dynamic segments.
+
+        @private
+        @property
+        @return {Array} An array with the route name and any dynamic segments
+       */
+      routeArgs: computed(function computeLinkViewRouteArgs() {
+        var resolvedParams = get(this, 'resolvedParams').slice(0),
+            router = get(this, 'router'),
+            namedRoute = resolvedParams[0];
+
+        if (!namedRoute) { return; }
+
+        
+        //normalize route name
+        var handlers = router.router.recognizer.handlersFor(namedRoute);
+        var normalizedPath = handlers[handlers.length - 1].handler;
+        if (namedRoute !== normalizedPath) {
+          //set namedRoute as currentWhen only when currentWhen is not given explicitly
+          if (!this.currentWhen) {
+            this.set('currentWhen', namedRoute);
+          }
+          namedRoute = handlers[handlers.length - 1].handler;
+          resolvedParams[0] = namedRoute;
+        }
+
+        for (var i = 1, len = resolvedParams.length; i < len; ++i) {
+          var param = resolvedParams[i];
+          if (param === null || typeof param === 'undefined') {
+            // If contexts aren't present, consider the linkView unloaded.
+            return;
+          }
+        }
+
+        
+        return resolvedParams;
+      }).property('resolvedParams', 'queryParams'),
+
+      queryParamsObject: null,
+      queryParams: computed(function computeLinkViewQueryParams() {
+        return computeQueryParams(this, false);
+      }).property('resolvedParams.[]'),
+
+      /**
+        Sets the element's `href` attribute to the url for
+        the `LinkView`'s targeted route.
+
+        If the `LinkView`'s `tagName` is changed to a value other
+        than `a`, this property will be ignored.
+
+        @property href
+      **/
+      href: computed(function computeLinkViewHref() {
+        if (get(this, 'tagName') !== 'a') { return; }
+
+        var router = get(this, 'router'),
+            routeArgs = get(this, 'routeArgs');
+
+        if (!routeArgs) {
+          return get(this, 'loadingHref');
+        }
+
+        
+        return router.generate.apply(router, routeArgs);
+      }).property('routeArgs'),
+
+      /**
+        The default href value to use while a link-to is loading.
+        Only applies when tagName is 'a'
+
+        @property loadingHref
+        @type String
+        @default #
+      */
+      loadingHref: '#'
+    });
+
+    LinkView.toString = function() { return "LinkView"; };
+
+    /**
+      The `{{link-to}}` helper renders a link to the supplied
+      `routeName` passing an optionally supplied model to the
+      route as its `model` context of the route. The block
+      for `{{link-to}}` becomes the innerHTML of the rendered
+      element:
+
+      ```handlebars
+      {{#link-to 'photoGallery'}}
+        Great Hamster Photos
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos">
+        Great Hamster Photos
+      </a>
+      ```
+
+      ### Supplying a tagName
+      By default `{{link-to}}` renders an `<a>` element. This can
+      be overridden for a single use of `{{link-to}}` by supplying
+      a `tagName` option:
+
+      ```handlebars
+      {{#link-to 'photoGallery' tagName="li"}}
+        Great Hamster Photos
+      {{/link-to}}
+      ```
+
+      ```html
+      <li>
+        Great Hamster Photos
+      </li>
+      ```
+
+      To override this option for your entire application, see
+      "Overriding Application-wide Defaults".
+
+      ### Disabling the `link-to` helper
+      By default `{{link-to}}` is enabled.
+      any passed value to `disabled` helper property will disable the `link-to` helper.
+
+      static use: the `disabled` option:
+
+      ```handlebars
+      {{#link-to 'photoGallery' disabled=true}}
+        Great Hamster Photos
+      {{/link-to}}
+      ```
+
+      dynamic use: the `disabledWhen` option:
+
+      ```handlebars
+      {{#link-to 'photoGallery' disabledWhen=controller.someProperty}}
+        Great Hamster Photos
+      {{/link-to}}
+      ```
+
+      any passed value to `disabled` will disable it except `undefined`.
+      to ensure that only `true` disable the `link-to` helper you can
+      override the global behaviour of `Ember.LinkView`.
+
+      ```javascript
+      Ember.LinkView.reopen({
+        disabled: Ember.computed(function(key, value) {
+          if (value !== undefined) {
+            this.set('_isDisabled', value === true);
+          }
+          return value === true ? get(this, 'disabledClass') : false;
+        })
+      });
+      ```
+
+      see "Overriding Application-wide Defaults" for more.
+
+      ### Handling `href`
+      `{{link-to}}` will use your application's Router to
+      fill the element's `href` property with a url that
+      matches the path to the supplied `routeName` for your
+      routers's configured `Location` scheme, which defaults
+      to Ember.HashLocation.
+
+      ### Handling current route
+      `{{link-to}}` will apply a CSS class name of 'active'
+      when the application's current route matches
+      the supplied routeName. For example, if the application's
+      current route is 'photoGallery.recent' the following
+      use of `{{link-to}}`:
+
+      ```handlebars
+      {{#link-to 'photoGallery.recent'}}
+        Great Hamster Photos from the last week
+      {{/link-to}}
+      ```
+
+      will result in
+
+      ```html
+      <a href="/hamster-photos/this-week" class="active">
+        Great Hamster Photos
+      </a>
+      ```
+
+      The CSS class name used for active classes can be customized
+      for a single use of `{{link-to}}` by passing an `activeClass`
+      option:
+
+      ```handlebars
+      {{#link-to 'photoGallery.recent' activeClass="current-url"}}
+        Great Hamster Photos from the last week
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos/this-week" class="current-url">
+        Great Hamster Photos
+      </a>
+      ```
+
+      To override this option for your entire application, see
+      "Overriding Application-wide Defaults".
+
+      ### Supplying a model
+      An optional model argument can be used for routes whose
+      paths contain dynamic segments. This argument will become
+      the model context of the linked route:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource("photoGallery", {path: "hamster-photos/:photo_id"});
+      });
+      ```
+
+      ```handlebars
+      {{#link-to 'photoGallery' aPhoto}}
+        {{aPhoto.title}}
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos/42">
+        Tomster
+      </a>
+      ```
+
+      ### Supplying multiple models
+      For deep-linking to route paths that contain multiple
+      dynamic segments, multiple model arguments can be used.
+      As the router transitions through the route path, each
+      supplied model argument will become the context for the
+      route with the dynamic segments:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource("photoGallery", {path: "hamster-photos/:photo_id"}, function() {
+          this.route("comment", {path: "comments/:comment_id"});
+        });
+      });
+      ```
+      This argument will become the model context of the linked route:
+
+      ```handlebars
+      {{#link-to 'photoGallery.comment' aPhoto comment}}
+        {{comment.body}}
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos/42/comment/718">
+        A+++ would snuggle again.
+      </a>
+      ```
+
+      ### Supplying an explicit dynamic segment value
+      If you don't have a model object available to pass to `{{link-to}}`,
+      an optional string or integer argument can be passed for routes whose
+      paths contain dynamic segments. This argument will become the value
+      of the dynamic segment:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource("photoGallery", {path: "hamster-photos/:photo_id"});
+      });
+      ```
+
+      ```handlebars
+      {{#link-to 'photoGallery' aPhotoId}}
+        {{aPhoto.title}}
+      {{/link-to}}
+      ```
+
+      ```html
+      <a href="/hamster-photos/42">
+        Tomster
+      </a>
+      ```
+
+      When transitioning into the linked route, the `model` hook will
+      be triggered with parameters including this passed identifier.
+
+      ### Allowing Default Action
+
+     By default the `{{link-to}}` helper prevents the default browser action
+     by calling `preventDefault()` as this sort of action bubbling is normally
+     handled internally and we do not want to take the browser to a new URL (for
+     example).
+
+     If you need to override this behavior specify `preventDefault=false` in
+     your template:
+
+      ```handlebars
+      {{#link-to 'photoGallery' aPhotoId preventDefault=false}}
+        {{aPhotoId.title}}
+      {{/link-to}}
+      ```
+
+      ### Overriding attributes
+      You can override any given property of the Ember.LinkView
+      that is generated by the `{{link-to}}` helper by passing
+      key/value pairs, like so:
+
+      ```handlebars
+      {{#link-to  aPhoto tagName='li' title='Following this link will change your life' classNames='pic sweet'}}
+        Uh-mazing!
+      {{/link-to}}
+      ```
+
+      See [Ember.LinkView](/api/classes/Ember.LinkView.html) for a
+      complete list of overrideable properties. Be sure to also
+      check out inherited properties of `LinkView`.
+
+      ### Overriding Application-wide Defaults
+      ``{{link-to}}`` creates an instance of Ember.LinkView
+      for rendering. To override options for your entire
+      application, reopen Ember.LinkView and supply the
+      desired values:
+
+      ``` javascript
+      Ember.LinkView.reopen({
+        activeClass: "is-active",
+        tagName: 'li'
+      })
+      ```
+
+      It is also possible to override the default event in
+      this manner:
+
+      ``` javascript
+      Ember.LinkView.reopen({
+        eventName: 'customEventName'
+      });
+      ```
+
+      @method link-to
+      @for Ember.Handlebars.helpers
+      @param {String} routeName
+      @param {Object} [context]*
+      @param [options] {Object} Handlebars key/value pairs of options, you can override any property of Ember.LinkView
+      @return {String} HTML string
+      @see {Ember.LinkView}
+    */
+    function linkToHelper(name) {
+      var options = slice.call(arguments, -1)[0],
+          params = slice.call(arguments, 0, -1),
+          hash = options.hash;
+
+      if (params[params.length - 1] instanceof QueryParams) {
+        hash.queryParamsObject = params.pop();
+      }
+
+      hash.disabledBinding = hash.disabledWhen;
+
+      if (!options.fn) {
+        var linkTitle = params.shift();
+        var linkType = options.types.shift();
+        var context = this;
+        if (linkType === 'ID') {
+          options.linkTextPath = linkTitle;
+          options.fn = function() {
+            return EmberHandlebars.getEscaped(context, linkTitle, options);
+          };
+        } else {
+          options.fn = function() {
+            return linkTitle;
+          };
+        }
+      }
+
+      hash.parameters = {
+        context: this,
+        options: options,
+        params: params
+      };
+
+      options.helperName = options.helperName || 'link-to';
+
+      return viewHelper.call(this, LinkView, options);
+    };
+
+
+    
+    /**
+      See [link-to](/api/classes/Ember.Handlebars.helpers.html#method_link-to)
+
+      @method linkTo
+      @for Ember.Handlebars.helpers
+      @deprecated
+      @param {String} routeName
+      @param {Object} [context]*
+      @return {String} HTML string
+    */
+    function deprecatedLinkToHelper() {
+            return linkToHelper.apply(this, arguments);
+    };
+
+    __exports__.LinkView = LinkView;
+    __exports__.deprecatedLinkToHelper = deprecatedLinkToHelper;
+    __exports__.linkToHelper = linkToHelper;
+  });
+define("ember-routing/helpers/outlet",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-views/views/container_view","ember-handlebars/views/metamorph_view","ember-handlebars/helpers/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var onLoad = __dependency4__.onLoad;
+    var ContainerView = __dependency5__["default"];
+    var _Metamorph = __dependency6__._Metamorph;
+    var viewHelper = __dependency7__.viewHelper;
+
+    // requireModule('ember-handlebars');
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+      /**
+      @module ember
+      @submodule ember-routing
+      */
+
+    var OutletView = ContainerView.extend(_Metamorph);
+
+    /**
+      The `outlet` helper is a placeholder that the router will fill in with
+      the appropriate template based on the current state of the application.
+
+      ``` handlebars
+      {{outlet}}
+      ```
+
+      By default, a template based on Ember's naming conventions will be rendered
+      into the `outlet` (e.g. `App.PostsRoute` will render the `posts` template).
+
+      You can render a different template by using the `render()` method in the
+      route's `renderTemplate` hook. The following will render the `favoritePost`
+      template into the `outlet`.
+
+      ``` javascript
+      App.PostsRoute = Ember.Route.extend({
+        renderTemplate: function() {
+          this.render('favoritePost');
+        }
+      });
+      ```
+
+      You can create custom named outlets for more control.
+
+      ``` handlebars
+      {{outlet 'favoritePost'}}
+      {{outlet 'posts'}}
+      ```
+
+      Then you can define what template is rendered into each outlet in your
+      route.
+
+
+      ``` javascript
+      App.PostsRoute = Ember.Route.extend({
+        renderTemplate: function() {
+          this.render('favoritePost', { outlet: 'favoritePost' });
+          this.render('posts', { outlet: 'posts' });
+        }
+      });
+      ```
+
+      You can specify the view that the outlet uses to contain and manage the
+      templates rendered into it.
+
+      ``` handlebars
+      {{outlet view='sectionContainer'}}
+      ```
+
+      ``` javascript
+      App.SectionContainer = Ember.ContainerView.extend({
+        tagName: 'section',
+        classNames: ['special']
+      });
+      ```
+
+      @method outlet
+      @for Ember.Handlebars.helpers
+      @param {String} property the property on the controller
+        that holds the view for this outlet
+      @return {String} HTML string
+    */
+    function outletHelper(property, options) {
+
+      var outletSource,
+          container,
+          viewName,
+          viewClass,
+          viewFullName;
+
+      if (property && property.data && property.data.isRenderData) {
+        options = property;
+        property = 'main';
+      }
+
+      container = options.data.view.container;
+
+      outletSource = options.data.view;
+      while (!outletSource.get('template.isTop')) {
+        outletSource = outletSource.get('_parentView');
+      }
+
+      // provide controller override
+      viewName = options.hash.view;
+
+      if (viewName) {
+        viewFullName = 'view:' + viewName;
+                      }
+
+      viewClass = viewName ? container.lookupFactory(viewFullName) : options.hash.viewClass || OutletView;
+
+      options.data.view.set('outletSource', outletSource);
+      options.hash.currentViewBinding = '_view.outletSource._outlets.' + property;
+
+      options.helperName = options.helperName || 'outlet';
+
+      return viewHelper.call(this, viewClass, options);
+    };
+
+    __exports__.outletHelper = outletHelper;
+    __exports__.OutletView = OutletView;
+  });
+define("ember-routing/helpers/render",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-routing/system/controller_for","ember-handlebars/ext","ember-handlebars/helpers/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // assert, deprecate
+    var EmberError = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var camelize = __dependency5__.camelize;
+    var generateControllerFactory = __dependency6__.generateControllerFactory;
+    var generateController = __dependency6__.generateController;
+    var handlebarsGet = __dependency7__.handlebarsGet;
+    var viewHelper = __dependency8__.viewHelper;
+
+
+    // requireModule('ember-handlebars');
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      Calling ``{{render}}`` from within a template will insert another
+      template that matches the provided name. The inserted template will
+      access its properties on its own controller (rather than the controller
+      of the parent template).
+
+      If a view class with the same name exists, the view class also will be used.
+
+      Note: A given controller may only be used *once* in your app in this manner.
+      A singleton instance of the controller will be created for you.
+
+      Example:
+
+      ```javascript
+      App.NavigationController = Ember.Controller.extend({
+        who: "world"
+      });
+      ```
+
+      ```handlebars
+      <!-- navigation.hbs -->
+      Hello, {{who}}.
+      ```
+
+      ```handelbars
+      <!-- application.hbs -->
+      <h1>My great app</h1>
+      {{render "navigation"}}
+      ```
+
+      ```html
+      <h1>My great app</h1>
+      <div class='ember-view'>
+        Hello, world.
+      </div>
+      ```
+
+      Optionally you may provide a second argument: a property path
+      that will be bound to the `model` property of the controller.
+
+      If a `model` property path is specified, then a new instance of the
+      controller will be created and `{{render}}` can be used multiple times
+      with the same name.
+
+     For example if you had this `author` template.
+
+     ```handlebars
+    <div class="author">
+    Written by {{firstName}} {{lastName}}.
+    Total Posts: {{postCount}}
+    </div>
+    ```
+
+    You could render it inside the `post` template using the `render` helper.
+
+    ```handlebars
+    <div class="post">
+    <h1>{{title}}</h1>
+    <div>{{body}}</div>
+    {{render "author" author}}
+    </div>
+     ```
+
+      @method render
+      @for Ember.Handlebars.helpers
+      @param {String} name
+      @param {Object?} contextString
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function renderHelper(name, contextString, options) {
+      var length = arguments.length;
+
+      var contextProvided = length === 3,
+          container, router, controller, view, context, lookupOptions;
+
+      container = (options || contextString).data.keywords.controller.container;
+      router = container.lookup('router:main');
+
+      if (length === 2) {
+        // use the singleton controller
+        options = contextString;
+        contextString = undefined;
+              } else if (length === 3) {
+        // create a new controller
+        context = handlebarsGet(options.contexts[1], contextString, options);
+      } else {
+        throw EmberError("You must pass a templateName to render");
+      }
+
+      
+      // # legacy namespace
+      name = name.replace(/\//g, '.');
+      // \ legacy slash as namespace support
+
+
+      view = container.lookup('view:' + name) || container.lookup('view:default');
+
+      // provide controller override
+      var controllerName = options.hash.controller || name;
+      var controllerFullName = 'controller:' + controllerName;
+
+      if (options.hash.controller) {
+              }
+
+      var parentController = options.data.keywords.controller;
+
+      // choose name
+      if (length > 2) {
+        var factory = container.lookupFactory(controllerFullName) ||
+                      generateControllerFactory(container, controllerName, context);
+
+        controller = factory.create({
+          model: context,
+          parentController: parentController,
+          target: parentController
+        });
+
+        view.one('willDestroyElement', function() {
+          controller.destroy();
+        });
+      } else {
+        controller = container.lookup(controllerFullName) ||
+                     generateController(container, controllerName);
+
+        controller.setProperties({
+          target: parentController,
+          parentController: parentController
+        });
+      }
+
+      var root = options.contexts[1];
+
+      if (root) {
+        view.registerObserver(root, contextString, function() {
+          controller.set('model', handlebarsGet(root, contextString, options));
+        });
+      }
+
+      options.hash.viewName = camelize(name);
+
+      var templateName = 'template:' + name;
+            options.hash.template = container.lookup(templateName);
+
+      options.hash.controller = controller;
+
+      if (router && !context) {
+        router._connectActiveView(name, view);
+      }
+
+      options.helperName = options.helperName || ('render "' + name + '"');
+
+      viewHelper.call(this, view, options);
+    };
+
+    __exports__["default"] = renderHelper;
+  });
+define("ember-routing/helpers/shared",
+  ["ember-metal/property_get","ember-metal/array","ember-runtime/system/lazy_load","ember-runtime/controllers/controller","ember-routing/system/router","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var map = __dependency2__.map;
+    var onLoad = __dependency3__.onLoad;
+    var ControllerMixin = __dependency4__.ControllerMixin;
+    var EmberRouter = __dependency5__["default"];
+    var handlebarsResolve = __dependency6__.resolveParams;
+    var handlebarsGet = __dependency6__.handlebarsGet;
+
+    function resolveParams(context, params, options) {
+      return map.call(resolvePaths(context, params, options), function(path, i) {
+        if (null === path) {
+          // Param was string/number, not a path, so just return raw string/number.
+          return params[i];
+        } else {
+          return handlebarsGet(context, path, options);
+        }
+      });
+    }
+
+    function resolvePaths(context, params, options) {
+      var resolved = handlebarsResolve(context, params, options),
+          types = options.types;
+
+      return map.call(resolved, function(object, i) {
+        if (types[i] === 'ID') {
+          return unwrap(object, params[i]);
+        } else {
+          return null;
+        }
+      });
+
+      function unwrap(object, path) {
+        if (path === 'controller') { return path; }
+
+        if (ControllerMixin.detect(object)) {
+          return unwrap(get(object, 'model'), path ? path + '.model' : 'model');
+        } else {
+          return path;
+        }
+      }
+    }
+
+    __exports__.resolveParams = resolveParams;
+    __exports__.resolvePaths = resolvePaths;
+  });
+define("ember-routing/location/api",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // deprecate, assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      Ember.Location returns an instance of the correct implementation of
+      the `location` API.
+
+      ## Implementations
+
+      You can pass an implementation name (`hash`, `history`, `none`) to force a
+      particular implementation to be used in your application.
+
+      ### HashLocation
+
+      Using `HashLocation` results in URLs with a `#` (hash sign) separating the
+      server side URL portion of the URL from the portion that is used by Ember.
+      This relies upon the `hashchange` event existing in the browser.
+
+      Example:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource('posts', function() {
+          this.route('new');
+        });
+      });
+
+      App.Router.reopen({
+        location: 'hash'
+      });
+      ```
+
+      This will result in a posts.new url of `/#/posts/new`.
+
+      ### HistoryLocation
+
+      Using `HistoryLocation` results in URLs that are indistinguishable from a
+      standard URL. This relies upon the browser's `history` API.
+
+      Example:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource('posts', function() {
+          this.route('new');
+        });
+      });
+
+      App.Router.reopen({
+        location: 'history'
+      });
+      ```
+
+      This will result in a posts.new url of `/posts/new`.
+
+      Keep in mind that your server must serve the Ember app at all the routes you
+      define.
+
+      ### AutoLocation
+
+      Using `AutoLocation`, the router will use the best Location class supported by
+      the browser it is running in.
+
+      Browsers that support the `history` API will use `HistoryLocation`, those that
+      do not, but still support the `hashchange` event will use `HashLocation`, and
+      in the rare case neither is supported will use `NoneLocation`.
+
+      Example:
+
+      ```javascript
+      App.Router.map(function() {
+        this.resource('posts', function() {
+          this.route('new');
+        });
+      });
+
+      App.Router.reopen({
+        location: 'auto'
+      });
+      ```
+
+      This will result in a posts.new url of `/posts/new` for modern browsers that
+      support the `history` api or `/#/posts/new` for older ones, like Internet
+      Explorer 9 and below.
+
+      When a user visits a link to your application, they will be automatically
+      upgraded or downgraded to the appropriate `Location` class, with the URL
+      transformed accordingly, if needed.
+
+      Keep in mind that since some of your users will use `HistoryLocation`, your
+      server must serve the Ember app at all the routes you define.
+
+      ### NoneLocation
+
+      Using `NoneLocation` causes Ember to not store the applications URL state
+      in the actual URL. This is generally used for testing purposes, and is one
+      of the changes made when calling `App.setupForTesting()`.
+
+      ## Location API
+
+      Each location implementation must provide the following methods:
+
+      * implementation: returns the string name used to reference the implementation.
+      * getURL: returns the current URL.
+      * setURL(path): sets the current URL.
+      * replaceURL(path): replace the current URL (optional).
+      * onUpdateURL(callback): triggers the callback when the URL changes.
+      * formatURL(url): formats `url` to be placed into `href` attribute.
+
+      Calling setURL or replaceURL will not trigger onUpdateURL callbacks.
+
+      @class Location
+      @namespace Ember
+      @static
+    */
+    var EmberLocation = {
+      /**
+       This is deprecated in favor of using the container to lookup the location
+       implementation as desired.
+
+       For example:
+
+       ```javascript
+       // Given a location registered as follows:
+       container.register('location:history-test', HistoryTestLocation);
+
+       // You could create a new instance via:
+       container.lookup('location:history-test');
+       ```
+
+        @method create
+        @param {Object} options
+        @return {Object} an instance of an implementation of the `location` API
+        @deprecated Use the container to lookup the location implementation that you
+        need.
+      */
+      create: function(options) {
+        var implementation = options && options.implementation;
+        
+        var implementationClass = this.implementations[implementation];
+        
+        return implementationClass.create.apply(implementationClass, arguments);
+      },
+
+      /**
+       This is deprecated in favor of using the container to register the
+       location implementation as desired.
+
+       Example:
+
+       ```javascript
+       Application.initializer({
+        name: "history-test-location",
+
+        initialize: function(container, application) {
+          application.register('location:history-test', HistoryTestLocation);
+        }
+       });
+       ```
+
+       @method registerImplementation
+       @param {String} name
+       @param {Object} implementation of the `location` API
+       @deprecated Register your custom location implementation with the
+       container directly.
+      */
+      registerImplementation: function(name, implementation) {
+        
+        this.implementations[name] = implementation;
+      },
+
+      implementations: {},
+      _location: window.location,
+
+      /**
+        Returns the current `location.hash` by parsing location.href since browsers
+        inconsistently URL-decode `location.hash`.
+
+        https://bugzilla.mozilla.org/show_bug.cgi?id=483304
+
+        @private
+        @method getHash
+        @since 1.4.0
+      */
+      _getHash: function () {
+        // AutoLocation has it at _location, HashLocation at .location.
+        // Being nice and not changing
+        var href = (this._location || this.location).href,
+            hashIndex = href.indexOf('#');
+
+        if (hashIndex === -1) {
+          return '';
+        } else {
+          return href.substr(hashIndex);
+        }
+      }
+    };
+
+    __exports__["default"] = EmberLocation;
+  });
+define("ember-routing/location/auto_location",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-routing/location/api","ember-routing/location/history_location","ember-routing/location/hash_location","ember-routing/location/none_location","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+
+    var EmberLocation = __dependency4__["default"];
+    var HistoryLocation = __dependency5__["default"];
+    var HashLocation = __dependency6__["default"];
+    var NoneLocation = __dependency7__["default"];
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      Ember.AutoLocation will select the best location option based off browser
+      support with the priority order: history, hash, none.
+
+      Clean pushState paths accessed by hashchange-only browsers will be redirected
+      to the hash-equivalent and vice versa so future transitions are consistent.
+
+      Keep in mind that since some of your users will use `HistoryLocation`, your
+      server must serve the Ember app at all the routes you define.
+
+      @class AutoLocation
+      @namespace Ember
+      @static
+    */
+    var AutoLocation = {
+
+      /**
+        @private
+
+        This property is used by router:main to know whether to cancel the routing
+        setup process, which is needed while we redirect the browser.
+
+        @since 1.5.1
+        @property cancelRouterSetup
+        @default false
+      */
+      cancelRouterSetup: false,
+
+      /**
+        @private
+
+        Will be pre-pended to path upon state change.
+
+        @since 1.5.1
+        @property rootURL
+        @default '/'
+      */
+      rootURL: '/',
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _window
+        @default window
+      */
+      _window: window,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @property location
+        @default window.location
+      */
+      _location: window.location,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _history
+        @default window.history
+      */
+      _history: window.history,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _HistoryLocation
+        @default Ember.HistoryLocation
+      */
+      _HistoryLocation: HistoryLocation,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _HashLocation
+        @default Ember.HashLocation
+      */
+      _HashLocation: HashLocation,
+
+      /**
+        @private
+
+        Attached for mocking in tests
+
+        @since 1.5.1
+        @property _NoneLocation
+        @default Ember.NoneLocation
+      */
+      _NoneLocation: NoneLocation,
+
+      /**
+        @private
+
+        Returns location.origin or builds it if device doesn't support it.
+
+        @method _getOrigin
+      */
+      _getOrigin: function () {
+        var location = this._location,
+            origin = location.origin;
+
+        // Older browsers, especially IE, don't have origin
+        if (!origin) {
+          origin = location.protocol + '//' + location.hostname;
+
+          if (location.port) {
+            origin += ':' + location.port;
+          }
+        }
+
+        return origin;
+      },
+
+      /**
+        @private
+
+        We assume that if the history object has a pushState method, the host should
+        support HistoryLocation.
+
+        @method _getSupportsHistory
+      */
+      _getSupportsHistory: function () {
+        // Boosted from Modernizr: https://github.com/Modernizr/Modernizr/blob/master/feature-detects/history.js
+        // The stock browser on Android 2.2 & 2.3 returns positive on history support
+        // Unfortunately support is really buggy and there is no clean way to detect
+        // these bugs, so we fall back to a user agent sniff :(
+        var userAgent = this._window.navigator.userAgent;
+
+        // We only want Android 2, stock browser, and not Chrome which identifies
+        // itself as 'Mobile Safari' as well
+        if (userAgent.indexOf('Android 2') !== -1 &&
+            userAgent.indexOf('Mobile Safari') !== -1 &&
+            userAgent.indexOf('Chrome') === -1) {
+          return false;
+        }
+
+        return !!(this._history && 'pushState' in this._history);
+      },
+
+      /**
+        @private
+
+        IE8 running in IE7 compatibility mode gives false positive, so we must also
+        check documentMode.
+
+        @method _getSupportsHashChange
+      */
+      _getSupportsHashChange: function () {
+        var _window = this._window,
+            documentMode = _window.document.documentMode;
+
+        return ('onhashchange' in _window && (documentMode === undefined || documentMode > 7 ));
+      },
+
+      /**
+        @private
+
+        Redirects the browser using location.replace, prepending the locatin.origin
+        to prevent phishing attempts
+
+        @method _replacePath
+      */
+      _replacePath: function (path) {
+        this._location.replace(this._getOrigin() + path);
+      },
+
+      /**
+        @since 1.5.1
+        @private
+        @method _getRootURL
+      */
+      _getRootURL: function () {
+        return this.rootURL;
+      },
+
+      /**
+        @private
+
+        Returns the current `location.pathname`, normalized for IE inconsistencies.
+
+        @method _getPath
+      */
+      _getPath: function () {
+        var pathname = this._location.pathname;
+        // Various versions of IE/Opera don't always return a leading slash
+        if (pathname.charAt(0) !== '/') {
+          pathname = '/' + pathname;
+        }
+
+        return pathname;
+      },
+
+      /**
+        @private
+
+        Returns normalized location.hash as an alias to Ember.Location._getHash
+
+        @since 1.5.1
+        @method _getHash
+      */
+      _getHash: EmberLocation._getHash,
+
+      /**
+        @private
+
+        Returns location.search
+
+        @since 1.5.1
+        @method _getQuery
+      */
+      _getQuery: function () {
+        return this._location.search;
+      },
+
+      /**
+        @private
+
+        Returns the full pathname including query and hash
+
+        @method _getFullPath
+      */
+      _getFullPath: function () {
+        return this._getPath() + this._getQuery() + this._getHash();
+      },
+
+      /**
+        @private
+
+        Returns the current path as it should appear for HistoryLocation supported
+        browsers. This may very well differ from the real current path (e.g. if it
+        starts off as a hashed URL)
+
+        @method _getHistoryPath
+      */
+      _getHistoryPath: function () {
+        var rootURL = this._getRootURL(),
+            path = this._getPath(),
+            hash = this._getHash(),
+            query = this._getQuery(),
+            rootURLIndex = path.indexOf(rootURL),
+            routeHash, hashParts;
+
+        
+        // By convention, Ember.js routes using HashLocation are required to start
+        // with `#/`. Anything else should NOT be considered a route and should
+        // be passed straight through, without transformation.
+        if (hash.substr(0, 2) === '#/') {
+          // There could be extra hash segments after the route
+          hashParts = hash.substr(1).split('#');
+          // The first one is always the route url
+          routeHash = hashParts.shift();
+
+          // If the path already has a trailing slash, remove the one
+          // from the hashed route so we don't double up.
+          if (path.slice(-1) === '/') {
+              routeHash = routeHash.substr(1);
+          }
+
+          // This is the "expected" final order
+          path += routeHash;
+          path += query;
+
+          if (hashParts.length) {
+            path += '#' + hashParts.join('#');
+          }
+        } else {
+          path += query;
+          path += hash;
+        }
+
+        return path;
+      },
+
+      /**
+        @private
+
+        Returns the current path as it should appear for HashLocation supported
+        browsers. This may very well differ from the real current path.
+
+        @method _getHashPath
+      */
+      _getHashPath: function () {
+        var rootURL = this._getRootURL(),
+            path = rootURL,
+            historyPath = this._getHistoryPath(),
+            routePath = historyPath.substr(rootURL.length);
+
+        if (routePath !== '') {
+          if (routePath.charAt(0) !== '/') {
+            routePath = '/' + routePath;
+          }
+
+          path += '#' + routePath;
+        }
+
+        return path;
+      },
+
+      /**
+        Selects the best location option based off browser support and returns an
+        instance of that Location class.
+
+        @see Ember.AutoLocation
+        @method create
+      */
+      create: function (options) {
+        if (options && options.rootURL) {
+                    this.rootURL = options.rootURL;
+        }
+
+        var historyPath, hashPath,
+            cancelRouterSetup = false,
+            implementationClass = this._NoneLocation,
+            currentPath = this._getFullPath();
+
+        if (this._getSupportsHistory()) {
+          historyPath = this._getHistoryPath();
+
+          // Since we support history paths, let's be sure we're using them else
+          // switch the location over to it.
+          if (currentPath === historyPath) {
+            implementationClass = this._HistoryLocation;
+          } else {
+            cancelRouterSetup = true;
+            this._replacePath(historyPath);
+          }
+
+        } else if (this._getSupportsHashChange()) {
+          hashPath = this._getHashPath();
+
+          // Be sure we're using a hashed path, otherwise let's switch over it to so
+          // we start off clean and consistent. We'll count an index path with no
+          // hash as "good enough" as well.
+          if (currentPath === hashPath || (currentPath === '/' && hashPath === '/#/')) {
+            implementationClass = this._HashLocation;
+          } else {
+            // Our URL isn't in the expected hash-supported format, so we want to
+            // cancel the router setup and replace the URL to start off clean
+            cancelRouterSetup = true;
+            this._replacePath(hashPath);
+          }
+        }
+
+        var implementation = implementationClass.create.apply(implementationClass, arguments);
+
+        if (cancelRouterSetup) {
+          set(implementation, 'cancelRouterSetup', true);
+        }
+
+        return implementation;
+      }
+    };
+
+    __exports__["default"] = AutoLocation;
+  });
+define("ember-routing/location/hash_location",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var run = __dependency3__["default"];
+    var guidFor = __dependency4__.guidFor;
+
+    var EmberObject = __dependency5__["default"];
+    var EmberLocation = __dependency6__["default"];
+    var jQuery = __dependency7__["default"];
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      `Ember.HashLocation` implements the location API using the browser's
+      hash. At present, it relies on a `hashchange` event existing in the
+      browser.
+
+      @class HashLocation
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var HashLocation = EmberObject.extend({
+      implementation: 'hash',
+
+      init: function() {
+        set(this, 'location', get(this, '_location') || window.location);
+      },
+
+      /**
+        @private
+
+        Returns normalized location.hash
+
+        @since 1.5.1
+        @method getHash
+      */
+      getHash: EmberLocation._getHash,
+
+      /**
+        Returns the current `location.hash`, minus the '#' at the front.
+
+        @private
+        @method getURL
+      */
+      getURL: function() {
+        return this.getHash().substr(1);
+      },
+
+      /**
+        Set the `location.hash` and remembers what was set. This prevents
+        `onUpdateURL` callbacks from triggering when the hash was set by
+        `HashLocation`.
+
+        @private
+        @method setURL
+        @param path {String}
+      */
+      setURL: function(path) {
+        get(this, 'location').hash = path;
+        set(this, 'lastSetURL', path);
+      },
+
+      /**
+        Uses location.replace to update the url without a page reload
+        or history modification.
+
+        @private
+        @method replaceURL
+        @param path {String}
+      */
+      replaceURL: function(path) {
+        get(this, 'location').replace('#' + path);
+        set(this, 'lastSetURL', path);
+      },
+
+      /**
+        Register a callback to be invoked when the hash changes. These
+        callbacks will execute when the user presses the back or forward
+        button, but not after `setURL` is invoked.
+
+        @private
+        @method onUpdateURL
+        @param callback {Function}
+      */
+      onUpdateURL: function(callback) {
+        var self = this;
+        var guid = guidFor(this);
+
+        jQuery(window).on('hashchange.ember-location-'+guid, function() {
+          run(function() {
+            var path = self.getURL();
+            if (get(self, 'lastSetURL') === path) { return; }
+
+            set(self, 'lastSetURL', null);
+
+            callback(path);
+          });
+        });
+      },
+
+      /**
+        Given a URL, formats it to be placed into the page as part
+        of an element's `href` attribute.
+
+        This is used, for example, when using the {{action}} helper
+        to generate a URL based on an event.
+
+        @private
+        @method formatURL
+        @param url {String}
+      */
+      formatURL: function(url) {
+        return '#'+url;
+      },
+
+      /**
+        Cleans up the HashLocation event listener.
+
+        @private
+        @method willDestroy
+      */
+      willDestroy: function() {
+        var guid = guidFor(this);
+
+        jQuery(window).off('hashchange.ember-location-'+guid);
+      }
+    });
+
+    __exports__["default"] = HashLocation;
+  });
+define("ember-routing/location/history_location",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/object","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var guidFor = __dependency4__.guidFor;
+
+    var EmberObject = __dependency5__["default"];
+    var jQuery = __dependency6__["default"];
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    var popstateFired = false;
+    var supportsHistoryState = window.history && 'state' in window.history;
+
+    /**
+      Ember.HistoryLocation implements the location API using the browser's
+      history.pushState API.
+
+      @class HistoryLocation
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var HistoryLocation = EmberObject.extend({
+      implementation: 'history',
+
+      init: function() {
+        set(this, 'location', get(this, 'location') || window.location);
+        set(this, 'baseURL', jQuery('base').attr('href') || '');
+      },
+
+      /**
+        Used to set state on first call to setURL
+
+        @private
+        @method initState
+      */
+      initState: function() {
+        set(this, 'history', get(this, 'history') || window.history);
+        this.replaceState(this.formatURL(this.getURL()));
+      },
+
+      /**
+        Will be pre-pended to path upon state change
+
+        @property rootURL
+        @default '/'
+      */
+      rootURL: '/',
+
+      /**
+        Returns the current `location.pathname` without `rootURL` or `baseURL`
+
+        @private
+        @method getURL
+        @return url {String}
+      */
+      getURL: function() {
+        var rootURL = get(this, 'rootURL'),
+            location = get(this, 'location'),
+            path = location.pathname,
+            baseURL = get(this, 'baseURL');
+
+        rootURL = rootURL.replace(/\/$/, '');
+        baseURL = baseURL.replace(/\/$/, '');
+        var url = path.replace(baseURL, '').replace(rootURL, '');
+
+        
+        return url;
+      },
+
+      /**
+        Uses `history.pushState` to update the url without a page reload.
+
+        @private
+        @method setURL
+        @param path {String}
+      */
+      setURL: function(path) {
+        var state = this.getState();
+        path = this.formatURL(path);
+
+        if (!state || state.path !== path) {
+          this.pushState(path);
+        }
+      },
+
+      /**
+        Uses `history.replaceState` to update the url without a page reload
+        or history modification.
+
+        @private
+        @method replaceURL
+        @param path {String}
+      */
+      replaceURL: function(path) {
+        var state = this.getState();
+        path = this.formatURL(path);
+
+        if (!state || state.path !== path) {
+          this.replaceState(path);
+        }
+      },
+
+      /**
+       Get the current `history.state`. Checks for if a polyfill is
+       required and if so fetches this._historyState. The state returned
+       from getState may be null if an iframe has changed a window's
+       history.
+
+       @private
+       @method getState
+       @return state {Object}
+      */
+      getState: function() {
+        return supportsHistoryState ? get(this, 'history').state : this._historyState;
+      },
+
+      /**
+       Pushes a new state.
+
+       @private
+       @method pushState
+       @param path {String}
+      */
+      pushState: function(path) {
+        var state = { path: path };
+
+        get(this, 'history').pushState(state, null, path);
+
+        // store state if browser doesn't support `history.state`
+        if (!supportsHistoryState) {
+          this._historyState = state;
+        }
+
+        // used for webkit workaround
+        this._previousURL = this.getURL();
+      },
+
+      /**
+       Replaces the current state.
+
+       @private
+       @method replaceState
+       @param path {String}
+      */
+      replaceState: function(path) {
+        var state = { path: path };
+
+        get(this, 'history').replaceState(state, null, path);
+
+        // store state if browser doesn't support `history.state`
+        if (!supportsHistoryState) {
+          this._historyState = state;
+        }
+
+        // used for webkit workaround
+        this._previousURL = this.getURL();
+      },
+
+      /**
+        Register a callback to be invoked whenever the browser
+        history changes, including using forward and back buttons.
+
+        @private
+        @method onUpdateURL
+        @param callback {Function}
+      */
+      onUpdateURL: function(callback) {
+        var guid = guidFor(this),
+            self = this;
+
+        jQuery(window).on('popstate.ember-location-'+guid, function(e) {
+          // Ignore initial page load popstate event in Chrome
+          if (!popstateFired) {
+            popstateFired = true;
+            if (self.getURL() === self._previousURL) { return; }
+          }
+          callback(self.getURL());
+        });
+      },
+
+      /**
+        Used when using `{{action}}` helper.  The url is always appended to the rootURL.
+
+        @private
+        @method formatURL
+        @param url {String}
+        @return formatted url {String}
+      */
+      formatURL: function(url) {
+        var rootURL = get(this, 'rootURL'),
+            baseURL = get(this, 'baseURL');
+
+        if (url !== '') {
+          rootURL = rootURL.replace(/\/$/, '');
+          baseURL = baseURL.replace(/\/$/, '');
+        } else if(baseURL.match(/^\//) && rootURL.match(/^\//)) {
+          baseURL = baseURL.replace(/\/$/, '');
+        }
+
+        return baseURL + rootURL + url;
+      },
+
+      /**
+        Cleans up the HistoryLocation event listener.
+
+        @private
+        @method willDestroy
+      */
+      willDestroy: function() {
+        var guid = guidFor(this);
+
+        jQuery(window).off('popstate.ember-location-'+guid);
+      }
+    });
+
+    __exports__["default"] = HistoryLocation;
+  });
+define("ember-routing/location/none_location",
+  ["ember-metal/property_get","ember-metal/property_set","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var EmberObject = __dependency3__["default"];
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+      Ember.NoneLocation does not interact with the browser. It is useful for
+      testing, or when you need to manage state with your Router, but temporarily
+      don't want it to muck with the URL (for example when you embed your
+      application in a larger page).
+
+      @class NoneLocation
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var NoneLocation = EmberObject.extend({
+      implementation: 'none',
+      path: '',
+
+      /**
+        Returns the current path.
+
+        @private
+        @method getURL
+        @return {String} path
+      */
+      getURL: function() {
+        return get(this, 'path');
+      },
+
+      /**
+        Set the path and remembers what was set. Using this method
+        to change the path will not invoke the `updateURL` callback.
+
+        @private
+        @method setURL
+        @param path {String}
+      */
+      setURL: function(path) {
+        set(this, 'path', path);
+      },
+
+      /**
+        Register a callback to be invoked when the path changes. These
+        callbacks will execute when the user presses the back or forward
+        button, but not after `setURL` is invoked.
+
+        @private
+        @method onUpdateURL
+        @param callback {Function}
+      */
+      onUpdateURL: function(callback) {
+        this.updateCallback = callback;
+      },
+
+      /**
+        Sets the path and calls the `updateURL` callback.
+
+        @private
+        @method handleURL
+        @param callback {Function}
+      */
+      handleURL: function(url) {
+        set(this, 'path', url);
+        this.updateCallback(url);
+      },
+
+      /**
+        Given a URL, formats it to be placed into the page as part
+        of an element's `href` attribute.
+
+        This is used, for example, when using the {{action}} helper
+        to generate a URL based on an event.
+
+        @private
+        @method formatURL
+        @param url {String}
+        @return {String} url
+      */
+      formatURL: function(url) {
+        // The return value is not overly meaningful, but we do not want to throw
+        // errors when test code renders templates containing {{action href=true}}
+        // helpers.
+        return url;
+      }
+    });
+
+    __exports__["default"] = NoneLocation;
+  });
+define("ember-routing",
+  ["ember-handlebars","ember-metal/core","ember-routing/ext/run_loop","ember-routing/ext/controller","ember-routing/ext/view","ember-routing/helpers/shared","ember-routing/helpers/link_to","ember-routing/location/api","ember-routing/location/none_location","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/system/controller_for","ember-routing/system/dsl","ember-routing/system/router","ember-routing/system/route","ember-routing/helpers/outlet","ember-routing/helpers/render","ember-routing/helpers/action","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
+    "use strict";
+    // require('ember-runtime');
+    // require('ember-views');
+    // require('ember-handlebars');
+
+    /**
+    Ember Routing
+
+    @module ember
+    @submodule ember-routing
+    @requires ember-views
+    */
+
+    var EmberHandlebars = __dependency1__["default"];
+    var Ember = __dependency2__["default"];
+
+    // ES6TODO: Cleanup modules with side-effects below
+
+    var resolvePaths = __dependency6__.resolvePaths;
+    var resolveParams = __dependency6__.resolveParams;
+    var deprecatedLinkToHelper = __dependency7__.deprecatedLinkToHelper;
+    var linkToHelper = __dependency7__.linkToHelper;
+    var LinkView = __dependency7__.LinkView;
+
+
+    // require('ember-views');
+    var EmberLocation = __dependency8__["default"];
+    var NoneLocation = __dependency9__["default"];
+    var HashLocation = __dependency10__["default"];
+    var HistoryLocation = __dependency11__["default"];
+    var AutoLocation = __dependency12__["default"];
+
+    var controllerFor = __dependency13__.controllerFor;
+    var generateControllerFactory = __dependency13__.generateControllerFactory;
+    var generateController = __dependency13__.generateController;
+    var RouterDSL = __dependency14__["default"];
+    var Router = __dependency15__["default"];
+    var Route = __dependency16__["default"];
+    var outletHelper = __dependency17__.outletHelper;
+    var OutletView = __dependency17__.OutletView;
+    var renderHelper = __dependency18__["default"];
+    var ActionHelper = __dependency19__.ActionHelper;
+    var actionHelper = __dependency19__.actionHelper;
+
+
+    Ember.Location = EmberLocation;
+    Ember.AutoLocation = AutoLocation;
+    Ember.HashLocation = HashLocation;
+    Ember.HistoryLocation = HistoryLocation;
+    Ember.NoneLocation = NoneLocation;
+
+    Ember.controllerFor = controllerFor;
+    Ember.generateControllerFactory = generateControllerFactory;
+    Ember.generateController = generateController;
+    Ember.RouterDSL = RouterDSL;
+    Ember.Router = Router;
+    Ember.Route = Route;
+    Ember.LinkView = LinkView;
+
+    Router.resolveParams = resolveParams;
+    Router.resolvePaths = resolvePaths;
+
+    EmberHandlebars.ActionHelper = ActionHelper;
+    EmberHandlebars.OutletView = OutletView;
+
+    EmberHandlebars.registerHelper('render', renderHelper)
+    EmberHandlebars.registerHelper('action', actionHelper);
+    EmberHandlebars.registerHelper('outlet', outletHelper);
+    EmberHandlebars.registerHelper('link-to', linkToHelper);
+    EmberHandlebars.registerHelper('linkTo', deprecatedLinkToHelper);
+
+    __exports__["default"] = Ember;
+  });
+define("ember-routing/system/controller_for",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Logger
+    var get = __dependency2__.get;
+    var isArray = __dependency3__.isArray;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    /**
+
+      Finds a controller instance.
+
+      @for Ember
+      @method controllerFor
+      @private
+    */
+    var controllerFor = function(container, controllerName, lookupOptions) {
+      return container.lookup('controller:' + controllerName, lookupOptions);
+    };
+
+    /**
+      Generates a controller factory
+
+      The type of the generated controller factory is derived
+      from the context. If the context is an array an array controller
+      is generated, if an object, an object controller otherwise, a basic
+      controller is generated.
+
+      You can customize your generated controllers by defining
+      `App.ObjectController` or `App.ArrayController`.
+
+      @for Ember
+      @method generateControllerFactory
+      @private
+    */
+    var generateControllerFactory = function(container, controllerName, context) {
+      var Factory, fullName, instance, name, factoryName, controllerType;
+
+      if (context && isArray(context)) {
+        controllerType = 'array';
+      } else if (context) {
+        controllerType = 'object';
+      } else {
+        controllerType = 'basic';
+      }
+
+      factoryName = 'controller:' + controllerType;
+
+      Factory = container.lookupFactory(factoryName).extend({
+        isGenerated: true,
+        toString: function() {
+          return "(generated " + controllerName + " controller)";
+        }
+      });
+
+      fullName = 'controller:' + controllerName;
+
+      container.register(fullName,  Factory);
+
+      return Factory;
+    };
+
+    /**
+      Generates and instantiates a controller.
+
+      The type of the generated controller factory is derived
+      from the context. If the context is an array an array controller
+      is generated, if an object, an object controller otherwise, a basic
+      controller is generated.
+
+      @for Ember
+      @method generateController
+      @private
+      @since 1.3.0
+    */
+    var generateController = function(container, controllerName, context) {
+      generateControllerFactory(container, controllerName, context);
+      var fullName = 'controller:' + controllerName;
+      var instance = container.lookup(fullName);
+
+      if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) {
+              }
+
+      return instance;
+    };
+
+    __exports__.controllerFor = controllerFor;
+    __exports__.generateControllerFactory = generateControllerFactory;
+    __exports__.generateController = generateController;
+  });
+define("ember-routing/system/dsl",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, assert
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    function DSL(name) {
+      this.parent = name;
+      this.matches = [];
+    }
+
+    DSL.prototype = {
+      resource: function(name, options, callback) {
+        
+        if (arguments.length === 2 && typeof options === 'function') {
+          callback = options;
+          options = {};
+        }
+
+        if (arguments.length === 1) {
+          options = {};
+        }
+
+        if (typeof options.path !== 'string') {
+          options.path = "/" + name;
+        }
+
+        if (callback) {
+          var dsl = new DSL(name);
+          route(dsl, 'loading');
+          route(dsl, 'error', { path: "/_unused_dummy_error_path_route_" + name + "/:error" });
+          callback.call(dsl);
+          this.push(options.path, name, dsl.generate());
+        } else {
+          this.push(options.path, name, null);
+        }
+
+
+              },
+
+      push: function(url, name, callback) {
+        var parts = name.split('.');
+        if (url === "" || url === "/" || parts[parts.length-1] === "index") { this.explicitIndex = true; }
+
+        this.matches.push([url, name, callback]);
+      },
+
+      route: function(name, options) {
+        
+        route(this, name, options);
+              },
+
+      generate: function() {
+        var dslMatches = this.matches;
+
+        if (!this.explicitIndex) {
+          this.route("index", { path: "/" });
+        }
+
+        return function(match) {
+          for (var i=0, l=dslMatches.length; i<l; i++) {
+            var dslMatch = dslMatches[i];
+            var matchObj = match(dslMatch[0]).to(dslMatch[1], dslMatch[2]);
+          }
+        };
+      }
+    };
+
+    function route(dsl, name, options) {
+      
+      options = options || {};
+
+      if (typeof options.path !== 'string') {
+        options.path = "/" + name;
+      }
+
+      if (dsl.parent && dsl.parent !== 'application') {
+        name = dsl.parent + "." + name;
+      }
+
+      dsl.push(options.path, name, null);
+    }
+
+    DSL.map = function(callback) {
+      var dsl = new DSL();
+      callback.call(dsl);
+      return dsl;
+    };
+
+    __exports__["default"] = DSL;
+  });
+define("ember-routing/system/route",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/utils","ember-metal/run_loop","ember-runtime/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/controller_for","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, K, A, deprecate, assert, Logger
+    var EmberError = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var getProperties = __dependency5__["default"];
+    var EnumerableUtils = __dependency6__["default"];
+    var isNone = __dependency7__.isNone;
+    var computed = __dependency8__.computed;
+    var typeOf = __dependency9__.typeOf;
+    var run = __dependency10__["default"];
+
+    var keys = __dependency11__["default"];
+    var copy = __dependency12__["default"];
+    var classify = __dependency13__.classify;
+    var fmt = __dependency13__.fmt;
+    var EmberObject = __dependency14__["default"];
+    var ActionHandler = __dependency15__["default"];
+    var generateController = __dependency16__.generateController;
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    var a_forEach = EnumerableUtils.forEach,
+        a_replace = EnumerableUtils.replace;
+
+    /**
+      The `Ember.Route` class is used to define individual routes. Refer to
+      the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+
+      @class Route
+      @namespace Ember
+      @extends Ember.Object
+      @uses Ember.ActionHandler
+    */
+    var Route = EmberObject.extend(ActionHandler, {
+
+      /**
+        @private
+
+        @method exit
+      */
+      exit: function() {
+                this.deactivate();
+        this.teardownViews();
+      },
+
+      /**
+        @private
+
+        @method enter
+      */
+      enter: function() {
+        this.activate();
+      },
+
+      /**
+        The name of the view to use by default when rendering this routes template.
+
+        When rendering a template, the route will, by default, determine the
+        template and view to use from the name of the route itself. If you need to
+        define a specific view, set this property.
+
+        This is useful when multiple routes would benefit from using the same view
+        because it doesn't require a custom `renderTemplate` method. For example,
+        the following routes will all render using the `App.PostsListView` view:
+
+        ```js
+        var PostsList = Ember.Route.extend({
+          viewName: 'postsList',
+        });
+
+        App.PostsIndexRoute = PostsList.extend();
+        App.PostsArchivedRoute = PostsList.extend();
+        ```
+
+        @property viewName
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      viewName: null,
+
+      /**
+        The name of the template to use by default when rendering this routes
+        template.
+
+        This is similar with `viewName`, but is useful when you just want a custom
+        template without a view.
+
+        ```js
+        var PostsList = Ember.Route.extend({
+          templateName: 'posts/list'
+        });
+
+        App.PostsIndexRoute = PostsList.extend();
+        App.PostsArchivedRoute = PostsList.extend();
+        ```
+
+        @property templateName
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      templateName: null,
+
+      /**
+        The name of the controller to associate with this route.
+
+        By default, Ember will lookup a route's controller that matches the name
+        of the route (i.e. `App.PostController` for `App.PostRoute`). However,
+        if you would like to define a specific controller to use, you can do so
+        using this property.
+
+        This is useful in many ways, as the controller specified will be:
+
+        * passed to the `setupController` method.
+        * used as the controller for the view being rendered by the route.
+        * returned from a call to `controllerFor` for the route.
+
+        @property controllerName
+        @type String
+        @default null
+        @since 1.4.0
+      */
+      controllerName: null,
+
+      /**
+        The `willTransition` action is fired at the beginning of any
+        attempted transition with a `Transition` object as the sole
+        argument. This action can be used for aborting, redirecting,
+        or decorating the transition from the currently active routes.
+
+        A good example is preventing navigation when a form is
+        half-filled out:
+
+        ```js
+        App.ContactFormRoute = Ember.Route.extend({
+          actions: {
+            willTransition: function(transition) {
+              if (this.controller.get('userHasEnteredData')) {
+                this.controller.displayNavigationConfirm();
+                transition.abort();
+              }
+            }
+          }
+        });
+        ```
+
+        You can also redirect elsewhere by calling
+        `this.transitionTo('elsewhere')` from within `willTransition`.
+        Note that `willTransition` will not be fired for the
+        redirecting `transitionTo`, since `willTransition` doesn't
+        fire when there is already a transition underway. If you want
+        subsequent `willTransition` actions to fire for the redirecting
+        transition, you must first explicitly call
+        `transition.abort()`.
+
+        @event willTransition
+        @param {Transition} transition
+      */
+
+      /**
+        The `didTransition` action is fired after a transition has
+        successfully been completed. This occurs after the normal model
+        hooks (`beforeModel`, `model`, `afterModel`, `setupController`)
+        have resolved. The `didTransition` action has no arguments,
+        however, it can be useful for tracking page views or resetting
+        state on the controller.
+
+        ```js
+        App.LoginRoute = Ember.Route.extend({
+          actions: {
+            didTransition: function() {
+              this.controller.get('errors.base').clear();
+              return true; // Bubble the didTransition event
+            }
+          }
+        });
+        ```
+
+        @event didTransition
+        @since 1.2.0
+      */
+
+      /**
+        The `loading` action is fired on the route when a route's `model`
+        hook returns a promise that is not already resolved. The current
+        `Transition` object is the first parameter and the route that
+        triggered the loading event is the second parameter.
+
+        ```js
+        App.ApplicationRoute = Ember.Route.extend({
+          actions: {
+            loading: function(transition, route) {
+              var view = Ember.View.create({
+                classNames: ['app-loading']
+              })
+              .append();
+
+              this.router.one('didTransition', function () {
+                view.destroy();
+              });
+              return true; // Bubble the loading event
+            }
+          }
+        });
+        ```
+
+        @event loading
+        @param {Transition} transition
+        @param {Ember.Route} route The route that triggered the loading event
+        @since 1.2.0
+      */
+
+      /**
+        When attempting to transition into a route, any of the hooks
+        may return a promise that rejects, at which point an `error`
+        action will be fired on the partially-entered routes, allowing
+        for per-route error handling logic, or shared error handling
+        logic defined on a parent route.
+
+        Here is an example of an error handler that will be invoked
+        for rejected promises from the various hooks on the route,
+        as well as any unhandled errors from child routes:
+
+        ```js
+        App.AdminRoute = Ember.Route.extend({
+          beforeModel: function() {
+            return Ember.RSVP.reject("bad things!");
+          },
+
+          actions: {
+            error: function(error, transition) {
+              // Assuming we got here due to the error in `beforeModel`,
+              // we can expect that error === "bad things!",
+              // but a promise model rejecting would also
+              // call this hook, as would any errors encountered
+              // in `afterModel`.
+
+              // The `error` hook is also provided the failed
+              // `transition`, which can be stored and later
+              // `.retry()`d if desired.
+
+              this.transitionTo('login');
+            }
+          }
+        });
+        ```
+
+        `error` actions that bubble up all the way to `ApplicationRoute`
+        will fire a default error handler that logs the error. You can
+        specify your own global default error handler by overriding the
+        `error` handler on `ApplicationRoute`:
+
+        ```js
+        App.ApplicationRoute = Ember.Route.extend({
+          actions: {
+            error: function(error, transition) {
+              this.controllerFor('banner').displayError(error.message);
+            }
+          }
+        });
+        ```
+        @event error
+        @param {Error} error
+        @param {Transition} transition
+      */
+
+      /**
+        The controller associated with this route.
+
+        Example
+
+        ```javascript
+        App.FormRoute = Ember.Route.extend({
+          actions: {
+            willTransition: function(transition) {
+              if (this.controller.get('userHasEnteredData') &&
+                  !confirm("Are you sure you want to abandon progress?")) {
+                transition.abort();
+              } else {
+                // Bubble the `willTransition` action so that
+                // parent routes can decide whether or not to abort.
+                return true;
+              }
+            }
+          }
+        });
+        ```
+
+        @property controller
+        @type Ember.Controller
+        @since 1.6.0
+      */
+
+      _actions: {
+
+        queryParamsDidChange: function(changed, totalPresent, removed) {
+                  },
+
+        finalizeQueryParamChange: function(params, finalParams, transition) {
+                  }
+      },
+
+      /**
+        @deprecated
+
+        Please use `actions` instead.
+        @method events
+      */
+      events: null,
+
+      mergedProperties: ['events'],
+
+      /**
+        This hook is executed when the router completely exits this route. It is
+        not executed when the model for the route changes.
+
+        @method deactivate
+      */
+      deactivate: Ember.K,
+
+      /**
+        This hook is executed when the router enters the route. It is not executed
+        when the model for the route changes.
+
+        @method activate
+      */
+      activate: Ember.K,
+
+      /**
+        Transition the application into another route. The route may
+        be either a single route or route path:
+
+        ```javascript
+        this.transitionTo('blogPosts');
+        this.transitionTo('blogPosts.recentEntries');
+        ```
+
+        Optionally supply a model for the route in question. The model
+        will be serialized into the URL using the `serialize` hook of
+        the route:
+
+        ```javascript
+        this.transitionTo('blogPost', aPost);
+        ```
+
+        If a literal is passed (such as a number or a string), it will
+        be treated as an identifier instead. In this case, the `model`
+        hook of the route will be triggered:
+
+        ```javascript
+        this.transitionTo('blogPost', 1);
+        ```
+
+        Multiple models will be applied last to first recursively up the
+        resource tree.
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('blogPost', {path:':blogPostId'}, function(){
+            this.resource('blogComment', {path: ':blogCommentId'});
+          });
+        });
+
+        this.transitionTo('blogComment', aPost, aComment);
+        this.transitionTo('blogComment', 1, 13);
+        ```
+
+        It is also possible to pass a URL (a string that starts with a
+        `/`). This is intended for testing and debugging purposes and
+        should rarely be used in production code.
+
+        ```javascript
+        this.transitionTo('/');
+        this.transitionTo('/blog/post/1/comment/13');
+        ```
+
+        See also 'replaceWith'.
+
+        Simple Transition Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.route("index");
+          this.route("secret");
+          this.route("fourOhFour", { path: "*:"});
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            moveToSecret: function(context){
+              if (authorized()){
+                this.transitionTo('secret', context);
+              }
+                this.transitionTo('fourOhFour');
+            }
+          }
+        });
+        ```
+
+        Transition to a nested route
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('articles', { path: '/articles' }, function() {
+            this.route('new');
+          });
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            transitionToNewArticle: function() {
+              this.transitionTo('articles.new');
+            }
+          }
+        });
+        ```
+
+        Multiple Models Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.route("index");
+          this.resource('breakfast', {path:':breakfastId'}, function(){
+            this.resource('cereal', {path: ':cerealId'});
+          });
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            moveToChocolateCereal: function(){
+              var cereal = { cerealId: "ChocolateYumminess"},
+                  breakfast = {breakfastId: "CerealAndMilk"};
+
+              this.transitionTo('cereal', breakfast, cereal);
+            }
+          }
+        });
+        ```
+
+        @method transitionTo
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used while
+          transitioning to the route.
+        @return {Transition} the transition object associated with this
+          attempted transition
+      */
+      transitionTo: function(name, context) {
+        var router = this.router;
+        return router.transitionTo.apply(router, arguments);
+      },
+
+      /**
+        Perform a synchronous transition into another route without attempting
+        to resolve promises, update the URL, or abort any currently active
+        asynchronous transitions (i.e. regular transitions caused by
+        `transitionTo` or URL changes).
+
+        This method is handy for performing intermediate transitions on the
+        way to a final destination route, and is called internally by the
+        default implementations of the `error` and `loading` handlers.
+
+        @method intermediateTransitionTo
+        @param {String} name the name of the route
+        @param {...Object} models the model(s) to be used while transitioning
+        to the route.
+        @since 1.2.0
+       */
+      intermediateTransitionTo: function() {
+        var router = this.router;
+        router.intermediateTransitionTo.apply(router, arguments);
+      },
+
+      /**
+        Refresh the model on this route and any child routes, firing the
+        `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+        to how routes are entered when transitioning in from other route.
+        The current route params (e.g. `article_id`) will be passed in
+        to the respective model hooks, and if a different model is returned,
+        `setupController` and associated route hooks will re-fire as well.
+
+        An example usage of this method is re-querying the server for the
+        latest information using the same parameters as when the route
+        was first entered.
+
+        Note that this will cause `model` hooks to fire even on routes
+        that were provided a model object when the route was initially
+        entered.
+
+        @method refresh
+        @return {Transition} the transition object associated with this
+          attempted transition
+        @since 1.4.0
+       */
+      refresh: function() {
+        return this.router.router.refresh(this);
+      },
+
+      /**
+        Transition into another route while replacing the current URL, if possible.
+        This will replace the current history entry instead of adding a new one.
+        Beside that, it is identical to `transitionTo` in all other respects. See
+        'transitionTo' for additional information regarding multiple models.
+
+        Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.route("index");
+          this.route("secret");
+        });
+
+        App.SecretRoute = Ember.Route.extend({
+          afterModel: function() {
+            if (!authorized()){
+              this.replaceWith('index');
+            }
+          }
+        });
+        ```
+
+        @method replaceWith
+        @param {String} name the name of the route or a URL
+        @param {...Object} models the model(s) or identifier(s) to be used while
+          transitioning to the route.
+        @return {Transition} the transition object associated with this
+          attempted transition
+      */
+      replaceWith: function() {
+        var router = this.router;
+        return router.replaceWith.apply(router, arguments);
+      },
+
+      /**
+        Sends an action to the router, which will delegate it to the currently
+        active route hierarchy per the bubbling rules explained under `actions`.
+
+        Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.route("index");
+        });
+
+        App.ApplicationRoute = Ember.Route.extend({
+          actions: {
+            track: function(arg) {
+              console.log(arg, 'was clicked');
+            }
+          }
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            trackIfDebug: function(arg) {
+              if (debug) {
+                this.send('track', arg);
+              }
+            }
+          }
+        });
+        ```
+
+        @method send
+        @param {String} name the name of the action to trigger
+        @param {...*} args
+      */
+      send: function() {
+        return this.router.send.apply(this.router, arguments);
+      },
+
+      /**
+        This hook is the entry point for router.js
+
+        @private
+        @method setup
+      */
+      setup: function(context, transition) {
+        var controllerName = this.controllerName || this.routeName,
+            controller = this.controllerFor(controllerName, true);
+        if (!controller) {
+          controller =  this.generateController(controllerName, context);
+        }
+
+        // Assign the route's controller so that it can more easily be
+        // referenced in action handlers
+        this.controller = controller;
+
+        
+        if (this.setupControllers) {
+                    this.setupControllers(controller, context);
+        } else {
+
+          
+            this.setupController(controller, context);
+          
+        }
+
+        if (this.renderTemplates) {
+                    this.renderTemplates(context);
+        } else {
+          this.renderTemplate(controller, context);
+        }
+      },
+
+      /**
+        This hook is the first of the route entry validation hooks
+        called when an attempt is made to transition into a route
+        or one of its children. It is called before `model` and
+        `afterModel`, and is appropriate for cases when:
+
+        1) A decision can be made to redirect elsewhere without
+           needing to resolve the model first.
+        2) Any async operations need to occur first before the
+           model is attempted to be resolved.
+
+        This hook is provided the current `transition` attempt
+        as a parameter, which can be used to `.abort()` the transition,
+        save it for a later `.retry()`, or retrieve values set
+        on it from a previous hook. You can also just call
+        `this.transitionTo` to another route to implicitly
+        abort the `transition`.
+
+        You can return a promise from this hook to pause the
+        transition until the promise resolves (or rejects). This could
+        be useful, for instance, for retrieving async code from
+        the server that is required to enter a route.
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          beforeModel: function(transition) {
+            if (!App.Post) {
+              return Ember.$.getScript('/models/post.js');
+            }
+          }
+        });
+        ```
+
+        If `App.Post` doesn't exist in the above example,
+        `beforeModel` will use jQuery's `getScript`, which
+        returns a promise that resolves after the server has
+        successfully retrieved and executed the code from the
+        server. Note that if an error were to occur, it would
+        be passed to the `error` hook on `Ember.Route`, but
+        it's also possible to handle errors specific to
+        `beforeModel` right from within the hook (to distinguish
+        from the shared error handling behavior of the `error`
+        hook):
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          beforeModel: function(transition) {
+            if (!App.Post) {
+              var self = this;
+              return Ember.$.getScript('post.js').then(null, function(e) {
+                self.transitionTo('help');
+
+                // Note that the above transitionTo will implicitly
+                // halt the transition. If you were to return
+                // nothing from this promise reject handler,
+                // according to promise semantics, that would
+                // convert the reject into a resolve and the
+                // transition would continue. To propagate the
+                // error so that it'd be handled by the `error`
+                // hook, you would have to either
+                return Ember.RSVP.reject(e);
+              });
+            }
+          }
+        });
+        ```
+
+        @method beforeModel
+        @param {Transition} transition
+        @param {Object} queryParams the active query params for this route
+        @return {Promise} if the value returned from this hook is
+          a promise, the transition will pause until the transition
+          resolves. Otherwise, non-promise return values are not
+          utilized in any way.
+      */
+      beforeModel: Ember.K,
+
+      /**
+        This hook is called after this route's model has resolved.
+        It follows identical async/promise semantics to `beforeModel`
+        but is provided the route's resolved model in addition to
+        the `transition`, and is therefore suited to performing
+        logic that can only take place after the model has already
+        resolved.
+
+        ```js
+        App.PostsRoute = Ember.Route.extend({
+          afterModel: function(posts, transition) {
+            if (posts.get('length') === 1) {
+              this.transitionTo('post.show', posts.get('firstObject'));
+            }
+          }
+        });
+        ```
+
+        Refer to documentation for `beforeModel` for a description
+        of transition-pausing semantics when a promise is returned
+        from this hook.
+
+        @method afterModel
+        @param {Object} resolvedModel the value returned from `model`,
+          or its resolved value if it was a promise
+        @param {Transition} transition
+        @param {Object} queryParams the active query params for this handler
+        @return {Promise} if the value returned from this hook is
+          a promise, the transition will pause until the transition
+          resolves. Otherwise, non-promise return values are not
+          utilized in any way.
+       */
+      afterModel: Ember.K,
+
+      /**
+        A hook you can implement to optionally redirect to another route.
+
+        If you call `this.transitionTo` from inside of this hook, this route
+        will not be entered in favor of the other hook.
+
+        `redirect` and `afterModel` behave very similarly and are
+        called almost at the same time, but they have an important
+        distinction in the case that, from one of these hooks, a
+        redirect into a child route of this route occurs: redirects
+        from `afterModel` essentially invalidate the current attempt
+        to enter this route, and will result in this route's `beforeModel`,
+        `model`, and `afterModel` hooks being fired again within
+        the new, redirecting transition. Redirects that occur within
+        the `redirect` hook, on the other hand, will _not_ cause
+        these hooks to be fired again the second time around; in
+        other words, by the time the `redirect` hook has been called,
+        both the resolved model and attempted entry into this route
+        are considered to be fully validated.
+
+        @method redirect
+        @param {Object} model the model for this route
+      */
+      redirect: Ember.K,
+
+      /**
+        Called when the context is changed by router.js.
+
+        @private
+        @method contextDidChange
+      */
+      contextDidChange: function() {
+        this.currentModel = this.context;
+      },
+
+      /**
+        A hook you can implement to convert the URL into the model for
+        this route.
+
+        ```js
+        App.Router.map(function() {
+          this.resource('post', {path: '/posts/:post_id'});
+        });
+        ```
+
+        The model for the `post` route is `App.Post.find(params.post_id)`.
+
+        By default, if your route has a dynamic segment ending in `_id`:
+
+        * The model class is determined from the segment (`post_id`'s
+          class is `App.Post`)
+        * The find method is called on the model class with the value of
+          the dynamic segment.
+
+        Note that for routes with dynamic segments, this hook is only
+        executed when entered via the URL. If the route is entered
+        through a transition (e.g. when using the `link-to` Handlebars
+        helper), then a model context is already provided and this hook
+        is not called. Routes without dynamic segments will always
+        execute the model hook.
+
+        This hook follows the asynchronous/promise semantics
+        described in the documentation for `beforeModel`. In particular,
+        if a promise returned from `model` fails, the error will be
+        handled by the `error` hook on `Ember.Route`.
+
+        Example
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          model: function(params) {
+            return App.Post.find(params.post_id);
+          }
+        });
+        ```
+
+        @method model
+        @param {Object} params the parameters extracted from the URL
+        @param {Transition} transition
+        @param {Object} queryParams the query params for this route
+        @return {Object|Promise} the model for this route. If
+          a promise is returned, the transition will pause until
+          the promise resolves, and the resolved value of the promise
+          will be used as the model for this route.
+      */
+      model: function(params, transition) {
+        var match, name, sawParams, value;
+
+        for (var prop in params) {
+          if (prop === 'queryParams') { continue; }
+
+          if (match = prop.match(/^(.*)_id$/)) {
+            name = match[1];
+            value = params[prop];
+          }
+          sawParams = true;
+        }
+
+        if (!name && sawParams) { return copy(params); }
+        else if (!name) {
+          if (transition.resolveIndex !== transition.state.handlerInfos.length-1) { return; }
+
+          var parentModel = transition.state.handlerInfos[transition.resolveIndex-1].context;
+
+          return parentModel;
+        }
+
+        return this.findModel(name, value);
+      },
+
+      /**
+        @private
+        @method deserialize
+        @param {Object} params the parameters extracted from the URL
+        @param {Transition} transition
+        @return {Object|Promise} the model for this route.
+
+        Router.js hook.
+       */
+      deserialize: function(params, transition) {
+        
+          return this.model(params, transition);
+        
+      },
+
+      /**
+
+        @method findModel
+        @param {String} type the model type
+        @param {Object} value the value passed to find
+      */
+      findModel: function(){
+        var store = get(this, 'store');
+        return store.find.apply(store, arguments);
+      },
+
+      /**
+        Store property provides a hook for data persistence libraries to inject themselves.
+
+        By default, this store property provides the exact same functionality previously
+        in the model hook.
+
+        Currently, the required interface is:
+
+        `store.find(modelName, findArguments)`
+
+        @method store
+        @param {Object} store
+      */
+      store: computed(function(){
+        var container = this.container;
+        var routeName = this.routeName;
+        var namespace = get(this, 'router.namespace');
+
+        return {
+          find: function(name, value) {
+            var modelClass = container.lookupFactory('model:' + name);
+
+            
+            if (!modelClass) { return; }
+
+            
+            return modelClass.find(value);
+          }
+        };
+      }),
+
+      /**
+        A hook you can implement to convert the route's model into parameters
+        for the URL.
+
+        ```js
+        App.Router.map(function() {
+          this.resource('post', {path: '/posts/:post_id'});
+        });
+
+        App.PostRoute = Ember.Route.extend({
+          model: function(params) {
+            // the server returns `{ id: 12 }`
+            return jQuery.getJSON("/posts/" + params.post_id);
+          },
+
+          serialize: function(model) {
+            // this will make the URL `/posts/12`
+            return { post_id: model.id };
+          }
+        });
+        ```
+
+        The default `serialize` method will insert the model's `id` into the
+        route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+        If the route has multiple dynamic segments or does not contain '_id', `serialize`
+        will return `Ember.getProperties(model, params)`
+
+        This method is called when `transitionTo` is called with a context
+        in order to populate the URL.
+
+        @method serialize
+        @param {Object} model the route's model
+        @param {Array} params an Array of parameter names for the current
+          route (in the example, `['post_id']`.
+        @return {Object} the serialized parameters
+      */
+      serialize: function(model, params) {
+        if (params.length < 1) { return; }
+        if (!model) { return; }
+
+        var name = params[0], object = {};
+
+        if (/_id$/.test(name) && params.length === 1) {
+          object[name] = get(model, "id");
+        } else {
+          object = getProperties(model, params);
+        }
+
+        return object;
+      },
+
+      /**
+        A hook you can use to setup the controller for the current route.
+
+        This method is called with the controller for the current route and the
+        model supplied by the `model` hook.
+
+        By default, the `setupController` hook sets the `content` property of
+        the controller to the `model`.
+
+        If you implement the `setupController` hook in your Route, it will
+        prevent this default behavior. If you want to preserve that behavior
+        when implementing your `setupController` function, make sure to call
+        `_super`:
+
+        ```js
+        App.PhotosRoute = Ember.Route.extend({
+          model: function() {
+            return App.Photo.find();
+          },
+
+          setupController: function (controller, model) {
+            // Call _super for default behavior
+            this._super(controller, model);
+            // Implement your custom setup after
+            this.controllerFor('application').set('showingPhotos', true);
+          }
+        });
+        ```
+
+        This means that your template will get a proxy for the model as its
+        context, and you can act as though the model itself was the context.
+
+        The provided controller will be one resolved based on the name
+        of this route.
+
+        If no explicit controller is defined, Ember will automatically create
+        an appropriate controller for the model.
+
+        * if the model is an `Ember.Array` (including record arrays from Ember
+          Data), the controller is an `Ember.ArrayController`.
+        * otherwise, the controller is an `Ember.ObjectController`.
+
+        As an example, consider the router:
+
+        ```js
+        App.Router.map(function() {
+          this.resource('post', {path: '/posts/:post_id'});
+        });
+        ```
+
+        For the `post` route, a controller named `App.PostController` would
+        be used if it is defined. If it is not defined, an `Ember.ObjectController`
+        instance would be used.
+
+        Example
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          setupController: function(controller, model) {
+            controller.set('model', model);
+          }
+        });
+        ```
+
+        @method setupController
+        @param {Controller} controller instance
+        @param {Object} model
+      */
+      setupController: function(controller, context, transition) {
+        if (controller && (context !== undefined)) {
+          set(controller, 'model', context);
+        }
+      },
+
+      /**
+        Returns the controller for a particular route or name.
+
+        The controller instance must already have been created, either through entering the
+        associated route or using `generateController`.
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          setupController: function(controller, post) {
+            this._super(controller, post);
+            this.controllerFor('posts').set('currentPost', post);
+          }
+        });
+        ```
+
+        @method controllerFor
+        @param {String} name the name of the route or controller
+        @return {Ember.Controller}
+      */
+      controllerFor: function(name, _skipAssert) {
+        var container = this.container,
+            route = container.lookup('route:'+name),
+            controller;
+
+        if (route && route.controllerName) {
+          name = route.controllerName;
+        }
+
+        controller = container.lookup('controller:' + name);
+
+        // NOTE: We're specifically checking that skipAssert is true, because according
+        //   to the old API the second parameter was model. We do not want people who
+        //   passed a model to skip the assertion.
+        
+        return controller;
+      },
+
+      /**
+        Generates a controller for a route.
+
+        If the optional model is passed then the controller type is determined automatically,
+        e.g., an ArrayController for arrays.
+
+        Example
+
+        ```js
+        App.PostRoute = Ember.Route.extend({
+          setupController: function(controller, post) {
+            this._super(controller, post);
+            this.generateController('posts', post);
+          }
+        });
+        ```
+
+        @method generateController
+        @param {String} name the name of the controller
+        @param {Object} model the model to infer the type of the controller (optional)
+      */
+      generateController: function(name, model) {
+        var container = this.container;
+
+        model = model || this.modelFor(name);
+
+        return generateController(container, name, model);
+      },
+
+      /**
+        Returns the model of a parent (or any ancestor) route
+        in a route hierarchy.  During a transition, all routes
+        must resolve a model object, and if a route
+        needs access to a parent route's model in order to
+        resolve a model (or just reuse the model from a parent),
+        it can call `this.modelFor(theNameOfParentRoute)` to
+        retrieve it.
+
+        Example
+
+        ```js
+        App.Router.map(function() {
+            this.resource('post', { path: '/post/:post_id' }, function() {
+                this.resource('comments');
+            });
+        });
+
+        App.CommentsRoute = Ember.Route.extend({
+            afterModel: function() {
+                this.set('post', this.modelFor('post'));
+            }
+        });
+        ```
+
+        @method modelFor
+        @param {String} name the name of the route
+        @return {Object} the model object
+      */
+      modelFor: function(name) {
+        var route = this.container.lookup('route:' + name),
+            transition = this.router ? this.router.router.activeTransition : null;
+
+        // If we are mid-transition, we want to try and look up
+        // resolved parent contexts on the current transitionEvent.
+        if (transition) {
+          var modelLookupName = (route && route.routeName) || name;
+          if (transition.resolvedModels.hasOwnProperty(modelLookupName)) {
+            return transition.resolvedModels[modelLookupName];
+          }
+        }
+
+        return route && route.currentModel;
+      },
+
+      /**
+        A hook you can use to render the template for the current route.
+
+        This method is called with the controller for the current route and the
+        model supplied by the `model` hook. By default, it renders the route's
+        template, configured with the controller for the route.
+
+        This method can be overridden to set up and render additional or
+        alternative templates.
+
+        ```js
+        App.PostsRoute = Ember.Route.extend({
+          renderTemplate: function(controller, model) {
+            var favController = this.controllerFor('favoritePost');
+
+            // Render the `favoritePost` template into
+            // the outlet `posts`, and display the `favoritePost`
+            // controller.
+            this.render('favoritePost', {
+              outlet: 'posts',
+              controller: favController
+            });
+          }
+        });
+        ```
+
+        @method renderTemplate
+        @param {Object} controller the route's controller
+        @param {Object} model the route's model
+      */
+      renderTemplate: function(controller, model) {
+        this.render();
+      },
+
+      /**
+        Renders a template into an outlet.
+
+        This method has a number of defaults, based on the name of the
+        route specified in the router.
+
+        For example:
+
+        ```js
+        App.Router.map(function() {
+          this.route('index');
+          this.resource('post', {path: '/posts/:post_id'});
+        });
+
+        App.PostRoute = App.Route.extend({
+          renderTemplate: function() {
+            this.render();
+          }
+        });
+        ```
+
+        The name of the `PostRoute`, as defined by the router, is `post`.
+
+        By default, render will:
+
+        * render the `post` template
+        * with the `post` view (`PostView`) for event handling, if one exists
+        * and the `post` controller (`PostController`), if one exists
+        * into the `main` outlet of the `application` template
+
+        You can override this behavior:
+
+        ```js
+        App.PostRoute = App.Route.extend({
+          renderTemplate: function() {
+            this.render('myPost', {   // the template to render
+              into: 'index',          // the template to render into
+              outlet: 'detail',       // the name of the outlet in that template
+              controller: 'blogPost'  // the controller to use for the template
+            });
+          }
+        });
+        ```
+
+        Remember that the controller's `content` will be the route's model. In
+        this case, the default model will be `App.Post.find(params.post_id)`.
+
+        @method render
+        @param {String} name the name of the template to render
+        @param {Object} options the options
+      */
+      render: function(name, options) {
+        
+        var namePassed = typeof name === 'string' && !!name;
+
+        if (typeof name === 'object' && !options) {
+          options = name;
+          name = this.routeName;
+        }
+
+        options = options || {};
+
+        var templateName;
+
+        if (name) {
+          name = name.replace(/\//g, '.');
+          templateName = name;
+        } else {
+          name = this.routeName;
+          templateName = this.templateName || name;
+        }
+
+        var viewName = options.view || namePassed && name || this.viewName || name;
+
+        var container = this.container,
+            view = container.lookup('view:' + viewName),
+            template = view ? view.get('template') : null;
+
+        if (!template) {
+          template = container.lookup('template:' + templateName);
+        }
+
+        if (!view && !template) {
+                    if (get(this.router, 'namespace.LOG_VIEW_LOOKUPS')) {
+                      }
+          return;
+        }
+
+        options = normalizeOptions(this, name, template, options);
+        view = setupView(view, container, options);
+
+        if (options.outlet === 'main') { this.lastRenderedTemplate = name; }
+
+        appendView(this, view, options);
+      },
+
+      /**
+        Disconnects a view that has been rendered into an outlet.
+
+        You may pass any or all of the following options to `disconnectOutlet`:
+
+        * `outlet`: the name of the outlet to clear (default: 'main')
+        * `parentView`: the name of the view containing the outlet to clear
+           (default: the view rendered by the parent route)
+
+        Example:
+
+        ```js
+        App.ApplicationRoute = App.Route.extend({
+          actions: {
+            showModal: function(evt) {
+              this.render(evt.modalName, {
+                outlet: 'modal',
+                into: 'application'
+              });
+            },
+            hideModal: function(evt) {
+              this.disconnectOutlet({
+                outlet: 'modal',
+                parentView: 'application'
+              });
+            }
+          }
+        });
+        ```
+
+        Alternatively, you can pass the `outlet` name directly as a string.
+
+        Example:
+
+        ```js
+        hideModal: function(evt) {
+          this.disconnectOutlet('modal');
+        }
+        ```
+
+        @method disconnectOutlet
+        @param {Object|String} options the options hash or outlet name
+      */
+      disconnectOutlet: function(options) {
+        if (!options || typeof options === "string") {
+          var outletName = options;
+          options = {};
+          options.outlet = outletName;
+        }
+        options.parentView = options.parentView ? options.parentView.replace(/\//g, '.') : parentTemplate(this);
+        options.outlet = options.outlet || 'main';
+
+        var parentView = this.router._lookupActiveView(options.parentView);
+        if (parentView) { parentView.disconnectOutlet(options.outlet); }
+      },
+
+      willDestroy: function() {
+        this.teardownViews();
+      },
+
+      /**
+        @private
+
+        @method teardownViews
+      */
+      teardownViews: function() {
+        // Tear down the top level view
+        if (this.teardownTopLevelView) { this.teardownTopLevelView(); }
+
+        // Tear down any outlets rendered with 'into'
+        var teardownOutletViews = this.teardownOutletViews || [];
+        a_forEach(teardownOutletViews, function(teardownOutletView) {
+          teardownOutletView();
+        });
+
+        delete this.teardownTopLevelView;
+        delete this.teardownOutletViews;
+        delete this.lastRenderedTemplate;
+      }
+    });
+
+
+    
+    function parentRoute(route) {
+      var handlerInfos = route.router.router.state.handlerInfos;
+
+      if (!handlerInfos) { return; }
+
+      var parent, current;
+
+      for (var i=0, l=handlerInfos.length; i<l; i++) {
+        current = handlerInfos[i].handler;
+        if (current === route) { return parent; }
+        parent = current;
+      }
+    }
+
+    function parentTemplate(route) {
+      var parent = parentRoute(route), template;
+
+      if (!parent) { return; }
+
+      if (template = parent.lastRenderedTemplate) {
+        return template;
+      } else {
+        return parentTemplate(parent);
+      }
+    }
+
+    function normalizeOptions(route, name, template, options) {
+      options = options || {};
+      options.into = options.into ? options.into.replace(/\//g, '.') : parentTemplate(route);
+      options.outlet = options.outlet || 'main';
+      options.name = name;
+      options.template = template;
+      options.LOG_VIEW_LOOKUPS = get(route.router, 'namespace.LOG_VIEW_LOOKUPS');
+
+      
+      var controller = options.controller,
+          model = options.model,
+          namedController;
+
+      if (options.controller) {
+        controller = options.controller;
+      } else if (namedController = route.container.lookup('controller:' + name)) {
+        controller = namedController;
+      } else {
+        controller = route.controllerName || route.routeName;
+      }
+
+      if (typeof controller === 'string') {
+        var controllerName = controller;
+        controller = route.container.lookup('controller:' + controllerName);
+        if (!controller) {
+          throw new EmberError("You passed `controller: '" + controllerName + "'` into the `render` method, but no such controller could be found.");
+        }
+      }
+
+      if (model) {
+        controller.set('model', model);
+      }
+
+      options.controller = controller;
+
+      return options;
+    }
+
+    function setupView(view, container, options) {
+      if (view) {
+        if (options.LOG_VIEW_LOOKUPS) {
+                  }
+      } else {
+        var defaultView = options.into ? 'view:default' : 'view:toplevel';
+        view = container.lookup(defaultView);
+        if (options.LOG_VIEW_LOOKUPS) {
+                  }
+      }
+
+      if (!get(view, 'templateName')) {
+        set(view, 'template', options.template);
+
+        set(view, '_debugTemplateName', options.name);
+      }
+
+      set(view, 'renderedName', options.name);
+      set(view, 'controller', options.controller);
+
+      return view;
+    }
+
+    function appendView(route, view, options) {
+      if (options.into) {
+        var parentView = route.router._lookupActiveView(options.into);
+        var teardownOutletView = generateOutletTeardown(parentView, options.outlet);
+        if (!route.teardownOutletViews) { route.teardownOutletViews = []; }
+        a_replace(route.teardownOutletViews, 0, 0, [teardownOutletView]);
+        parentView.connectOutlet(options.outlet, view);
+      } else {
+        var rootElement = get(route, 'router.namespace.rootElement');
+        // tear down view if one is already rendered
+        if (route.teardownTopLevelView) {
+          route.teardownTopLevelView();
+        }
+        route.router._connectActiveView(options.name, view);
+        route.teardownTopLevelView = generateTopLevelTeardown(view);
+        view.appendTo(rootElement);
+      }
+    }
+
+    function generateTopLevelTeardown(view) {
+      return function() { view.destroy(); };
+    }
+
+    function generateOutletTeardown(parentView, outlet) {
+      return function() { parentView.disconnectOutlet(outlet); };
+    }
+
+    function toggleQueryParamObservers(route, controller, enable) {
+      var queryParams = get(controller, 'queryParams'), i, len,
+          method = enable ? 'addObserver' : 'removeObserver';
+
+      for (i = 0, len = queryParams.length; i < len; ++i) {
+        var prop = queryParams[i].split(':')[0];
+        controller[method](prop,         route, route._qpChanged);
+        controller[method](prop + '.[]', route, route._qpChanged);
+      }
+    }
+
+    __exports__["default"] = Route;
+  });
+define("ember-routing/system/router",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/array","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // FEATURES, Logger, K, assert
+    var EmberError = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var forEach = __dependency5__.forEach;
+    var defineProperty = __dependency6__.defineProperty;
+    var computed = __dependency7__.computed;
+    var merge = __dependency8__["default"];
+    var run = __dependency9__["default"];
+    var EnumerableUtils = __dependency10__["default"];
+
+    var fmt = __dependency11__.fmt;
+    var EmberObject = __dependency12__["default"];
+    var Evented = __dependency13__["default"];
+    var EmberRouterDSL = __dependency14__["default"];
+    var EmberView = __dependency15__.View;
+    var EmberLocation = __dependency16__["default"];
+    var _MetamorphView = __dependency17__._MetamorphView;
+
+    // requireModule("ember-handlebars");
+    // requireModule("ember-runtime");
+    // requireModule("ember-views");
+
+    /**
+    @module ember
+    @submodule ember-routing
+    */
+
+    // // side effect of loading some Ember globals, for now
+    // requireModule("ember-handlebars");
+    // requireModule("ember-runtime");
+    // requireModule("ember-views");
+
+    var Router = requireModule("router")['default'];
+    var Transition = requireModule("router/transition").Transition;
+
+    var slice = [].slice;
+    var forEach = EnumerableUtils.forEach;
+
+    var DefaultView = _MetamorphView;
+
+    /**
+      The `Ember.Router` class manages the application state and URLs. Refer to
+      the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+
+      @class Router
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var EmberRouter = EmberObject.extend(Evented, {
+      /**
+        The `location` property determines the type of URL's that your
+        application will use.
+
+        The following location types are currently available:
+
+        * `hash`
+        * `history`
+        * `none`
+
+        @property location
+        @default 'hash'
+        @see {Ember.Location}
+      */
+      location: 'hash',
+
+      /**
+       Represents the URL of the root of the application, often '/'. This prefix is
+       assumed on all routes defined on this router.
+
+       @property rootURL
+       @default '/'
+      */
+      rootURL: '/',
+
+      init: function() {
+        this.router = this.constructor.router || this.constructor.map(Ember.K);
+        this._activeViews = {};
+        this._setupLocation();
+        this._qpCache = {};
+        this._queuedQPChanges = {};
+
+        if (get(this, 'namespace.LOG_TRANSITIONS_INTERNAL')) {
+          this.router.log = Ember.Logger.debug;
+        }
+      },
+
+      /**
+        Represents the current URL.
+
+        @method url
+        @return {String} The current URL.
+      */
+      url: computed(function() {
+        return get(this, 'location').getURL();
+      }),
+
+      /**
+        Initializes the current router instance and sets up the change handling
+        event listeners used by the instances `location` implementation.
+
+        A property named `initialURL` will be used to determine the initial URL.
+        If no value is found `/` will be used.
+
+        @method startRouting
+        @private
+      */
+      startRouting: function() {
+        this.router = this.router || this.constructor.map(Ember.K);
+
+        var router = this.router,
+            location = get(this, 'location'),
+            container = this.container,
+            self = this,
+            initialURL = get(this, 'initialURL');
+
+        // Allow the Location class to cancel the router setup while it refreshes
+        // the page
+        if (get(location, 'cancelRouterSetup')) {
+          return;
+        }
+
+        this._setupRouter(router, location);
+
+        container.register('view:default', DefaultView);
+        container.register('view:toplevel', EmberView.extend());
+
+        location.onUpdateURL(function(url) {
+          self.handleURL(url);
+        });
+
+        if (typeof initialURL === "undefined") {
+          initialURL = location.getURL();
+        }
+
+        this.handleURL(initialURL);
+      },
+
+      /**
+        Handles updating the paths and notifying any listeners of the URL
+        change.
+
+        Triggers the router level `didTransition` hook.
+
+        @method didTransition
+        @private
+        @since 1.2.0
+      */
+      didTransition: function(infos) {
+        updatePaths(this);
+
+        this._cancelLoadingEvent();
+
+        this.notifyPropertyChange('url');
+
+        // Put this in the runloop so url will be accurate. Seems
+        // less surprising than didTransition being out of sync.
+        run.once(this, this.trigger, 'didTransition');
+
+        if (get(this, 'namespace').LOG_TRANSITIONS) {
+          Ember.Logger.log("Transitioned into '" + EmberRouter._routePath(infos) + "'");
+        }
+      },
+
+      handleURL: function(url) {
+        return this._doTransition('handleURL', [url]);
+      },
+
+      transitionTo: function() {
+        return this._doTransition('transitionTo', arguments);
+      },
+
+      intermediateTransitionTo: function() {
+        this.router.intermediateTransitionTo.apply(this.router, arguments);
+
+        updatePaths(this);
+
+        var infos = this.router.currentHandlerInfos;
+        if (get(this, 'namespace').LOG_TRANSITIONS) {
+          Ember.Logger.log("Intermediate-transitioned into '" + EmberRouter._routePath(infos) + "'");
+        }
+      },
+
+      replaceWith: function() {
+        return this._doTransition('replaceWith', arguments);
+      },
+
+      generate: function() {
+        var url = this.router.generate.apply(this.router, arguments);
+        return this.location.formatURL(url);
+      },
+
+      /**
+        Determines if the supplied route is currently active.
+
+        @method isActive
+        @param routeName
+        @return {Boolean}
+        @private
+      */
+      isActive: function(routeName) {
+        var router = this.router;
+        return router.isActive.apply(router, arguments);
+      },
+
+      send: function(name, context) {
+        this.router.trigger.apply(this.router, arguments);
+      },
+
+      /**
+        Does this router instance have the given route.
+
+        @method hasRoute
+        @return {Boolean}
+        @private
+      */
+      hasRoute: function(route) {
+        return this.router.hasRoute(route);
+      },
+
+      /**
+        Resets the state of the router by clearing the current route
+        handlers and deactivating them.
+
+        @private
+        @method reset
+       */
+      reset: function() {
+        this.router.reset();
+      },
+
+      _lookupActiveView: function(templateName) {
+        var active = this._activeViews[templateName];
+        return active && active[0];
+      },
+
+      _connectActiveView: function(templateName, view) {
+        var existing = this._activeViews[templateName];
+
+        if (existing) {
+          existing[0].off('willDestroyElement', this, existing[1]);
+        }
+
+        function disconnectActiveView() {
+          delete this._activeViews[templateName];
+        }
+
+        this._activeViews[templateName] = [view, disconnectActiveView];
+        view.one('willDestroyElement', this, disconnectActiveView);
+      },
+
+      _setupLocation: function() {
+        var location = get(this, 'location'),
+            rootURL = get(this, 'rootURL');
+
+        if (rootURL && !this.container.has('-location-setting:root-url')) {
+          this.container.register('-location-setting:root-url', rootURL, { instantiate: false });
+        }
+
+        if ('string' === typeof location && this.container) {
+          var resolvedLocation = this.container.lookup('location:' + location);
+
+          if ('undefined' !== typeof resolvedLocation) {
+            location = set(this, 'location', resolvedLocation);
+          } else {
+            // Allow for deprecated registration of custom location API's
+            var options = {implementation: location};
+
+            location = set(this, 'location', EmberLocation.create(options));
+          }
+        }
+
+        if (rootURL && typeof rootURL === 'string') {
+          location.rootURL = rootURL;
+        }
+
+        // ensure that initState is called AFTER the rootURL is set on
+        // the location instance
+        if (typeof location.initState === 'function') { location.initState(); }
+      },
+
+      _getHandlerFunction: function() {
+        var seen = {}, container = this.container,
+            DefaultRoute = container.lookupFactory('route:basic'),
+            self = this;
+
+        return function(name) {
+          var routeName = 'route:' + name,
+              handler = container.lookup(routeName);
+
+          if (seen[name]) { return handler; }
+
+          seen[name] = true;
+
+          if (!handler) {
+            container.register(routeName, DefaultRoute.extend());
+            handler = container.lookup(routeName);
+
+            if (get(self, 'namespace.LOG_ACTIVE_GENERATION')) {
+                          }
+          }
+
+          handler.routeName = name;
+          return handler;
+        };
+      },
+
+      _setupRouter: function(router, location) {
+        var lastURL, emberRouter = this;
+
+        router.getHandler = this._getHandlerFunction();
+
+        var doUpdateURL = function() {
+          location.setURL(lastURL);
+        };
+
+        router.updateURL = function(path) {
+          lastURL = path;
+          run.once(doUpdateURL);
+        };
+
+        if (location.replaceURL) {
+          var doReplaceURL = function() {
+            location.replaceURL(lastURL);
+          };
+
+          router.replaceURL = function(path) {
+            lastURL = path;
+            run.once(doReplaceURL);
+          };
+        }
+
+        router.didTransition = function(infos) {
+          emberRouter.didTransition(infos);
+        };
+      },
+
+      _doTransition: function(method, args) {
+        // Normalize blank route to root URL.
+        args = slice.call(args);
+        args[0] = args[0] || '/';
+
+        var name = args[0], self = this,
+          isQueryParamsOnly = false, queryParams;
+
+        
+        if (!isQueryParamsOnly && name.charAt(0) !== '/') {
+                  }
+
+        if (queryParams) {
+          // router.js expects queryParams to be passed in in
+          // their final serialized form, so we need to translate.
+
+          if (!name) {
+            // Need to determine destination route name.
+            var handlerInfos = this.router.activeTransition ?
+                               this.router.activeTransition.state.handlerInfos :
+                               this.router.state.handlerInfos;
+            name = handlerInfos[handlerInfos.length - 1].name;
+            args.unshift(name);
+          }
+
+          var qpCache = this._queryParamsFor(name), qps = qpCache.qps;
+
+          var finalParams = {};
+          for (var key in queryParams) {
+            if (!queryParams.hasOwnProperty(key)) { continue; }
+            var inputValue = queryParams[key],
+                qp = qpCache.map[key];
+
+            if (!qp) {
+              throw new EmberError("Unrecognized query param " + key + " provided as transition argument");
+            }
+            finalParams[qp.urlKey] = qp.route.serializeQueryParam(inputValue, qp.urlKey, qp.type);
+          }
+
+          // Perform any necessary serialization.
+          args[args.length-1].queryParams = finalParams;
+        }
+
+        var transitionPromise = this.router[method].apply(this.router, args);
+
+        transitionPromise.then(null, function(error) {
+          if (!error || !error.name) { return; }
+
+          if (error.name === "UnrecognizedURLError") {
+                      } else if (error.name === 'TransitionAborted') {
+            // just ignore TransitionAborted here
+          } else {
+            logError(error);
+          }
+
+          return error;
+        }, 'Ember: Process errors from Router');
+
+        // We want to return the configurable promise object
+        // so that callers of this function can use `.method()` on it,
+        // which obviously doesn't exist for normal RSVP promises.
+        return transitionPromise;
+      },
+
+      _queryParamsFor: function(leafRouteName) {
+        if (this._qpCache[leafRouteName]) {
+          return this._qpCache[leafRouteName];
+        }
+
+        var map = {}, qps = [], qpCache = this._qpCache[leafRouteName] = {
+          map: map,
+          qps: qps
+        };
+
+        var routerjs = this.router,
+            recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
+
+        for (var i = 0, len = recogHandlerInfos.length; i < len; ++i) {
+          var recogHandler = recogHandlerInfos[i],
+              route = routerjs.getHandler(recogHandler.handler),
+              qpMeta = get(route, '_qp');
+
+          if (!qpMeta) { continue; }
+
+          merge(map, qpMeta.map);
+          qps.push.apply(qps, qpMeta.qps);
+        }
+
+        return {
+          qps: qps,
+          map: map
+        };
+      },
+
+      _scheduleLoadingEvent: function(transition, originRoute) {
+        this._cancelLoadingEvent();
+        this._loadingStateTimer = run.scheduleOnce('routerTransitions', this, '_fireLoadingEvent', transition, originRoute);
+      },
+
+      _fireLoadingEvent: function(transition, originRoute) {
+        if (!this.router.activeTransition) {
+          // Don't fire an event if we've since moved on from
+          // the transition that put us in a loading state.
+          return;
+        }
+
+        transition.trigger(true, 'loading', transition, originRoute);
+      },
+
+      _cancelLoadingEvent: function () {
+        if (this._loadingStateTimer) {
+          run.cancel(this._loadingStateTimer);
+        }
+        this._loadingStateTimer = null;
+      }
+    });
+
+    function controllerOrProtoFor(controllerName, container, getProto) {
+      var fullName = container.normalize('controller:' + controllerName);
+      if (!getProto && container.cache.has(fullName)) {
+        return container.lookup(fullName);
+      } else {
+        // Controller hasn't been instantiated yet; just return its proto.
+        var controllerClass = container.lookupFactory(fullName);
+        if (controllerClass && typeof controllerClass.proto === 'function') {
+          return controllerClass.proto();
+        } else {
+          return {};
+        }
+      }
+    }
+
+    /*
+      Helper function for iterating root-ward, starting
+      from (but not including) the provided `originRoute`.
+
+      Returns true if the last callback fired requested
+      to bubble upward.
+
+      @private
+     */
+    function forEachRouteAbove(originRoute, transition, callback) {
+      var handlerInfos = transition.state.handlerInfos,
+          originRouteFound = false;
+
+      for (var i = handlerInfos.length - 1; i >= 0; --i) {
+        var handlerInfo = handlerInfos[i],
+            route = handlerInfo.handler;
+
+        if (!originRouteFound) {
+          if (originRoute === route) {
+            originRouteFound = true;
+          }
+          continue;
+        }
+
+        if (callback(route, handlerInfos[i + 1].handler) !== true) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    // These get invoked when an action bubbles above ApplicationRoute
+    // and are not meant to be overridable.
+    var defaultActionHandlers = {
+
+      willResolveModel: function(transition, originRoute) {
+        originRoute.router._scheduleLoadingEvent(transition, originRoute);
+      },
+
+      error: function(error, transition, originRoute) {
+        // Attempt to find an appropriate error substate to enter.
+        var router = originRoute.router;
+
+        var tryTopLevel = forEachRouteAbove(originRoute, transition, function(route, childRoute) {
+          var childErrorRouteName = findChildRouteName(route, childRoute, 'error');
+          if (childErrorRouteName) {
+            router.intermediateTransitionTo(childErrorRouteName, error);
+            return;
+          }
+          return true;
+        });
+
+        if (tryTopLevel) {
+          // Check for top-level error state to enter.
+          if (routeHasBeenDefined(originRoute.router, 'application_error')) {
+            router.intermediateTransitionTo('application_error', error);
+            return;
+          }
+        } else {
+          // Don't fire an assertion if we found an error substate.
+          return;
+        }
+
+        logError(error, 'Error while processing route: ' + transition.targetName);
+      },
+
+      loading: function(transition, originRoute) {
+        // Attempt to find an appropriate loading substate to enter.
+        var router = originRoute.router;
+
+        var tryTopLevel = forEachRouteAbove(originRoute, transition, function(route, childRoute) {
+          var childLoadingRouteName = findChildRouteName(route, childRoute, 'loading');
+
+          if (childLoadingRouteName) {
+            router.intermediateTransitionTo(childLoadingRouteName);
+            return;
+          }
+
+          // Don't bubble above pivot route.
+          if (transition.pivotHandler !== route) {
+            return true;
+          }
+        });
+
+        if (tryTopLevel) {
+          // Check for top-level loading state to enter.
+          if (routeHasBeenDefined(originRoute.router, 'application_loading')) {
+            router.intermediateTransitionTo('application_loading');
+            return;
+          }
+        }
+      }
+    };
+
+    function logError(error, initialMessage) {
+      var errorArgs = [];
+
+      if (initialMessage) { errorArgs.push(initialMessage); }
+
+      if (error) {
+        if (error.message) { errorArgs.push(error.message); }
+        if (error.stack)   { errorArgs.push(error.stack); }
+
+        if (typeof error === "string") { errorArgs.push(error); }
+      }
+
+      Ember.Logger.error.apply(this, errorArgs);
+    }
+
+    function findChildRouteName(parentRoute, originatingChildRoute, name) {
+      var router = parentRoute.router,
+          childName,
+          targetChildRouteName = originatingChildRoute.routeName.split('.').pop(),
+          namespace = parentRoute.routeName === 'application' ? '' : parentRoute.routeName + '.';
+
+      
+      // Second, try general loading state, e.g. 'loading'
+      childName = namespace + name;
+      if (routeHasBeenDefined(router, childName)) {
+        return childName;
+      }
+    }
+
+    function routeHasBeenDefined(router, name) {
+      var container = router.container;
+      return router.hasRoute(name) &&
+             (container.has('template:' + name) || container.has('route:' + name));
+    }
+
+    function triggerEvent(handlerInfos, ignoreFailure, args) {
+      var name = args.shift();
+
+      if (!handlerInfos) {
+        if (ignoreFailure) { return; }
+        throw new EmberError("Can't trigger action '" + name + "' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call `.send()` on the `Transition` object passed to the `model/beforeModel/afterModel` hooks.");
+      }
+
+      var eventWasHandled = false;
+
+      for (var i = handlerInfos.length - 1; i >= 0; i--) {
+        var handlerInfo = handlerInfos[i],
+            handler = handlerInfo.handler;
+
+        if (handler._actions && handler._actions[name]) {
+          if (handler._actions[name].apply(handler, args) === true) {
+            eventWasHandled = true;
+          } else {
+            return;
+          }
+        }
+      }
+
+      if (defaultActionHandlers[name]) {
+        defaultActionHandlers[name].apply(null, args);
+        return;
+      }
+
+      if (!eventWasHandled && !ignoreFailure) {
+        throw new EmberError("Nothing handled the action '" + name + "'. If you did handle the action, this error can be caused by returning true from an action handler in a controller, causing the action to bubble.");
+      }
+    }
+
+    function updatePaths(router) {
+      var appController = router.container.lookup('controller:application');
+
+      if (!appController) {
+        // appController might not exist when top-level loading/error
+        // substates have been entered since ApplicationRoute hasn't
+        // actually been entered at that point.
+        return;
+      }
+
+      var infos = router.router.currentHandlerInfos,
+          path = EmberRouter._routePath(infos);
+
+      if (!('currentPath' in appController)) {
+        defineProperty(appController, 'currentPath');
+      }
+
+      set(appController, 'currentPath', path);
+
+      if (!('currentRouteName' in appController)) {
+        defineProperty(appController, 'currentRouteName');
+      }
+
+      set(appController, 'currentRouteName', infos[infos.length - 1].name);
+    }
+
+    EmberRouter.reopenClass({
+      router: null,
+      map: function(callback) {
+        var router = this.router;
+        if (!router) {
+          router = new Router();
+          router.callbacks = [];
+          router.triggerEvent = triggerEvent;
+          this.reopenClass({ router: router });
+        }
+
+        var dsl = EmberRouterDSL.map(function() {
+          this.resource('application', { path: "/" }, function() {
+            for (var i=0; i < router.callbacks.length; i++) {
+              router.callbacks[i].call(this);
+            }
+            callback.call(this);
+          });
+        });
+
+        router.callbacks.push(callback);
+        router.map(dsl.generate());
+        return router;
+      },
+
+      _routePath: function(handlerInfos) {
+        var path = [];
+
+        // We have to handle coalescing resource names that
+        // are prefixed with their parent's names, e.g.
+        // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz'
+
+        function intersectionMatches(a1, a2) {
+          for (var i = 0, len = a1.length; i < len; ++i) {
+            if (a1[i] !== a2[i]) {
+              return false;
+            }
+          }
+          return true;
+        }
+
+        for (var i=1, l=handlerInfos.length; i<l; i++) {
+          var name = handlerInfos[i].name,
+              nameParts = name.split("."),
+              oldNameParts = slice.call(path);
+
+          while (oldNameParts.length) {
+            if (intersectionMatches(oldNameParts, nameParts)) {
+              break;
+            }
+            oldNameParts.shift();
+          }
+
+          path.push.apply(path, nameParts.slice(oldNameParts.length));
+        }
+
+        return path.join(".");
+      }
+    });
+
+    __exports__["default"] = EmberRouter;
+  });
+define("route-recognizer",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var specials = [
+      '/', '.', '*', '+', '?', '|',
+      '(', ')', '[', ']', '{', '}', '\\'
+    ];
+
+    var escapeRegex = new RegExp('(\\' + specials.join('|\\') + ')', 'g');
+
+    function isArray(test) {
+      return Object.prototype.toString.call(test) === "[object Array]";
+    }
+
+    // A Segment represents a segment in the original route description.
+    // Each Segment type provides an `eachChar` and `regex` method.
+    //
+    // The `eachChar` method invokes the callback with one or more character
+    // specifications. A character specification consumes one or more input
+    // characters.
+    //
+    // The `regex` method returns a regex fragment for the segment. If the
+    // segment is a dynamic of star segment, the regex fragment also includes
+    // a capture.
+    //
+    // A character specification contains:
+    //
+    // * `validChars`: a String with a list of all valid characters, or
+    // * `invalidChars`: a String with a list of all invalid characters
+    // * `repeat`: true if the character specification can repeat
+
+    function StaticSegment(string) { this.string = string; }
+    StaticSegment.prototype = {
+      eachChar: function(callback) {
+        var string = this.string, ch;
+
+        for (var i=0, l=string.length; i<l; i++) {
+          ch = string.charAt(i);
+          callback({ validChars: ch });
+        }
+      },
+
+      regex: function() {
+        return this.string.replace(escapeRegex, '\\$1');
+      },
+
+      generate: function() {
+        return this.string;
+      }
+    };
+
+    function DynamicSegment(name) { this.name = name; }
+    DynamicSegment.prototype = {
+      eachChar: function(callback) {
+        callback({ invalidChars: "/", repeat: true });
+      },
+
+      regex: function() {
+        return "([^/]+)";
+      },
+
+      generate: function(params) {
+        return params[this.name];
+      }
+    };
+
+    function StarSegment(name) { this.name = name; }
+    StarSegment.prototype = {
+      eachChar: function(callback) {
+        callback({ invalidChars: "", repeat: true });
+      },
+
+      regex: function() {
+        return "(.+)";
+      },
+
+      generate: function(params) {
+        return params[this.name];
+      }
+    };
+
+    function EpsilonSegment() {}
+    EpsilonSegment.prototype = {
+      eachChar: function() {},
+      regex: function() { return ""; },
+      generate: function() { return ""; }
+    };
+
+    function parse(route, names, types) {
+      // normalize route as not starting with a "/". Recognition will
+      // also normalize.
+      if (route.charAt(0) === "/") { route = route.substr(1); }
+
+      var segments = route.split("/"), results = [];
+
+      for (var i=0, l=segments.length; i<l; i++) {
+        var segment = segments[i], match;
+
+        if (match = segment.match(/^:([^\/]+)$/)) {
+          results.push(new DynamicSegment(match[1]));
+          names.push(match[1]);
+          types.dynamics++;
+        } else if (match = segment.match(/^\*([^\/]+)$/)) {
+          results.push(new StarSegment(match[1]));
+          names.push(match[1]);
+          types.stars++;
+        } else if(segment === "") {
+          results.push(new EpsilonSegment());
+        } else {
+          results.push(new StaticSegment(segment));
+          types.statics++;
+        }
+      }
+
+      return results;
+    }
+
+    // A State has a character specification and (`charSpec`) and a list of possible
+    // subsequent states (`nextStates`).
+    //
+    // If a State is an accepting state, it will also have several additional
+    // properties:
+    //
+    // * `regex`: A regular expression that is used to extract parameters from paths
+    //   that reached this accepting state.
+    // * `handlers`: Information on how to convert the list of captures into calls
+    //   to registered handlers with the specified parameters
+    // * `types`: How many static, dynamic or star segments in this route. Used to
+    //   decide which route to use if multiple registered routes match a path.
+    //
+    // Currently, State is implemented naively by looping over `nextStates` and
+    // comparing a character specification against a character. A more efficient
+    // implementation would use a hash of keys pointing at one or more next states.
+
+    function State(charSpec) {
+      this.charSpec = charSpec;
+      this.nextStates = [];
+    }
+
+    State.prototype = {
+      get: function(charSpec) {
+        var nextStates = this.nextStates;
+
+        for (var i=0, l=nextStates.length; i<l; i++) {
+          var child = nextStates[i];
+
+          var isEqual = child.charSpec.validChars === charSpec.validChars;
+          isEqual = isEqual && child.charSpec.invalidChars === charSpec.invalidChars;
+
+          if (isEqual) { return child; }
+        }
+      },
+
+      put: function(charSpec) {
+        var state;
+
+        // If the character specification already exists in a child of the current
+        // state, just return that state.
+        if (state = this.get(charSpec)) { return state; }
+
+        // Make a new state for the character spec
+        state = new State(charSpec);
+
+        // Insert the new state as a child of the current state
+        this.nextStates.push(state);
+
+        // If this character specification repeats, insert the new state as a child
+        // of itself. Note that this will not trigger an infinite loop because each
+        // transition during recognition consumes a character.
+        if (charSpec.repeat) {
+          state.nextStates.push(state);
+        }
+
+        // Return the new state
+        return state;
+      },
+
+      // Find a list of child states matching the next character
+      match: function(ch) {
+        // DEBUG "Processing `" + ch + "`:"
+        var nextStates = this.nextStates,
+            child, charSpec, chars;
+
+        // DEBUG "  " + debugState(this)
+        var returned = [];
+
+        for (var i=0, l=nextStates.length; i<l; i++) {
+          child = nextStates[i];
+
+          charSpec = child.charSpec;
+
+          if (typeof (chars = charSpec.validChars) !== 'undefined') {
+            if (chars.indexOf(ch) !== -1) { returned.push(child); }
+          } else if (typeof (chars = charSpec.invalidChars) !== 'undefined') {
+            if (chars.indexOf(ch) === -1) { returned.push(child); }
+          }
+        }
+
+        return returned;
+      }
+
+      /** IF DEBUG
+      , debug: function() {
+        var charSpec = this.charSpec,
+            debug = "[",
+            chars = charSpec.validChars || charSpec.invalidChars;
+
+        if (charSpec.invalidChars) { debug += "^"; }
+        debug += chars;
+        debug += "]";
+
+        if (charSpec.repeat) { debug += "+"; }
+
+        return debug;
+      }
+      END IF **/
+    };
+
+    /** IF DEBUG
+    function debug(log) {
+      console.log(log);
+    }
+
+    function debugState(state) {
+      return state.nextStates.map(function(n) {
+        if (n.nextStates.length === 0) { return "( " + n.debug() + " [accepting] )"; }
+        return "( " + n.debug() + " <then> " + n.nextStates.map(function(s) { return s.debug() }).join(" or ") + " )";
+      }).join(", ")
+    }
+    END IF **/
+
+    // This is a somewhat naive strategy, but should work in a lot of cases
+    // A better strategy would properly resolve /posts/:id/new and /posts/edit/:id.
+    //
+    // This strategy generally prefers more static and less dynamic matching.
+    // Specifically, it
+    //
+    //  * prefers fewer stars to more, then
+    //  * prefers using stars for less of the match to more, then
+    //  * prefers fewer dynamic segments to more, then
+    //  * prefers more static segments to more
+    function sortSolutions(states) {
+      return states.sort(function(a, b) {
+        if (a.types.stars !== b.types.stars) { return a.types.stars - b.types.stars; }
+
+        if (a.types.stars) {
+          if (a.types.statics !== b.types.statics) { return b.types.statics - a.types.statics; }
+          if (a.types.dynamics !== b.types.dynamics) { return b.types.dynamics - a.types.dynamics; }
+        }
+
+        if (a.types.dynamics !== b.types.dynamics) { return a.types.dynamics - b.types.dynamics; }
+        if (a.types.statics !== b.types.statics) { return b.types.statics - a.types.statics; }
+
+        return 0;
+      });
+    }
+
+    function recognizeChar(states, ch) {
+      var nextStates = [];
+
+      for (var i=0, l=states.length; i<l; i++) {
+        var state = states[i];
+
+        nextStates = nextStates.concat(state.match(ch));
+      }
+
+      return nextStates;
+    }
+
+    var oCreate = Object.create || function(proto) {
+      function F() {}
+      F.prototype = proto;
+      return new F();
+    };
+
+    function RecognizeResults(queryParams) {
+      this.queryParams = queryParams || {};
+    }
+    RecognizeResults.prototype = oCreate({
+      splice: Array.prototype.splice,
+      slice:  Array.prototype.slice,
+      push:   Array.prototype.push,
+      length: 0,
+      queryParams: null
+    });
+
+    function findHandler(state, path, queryParams) {
+      var handlers = state.handlers, regex = state.regex;
+      var captures = path.match(regex), currentCapture = 1;
+      var result = new RecognizeResults(queryParams);
+
+      for (var i=0, l=handlers.length; i<l; i++) {
+        var handler = handlers[i], names = handler.names, params = {};
+
+        for (var j=0, m=names.length; j<m; j++) {
+          params[names[j]] = captures[currentCapture++];
+        }
+
+        result.push({ handler: handler.handler, params: params, isDynamic: !!names.length });
+      }
+
+      return result;
+    }
+
+    function addSegment(currentState, segment) {
+      segment.eachChar(function(ch) {
+        var state;
+
+        currentState = currentState.put(ch);
+      });
+
+      return currentState;
+    }
+
+    // The main interface
+
+    var RouteRecognizer = function() {
+      this.rootState = new State();
+      this.names = {};
+    };
+
+
+    RouteRecognizer.prototype = {
+      add: function(routes, options) {
+        var currentState = this.rootState, regex = "^",
+            types = { statics: 0, dynamics: 0, stars: 0 },
+            handlers = [], allSegments = [], name;
+
+        var isEmpty = true;
+
+        for (var i=0, l=routes.length; i<l; i++) {
+          var route = routes[i], names = [];
+
+          var segments = parse(route.path, names, types);
+
+          allSegments = allSegments.concat(segments);
+
+          for (var j=0, m=segments.length; j<m; j++) {
+            var segment = segments[j];
+
+            if (segment instanceof EpsilonSegment) { continue; }
+
+            isEmpty = false;
+
+            // Add a "/" for the new segment
+            currentState = currentState.put({ validChars: "/" });
+            regex += "/";
+
+            // Add a representation of the segment to the NFA and regex
+            currentState = addSegment(currentState, segment);
+            regex += segment.regex();
+          }
+
+          var handler = { handler: route.handler, names: names };
+          handlers.push(handler);
+        }
+
+        if (isEmpty) {
+          currentState = currentState.put({ validChars: "/" });
+          regex += "/";
+        }
+
+        currentState.handlers = handlers;
+        currentState.regex = new RegExp(regex + "$");
+        currentState.types = types;
+
+        if (name = options && options.as) {
+          this.names[name] = {
+            segments: allSegments,
+            handlers: handlers
+          };
+        }
+      },
+
+      handlersFor: function(name) {
+        var route = this.names[name], result = [];
+        if (!route) { throw new Error("There is no route named " + name); }
+
+        for (var i=0, l=route.handlers.length; i<l; i++) {
+          result.push(route.handlers[i]);
+        }
+
+        return result;
+      },
+
+      hasRoute: function(name) {
+        return !!this.names[name];
+      },
+
+      generate: function(name, params) {
+        var route = this.names[name], output = "";
+        if (!route) { throw new Error("There is no route named " + name); }
+
+        var segments = route.segments;
+
+        for (var i=0, l=segments.length; i<l; i++) {
+          var segment = segments[i];
+
+          if (segment instanceof EpsilonSegment) { continue; }
+
+          output += "/";
+          output += segment.generate(params);
+        }
+
+        if (output.charAt(0) !== '/') { output = '/' + output; }
+
+        if (params && params.queryParams) {
+          output += this.generateQueryString(params.queryParams, route.handlers);
+        }
+
+        return output;
+      },
+
+      generateQueryString: function(params, handlers) {
+        var pairs = [];
+        var keys = [];
+        for(var key in params) {
+          if (params.hasOwnProperty(key)) {
+            keys.push(key);
+          }
+        }
+        keys.sort();
+        for (var i = 0, len = keys.length; i < len; i++) {
+          key = keys[i];
+          var value = params[key];
+          if (value == null) {
+            continue;
+          }
+          var pair = key;
+          if (isArray(value)) {
+            for (var j = 0, l = value.length; j < l; j++) {
+              var arrayPair = key + '[]' + '=' + encodeURIComponent(value[j]);
+              pairs.push(arrayPair);
+            }
+          } else {
+            pair += "=" + encodeURIComponent(value);
+            pairs.push(pair);
+          }
+        }
+
+        if (pairs.length === 0) { return ''; }
+
+        return "?" + pairs.join("&");
+      },
+
+      parseQueryString: function(queryString) {
+        var pairs = queryString.split("&"), queryParams = {};
+        for(var i=0; i < pairs.length; i++) {
+          var pair      = pairs[i].split('='),
+              key       = decodeURIComponent(pair[0]),
+              keyLength = key.length,
+              isArray = false,
+              value;
+          if (pair.length === 1) {
+            value = 'true';
+          } else {
+            //Handle arrays
+            if (keyLength > 2 && key.slice(keyLength -2) === '[]') {
+              isArray = true;
+              key = key.slice(0, keyLength - 2);
+              if(!queryParams[key]) {
+                queryParams[key] = [];
+              }
+            }
+            value = pair[1] ? decodeURIComponent(pair[1]) : '';
+          }
+          if (isArray) {
+            queryParams[key].push(value);
+          } else {
+            queryParams[key] = decodeURIComponent(value);
+          }
+        }
+        return queryParams;
+      },
+
+      recognize: function(path) {
+        var states = [ this.rootState ],
+            pathLen, i, l, queryStart, queryParams = {},
+            isSlashDropped = false;
+
+        path = decodeURI(path);
+
+        queryStart = path.indexOf('?');
+        if (queryStart !== -1) {
+          var queryString = path.substr(queryStart + 1, path.length);
+          path = path.substr(0, queryStart);
+          queryParams = this.parseQueryString(queryString);
+        }
+
+        // DEBUG GROUP path
+
+        if (path.charAt(0) !== "/") { path = "/" + path; }
+
+        pathLen = path.length;
+        if (pathLen > 1 && path.charAt(pathLen - 1) === "/") {
+          path = path.substr(0, pathLen - 1);
+          isSlashDropped = true;
+        }
+
+        for (i=0, l=path.length; i<l; i++) {
+          states = recognizeChar(states, path.charAt(i));
+          if (!states.length) { break; }
+        }
+
+        // END DEBUG GROUP
+
+        var solutions = [];
+        for (i=0, l=states.length; i<l; i++) {
+          if (states[i].handlers) { solutions.push(states[i]); }
+        }
+
+        states = sortSolutions(solutions);
+
+        var state = solutions[0];
+
+        if (state && state.handlers) {
+          // if a trailing slash was dropped and a star segment is the last segment
+          // specified, put the trailing slash back
+          if (isSlashDropped && state.regex.source.slice(-5) === "(.+)$") {
+            path = path + "/";
+          }
+          return findHandler(state, path, queryParams);
+        }
+      }
+    };
+
+    __exports__["default"] = RouteRecognizer;
+
+    function Target(path, matcher, delegate) {
+      this.path = path;
+      this.matcher = matcher;
+      this.delegate = delegate;
+    }
+
+    Target.prototype = {
+      to: function(target, callback) {
+        var delegate = this.delegate;
+
+        if (delegate && delegate.willAddRoute) {
+          target = delegate.willAddRoute(this.matcher.target, target);
+        }
+
+        this.matcher.add(this.path, target);
+
+        if (callback) {
+          if (callback.length === 0) { throw new Error("You must have an argument in the function passed to `to`"); }
+          this.matcher.addChild(this.path, target, callback, this.delegate);
+        }
+        return this;
+      }
+    };
+
+    function Matcher(target) {
+      this.routes = {};
+      this.children = {};
+      this.target = target;
+    }
+
+    Matcher.prototype = {
+      add: function(path, handler) {
+        this.routes[path] = handler;
+      },
+
+      addChild: function(path, target, callback, delegate) {
+        var matcher = new Matcher(target);
+        this.children[path] = matcher;
+
+        var match = generateMatch(path, matcher, delegate);
+
+        if (delegate && delegate.contextEntered) {
+          delegate.contextEntered(target, match);
+        }
+
+        callback(match);
+      }
+    };
+
+    function generateMatch(startingPath, matcher, delegate) {
+      return function(path, nestedCallback) {
+        var fullPath = startingPath + path;
+
+        if (nestedCallback) {
+          nestedCallback(generateMatch(fullPath, matcher, delegate));
+        } else {
+          return new Target(startingPath + path, matcher, delegate);
+        }
+      };
+    }
+
+    function addRoute(routeArray, path, handler) {
+      var len = 0;
+      for (var i=0, l=routeArray.length; i<l; i++) {
+        len += routeArray[i].path.length;
+      }
+
+      path = path.substr(len);
+      var route = { path: path, handler: handler };
+      routeArray.push(route);
+    }
+
+    function eachRoute(baseRoute, matcher, callback, binding) {
+      var routes = matcher.routes;
+
+      for (var path in routes) {
+        if (routes.hasOwnProperty(path)) {
+          var routeArray = baseRoute.slice();
+          addRoute(routeArray, path, routes[path]);
+
+          if (matcher.children[path]) {
+            eachRoute(routeArray, matcher.children[path], callback, binding);
+          } else {
+            callback.call(binding, routeArray);
+          }
+        }
+      }
+    }
+
+    RouteRecognizer.prototype.map = function(callback, addRouteCallback) {
+      var matcher = new Matcher();
+
+      callback(generateMatch("", matcher, this.delegate));
+
+      eachRoute([], matcher, function(route) {
+        if (addRouteCallback) { addRouteCallback(this, route); }
+        else { this.add(route); }
+      }, this);
+    };
+  });
+
+define("router/handler-info", 
+  ["./utils","rsvp/promise","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var bind = __dependency1__.bind;
+    var merge = __dependency1__.merge;
+    var serialize = __dependency1__.serialize;
+    var promiseLabel = __dependency1__.promiseLabel;
+    var Promise = __dependency2__["default"];
+
+    function HandlerInfo(_props) {
+      var props = _props || {};
+      merge(this, props);
+      this.initialize(props);
+    }
+
+    HandlerInfo.prototype = {
+      name: null,
+      handler: null,
+      params: null,
+      context: null,
+
+      // Injected by the handler info factory.
+      factory: null,
+
+      initialize: function() {},
+
+      log: function(payload, message) {
+        if (payload.log) {
+          payload.log(this.name + ': ' + message);
+        }
+      },
+
+      promiseLabel: function(label) {
+        return promiseLabel("'" + this.name + "' " + label);
+      },
+
+      getUnresolved: function() {
+        return this;
+      },
+
+      serialize: function() {
+        return this.params || {};
+      },
+
+      resolve: function(shouldContinue, payload) {
+        var checkForAbort  = bind(this, this.checkForAbort,      shouldContinue),
+            beforeModel    = bind(this, this.runBeforeModelHook, payload),
+            model          = bind(this, this.getModel,           payload),
+            afterModel     = bind(this, this.runAfterModelHook,  payload),
+            becomeResolved = bind(this, this.becomeResolved,     payload);
+
+        return Promise.resolve(undefined, this.promiseLabel("Start handler"))
+               .then(checkForAbort, null, this.promiseLabel("Check for abort"))
+               .then(beforeModel, null, this.promiseLabel("Before model"))
+               .then(checkForAbort, null, this.promiseLabel("Check if aborted during 'beforeModel' hook"))
+               .then(model, null, this.promiseLabel("Model"))
+               .then(checkForAbort, null, this.promiseLabel("Check if aborted in 'model' hook"))
+               .then(afterModel, null, this.promiseLabel("After model"))
+               .then(checkForAbort, null, this.promiseLabel("Check if aborted in 'afterModel' hook"))
+               .then(becomeResolved, null, this.promiseLabel("Become resolved"));
+      },
+
+      runBeforeModelHook: function(payload) {
+        if (payload.trigger) {
+          payload.trigger(true, 'willResolveModel', payload, this.handler);
+        }
+        return this.runSharedModelHook(payload, 'beforeModel', []);
+      },
+
+      runAfterModelHook: function(payload, resolvedModel) {
+        // Stash the resolved model on the payload.
+        // This makes it possible for users to swap out
+        // the resolved model in afterModel.
+        var name = this.name;
+        this.stashResolvedModel(payload, resolvedModel);
+
+        return this.runSharedModelHook(payload, 'afterModel', [resolvedModel])
+                   .then(function() {
+                     // Ignore the fulfilled value returned from afterModel.
+                     // Return the value stashed in resolvedModels, which
+                     // might have been swapped out in afterModel.
+                     return payload.resolvedModels[name];
+                   }, null, this.promiseLabel("Ignore fulfillment value and return model value"));
+      },
+
+      runSharedModelHook: function(payload, hookName, args) {
+        this.log(payload, "calling " + hookName + " hook");
+
+        if (this.queryParams) {
+          args.push(this.queryParams);
+        }
+        args.push(payload);
+
+        var handler = this.handler;
+        var result = handler[hookName] && handler[hookName].apply(handler, args);
+
+        if (result && result.isTransition) {
+          result = null;
+        }
+
+        return Promise.resolve(result, null, this.promiseLabel("Resolve value returned from one of the model hooks"));
+      },
+
+      // overridden by subclasses
+      getModel: null,
+
+      checkForAbort: function(shouldContinue, promiseValue) {
+        return Promise.resolve(shouldContinue(), this.promiseLabel("Check for abort")).then(function() {
+          // We don't care about shouldContinue's resolve value;
+          // pass along the original value passed to this fn.
+          return promiseValue;
+        }, null, this.promiseLabel("Ignore fulfillment value and continue"));
+      },
+
+      stashResolvedModel: function(payload, resolvedModel) {
+        payload.resolvedModels = payload.resolvedModels || {};
+        payload.resolvedModels[this.name] = resolvedModel;
+      },
+
+      becomeResolved: function(payload, resolvedContext) {
+        var params = this.serialize(resolvedContext);
+
+        if (payload) {
+          this.stashResolvedModel(payload, resolvedContext);
+          payload.params = payload.params || {};
+          payload.params[this.name] = params;
+        }
+
+        return this.factory('resolved', {
+          context: resolvedContext,
+          name: this.name,
+          handler: this.handler,
+          params: params
+        });
+      },
+
+      shouldSupercede: function(other) {
+        // Prefer this newer handlerInfo over `other` if:
+        // 1) The other one doesn't exist
+        // 2) The names don't match
+        // 3) This handler has a context that doesn't match
+        //    the other one (or the other one doesn't have one).
+        // 4) This handler has parameters that don't match the other.
+        if (!other) { return true; }
+
+        var contextsMatch = (other.context === this.context);
+        return other.name !== this.name ||
+               (this.hasOwnProperty('context') && !contextsMatch) ||
+               (this.hasOwnProperty('params') && !paramsMatch(this.params, other.params));
+      }
+    };
+
+    function paramsMatch(a, b) {
+      if ((!a) ^ (!b)) {
+        // Only one is null.
+        return false;
+      }
+
+      if (!a) {
+        // Both must be null.
+        return true;
+      }
+
+      // Note: this assumes that both params have the same
+      // number of keys, but since we're comparing the
+      // same handlers, they should.
+      for (var k in a) {
+        if (a.hasOwnProperty(k) && a[k] !== b[k]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    __exports__["default"] = HandlerInfo;
+  });
+define("router/handler-info/factory", 
+  ["router/handler-info/resolved-handler-info","router/handler-info/unresolved-handler-info-by-object","router/handler-info/unresolved-handler-info-by-param","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var ResolvedHandlerInfo = __dependency1__["default"];
+    var UnresolvedHandlerInfoByObject = __dependency2__["default"];
+    var UnresolvedHandlerInfoByParam = __dependency3__["default"];
+
+    handlerInfoFactory.klasses = {
+      resolved: ResolvedHandlerInfo,
+      param: UnresolvedHandlerInfoByParam,
+      object: UnresolvedHandlerInfoByObject
+    };
+
+    function handlerInfoFactory(name, props) {
+      var Ctor = handlerInfoFactory.klasses[name],
+          handlerInfo = new Ctor(props || {});
+      handlerInfo.factory = handlerInfoFactory;
+      return handlerInfo;
+    }
+
+    __exports__["default"] = handlerInfoFactory;
+  });
+define("router/handler-info/resolved-handler-info", 
+  ["../handler-info","router/utils","rsvp/promise","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var HandlerInfo = __dependency1__["default"];
+    var subclass = __dependency2__.subclass;
+    var promiseLabel = __dependency2__.promiseLabel;
+    var Promise = __dependency3__["default"];
+
+    var ResolvedHandlerInfo = subclass(HandlerInfo, {
+      resolve: function(shouldContinue, payload) {
+        // A ResolvedHandlerInfo just resolved with itself.
+        if (payload && payload.resolvedModels) {
+          payload.resolvedModels[this.name] = this.context;
+        }
+        return Promise.resolve(this, this.promiseLabel("Resolve"));
+      },
+
+      getUnresolved: function() {
+        return this.factory('param', {
+          name: this.name,
+          handler: this.handler,
+          params: this.params
+        });
+      },
+
+      isResolved: true
+    });
+
+    __exports__["default"] = ResolvedHandlerInfo;
+  });
+define("router/handler-info/unresolved-handler-info-by-object", 
+  ["../handler-info","router/utils","rsvp/promise","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var HandlerInfo = __dependency1__["default"];
+    var merge = __dependency2__.merge;
+    var subclass = __dependency2__.subclass;
+    var promiseLabel = __dependency2__.promiseLabel;
+    var isParam = __dependency2__.isParam;
+    var Promise = __dependency3__["default"];
+
+    var UnresolvedHandlerInfoByObject = subclass(HandlerInfo, {
+      getModel: function(payload) {
+        this.log(payload, this.name + ": resolving provided model");
+        return Promise.resolve(this.context);
+      },
+
+      initialize: function(props) {
+        this.names = props.names || [];
+        this.context = props.context;
+      },
+
+      /**
+        @private
+
+        Serializes a handler using its custom `serialize` method or
+        by a default that looks up the expected property name from
+        the dynamic segment.
+
+        @param {Object} model the model to be serialized for this handler
+      */
+      serialize: function(_model) {
+        var model = _model || this.context,
+            names = this.names,
+            handler = this.handler;
+
+        var object = {};
+        if (isParam(model)) {
+          object[names[0]] = model;
+          return object;
+        }
+
+        // Use custom serialize if it exists.
+        if (handler.serialize) {
+          return handler.serialize(model, names);
+        }
+
+        if (names.length !== 1) { return; }
+
+        var name = names[0];
+
+        if (/_id$/.test(name)) {
+          object[name] = model.id;
+        } else {
+          object[name] = model;
+        }
+        return object;
+      }
+    });
+
+    __exports__["default"] = UnresolvedHandlerInfoByObject;
+  });
+define("router/handler-info/unresolved-handler-info-by-param", 
+  ["../handler-info","router/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var HandlerInfo = __dependency1__["default"];
+    var merge = __dependency2__.merge;
+    var subclass = __dependency2__.subclass;
+    var promiseLabel = __dependency2__.promiseLabel;
+
+    // Generated by URL transitions and non-dynamic route segments in named Transitions.
+    var UnresolvedHandlerInfoByParam = subclass (HandlerInfo, {
+      initialize: function(props) {
+        this.params = props.params || {};
+      },
+
+      getModel: function(payload) {
+        var fullParams = this.params;
+        if (payload && payload.queryParams) {
+          fullParams = {};
+          merge(fullParams, this.params);
+          fullParams.queryParams = payload.queryParams;
+        }
+
+        var hookName = typeof this.handler.deserialize === 'function' ?
+                       'deserialize' : 'model';
+
+        return this.runSharedModelHook(payload, hookName, [fullParams]);
+      }
+    });
+
+    __exports__["default"] = UnresolvedHandlerInfoByParam;
+  });
+define("router/router", 
+  ["route-recognizer","rsvp/promise","./utils","./transition-state","./transition","./transition-intent/named-transition-intent","./transition-intent/url-transition-intent","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var RouteRecognizer = __dependency1__["default"];
+    var Promise = __dependency2__["default"];
+    var trigger = __dependency3__.trigger;
+    var log = __dependency3__.log;
+    var slice = __dependency3__.slice;
+    var forEach = __dependency3__.forEach;
+    var merge = __dependency3__.merge;
+    var serialize = __dependency3__.serialize;
+    var extractQueryParams = __dependency3__.extractQueryParams;
+    var getChangelist = __dependency3__.getChangelist;
+    var promiseLabel = __dependency3__.promiseLabel;
+    var TransitionState = __dependency4__["default"];
+    var logAbort = __dependency5__.logAbort;
+    var Transition = __dependency5__.Transition;
+    var TransitionAborted = __dependency5__.TransitionAborted;
+    var NamedTransitionIntent = __dependency6__["default"];
+    var URLTransitionIntent = __dependency7__["default"];
+
+    var pop = Array.prototype.pop;
+
+    function Router() {
+      this.recognizer = new RouteRecognizer();
+      this.reset();
+    }
+
+    Router.prototype = {
+
+      /**
+        The main entry point into the router. The API is essentially
+        the same as the `map` method in `route-recognizer`.
+
+        This method extracts the String handler at the last `.to()`
+        call and uses it as the name of the whole route.
+
+        @param {Function} callback
+      */
+      map: function(callback) {
+        this.recognizer.delegate = this.delegate;
+
+        this.recognizer.map(callback, function(recognizer, routes) {
+          for (var i = routes.length - 1, proceed = true; i >= 0 && proceed; --i) {
+            var route = routes[i];
+            recognizer.add(routes, { as: route.handler });
+            proceed = route.path === '/' || route.path === '' || route.handler.slice(-6) === '.index';
+          }
+        });
+      },
+
+      hasRoute: function(route) {
+        return this.recognizer.hasRoute(route);
+      },
+
+      // NOTE: this doesn't really belong here, but here
+      // it shall remain until our ES6 transpiler can
+      // handle cyclical deps.
+      transitionByIntent: function(intent, isIntermediate) {
+
+        var wasTransitioning = !!this.activeTransition;
+        var oldState = wasTransitioning ? this.activeTransition.state : this.state;
+        var newTransition;
+        var router = this;
+
+        try {
+          var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
+
+          if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
+
+            // This is a no-op transition. See if query params changed.
+            var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
+            if (queryParamChangelist) {
+
+              // This is a little hacky but we need some way of storing
+              // changed query params given that no activeTransition
+              // is guaranteed to have occurred.
+              this._changedQueryParams = queryParamChangelist.changed;
+              for (var k in queryParamChangelist.removed) {
+                if (queryParamChangelist.removed.hasOwnProperty(k)) {
+                  this._changedQueryParams[k] = null;
+                }
+              }
+              trigger(this, newState.handlerInfos, true, ['queryParamsDidChange', queryParamChangelist.changed, queryParamChangelist.all, queryParamChangelist.removed]);
+              this._changedQueryParams = null;
+
+              if (!wasTransitioning && this.activeTransition) {
+                // One of the handlers in queryParamsDidChange
+                // caused a transition. Just return that transition.
+                return this.activeTransition;
+              } else {
+                // Running queryParamsDidChange didn't change anything.
+                // Just update query params and be on our way.
+
+                // We have to return a noop transition that will
+                // perform a URL update at the end. This gives
+                // the user the ability to set the url update
+                // method (default is replaceState).
+                newTransition = new Transition(this);
+
+                oldState.queryParams = finalizeQueryParamChange(this, newState.handlerInfos, newState.queryParams, newTransition);
+
+                newTransition.promise = newTransition.promise.then(function(result) {
+                  updateURL(newTransition, oldState, true);
+                  if (router.didTransition) {
+                    router.didTransition(router.currentHandlerInfos);
+                  }
+                  return result;
+                }, null, promiseLabel("Transition complete"));
+                return newTransition;
+              }
+            }
+
+            // No-op. No need to create a new transition.
+            return new Transition(this);
+          }
+
+          if (isIntermediate) {
+            setupContexts(this, newState);
+            return;
+          }
+
+          // Create a new transition to the destination route.
+          newTransition = new Transition(this, intent, newState);
+
+          // Abort and usurp any previously active transition.
+          if (this.activeTransition) {
+            this.activeTransition.abort();
+          }
+          this.activeTransition = newTransition;
+
+          // Transition promises by default resolve with resolved state.
+          // For our purposes, swap out the promise to resolve
+          // after the transition has been finalized.
+          newTransition.promise = newTransition.promise.then(function(result) {
+            return finalizeTransition(newTransition, result.state);
+          }, null, promiseLabel("Settle transition promise when transition is finalized"));
+
+          if (!wasTransitioning) {
+            trigger(this, this.state.handlerInfos, true, ['willTransition', newTransition]);
+          }
+
+          return newTransition;
+        } catch(e) {
+          return new Transition(this, intent, null, e);
+        }
+      },
+
+      /**
+        Clears the current and target route handlers and triggers exit
+        on each of them starting at the leaf and traversing up through
+        its ancestors.
+      */
+      reset: function() {
+        if (this.state) {
+          forEach(this.state.handlerInfos, function(handlerInfo) {
+            var handler = handlerInfo.handler;
+            if (handler.exit) {
+              handler.exit();
+            }
+          });
+        }
+
+        this.state = new TransitionState();
+        this.currentHandlerInfos = null;
+      },
+
+      activeTransition: null,
+
+      /**
+        var handler = handlerInfo.handler;
+        The entry point for handling a change to the URL (usually
+        via the back and forward button).
+
+        Returns an Array of handlers and the parameters associated
+        with those parameters.
+
+        @param {String} url a URL to process
+
+        @return {Array} an Array of `[handler, parameter]` tuples
+      */
+      handleURL: function(url) {
+        // Perform a URL-based transition, but don't change
+        // the URL afterward, since it already happened.
+        var args = slice.call(arguments);
+        if (url.charAt(0) !== '/') { args[0] = '/' + url; }
+
+        return doTransition(this, args).method(null);
+      },
+
+      /**
+        Hook point for updating the URL.
+
+        @param {String} url a URL to update to
+      */
+      updateURL: function() {
+        throw new Error("updateURL is not implemented");
+      },
+
+      /**
+        Hook point for replacing the current URL, i.e. with replaceState
+
+        By default this behaves the same as `updateURL`
+
+        @param {String} url a URL to update to
+      */
+      replaceURL: function(url) {
+        this.updateURL(url);
+      },
+
+      /**
+        Transition into the specified named route.
+
+        If necessary, trigger the exit callback on any handlers
+        that are no longer represented by the target route.
+
+        @param {String} name the name of the route
+      */
+      transitionTo: function(name) {
+        return doTransition(this, arguments);
+      },
+
+      intermediateTransitionTo: function(name) {
+        doTransition(this, arguments, true);
+      },
+
+      refresh: function(pivotHandler) {
+
+
+        var state = this.activeTransition ? this.activeTransition.state : this.state;
+        var handlerInfos = state.handlerInfos;
+        var params = {};
+        for (var i = 0, len = handlerInfos.length; i < len; ++i) {
+          var handlerInfo = handlerInfos[i];
+          params[handlerInfo.name] = handlerInfo.params || {};
+        }
+
+        log(this, "Starting a refresh transition");
+        var intent = new NamedTransitionIntent({
+          name: handlerInfos[handlerInfos.length - 1].name,
+          pivotHandler: pivotHandler || handlerInfos[0].handler,
+          contexts: [], // TODO collect contexts...?
+          queryParams: this._changedQueryParams || state.queryParams || {}
+        });
+
+        return this.transitionByIntent(intent, false);
+      },
+
+      /**
+        Identical to `transitionTo` except that the current URL will be replaced
+        if possible.
+
+        This method is intended primarily for use with `replaceState`.
+
+        @param {String} name the name of the route
+      */
+      replaceWith: function(name) {
+        return doTransition(this, arguments).method('replace');
+      },
+
+      /**
+        Take a named route and context objects and generate a
+        URL.
+
+        @param {String} name the name of the route to generate
+          a URL for
+        @param {...Object} objects a list of objects to serialize
+
+        @return {String} a URL
+      */
+      generate: function(handlerName) {
+
+        var partitionedArgs = extractQueryParams(slice.call(arguments, 1)),
+          suppliedParams = partitionedArgs[0],
+          queryParams = partitionedArgs[1];
+
+        // Construct a TransitionIntent with the provided params
+        // and apply it to the present state of the router.
+        var intent = new NamedTransitionIntent({ name: handlerName, contexts: suppliedParams });
+        var state = intent.applyToState(this.state, this.recognizer, this.getHandler);
+        var params = {};
+
+        for (var i = 0, len = state.handlerInfos.length; i < len; ++i) {
+          var handlerInfo = state.handlerInfos[i];
+          var handlerParams = handlerInfo.serialize();
+          merge(params, handlerParams);
+        }
+        params.queryParams = queryParams;
+
+        return this.recognizer.generate(handlerName, params);
+      },
+
+      isActive: function(handlerName) {
+
+        var partitionedArgs   = extractQueryParams(slice.call(arguments, 1)),
+            contexts          = partitionedArgs[0],
+            queryParams       = partitionedArgs[1],
+            activeQueryParams  = this.state.queryParams;
+
+        var targetHandlerInfos = this.state.handlerInfos,
+            found = false, names, object, handlerInfo, handlerObj, i, len;
+
+        if (!targetHandlerInfos.length) { return false; }
+
+        var targetHandler = targetHandlerInfos[targetHandlerInfos.length - 1].name;
+        var recogHandlers = this.recognizer.handlersFor(targetHandler);
+
+        var index = 0;
+        for (len = recogHandlers.length; index < len; ++index) {
+          handlerInfo = targetHandlerInfos[index];
+          if (handlerInfo.name === handlerName) { break; }
+        }
+
+        if (index === recogHandlers.length) {
+          // The provided route name isn't even in the route hierarchy.
+          return false;
+        }
+
+        var state = new TransitionState();
+        state.handlerInfos = targetHandlerInfos.slice(0, index + 1);
+        recogHandlers = recogHandlers.slice(0, index + 1);
+
+        var intent = new NamedTransitionIntent({
+          name: targetHandler,
+          contexts: contexts
+        });
+
+        var newState = intent.applyToHandlers(state, recogHandlers, this.getHandler, targetHandler, true, true);
+
+        // Get a hash of QPs that will still be active on new route
+        var activeQPsOnNewHandler = {};
+        merge(activeQPsOnNewHandler, queryParams);
+        for (var key in activeQueryParams) {
+          if (activeQueryParams.hasOwnProperty(key) &&
+              activeQPsOnNewHandler.hasOwnProperty(key)) {
+            activeQPsOnNewHandler[key] = activeQueryParams[key];
+          }
+        }
+
+        return handlerInfosEqual(newState.handlerInfos, state.handlerInfos) &&
+               !getChangelist(activeQPsOnNewHandler, queryParams);
+      },
+
+      trigger: function(name) {
+        var args = slice.call(arguments);
+        trigger(this, this.currentHandlerInfos, false, args);
+      },
+
+      /**
+        Hook point for logging transition status updates.
+
+        @param {String} message The message to log.
+      */
+      log: null
+    };
+
+    /**
+      @private
+
+      Takes an Array of `HandlerInfo`s, figures out which ones are
+      exiting, entering, or changing contexts, and calls the
+      proper handler hooks.
+
+      For example, consider the following tree of handlers. Each handler is
+      followed by the URL segment it handles.
+
+      ```
+      |~index ("/")
+      | |~posts ("/posts")
+      | | |-showPost ("/:id")
+      | | |-newPost ("/new")
+      | | |-editPost ("/edit")
+      | |~about ("/about/:id")
+      ```
+
+      Consider the following transitions:
+
+      1. A URL transition to `/posts/1`.
+         1. Triggers the `*model` callbacks on the
+            `index`, `posts`, and `showPost` handlers
+         2. Triggers the `enter` callback on the same
+         3. Triggers the `setup` callback on the same
+      2. A direct transition to `newPost`
+         1. Triggers the `exit` callback on `showPost`
+         2. Triggers the `enter` callback on `newPost`
+         3. Triggers the `setup` callback on `newPost`
+      3. A direct transition to `about` with a specified
+         context object
+         1. Triggers the `exit` callback on `newPost`
+            and `posts`
+         2. Triggers the `serialize` callback on `about`
+         3. Triggers the `enter` callback on `about`
+         4. Triggers the `setup` callback on `about`
+
+      @param {Router} transition
+      @param {TransitionState} newState
+    */
+    function setupContexts(router, newState, transition) {
+      var partition = partitionHandlers(router.state, newState);
+
+      forEach(partition.exited, function(handlerInfo) {
+        var handler = handlerInfo.handler;
+        delete handler.context;
+        if (handler.exit) { handler.exit(); }
+      });
+
+      var oldState = router.oldState = router.state;
+      router.state = newState;
+      var currentHandlerInfos = router.currentHandlerInfos = partition.unchanged.slice();
+
+      try {
+        forEach(partition.updatedContext, function(handlerInfo) {
+          return handlerEnteredOrUpdated(currentHandlerInfos, handlerInfo, false, transition);
+        });
+
+        forEach(partition.entered, function(handlerInfo) {
+          return handlerEnteredOrUpdated(currentHandlerInfos, handlerInfo, true, transition);
+        });
+      } catch(e) {
+        router.state = oldState;
+        router.currentHandlerInfos = oldState.handlerInfos;
+        throw e;
+      }
+
+      router.state.queryParams = finalizeQueryParamChange(router, currentHandlerInfos, newState.queryParams, transition);
+    }
+
+
+    /**
+      @private
+
+      Helper method used by setupContexts. Handles errors or redirects
+      that may happen in enter/setup.
+    */
+    function handlerEnteredOrUpdated(currentHandlerInfos, handlerInfo, enter, transition) {
+
+      var handler = handlerInfo.handler,
+          context = handlerInfo.context;
+
+      if (enter && handler.enter) { handler.enter(transition); }
+      if (transition && transition.isAborted) {
+        throw new TransitionAborted();
+      }
+
+      handler.context = context;
+      if (handler.contextDidChange) { handler.contextDidChange(); }
+
+      if (handler.setup) { handler.setup(context, transition); }
+      if (transition && transition.isAborted) {
+        throw new TransitionAborted();
+      }
+
+      currentHandlerInfos.push(handlerInfo);
+
+      return true;
+    }
+
+
+    /**
+      @private
+
+      This function is called when transitioning from one URL to
+      another to determine which handlers are no longer active,
+      which handlers are newly active, and which handlers remain
+      active but have their context changed.
+
+      Take a list of old handlers and new handlers and partition
+      them into four buckets:
+
+      * unchanged: the handler was active in both the old and
+        new URL, and its context remains the same
+      * updated context: the handler was active in both the
+        old and new URL, but its context changed. The handler's
+        `setup` method, if any, will be called with the new
+        context.
+      * exited: the handler was active in the old URL, but is
+        no longer active.
+      * entered: the handler was not active in the old URL, but
+        is now active.
+
+      The PartitionedHandlers structure has four fields:
+
+      * `updatedContext`: a list of `HandlerInfo` objects that
+        represent handlers that remain active but have a changed
+        context
+      * `entered`: a list of `HandlerInfo` objects that represent
+        handlers that are newly active
+      * `exited`: a list of `HandlerInfo` objects that are no
+        longer active.
+      * `unchanged`: a list of `HanderInfo` objects that remain active.
+
+      @param {Array[HandlerInfo]} oldHandlers a list of the handler
+        information for the previous URL (or `[]` if this is the
+        first handled transition)
+      @param {Array[HandlerInfo]} newHandlers a list of the handler
+        information for the new URL
+
+      @return {Partition}
+    */
+    function partitionHandlers(oldState, newState) {
+      var oldHandlers = oldState.handlerInfos;
+      var newHandlers = newState.handlerInfos;
+
+      var handlers = {
+            updatedContext: [],
+            exited: [],
+            entered: [],
+            unchanged: []
+          };
+
+      var handlerChanged, contextChanged, queryParamsChanged, i, l;
+
+      for (i=0, l=newHandlers.length; i<l; i++) {
+        var oldHandler = oldHandlers[i], newHandler = newHandlers[i];
+
+        if (!oldHandler || oldHandler.handler !== newHandler.handler) {
+          handlerChanged = true;
+        }
+
+        if (handlerChanged) {
+          handlers.entered.push(newHandler);
+          if (oldHandler) { handlers.exited.unshift(oldHandler); }
+        } else if (contextChanged || oldHandler.context !== newHandler.context || queryParamsChanged) {
+          contextChanged = true;
+          handlers.updatedContext.push(newHandler);
+        } else {
+          handlers.unchanged.push(oldHandler);
+        }
+      }
+
+      for (i=newHandlers.length, l=oldHandlers.length; i<l; i++) {
+        handlers.exited.unshift(oldHandlers[i]);
+      }
+
+      return handlers;
+    }
+
+    function updateURL(transition, state, inputUrl) {
+      var urlMethod = transition.urlMethod;
+
+      if (!urlMethod) {
+        return;
+      }
+
+      var router = transition.router,
+          handlerInfos = state.handlerInfos,
+          handlerName = handlerInfos[handlerInfos.length - 1].name,
+          params = {};
+
+      for (var i = handlerInfos.length - 1; i >= 0; --i) {
+        var handlerInfo = handlerInfos[i];
+        merge(params, handlerInfo.params);
+        if (handlerInfo.handler.inaccessibleByURL) {
+          urlMethod = null;
+        }
+      }
+
+      if (urlMethod) {
+        params.queryParams = transition._visibleQueryParams || state.queryParams;
+        var url = router.recognizer.generate(handlerName, params);
+
+        if (urlMethod === 'replace') {
+          router.replaceURL(url);
+        } else {
+          router.updateURL(url);
+        }
+      }
+    }
+
+    /**
+      @private
+
+      Updates the URL (if necessary) and calls `setupContexts`
+      to update the router's array of `currentHandlerInfos`.
+     */
+    function finalizeTransition(transition, newState) {
+
+      try {
+        log(transition.router, transition.sequence, "Resolved all models on destination route; finalizing transition.");
+
+        var router = transition.router,
+            handlerInfos = newState.handlerInfos,
+            seq = transition.sequence;
+
+        // Run all the necessary enter/setup/exit hooks
+        setupContexts(router, newState, transition);
+
+        // Check if a redirect occurred in enter/setup
+        if (transition.isAborted) {
+          // TODO: cleaner way? distinguish b/w targetHandlerInfos?
+          router.state.handlerInfos = router.currentHandlerInfos;
+          return Promise.reject(logAbort(transition));
+        }
+
+        updateURL(transition, newState, transition.intent.url);
+
+        transition.isActive = false;
+        router.activeTransition = null;
+
+        trigger(router, router.currentHandlerInfos, true, ['didTransition']);
+
+        if (router.didTransition) {
+          router.didTransition(router.currentHandlerInfos);
+        }
+
+        log(router, transition.sequence, "TRANSITION COMPLETE.");
+
+        // Resolve with the final handler.
+        return handlerInfos[handlerInfos.length - 1].handler;
+      } catch(e) {
+        if (!(e instanceof TransitionAborted)) {
+          //var erroneousHandler = handlerInfos.pop();
+          var infos = transition.state.handlerInfos;
+          transition.trigger(true, 'error', e, transition, infos[infos.length-1].handler);
+          transition.abort();
+        }
+
+        throw e;
+      }
+    }
+
+    /**
+      @private
+
+      Begins and returns a Transition based on the provided
+      arguments. Accepts arguments in the form of both URL
+      transitions and named transitions.
+
+      @param {Router} router
+      @param {Array[Object]} args arguments passed to transitionTo,
+        replaceWith, or handleURL
+    */
+    function doTransition(router, args, isIntermediate) {
+      // Normalize blank transitions to root URL transitions.
+      var name = args[0] || '/';
+
+      var lastArg = args[args.length-1];
+      var queryParams = {};
+      if (lastArg && lastArg.hasOwnProperty('queryParams')) {
+        queryParams = pop.call(args).queryParams;
+      }
+
+      var intent;
+      if (args.length === 0) {
+
+        log(router, "Updating query params");
+
+        // A query param update is really just a transition
+        // into the route you're already on.
+        var handlerInfos = router.state.handlerInfos;
+        intent = new NamedTransitionIntent({
+          name: handlerInfos[handlerInfos.length - 1].name,
+          contexts: [],
+          queryParams: queryParams
+        });
+
+      } else if (name.charAt(0) === '/') {
+
+        log(router, "Attempting URL transition to " + name);
+        intent = new URLTransitionIntent({ url: name });
+
+      } else {
+
+        log(router, "Attempting transition to " + name);
+        intent = new NamedTransitionIntent({
+          name: args[0],
+          contexts: slice.call(args, 1),
+          queryParams: queryParams
+        });
+      }
+
+      return router.transitionByIntent(intent, isIntermediate);
+    }
+
+    function handlerInfosEqual(handlerInfos, otherHandlerInfos) {
+      if (handlerInfos.length !== otherHandlerInfos.length) {
+        return false;
+      }
+
+      for (var i = 0, len = handlerInfos.length; i < len; ++i) {
+        if (handlerInfos[i] !== otherHandlerInfos[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    function finalizeQueryParamChange(router, resolvedHandlers, newQueryParams, transition) {
+      // We fire a finalizeQueryParamChange event which
+      // gives the new route hierarchy a chance to tell
+      // us which query params it's consuming and what
+      // their final values are. If a query param is
+      // no longer consumed in the final route hierarchy,
+      // its serialized segment will be removed
+      // from the URL.
+
+      for (var k in newQueryParams) {
+        if (newQueryParams.hasOwnProperty(k) &&
+            newQueryParams[k] === null) {
+          delete newQueryParams[k];
+        }
+      }
+
+      var finalQueryParamsArray = [];
+      trigger(router, resolvedHandlers, true, ['finalizeQueryParamChange', newQueryParams, finalQueryParamsArray, transition]);
+
+      if (transition) {
+        transition._visibleQueryParams = {};
+      }
+
+      var finalQueryParams = {};
+      for (var i = 0, len = finalQueryParamsArray.length; i < len; ++i) {
+        var qp = finalQueryParamsArray[i];
+        finalQueryParams[qp.key] = qp.value;
+        if (transition && qp.visible !== false) {
+          transition._visibleQueryParams[qp.key] = qp.value;
+        }
+      }
+      return finalQueryParams;
+    }
+
+    __exports__["default"] = Router;
+  });
+define("router/transition-intent", 
+  ["./utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var merge = __dependency1__.merge;
+
+    function TransitionIntent(props) {
+      this.initialize(props);
+
+      // TODO: wat
+      this.data = this.data || {};
+    }
+
+    TransitionIntent.prototype = {
+      initialize: null,
+      applyToState: null
+    };
+
+    __exports__["default"] = TransitionIntent;
+  });
+define("router/transition-intent/named-transition-intent", 
+  ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var TransitionIntent = __dependency1__["default"];
+    var TransitionState = __dependency2__["default"];
+    var handlerInfoFactory = __dependency3__["default"];
+    var isParam = __dependency4__.isParam;
+    var extractQueryParams = __dependency4__.extractQueryParams;
+    var merge = __dependency4__.merge;
+    var subclass = __dependency4__.subclass;
+
+    __exports__["default"] = subclass(TransitionIntent, {
+      name: null,
+      pivotHandler: null,
+      contexts: null,
+      queryParams: null,
+
+      initialize: function(props) {
+        this.name = props.name;
+        this.pivotHandler = props.pivotHandler;
+        this.contexts = props.contexts || [];
+        this.queryParams = props.queryParams;
+      },
+
+      applyToState: function(oldState, recognizer, getHandler, isIntermediate) {
+
+        var partitionedArgs     = extractQueryParams([this.name].concat(this.contexts)),
+          pureArgs              = partitionedArgs[0],
+          queryParams           = partitionedArgs[1],
+          handlers              = recognizer.handlersFor(pureArgs[0]);
+
+        var targetRouteName = handlers[handlers.length-1].handler;
+
+        return this.applyToHandlers(oldState, handlers, getHandler, targetRouteName, isIntermediate);
+      },
+
+      applyToHandlers: function(oldState, handlers, getHandler, targetRouteName, isIntermediate, checkingIfActive) {
+
+        var i;
+        var newState = new TransitionState();
+        var objects = this.contexts.slice(0);
+
+        var invalidateIndex = handlers.length;
+
+        // Pivot handlers are provided for refresh transitions
+        if (this.pivotHandler) {
+          for (i = 0; i < handlers.length; ++i) {
+            if (getHandler(handlers[i].handler) === this.pivotHandler) {
+              invalidateIndex = i;
+              break;
+            }
+          }
+        }
+
+        var pivotHandlerFound = !this.pivotHandler;
+
+        for (i = handlers.length - 1; i >= 0; --i) {
+          var result = handlers[i];
+          var name = result.handler;
+          var handler = getHandler(name);
+
+          var oldHandlerInfo = oldState.handlerInfos[i];
+          var newHandlerInfo = null;
+
+          if (result.names.length > 0) {
+            if (i >= invalidateIndex) {
+              newHandlerInfo = this.createParamHandlerInfo(name, handler, result.names, objects, oldHandlerInfo);
+            } else {
+              newHandlerInfo = this.getHandlerInfoForDynamicSegment(name, handler, result.names, objects, oldHandlerInfo, targetRouteName, i);
+            }
+          } else {
+            // This route has no dynamic segment.
+            // Therefore treat as a param-based handlerInfo
+            // with empty params. This will cause the `model`
+            // hook to be called with empty params, which is desirable.
+            newHandlerInfo = this.createParamHandlerInfo(name, handler, result.names, objects, oldHandlerInfo);
+          }
+
+          if (checkingIfActive) {
+            // If we're performing an isActive check, we want to
+            // serialize URL params with the provided context, but
+            // ignore mismatches between old and new context.
+            newHandlerInfo = newHandlerInfo.becomeResolved(null, newHandlerInfo.context);
+            var oldContext = oldHandlerInfo && oldHandlerInfo.context;
+            if (result.names.length > 0 && newHandlerInfo.context === oldContext) {
+              // If contexts match in isActive test, assume params also match.
+              // This allows for flexibility in not requiring that every last
+              // handler provide a `serialize` method
+              newHandlerInfo.params = oldHandlerInfo && oldHandlerInfo.params;
+            }
+            newHandlerInfo.context = oldContext;
+          }
+
+          var handlerToUse = oldHandlerInfo;
+          if (i >= invalidateIndex || newHandlerInfo.shouldSupercede(oldHandlerInfo)) {
+            invalidateIndex = Math.min(i, invalidateIndex);
+            handlerToUse = newHandlerInfo;
+          }
+
+          if (isIntermediate && !checkingIfActive) {
+            handlerToUse = handlerToUse.becomeResolved(null, handlerToUse.context);
+          }
+
+          newState.handlerInfos.unshift(handlerToUse);
+        }
+
+        if (objects.length > 0) {
+          throw new Error("More context objects were passed than there are dynamic segments for the route: " + targetRouteName);
+        }
+
+        if (!isIntermediate) {
+          this.invalidateChildren(newState.handlerInfos, invalidateIndex);
+        }
+
+        merge(newState.queryParams, oldState.queryParams);
+        merge(newState.queryParams, this.queryParams || {});
+
+        return newState;
+      },
+
+      invalidateChildren: function(handlerInfos, invalidateIndex) {
+        for (var i = invalidateIndex, l = handlerInfos.length; i < l; ++i) {
+          var handlerInfo = handlerInfos[i];
+          handlerInfos[i] = handlerInfos[i].getUnresolved();
+        }
+      },
+
+      getHandlerInfoForDynamicSegment: function(name, handler, names, objects, oldHandlerInfo, targetRouteName, i) {
+
+        var numNames = names.length;
+        var objectToUse;
+        if (objects.length > 0) {
+
+          // Use the objects provided for this transition.
+          objectToUse = objects[objects.length - 1];
+          if (isParam(objectToUse)) {
+            return this.createParamHandlerInfo(name, handler, names, objects, oldHandlerInfo);
+          } else {
+            objects.pop();
+          }
+        } else if (oldHandlerInfo && oldHandlerInfo.name === name) {
+          // Reuse the matching oldHandlerInfo
+          return oldHandlerInfo;
+        } else {
+          if (this.preTransitionState) {
+            var preTransitionHandlerInfo = this.preTransitionState.handlerInfos[i];
+            objectToUse = preTransitionHandlerInfo && preTransitionHandlerInfo.context;
+          } else {
+            // Ideally we should throw this error to provide maximal
+            // information to the user that not enough context objects
+            // were provided, but this proves too cumbersome in Ember
+            // in cases where inner template helpers are evaluated
+            // before parent helpers un-render, in which cases this
+            // error somewhat prematurely fires.
+            //throw new Error("Not enough context objects were provided to complete a transition to " + targetRouteName + ". Specifically, the " + name + " route needs an object that can be serialized into its dynamic URL segments [" + names.join(', ') + "]");
+            return oldHandlerInfo;
+          }
+        }
+
+        return handlerInfoFactory('object', {
+          name: name,
+          handler: handler,
+          context: objectToUse,
+          names: names
+        });
+      },
+
+      createParamHandlerInfo: function(name, handler, names, objects, oldHandlerInfo) {
+        var params = {};
+
+        // Soak up all the provided string/numbers
+        var numNames = names.length;
+        while (numNames--) {
+
+          // Only use old params if the names match with the new handler
+          var oldParams = (oldHandlerInfo && name === oldHandlerInfo.name && oldHandlerInfo.params) || {};
+
+          var peek = objects[objects.length - 1];
+          var paramName = names[numNames];
+          if (isParam(peek)) {
+            params[paramName] = "" + objects.pop();
+          } else {
+            // If we're here, this means only some of the params
+            // were string/number params, so try and use a param
+            // value from a previous handler.
+            if (oldParams.hasOwnProperty(paramName)) {
+              params[paramName] = oldParams[paramName];
+            } else {
+              throw new Error("You didn't provide enough string/numeric parameters to satisfy all of the dynamic segments for route " + name);
+            }
+          }
+        }
+
+        return handlerInfoFactory('param', {
+          name: name,
+          handler: handler,
+          params: params
+        });
+      }
+    });
+  });
+define("router/transition-intent/url-transition-intent", 
+  ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var TransitionIntent = __dependency1__["default"];
+    var TransitionState = __dependency2__["default"];
+    var handlerInfoFactory = __dependency3__["default"];
+    var oCreate = __dependency4__.oCreate;
+    var merge = __dependency4__.merge;
+    var subclass = __dependency4__.subclass;
+
+    __exports__["default"] = subclass(TransitionIntent, {
+      url: null,
+
+      initialize: function(props) {
+        this.url = props.url;
+      },
+
+      applyToState: function(oldState, recognizer, getHandler) {
+        var newState = new TransitionState();
+
+        var results = recognizer.recognize(this.url),
+            queryParams = {},
+            i, len;
+
+        if (!results) {
+          throw new UnrecognizedURLError(this.url);
+        }
+
+        var statesDiffer = false;
+
+        for (i = 0, len = results.length; i < len; ++i) {
+          var result = results[i];
+          var name = result.handler;
+          var handler = getHandler(name);
+
+          if (handler.inaccessibleByURL) {
+            throw new UnrecognizedURLError(this.url);
+          }
+
+          var newHandlerInfo = handlerInfoFactory('param', {
+            name: name,
+            handler: handler,
+            params: result.params
+          });
+
+          var oldHandlerInfo = oldState.handlerInfos[i];
+          if (statesDiffer || newHandlerInfo.shouldSupercede(oldHandlerInfo)) {
+            statesDiffer = true;
+            newState.handlerInfos[i] = newHandlerInfo;
+          } else {
+            newState.handlerInfos[i] = oldHandlerInfo;
+          }
+        }
+
+        merge(newState.queryParams, results.queryParams);
+
+        return newState;
+      }
+    });
+
+    /**
+      Promise reject reasons passed to promise rejection
+      handlers for failed transitions.
+     */
+    function UnrecognizedURLError(message) {
+      this.message = (message || "UnrecognizedURLError");
+      this.name = "UnrecognizedURLError";
+    }
+  });
+define("router/transition-state", 
+  ["./handler-info","./utils","rsvp/promise","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var ResolvedHandlerInfo = __dependency1__.ResolvedHandlerInfo;
+    var forEach = __dependency2__.forEach;
+    var promiseLabel = __dependency2__.promiseLabel;
+    var Promise = __dependency3__["default"];
+
+    function TransitionState(other) {
+      this.handlerInfos = [];
+      this.queryParams = {};
+      this.params = {};
+    }
+
+    TransitionState.prototype = {
+      handlerInfos: null,
+      queryParams: null,
+      params: null,
+
+      promiseLabel: function(label) {
+        var targetName = '';
+        forEach(this.handlerInfos, function(handlerInfo) {
+          if (targetName !== '') {
+            targetName += '.';
+          }
+          targetName += handlerInfo.name;
+        });
+        return promiseLabel("'" + targetName + "': " + label);
+      },
+
+      resolve: function(shouldContinue, payload) {
+        var self = this;
+        // First, calculate params for this state. This is useful
+        // information to provide to the various route hooks.
+        var params = this.params;
+        forEach(this.handlerInfos, function(handlerInfo) {
+          params[handlerInfo.name] = handlerInfo.params || {};
+        });
+
+        payload = payload || {};
+        payload.resolveIndex = 0;
+
+        var currentState = this;
+        var wasAborted = false;
+
+        // The prelude RSVP.resolve() asyncs us into the promise land.
+        return Promise.resolve(null, this.promiseLabel("Start transition"))
+        .then(resolveOneHandlerInfo, null, this.promiseLabel('Resolve handler'))['catch'](handleError, this.promiseLabel('Handle error'));
+
+        function innerShouldContinue() {
+          return Promise.resolve(shouldContinue(), promiseLabel("Check if should continue"))['catch'](function(reason) {
+            // We distinguish between errors that occurred
+            // during resolution (e.g. beforeModel/model/afterModel),
+            // and aborts due to a rejecting promise from shouldContinue().
+            wasAborted = true;
+            return Promise.reject(reason);
+          }, promiseLabel("Handle abort"));
+        }
+
+        function handleError(error) {
+          // This is the only possible
+          // reject value of TransitionState#resolve
+          var handlerInfos = currentState.handlerInfos;
+          var errorHandlerIndex = payload.resolveIndex >= handlerInfos.length ?
+                                  handlerInfos.length - 1 : payload.resolveIndex;
+          return Promise.reject({
+            error: error,
+            handlerWithError: currentState.handlerInfos[errorHandlerIndex].handler,
+            wasAborted: wasAborted,
+            state: currentState
+          });
+        }
+
+        function proceed(resolvedHandlerInfo) {
+          var wasAlreadyResolved = currentState.handlerInfos[payload.resolveIndex].isResolved;
+
+          // Swap the previously unresolved handlerInfo with
+          // the resolved handlerInfo
+          currentState.handlerInfos[payload.resolveIndex++] = resolvedHandlerInfo;
+
+          if (!wasAlreadyResolved) {
+            // Call the redirect hook. The reason we call it here
+            // vs. afterModel is so that redirects into child
+            // routes don't re-run the model hooks for this
+            // already-resolved route.
+            var handler = resolvedHandlerInfo.handler;
+            if (handler && handler.redirect) {
+              handler.redirect(resolvedHandlerInfo.context, payload);
+            }
+          }
+
+          // Proceed after ensuring that the redirect hook
+          // didn't abort this transition by transitioning elsewhere.
+          return innerShouldContinue().then(resolveOneHandlerInfo, null, promiseLabel('Resolve handler'));
+        }
+
+        function resolveOneHandlerInfo() {
+          if (payload.resolveIndex === currentState.handlerInfos.length) {
+            // This is is the only possible
+            // fulfill value of TransitionState#resolve
+            return {
+              error: null,
+              state: currentState
+            };
+          }
+
+          var handlerInfo = currentState.handlerInfos[payload.resolveIndex];
+
+          return handlerInfo.resolve(innerShouldContinue, payload)
+                            .then(proceed, null, promiseLabel('Proceed'));
+        }
+      }
+    };
+
+    __exports__["default"] = TransitionState;
+  });
+define("router/transition", 
+  ["rsvp/promise","./handler-info","./utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Promise = __dependency1__["default"];
+    var ResolvedHandlerInfo = __dependency2__.ResolvedHandlerInfo;
+    var trigger = __dependency3__.trigger;
+    var slice = __dependency3__.slice;
+    var log = __dependency3__.log;
+    var promiseLabel = __dependency3__.promiseLabel;
+
+    /**
+      @private
+
+      A Transition is a thennable (a promise-like object) that represents
+      an attempt to transition to another route. It can be aborted, either
+      explicitly via `abort` or by attempting another transition while a
+      previous one is still underway. An aborted transition can also
+      be `retry()`d later.
+     */
+    function Transition(router, intent, state, error) {
+      var transition = this;
+      this.state = state || router.state;
+      this.intent = intent;
+      this.router = router;
+      this.data = this.intent && this.intent.data || {};
+      this.resolvedModels = {};
+      this.queryParams = {};
+
+      if (error) {
+        this.promise = Promise.reject(error);
+        return;
+      }
+
+      if (state) {
+        this.params = state.params;
+        this.queryParams = state.queryParams;
+
+        var len = state.handlerInfos.length;
+        if (len) {
+          this.targetName = state.handlerInfos[state.handlerInfos.length-1].name;
+        }
+
+        for (var i = 0; i < len; ++i) {
+          var handlerInfo = state.handlerInfos[i];
+
+          // TODO: this all seems hacky
+          if (!handlerInfo.isResolved) { break; }
+          this.pivotHandler = handlerInfo.handler;
+        }
+
+        this.sequence = Transition.currentSequence++;
+        this.promise = state.resolve(checkForAbort, this)['catch'](function(result) {
+          if (result.wasAborted || transition.isAborted) {
+            return Promise.reject(logAbort(transition));
+          } else {
+            transition.trigger('error', result.error, transition, result.handlerWithError);
+            transition.abort();
+            return Promise.reject(result.error);
+          }
+        }, promiseLabel('Handle Abort'));
+      } else {
+        this.promise = Promise.resolve(this.state);
+        this.params = {};
+      }
+
+      function checkForAbort() {
+        if (transition.isAborted) {
+          return Promise.reject(undefined, promiseLabel("Transition aborted - reject"));
+        }
+      }
+    }
+
+    Transition.currentSequence = 0;
+
+    Transition.prototype = {
+      targetName: null,
+      urlMethod: 'update',
+      intent: null,
+      params: null,
+      pivotHandler: null,
+      resolveIndex: 0,
+      handlerInfos: null,
+      resolvedModels: null,
+      isActive: true,
+      state: null,
+
+      isTransition: true,
+
+      /**
+        @public
+
+        The Transition's internal promise. Calling `.then` on this property
+        is that same as calling `.then` on the Transition object itself, but
+        this property is exposed for when you want to pass around a
+        Transition's promise, but not the Transition object itself, since
+        Transition object can be externally `abort`ed, while the promise
+        cannot.
+       */
+      promise: null,
+
+      /**
+        @public
+
+        Custom state can be stored on a Transition's `data` object.
+        This can be useful for decorating a Transition within an earlier
+        hook and shared with a later hook. Properties set on `data` will
+        be copied to new transitions generated by calling `retry` on this
+        transition.
+       */
+      data: null,
+
+      /**
+        @public
+
+        A standard promise hook that resolves if the transition
+        succeeds and rejects if it fails/redirects/aborts.
+
+        Forwards to the internal `promise` property which you can
+        use in situations where you want to pass around a thennable,
+        but not the Transition itself.
+
+        @param {Function} success
+        @param {Function} failure
+       */
+      then: function(success, failure) {
+        return this.promise.then(success, failure);
+      },
+
+      /**
+        @public
+
+        Aborts the Transition. Note you can also implicitly abort a transition
+        by initiating another transition while a previous one is underway.
+       */
+      abort: function() {
+        if (this.isAborted) { return this; }
+        log(this.router, this.sequence, this.targetName + ": transition was aborted");
+        this.intent.preTransitionState = this.router.state;
+        this.isAborted = true;
+        this.isActive = false;
+        this.router.activeTransition = null;
+        return this;
+      },
+
+      /**
+        @public
+
+        Retries a previously-aborted transition (making sure to abort the
+        transition if it's still active). Returns a new transition that
+        represents the new attempt to transition.
+       */
+      retry: function() {
+        // TODO: add tests for merged state retry()s
+        this.abort();
+        return this.router.transitionByIntent(this.intent, false);
+      },
+
+      /**
+        @public
+
+        Sets the URL-changing method to be employed at the end of a
+        successful transition. By default, a new Transition will just
+        use `updateURL`, but passing 'replace' to this method will
+        cause the URL to update using 'replaceWith' instead. Omitting
+        a parameter will disable the URL change, allowing for transitions
+        that don't update the URL at completion (this is also used for
+        handleURL, since the URL has already changed before the
+        transition took place).
+
+        @param {String} method the type of URL-changing method to use
+          at the end of a transition. Accepted values are 'replace',
+          falsy values, or any other non-falsy value (which is
+          interpreted as an updateURL transition).
+
+        @return {Transition} this transition
+       */
+      method: function(method) {
+        this.urlMethod = method;
+        return this;
+      },
+
+      /**
+        @public
+
+        Fires an event on the current list of resolved/resolving
+        handlers within this transition. Useful for firing events
+        on route hierarchies that haven't fully been entered yet.
+
+        Note: This method is also aliased as `send`
+
+        @param {Boolean} [ignoreFailure=false] a boolean specifying whether unhandled events throw an error
+        @param {String} name the name of the event to fire
+       */
+      trigger: function (ignoreFailure) {
+        var args = slice.call(arguments);
+        if (typeof ignoreFailure === 'boolean') {
+          args.shift();
+        } else {
+          // Throw errors on unhandled trigger events by default
+          ignoreFailure = false;
+        }
+        trigger(this.router, this.state.handlerInfos.slice(0, this.resolveIndex + 1), ignoreFailure, args);
+      },
+
+      /**
+        @public
+
+        Transitions are aborted and their promises rejected
+        when redirects occur; this method returns a promise
+        that will follow any redirects that occur and fulfill
+        with the value fulfilled by any redirecting transitions
+        that occur.
+
+        @return {Promise} a promise that fulfills with the same
+          value that the final redirecting transition fulfills with
+       */
+      followRedirects: function() {
+        var router = this.router;
+        return this.promise['catch'](function(reason) {
+          if (router.activeTransition) {
+            return router.activeTransition.followRedirects();
+          }
+          return Promise.reject(reason);
+        });
+      },
+
+      toString: function() {
+        return "Transition (sequence " + this.sequence + ")";
+      },
+
+      /**
+        @private
+       */
+      log: function(message) {
+        log(this.router, this.sequence, message);
+      }
+    };
+
+    // Alias 'trigger' as 'send'
+    Transition.prototype.send = Transition.prototype.trigger;
+
+    /**
+      @private
+
+      Logs and returns a TransitionAborted error.
+     */
+    function logAbort(transition) {
+      log(transition.router, transition.sequence, "detected abort.");
+      return new TransitionAborted();
+    }
+
+    function TransitionAborted(message) {
+      this.message = (message || "TransitionAborted");
+      this.name = "TransitionAborted";
+    }
+
+    __exports__.Transition = Transition;
+    __exports__.logAbort = logAbort;
+    __exports__.TransitionAborted = TransitionAborted;
+  });
+define("router/utils", 
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var slice = Array.prototype.slice;
+
+    var _isArray;
+    if (!Array.isArray) {
+      _isArray = function (x) {
+        return Object.prototype.toString.call(x) === "[object Array]";
+      };
+    } else {
+      _isArray = Array.isArray;
+    }
+
+    var isArray = _isArray;
+    __exports__.isArray = isArray;
+    function merge(hash, other) {
+      for (var prop in other) {
+        if (other.hasOwnProperty(prop)) { hash[prop] = other[prop]; }
+      }
+    }
+
+    var oCreate = Object.create || function(proto) {
+      function F() {}
+      F.prototype = proto;
+      return new F();
+    };
+    __exports__.oCreate = oCreate;
+    /**
+      @private
+
+      Extracts query params from the end of an array
+    **/
+    function extractQueryParams(array) {
+      var len = (array && array.length), head, queryParams;
+
+      if(len && len > 0 && array[len - 1] && array[len - 1].hasOwnProperty('queryParams')) {
+        queryParams = array[len - 1].queryParams;
+        head = slice.call(array, 0, len - 1);
+        return [head, queryParams];
+      } else {
+        return [array, null];
+      }
+    }
+
+    __exports__.extractQueryParams = extractQueryParams;/**
+      @private
+
+      Coerces query param properties and array elements into strings.
+    **/
+    function coerceQueryParamsToString(queryParams) {
+      for (var key in queryParams) {
+        if (typeof queryParams[key] === 'number') {
+          queryParams[key] = '' + queryParams[key];
+        } else if (isArray(queryParams[key])) {
+          for (var i = 0, l = queryParams[key].length; i < l; i++) {
+            queryParams[key][i] = '' + queryParams[key][i];
+          }
+        }
+      }
+    }
+    /**
+      @private
+     */
+    function log(router, sequence, msg) {
+      if (!router.log) { return; }
+
+      if (arguments.length === 3) {
+        router.log("Transition #" + sequence + ": " + msg);
+      } else {
+        msg = sequence;
+        router.log(msg);
+      }
+    }
+
+    __exports__.log = log;function bind(context, fn) {
+      var boundArgs = arguments;
+      return function(value) {
+        var args = slice.call(boundArgs, 2);
+        args.push(value);
+        return fn.apply(context, args);
+      };
+    }
+
+    __exports__.bind = bind;function isParam(object) {
+      return (typeof object === "string" || object instanceof String || typeof object === "number" || object instanceof Number);
+    }
+
+
+    function forEach(array, callback) {
+      for (var i=0, l=array.length; i<l && false !== callback(array[i]); i++) { }
+    }
+
+    __exports__.forEach = forEach;function trigger(router, handlerInfos, ignoreFailure, args) {
+      if (router.triggerEvent) {
+        router.triggerEvent(handlerInfos, ignoreFailure, args);
+        return;
+      }
+
+      var name = args.shift();
+
+      if (!handlerInfos) {
+        if (ignoreFailure) { return; }
+        throw new Error("Could not trigger event '" + name + "'. There are no active handlers");
+      }
+
+      var eventWasHandled = false;
+
+      for (var i=handlerInfos.length-1; i>=0; i--) {
+        var handlerInfo = handlerInfos[i],
+            handler = handlerInfo.handler;
+
+        if (handler.events && handler.events[name]) {
+          if (handler.events[name].apply(handler, args) === true) {
+            eventWasHandled = true;
+          } else {
+            return;
+          }
+        }
+      }
+
+      if (!eventWasHandled && !ignoreFailure) {
+        throw new Error("Nothing handled the event '" + name + "'.");
+      }
+    }
+
+    __exports__.trigger = trigger;function getChangelist(oldObject, newObject) {
+      var key;
+      var results = {
+        all: {},
+        changed: {},
+        removed: {}
+      };
+
+      merge(results.all, newObject);
+
+      var didChange = false;
+      coerceQueryParamsToString(oldObject);
+      coerceQueryParamsToString(newObject);
+
+      // Calculate removals
+      for (key in oldObject) {
+        if (oldObject.hasOwnProperty(key)) {
+          if (!newObject.hasOwnProperty(key)) {
+            didChange = true;
+            results.removed[key] = oldObject[key];
+          }
+        }
+      }
+
+      // Calculate changes
+      for (key in newObject) {
+        if (newObject.hasOwnProperty(key)) {
+          if (isArray(oldObject[key]) && isArray(newObject[key])) {
+            if (oldObject[key].length !== newObject[key].length) {
+              results.changed[key] = newObject[key];
+              didChange = true;
+            } else {
+              for (var i = 0, l = oldObject[key].length; i < l; i++) {
+                if (oldObject[key][i] !== newObject[key][i]) {
+                  results.changed[key] = newObject[key];
+                  didChange = true;
+                }
+              }
+            }
+          }
+          else {
+            if (oldObject[key] !== newObject[key]) {
+              results.changed[key] = newObject[key];
+              didChange = true;
+            }
+          }
+        }
+      }
+
+      return didChange && results;
+    }
+
+    __exports__.getChangelist = getChangelist;function promiseLabel(label) {
+      return 'Router: ' + label;
+    }
+
+    __exports__.promiseLabel = promiseLabel;function subclass(parentConstructor, proto) {
+      function C(props) {
+        parentConstructor.call(this, props || {});
+      }
+      C.prototype = oCreate(parentConstructor.prototype);
+      merge(C.prototype, proto);
+      return C;
+    }
+
+    __exports__.subclass = subclass;__exports__.merge = merge;
+    __exports__.slice = slice;
+    __exports__.isParam = isParam;
+    __exports__.coerceQueryParamsToString = coerceQueryParamsToString;
+  });
+define("router", 
+  ["./router/router","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Router = __dependency1__["default"];
+
+    __exports__["default"] = Router;
+  });
+
+})();
+
+(function() {
+define("ember-application/ext/controller",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/utils","ember-metal/computed","ember-runtime/controllers/controller","ember-routing/system/controller_for","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-application
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var EmberError = __dependency4__["default"];
+    var inspect = __dependency5__.inspect;
+    var computed = __dependency6__.computed;
+    var ControllerMixin = __dependency7__.ControllerMixin;
+    var meta = __dependency5__.meta;
+    var controllerFor = __dependency8__.controllerFor;
+    var meta = __dependency5__.meta;
+
+    function verifyNeedsDependencies(controller, container, needs) {
+      var dependency, i, l, missing = [];
+
+      for (i=0, l=needs.length; i<l; i++) {
+        dependency = needs[i];
+
+        
+        if (dependency.indexOf(':') === -1) {
+          dependency = "controller:" + dependency;
+        }
+
+        // Structure assert to still do verification but not string concat in production
+        if (!container.has(dependency)) {
+          missing.push(dependency);
+        }
+      }
+      if (missing.length) {
+        throw new EmberError(inspect(controller) + " needs [ " + missing.join(', ') + " ] but " + (missing.length > 1 ? 'they' : 'it') + " could not be found");
+      }
+    }
+
+    var defaultControllersComputedProperty = computed(function() {
+      var controller = this;
+
+      return {
+        needs: get(controller, 'needs'),
+        container: get(controller, 'container'),
+        unknownProperty: function(controllerName) {
+          var needs = this.needs,
+            dependency, i, l;
+          for (i=0, l=needs.length; i<l; i++) {
+            dependency = needs[i];
+            if (dependency === controllerName) {
+              return this.container.lookup('controller:' + controllerName);
+            }
+          }
+
+          var errorMessage = inspect(controller) + '#needs does not include `' + controllerName + '`. To access the ' + controllerName + ' controller from ' + inspect(controller) + ', ' + inspect(controller) + ' should have a `needs` property that is an array of the controllers it has access to.';
+          throw new ReferenceError(errorMessage);
+        },
+        setUnknownProperty: function (key, value) {
+          throw new Error("You cannot overwrite the value of `controllers." + key + "` of " + inspect(controller));
+        }
+      };
+    });
+
+    /**
+      @class ControllerMixin
+      @namespace Ember
+    */
+    ControllerMixin.reopen({
+      concatenatedProperties: ['needs'],
+
+      /**
+        An array of other controller objects available inside
+        instances of this controller via the `controllers`
+        property:
+
+        For example, when you define a controller:
+
+        ```javascript
+        App.CommentsController = Ember.ArrayController.extend({
+          needs: ['post']
+        });
+        ```
+
+        The application's single instance of these other
+        controllers are accessible by name through the
+        `controllers` property:
+
+        ```javascript
+        this.get('controllers.post'); // instance of App.PostController
+        ```
+
+        Given that you have a nested controller (nested resource):
+
+        ```javascript
+        App.CommentsNewController = Ember.ObjectController.extend({
+        });
+        ```
+
+        When you define a controller that requires access to a nested one:
+
+        ```javascript
+        App.IndexController = Ember.ObjectController.extend({
+          needs: ['commentsNew']
+        });
+        ```
+
+        You will be able to get access to it:
+
+        ```javascript
+        this.get('controllers.commentsNew'); // instance of App.CommentsNewController
+        ```
+
+        This is only available for singleton controllers.
+
+        @property {Array} needs
+        @default []
+      */
+      needs: [],
+
+      init: function() {
+        var needs = get(this, 'needs'),
+        length = get(needs, 'length');
+
+        if (length > 0) {
+          
+          if (this.container) {
+            verifyNeedsDependencies(this, this.container, needs);
+          }
+
+          // if needs then initialize controllers proxy
+          get(this, 'controllers');
+        }
+
+        this._super.apply(this, arguments);
+      },
+
+      /**
+        @method controllerFor
+        @see {Ember.Route#controllerFor}
+        @deprecated Use `needs` instead
+      */
+      controllerFor: function(controllerName) {
+                return controllerFor(get(this, 'container'), controllerName);
+      },
+
+      /**
+        Stores the instances of other controllers available from within
+        this controller. Any controller listed by name in the `needs`
+        property will be accessible by name through this property.
+
+        ```javascript
+        App.CommentsController = Ember.ArrayController.extend({
+          needs: ['post'],
+          postTitle: function(){
+            var currentPost = this.get('controllers.post'); // instance of App.PostController
+            return currentPost.get('title');
+          }.property('controllers.post.title')
+        });
+        ```
+
+        @see {Ember.ControllerMixin#needs}
+        @property {Object} controllers
+        @default null
+      */
+      controllers: defaultControllersComputedProperty
+    });
+
+    __exports__["default"] = ControllerMixin;
+  });
+define("ember-application",
+  ["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/dag","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var runLoadHooks = __dependency2__.runLoadHooks;
+
+    /**
+    Ember Application
+
+    @module ember
+    @submodule ember-application
+    @requires ember-views, ember-routing
+    */
+
+    var DAG = __dependency3__["default"];var Resolver = __dependency4__.Resolver;
+    var DefaultResolver = __dependency4__.DefaultResolver;
+    var Application = __dependency5__["default"];
+    // side effect of extending ControllerMixin
+
+    Ember.Application = Application;
+    Ember.DAG = DAG;
+    Ember.Resolver = Resolver;
+    Ember.DefaultResolver = DefaultResolver;
+
+    runLoadHooks('Ember.Application', Application);
+  });
+define("ember-application/system/application",
+  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-views/system/event_dispatcher","ember-extension-support/container_debug_adapter","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-application
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.FEATURES, Ember.deprecate, Ember.assert, Ember.libraries, LOG_VERSION, Namespace, BOOTED
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var runLoadHooks = __dependency4__.runLoadHooks;
+    var DAG = __dependency5__["default"];var Namespace = __dependency6__["default"];
+    var DeferredMixin = __dependency7__["default"];
+    var DefaultResolver = __dependency8__.DefaultResolver;
+    var create = __dependency9__.create;
+    var run = __dependency10__["default"];
+    var canInvoke = __dependency11__.canInvoke;
+    var Container = __dependency12__["default"];
+    var Controller = __dependency13__.Controller;
+    var EnumerableUtils = __dependency14__["default"];
+    var ObjectController = __dependency15__["default"];
+    var ArrayController = __dependency16__["default"];
+    var EventDispatcher = __dependency17__["default"];
+    var ContainerDebugAdapter = __dependency18__["default"];
+    var jQuery = __dependency19__["default"];
+    var Route = __dependency20__["default"];
+    var Router = __dependency21__["default"];
+    var HashLocation = __dependency22__["default"];
+    var HistoryLocation = __dependency23__["default"];
+    var AutoLocation = __dependency24__["default"];
+    var NoneLocation = __dependency25__["default"];
+
+    var EmberHandlebars = __dependency26__["default"];
+
+    var K = Ember.K;
+
+    function DeprecatedContainer(container) {
+      this._container = container;
+    }
+
+    DeprecatedContainer.deprecate = function(method) {
+      return function() {
+        var container = this._container;
+
+                return container[method].apply(container, arguments);
+      };
+    };
+
+    DeprecatedContainer.prototype = {
+      _container: null,
+      lookup: DeprecatedContainer.deprecate('lookup'),
+      resolve: DeprecatedContainer.deprecate('resolve'),
+      register: DeprecatedContainer.deprecate('register')
+    };
+
+    /**
+      An instance of `Ember.Application` is the starting point for every Ember
+      application. It helps to instantiate, initialize and coordinate the many
+      objects that make up your app.
+
+      Each Ember app has one and only one `Ember.Application` object. In fact, the
+      very first thing you should do in your application is create the instance:
+
+      ```javascript
+      window.App = Ember.Application.create();
+      ```
+
+      Typically, the application object is the only global variable. All other
+      classes in your app should be properties on the `Ember.Application` instance,
+      which highlights its first role: a global namespace.
+
+      For example, if you define a view class, it might look like this:
+
+      ```javascript
+      App.MyView = Ember.View.extend();
+      ```
+
+      By default, calling `Ember.Application.create()` will automatically initialize
+      your application by calling the `Ember.Application.initialize()` method. If
+      you need to delay initialization, you can call your app's `deferReadiness()`
+      method. When you are ready for your app to be initialized, call its
+      `advanceReadiness()` method.
+
+      You can define a `ready` method on the `Ember.Application` instance, which
+      will be run by Ember when the application is initialized.
+
+      Because `Ember.Application` inherits from `Ember.Namespace`, any classes
+      you create will have useful string representations when calling `toString()`.
+      See the `Ember.Namespace` documentation for more information.
+
+      While you can think of your `Ember.Application` as a container that holds the
+      other classes in your application, there are several other responsibilities
+      going on under-the-hood that you may want to understand.
+
+      ### Event Delegation
+
+      Ember uses a technique called _event delegation_. This allows the framework
+      to set up a global, shared event listener instead of requiring each view to
+      do it manually. For example, instead of each view registering its own
+      `mousedown` listener on its associated element, Ember sets up a `mousedown`
+      listener on the `body`.
+
+      If a `mousedown` event occurs, Ember will look at the target of the event and
+      start walking up the DOM node tree, finding corresponding views and invoking
+      their `mouseDown` method as it goes.
+
+      `Ember.Application` has a number of default events that it listens for, as
+      well as a mapping from lowercase events to camel-cased view method names. For
+      example, the `keypress` event causes the `keyPress` method on the view to be
+      called, the `dblclick` event causes `doubleClick` to be called, and so on.
+
+      If there is a bubbling browser event that Ember does not listen for by
+      default, you can specify custom events and their corresponding view method
+      names by setting the application's `customEvents` property:
+
+      ```javascript
+      App = Ember.Application.create({
+        customEvents: {
+          // add support for the paste event
+          paste: "paste"
+        }
+      });
+      ```
+
+      By default, the application sets up these event listeners on the document
+      body. However, in cases where you are embedding an Ember application inside
+      an existing page, you may want it to set up the listeners on an element
+      inside the body.
+
+      For example, if only events inside a DOM element with the ID of `ember-app`
+      should be delegated, set your application's `rootElement` property:
+
+      ```javascript
+      window.App = Ember.Application.create({
+        rootElement: '#ember-app'
+      });
+      ```
+
+      The `rootElement` can be either a DOM element or a jQuery-compatible selector
+      string. Note that *views appended to the DOM outside the root element will
+      not receive events.* If you specify a custom root element, make sure you only
+      append views inside it!
+
+      To learn more about the advantages of event delegation and the Ember view
+      layer, and a list of the event listeners that are setup by default, visit the
+      [Ember View Layer guide](http://emberjs.com/guides/understanding-ember/the-view-layer/#toc_event-delegation).
+
+      ### Initializers
+
+      Libraries on top of Ember can add initializers, like so:
+
+      ```javascript
+      Ember.Application.initializer({
+        name: 'api-adapter',
+
+        initialize: function(container, application) {
+          application.register('api-adapter:main', ApiAdapter);
+        }
+      });
+      ```
+
+      Initializers provide an opportunity to access the container, which
+      organizes the different components of an Ember application. Additionally
+      they provide a chance to access the instantiated application. Beyond
+      being used for libraries, initializers are also a great way to organize
+      dependency injection or setup in your own application.
+
+      ### Routing
+
+      In addition to creating your application's router, `Ember.Application` is
+      also responsible for telling the router when to start routing. Transitions
+      between routes can be logged with the `LOG_TRANSITIONS` flag, and more
+      detailed intra-transition logging can be logged with
+      the `LOG_TRANSITIONS_INTERNAL` flag:
+
+      ```javascript
+      window.App = Ember.Application.create({
+        LOG_TRANSITIONS: true, // basic logging of successful transitions
+        LOG_TRANSITIONS_INTERNAL: true // detailed logging of all routing steps
+      });
+      ```
+
+      By default, the router will begin trying to translate the current URL into
+      application state once the browser emits the `DOMContentReady` event. If you
+      need to defer routing, you can call the application's `deferReadiness()`
+      method. Once routing can begin, call the `advanceReadiness()` method.
+
+      If there is any setup required before routing begins, you can implement a
+      `ready()` method on your app that will be invoked immediately before routing
+      begins.
+      ```
+
+      @class Application
+      @namespace Ember
+      @extends Ember.Namespace
+    */
+
+    var Application = Namespace.extend(DeferredMixin, {
+
+      /**
+        The root DOM element of the Application. This can be specified as an
+        element or a
+        [jQuery-compatible selector string](http://api.jquery.com/category/selectors/).
+
+        This is the element that will be passed to the Application's,
+        `eventDispatcher`, which sets up the listeners for event delegation. Every
+        view in your application should be a child of the element you specify here.
+
+        @property rootElement
+        @type DOMElement
+        @default 'body'
+      */
+      rootElement: 'body',
+
+      /**
+        The `Ember.EventDispatcher` responsible for delegating events to this
+        application's views.
+
+        The event dispatcher is created by the application at initialization time
+        and sets up event listeners on the DOM element described by the
+        application's `rootElement` property.
+
+        See the documentation for `Ember.EventDispatcher` for more information.
+
+        @property eventDispatcher
+        @type Ember.EventDispatcher
+        @default null
+      */
+      eventDispatcher: null,
+
+      /**
+        The DOM events for which the event dispatcher should listen.
+
+        By default, the application's `Ember.EventDispatcher` listens
+        for a set of standard DOM events, such as `mousedown` and
+        `keyup`, and delegates them to your application's `Ember.View`
+        instances.
+
+        If you would like additional bubbling events to be delegated to your
+        views, set your `Ember.Application`'s `customEvents` property
+        to a hash containing the DOM event name as the key and the
+        corresponding view method name as the value. For example:
+
+        ```javascript
+        App = Ember.Application.create({
+          customEvents: {
+            // add support for the paste event
+            paste: "paste"
+          }
+        });
+        ```
+
+        @property customEvents
+        @type Object
+        @default null
+      */
+      customEvents: null,
+
+      // Start off the number of deferrals at 1. This will be
+      // decremented by the Application's own `initialize` method.
+      _readinessDeferrals: 1,
+
+      init: function() {
+        if (!this.$) { this.$ = jQuery; }
+        this.__container__ = this.buildContainer();
+
+        this.Router = this.defaultRouter();
+
+        this._super();
+
+        this.scheduleInitialize();
+
+        Ember.libraries.registerCoreLibrary('Handlebars', EmberHandlebars.VERSION);
+        Ember.libraries.registerCoreLibrary('jQuery', jQuery().jquery);
+
+        if ( Ember.LOG_VERSION ) {
+          Ember.LOG_VERSION = false; // we only need to see this once per Application#init
+
+          var nameLengths = EnumerableUtils.map(Ember.libraries, function(item) {
+            return get(item, "name.length");
+          });
+
+          var maxNameLength = Math.max.apply(this, nameLengths);
+
+                    Ember.libraries.each(function(name, version) {
+            var spaces = new Array(maxNameLength - name.length + 1).join(" ");
+                      });
+                  }
+      },
+
+      /**
+        Build the container for the current application.
+
+        Also register a default application view in case the application
+        itself does not.
+
+        @private
+        @method buildContainer
+        @return {Ember.Container} the configured container
+      */
+      buildContainer: function() {
+        var container = this.__container__ = Application.buildContainer(this);
+
+        return container;
+      },
+
+      /**
+        If the application has not opted out of routing and has not explicitly
+        defined a router, supply a default router for the application author
+        to configure.
+
+        This allows application developers to do:
+
+        ```javascript
+        var App = Ember.Application.create();
+
+        App.Router.map(function() {
+          this.resource('posts');
+        });
+        ```
+
+        @private
+        @method defaultRouter
+        @return {Ember.Router} the default router
+      */
+
+      defaultRouter: function() {
+        if (this.Router === false) { return; }
+        var container = this.__container__;
+
+        if (this.Router) {
+          container.unregister('router:main');
+          container.register('router:main', this.Router);
+        }
+
+        return container.lookupFactory('router:main');
+      },
+
+      /**
+        Automatically initialize the application once the DOM has
+        become ready.
+
+        The initialization itself is scheduled on the actions queue
+        which ensures that application loading finishes before
+        booting.
+
+        If you are asynchronously loading code, you should call
+        `deferReadiness()` to defer booting, and then call
+        `advanceReadiness()` once all of your code has finished
+        loading.
+
+        @private
+        @method scheduleInitialize
+      */
+      scheduleInitialize: function() {
+        var self = this;
+
+        if (!this.$ || this.$.isReady) {
+          run.schedule('actions', self, '_initialize');
+        } else {
+          this.$().ready(function runInitialize() {
+            run(self, '_initialize');
+          });
+        }
+      },
+
+      /**
+        Use this to defer readiness until some condition is true.
+
+        Example:
+
+        ```javascript
+        App = Ember.Application.create();
+        App.deferReadiness();
+
+        jQuery.getJSON("/auth-token", function(token) {
+          App.token = token;
+          App.advanceReadiness();
+        });
+        ```
+
+        This allows you to perform asynchronous setup logic and defer
+        booting your application until the setup has finished.
+
+        However, if the setup requires a loading UI, it might be better
+        to use the router for this purpose.
+
+        @method deferReadiness
+      */
+      deferReadiness: function() {
+                        this._readinessDeferrals++;
+      },
+
+      /**
+        Call `advanceReadiness` after any asynchronous setup logic has completed.
+        Each call to `deferReadiness` must be matched by a call to `advanceReadiness`
+        or the application will never become ready and routing will not begin.
+
+        @method advanceReadiness
+        @see {Ember.Application#deferReadiness}
+      */
+      advanceReadiness: function() {
+                this._readinessDeferrals--;
+
+        if (this._readinessDeferrals === 0) {
+          run.once(this, this.didBecomeReady);
+        }
+      },
+
+      /**
+        Registers a factory that can be used for dependency injection (with
+        `App.inject`) or for service lookup. Each factory is registered with
+        a full name including two parts: `type:name`.
+
+        A simple example:
+
+        ```javascript
+        var App = Ember.Application.create();
+        App.Orange  = Ember.Object.extend();
+        App.register('fruit:favorite', App.Orange);
+        ```
+
+        Ember will resolve factories from the `App` namespace automatically.
+        For example `App.CarsController` will be discovered and returned if
+        an application requests `controller:cars`.
+
+        An example of registering a controller with a non-standard name:
+
+        ```javascript
+        var App = Ember.Application.create(),
+            Session  = Ember.Controller.extend();
+
+        App.register('controller:session', Session);
+
+        // The Session controller can now be treated like a normal controller,
+        // despite its non-standard name.
+        App.ApplicationController = Ember.Controller.extend({
+          needs: ['session']
+        });
+        ```
+
+        Registered factories are **instantiated** by having `create`
+        called on them. Additionally they are **singletons**, each time
+        they are looked up they return the same instance.
+
+        Some examples modifying that default behavior:
+
+        ```javascript
+        var App = Ember.Application.create();
+
+        App.Person  = Ember.Object.extend();
+        App.Orange  = Ember.Object.extend();
+        App.Email   = Ember.Object.extend();
+        App.session = Ember.Object.create();
+
+        App.register('model:user', App.Person, {singleton: false });
+        App.register('fruit:favorite', App.Orange);
+        App.register('communication:main', App.Email, {singleton: false});
+        App.register('session', App.session, {instantiate: false});
+        ```
+
+        @method register
+        @param  fullName {String} type:name (e.g., 'model:user')
+        @param  factory {Function} (e.g., App.Person)
+        @param  options {Object} (optional) disable instantiation or singleton usage
+      **/
+      register: function() {
+        var container = this.__container__;
+        container.register.apply(container, arguments);
+      },
+
+      /**
+        Define a dependency injection onto a specific factory or all factories
+        of a type.
+
+        When Ember instantiates a controller, view, or other framework component
+        it can attach a dependency to that component. This is often used to
+        provide services to a set of framework components.
+
+        An example of providing a session object to all controllers:
+
+        ```javascript
+        var App = Ember.Application.create(),
+            Session = Ember.Object.extend({ isAuthenticated: false });
+
+        // A factory must be registered before it can be injected
+        App.register('session:main', Session);
+
+        // Inject 'session:main' onto all factories of the type 'controller'
+        // with the name 'session'
+        App.inject('controller', 'session', 'session:main');
+
+        App.IndexController = Ember.Controller.extend({
+          isLoggedIn: Ember.computed.alias('session.isAuthenticated')
+        });
+        ```
+
+        Injections can also be performed on specific factories.
+
+        ```javascript
+        App.inject(<full_name or type>, <property name>, <full_name>)
+        App.inject('route', 'source', 'source:main')
+        App.inject('route:application', 'email', 'model:email')
+        ```
+
+        It is important to note that injections can only be performed on
+        classes that are instantiated by Ember itself. Instantiating a class
+        directly (via `create` or `new`) bypasses the dependency injection
+        system.
+
+        Ember-Data instantiates its models in a unique manner, and consequently
+        injections onto models (or all models) will not work as expected. Injections
+        on models can be enabled by setting `Ember.MODEL_FACTORY_INJECTIONS`
+        to `true`.
+
+        @method inject
+        @param  factoryNameOrType {String}
+        @param  property {String}
+        @param  injectionName {String}
+      **/
+      inject: function() {
+        var container = this.__container__;
+        container.injection.apply(container, arguments);
+      },
+
+      /**
+        Calling initialize manually is not supported.
+
+        Please see Ember.Application#advanceReadiness and
+        Ember.Application#deferReadiness.
+
+        @private
+        @deprecated
+        @method initialize
+       **/
+      initialize: function() {
+              },
+
+      /**
+        Initialize the application. This happens automatically.
+
+        Run any initializers and run the application load hook. These hooks may
+        choose to defer readiness. For example, an authentication hook might want
+        to defer readiness until the auth token has been retrieved.
+
+        @private
+        @method _initialize
+      */
+      _initialize: function() {
+        if (this.isDestroyed) { return; }
+
+        // At this point, the App.Router must already be assigned
+        if (this.Router) {
+          var container = this.__container__;
+          container.unregister('router:main');
+          container.register('router:main', this.Router);
+        }
+
+        this.runInitializers();
+        runLoadHooks('application', this);
+
+        // At this point, any initializers or load hooks that would have wanted
+        // to defer readiness have fired. In general, advancing readiness here
+        // will proceed to didBecomeReady.
+        this.advanceReadiness();
+
+        return this;
+      },
+
+      /**
+        Reset the application. This is typically used only in tests. It cleans up
+        the application in the following order:
+
+        1. Deactivate existing routes
+        2. Destroy all objects in the container
+        3. Create a new application container
+        4. Re-route to the existing url
+
+        Typical Example:
+
+        ```javascript
+
+        var App;
+
+        run(function() {
+          App = Ember.Application.create();
+        });
+
+        module("acceptance test", {
+          setup: function() {
+            App.reset();
+          }
+        });
+
+        test("first test", function() {
+          // App is freshly reset
+        });
+
+        test("first test", function() {
+          // App is again freshly reset
+        });
+        ```
+
+        Advanced Example:
+
+        Occasionally you may want to prevent the app from initializing during
+        setup. This could enable extra configuration, or enable asserting prior
+        to the app becoming ready.
+
+        ```javascript
+
+        var App;
+
+        run(function() {
+          App = Ember.Application.create();
+        });
+
+        module("acceptance test", {
+          setup: function() {
+            run(function() {
+              App.reset();
+              App.deferReadiness();
+            });
+          }
+        });
+
+        test("first test", function() {
+          ok(true, 'something before app is initialized');
+
+          run(function() {
+            App.advanceReadiness();
+          });
+          ok(true, 'something after app is initialized');
+        });
+        ```
+
+        @method reset
+      **/
+      reset: function() {
+        this._readinessDeferrals = 1;
+
+        function handleReset() {
+          var router = this.__container__.lookup('router:main');
+          router.reset();
+
+          run(this.__container__, 'destroy');
+
+          this.buildContainer();
+
+          run.schedule('actions', this, function() {
+            this._initialize();
+          });
+        }
+
+        run.join(this, handleReset);
+      },
+
+      /**
+        @private
+        @method runInitializers
+      */
+      runInitializers: function() {
+        var initializers = get(this.constructor, 'initializers'),
+            container = this.__container__,
+            graph = new DAG(),
+            namespace = this,
+            name, initializer;
+
+        for (name in initializers) {
+          initializer = initializers[name];
+          graph.addEdges(initializer.name, initializer.initialize, initializer.before, initializer.after);
+        }
+
+        graph.topsort(function (vertex) {
+          var initializer = vertex.value;
+                    initializer(container, namespace);
+        });
+      },
+
+      /**
+        @private
+        @method didBecomeReady
+      */
+      didBecomeReady: function() {
+        this.setupEventDispatcher();
+        this.ready(); // user hook
+        this.startRouting();
+
+        if (!Ember.testing) {
+          // Eagerly name all classes that are already loaded
+          Ember.Namespace.processAll();
+          Ember.BOOTED = true;
+        }
+
+        this.resolve(this);
+      },
+
+      /**
+        Setup up the event dispatcher to receive events on the
+        application's `rootElement` with any registered
+        `customEvents`.
+
+        @private
+        @method setupEventDispatcher
+      */
+      setupEventDispatcher: function() {
+        var customEvents = get(this, 'customEvents'),
+            rootElement = get(this, 'rootElement'),
+            dispatcher = this.__container__.lookup('event_dispatcher:main');
+
+        set(this, 'eventDispatcher', dispatcher);
+        dispatcher.setup(customEvents, rootElement);
+      },
+
+      /**
+        If the application has a router, use it to route to the current URL, and
+        trigger a new call to `route` whenever the URL changes.
+
+        @private
+        @method startRouting
+        @property router {Ember.Router}
+      */
+      startRouting: function() {
+        var router = this.__container__.lookup('router:main');
+        if (!router) { return; }
+
+        router.startRouting();
+      },
+
+      handleURL: function(url) {
+        var router = this.__container__.lookup('router:main');
+
+        router.handleURL(url);
+      },
+
+      /**
+        Called when the Application has become ready.
+        The call will be delayed until the DOM has become ready.
+
+        @event ready
+      */
+      ready: K,
+
+      /**
+        @deprecated Use 'Resolver' instead
+        Set this to provide an alternate class to `Ember.DefaultResolver`
+
+
+        @property resolver
+      */
+      resolver: null,
+
+      /**
+        Set this to provide an alternate class to `Ember.DefaultResolver`
+
+        @property resolver
+      */
+      Resolver: null,
+
+      willDestroy: function() {
+        Ember.BOOTED = false;
+        // Ensure deactivation of routes before objects are destroyed
+        this.__container__.lookup('router:main').reset();
+
+        this.__container__.destroy();
+      },
+
+      initializer: function(options) {
+        this.constructor.initializer(options);
+      }
+    });
+
+    Application.reopenClass({
+      initializers: {},
+
+      /**
+        Initializer receives an object which has the following attributes:
+        `name`, `before`, `after`, `initialize`. The only required attribute is
+        `initialize, all others are optional.
+
+        * `name` allows you to specify under which name the initializer is registered.
+        This must be a unique name, as trying to register two initializers with the
+        same name will result in an error.
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'namedInitializer',
+          initialize: function(container, application) {
+            Ember.debug("Running namedInitializer!");
+          }
+        });
+        ```
+
+        * `before` and `after` are used to ensure that this initializer is ran prior
+        or after the one identified by the value. This value can be a single string
+        or an array of strings, referencing the `name` of other initializers.
+
+        An example of ordering initializers, we create an initializer named `first`:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'first',
+          initialize: function(container, application) {
+            Ember.debug("First initializer!");
+          }
+        });
+
+        // DEBUG: First initializer!
+        ```
+
+        We add another initializer named `second`, specifying that it should run
+        after the initializer named `first`:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'second',
+          after: 'first',
+
+          initialize: function(container, application) {
+            Ember.debug("Second initializer!");
+          }
+        });
+
+        // DEBUG: First initializer!
+        // DEBUG: Second initializer!
+        ```
+
+        Afterwards we add a further initializer named `pre`, this time specifying
+        that it should run before the initializer named `first`:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'pre',
+          before: 'first',
+
+          initialize: function(container, application) {
+            Ember.debug("Pre initializer!");
+          }
+        });
+
+        // DEBUG: Pre initializer!
+        // DEBUG: First initializer!
+        // DEBUG: Second initializer!
+        ```
+
+        Finally we add an initializer named `post`, specifying it should run after
+        both the `first` and the `second` initializers:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'post',
+          after: ['first', 'second'],
+
+          initialize: function(container, application) {
+            Ember.debug("Post initializer!");
+          }
+        });
+
+        // DEBUG: Pre initializer!
+        // DEBUG: First initializer!
+        // DEBUG: Second initializer!
+        // DEBUG: Post initializer!
+        ```
+
+        * `initialize` is a callback function that receives two arguments, `container`
+        and `application` on which you can operate.
+
+        Example of using `container` to preload data into the store:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: "preload-data",
+
+          initialize: function(container, application) {
+            var store = container.lookup('store:main');
+            store.pushPayload(preloadedData);
+          }
+        });
+        ```
+
+        Example of using `application` to register an adapter:
+
+        ```javascript
+        Ember.Application.initializer({
+          name: 'api-adapter',
+
+          initialize: function(container, application) {
+            application.register('api-adapter:main', ApiAdapter);
+          }
+        });
+        ```
+
+        @method initializer
+        @param initializer {Object}
+       */
+      initializer: function(initializer) {
+        // If this is the first initializer being added to a subclass, we are going to reopen the class
+        // to make sure we have a new `initializers` object, which extends from the parent class' using
+        // prototypal inheritance. Without this, attempting to add initializers to the subclass would
+        // pollute the parent class as well as other subclasses.
+        if (this.superclass.initializers !== undefined && this.superclass.initializers === this.initializers) {
+          this.reopenClass({
+            initializers: create(this.initializers)
+          });
+        }
+
+                
+        this.initializers[initializer.name] = initializer;
+      },
+
+      /**
+        This creates a container with the default Ember naming conventions.
+
+        It also configures the container:
+
+        * registered views are created every time they are looked up (they are
+          not singletons)
+        * registered templates are not factories; the registered value is
+          returned directly.
+        * the router receives the application as its `namespace` property
+        * all controllers receive the router as their `target` and `controllers`
+          properties
+        * all controllers receive the application as their `namespace` property
+        * the application view receives the application controller as its
+          `controller` property
+        * the application view receives the application template as its
+          `defaultTemplate` property
+
+        @private
+        @method buildContainer
+        @static
+        @param {Ember.Application} namespace the application to build the
+          container for.
+        @return {Ember.Container} the built container
+      */
+      buildContainer: function(namespace) {
+        var container = new Container();
+
+        Container.defaultContainer = new DeprecatedContainer(container);
+
+        container.set = set;
+        container.resolver  = resolverFor(namespace);
+        container.normalize = container.resolver.normalize;
+        container.describe  = container.resolver.describe;
+        container.makeToString = container.resolver.makeToString;
+
+        container.optionsForType('component', { singleton: false });
+        container.optionsForType('view', { singleton: false });
+        container.optionsForType('template', { instantiate: false });
+        container.optionsForType('helper', { instantiate: false });
+
+        container.register('application:main', namespace, { instantiate: false });
+
+        container.register('controller:basic', Controller, { instantiate: false });
+        container.register('controller:object', ObjectController, { instantiate: false });
+        container.register('controller:array', ArrayController, { instantiate: false });
+        container.register('route:basic', Route, { instantiate: false });
+        container.register('event_dispatcher:main', EventDispatcher);
+
+        container.register('router:main',  Router);
+        container.injection('router:main', 'namespace', 'application:main');
+
+        container.register('location:auto', AutoLocation);
+        container.register('location:hash', HashLocation);
+        container.register('location:history', HistoryLocation);
+        container.register('location:none', NoneLocation);
+
+        container.injection('controller', 'target', 'router:main');
+        container.injection('controller', 'namespace', 'application:main');
+
+        container.injection('route', 'router', 'router:main');
+        container.injection('location', 'rootURL', '-location-setting:root-url');
+
+        // DEBUGGING
+        container.register('resolver-for-debugging:main', container.resolver.__resolver__, { instantiate: false });
+        container.injection('container-debug-adapter:main', 'resolver', 'resolver-for-debugging:main');
+        container.injection('data-adapter:main', 'containerDebugAdapter', 'container-debug-adapter:main');
+        // Custom resolver authors may want to register their own ContainerDebugAdapter with this key
+
+        // ES6TODO: resolve this via import once ember-application package is ES6'ed
+        requireModule('ember-extension-support');
+        container.register('container-debug-adapter:main', ContainerDebugAdapter);
+
+        return container;
+      }
+    });
+
+    /**
+      This function defines the default lookup rules for container lookups:
+
+      * templates are looked up on `Ember.TEMPLATES`
+      * other names are looked up on the application after classifying the name.
+        For example, `controller:post` looks up `App.PostController` by default.
+      * if the default lookup fails, look for registered classes on the container
+
+      This allows the application to register default injections in the container
+      that could be overridden by the normal naming convention.
+
+      @private
+      @method resolverFor
+      @param {Ember.Namespace} namespace the namespace to look for classes
+      @return {*} the resolved value for a given lookup
+    */
+    function resolverFor(namespace) {
+      if (namespace.get('resolver')) {
+              }
+
+      var ResolverClass = namespace.get('resolver') || namespace.get('Resolver') || DefaultResolver;
+      var resolver = ResolverClass.create({
+        namespace: namespace
+      });
+
+      function resolve(fullName) {
+        return resolver.resolve(fullName);
+      }
+
+      resolve.describe = function(fullName) {
+        return resolver.lookupDescription(fullName);
+      };
+
+      resolve.makeToString = function(factory, fullName) {
+        return resolver.makeToString(factory, fullName);
+      };
+
+      resolve.normalize = function(fullName) {
+        if (resolver.normalize) {
+          return resolver.normalize(fullName);
+        } else {
+                    return fullName;
+        }
+      };
+
+      resolve.__resolver__ = resolver;
+
+      return resolve;
+    }
+
+    __exports__["default"] = Application;
+  });
+define("ember-application/system/dag",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function visit(vertex, fn, visited, path) {
+      var name = vertex.name,
+        vertices = vertex.incoming,
+        names = vertex.incomingNames,
+        len = names.length,
+        i;
+      if (!visited) {
+        visited = {};
+      }
+      if (!path) {
+        path = [];
+      }
+      if (visited.hasOwnProperty(name)) {
+        return;
+      }
+      path.push(name);
+      visited[name] = true;
+      for (i = 0; i < len; i++) {
+        visit(vertices[names[i]], fn, visited, path);
+      }
+      fn(vertex, path);
+      path.pop();
+    }
+
+    function DAG() {
+      this.names = [];
+      this.vertices = {};
+    }
+
+    DAG.prototype.add = function(name) {
+      if (!name) { return; }
+      if (this.vertices.hasOwnProperty(name)) {
+        return this.vertices[name];
+      }
+      var vertex = {
+        name: name, incoming: {}, incomingNames: [], hasOutgoing: false, value: null
+      };
+      this.vertices[name] = vertex;
+      this.names.push(name);
+      return vertex;
+    };
+
+    DAG.prototype.map = function(name, value) {
+      this.add(name).value = value;
+    };
+
+    DAG.prototype.addEdge = function(fromName, toName) {
+      if (!fromName || !toName || fromName === toName) {
+        return;
+      }
+      var from = this.add(fromName), to = this.add(toName);
+      if (to.incoming.hasOwnProperty(fromName)) {
+        return;
+      }
+      function checkCycle(vertex, path) {
+        if (vertex.name === toName) {
+          throw new EmberError("cycle detected: " + toName + " <- " + path.join(" <- "));
+        }
+      }
+      visit(from, checkCycle);
+      from.hasOutgoing = true;
+      to.incoming[fromName] = from;
+      to.incomingNames.push(fromName);
+    };
+
+    DAG.prototype.topsort = function(fn) {
+      var visited = {},
+        vertices = this.vertices,
+        names = this.names,
+        len = names.length,
+        i, vertex;
+      for (i = 0; i < len; i++) {
+        vertex = vertices[names[i]];
+        if (!vertex.hasOutgoing) {
+          visit(vertex, fn, visited);
+        }
+      }
+    };
+
+    DAG.prototype.addEdges = function(name, value, before, after) {
+      var i;
+      this.map(name, value);
+      if (before) {
+        if (typeof before === 'string') {
+          this.addEdge(name, before);
+        } else {
+          for (i = 0; i < before.length; i++) {
+            this.addEdge(name, before[i]);
+          }
+        }
+      }
+      if (after) {
+        if (typeof after === 'string') {
+          this.addEdge(after, name);
+        } else {
+          for (i = 0; i < after.length; i++) {
+            this.addEdge(after[i], name);
+          }
+        }
+      }
+    };
+
+    __exports__["default"] = DAG;
+  });
+define("ember-application/system/resolver",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-application
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.TEMPLATES, Ember.assert
+    var get = __dependency2__.get;
+    var Logger = __dependency3__["default"];
+    var classify = __dependency4__.classify;
+    var capitalize = __dependency4__.capitalize;
+    var decamelize = __dependency4__.decamelize;
+    var EmberObject = __dependency5__["default"];
+    var Namespace = __dependency6__["default"];
+    var EmberHandlebars = __dependency7__["default"];
+
+    var Resolver = EmberObject.extend({
+      /**
+        This will be set to the Application instance when it is
+        created.
+
+        @property namespace
+      */
+      namespace: null,
+      normalize: function(fullName) {
+        throw new Error("Invalid call to `resolver.normalize(fullName)`. Please override the 'normalize' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      resolve: function(fullName) {
+       throw new Error("Invalid call to `resolver.resolve(parsedName)`. Please override the 'resolve' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      parseName: function(parsedName) {
+       throw new Error("Invalid call to `resolver.resolveByType(parsedName)`. Please override the 'resolveByType' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      lookupDescription: function(fullName) {
+        throw new Error("Invalid call to `resolver.lookupDescription(fullName)`. Please override the 'lookupDescription' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      makeToString: function(factory, fullName) {
+        throw new Error("Invalid call to `resolver.makeToString(factory, fullName)`. Please override the 'makeToString' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      resolveOther: function(parsedName) {
+       throw new Error("Invalid call to `resolver.resolveOther(parsedName)`. Please override the 'resolveOther' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      },
+      _logLookup: function(found, parsedName) {
+       throw new Error("Invalid call to `resolver._logLookup(found, parsedName)`. Please override the '_logLookup' method in subclass of `Ember.Resolver` to prevent falling through to this error.");
+      }
+    });
+
+
+
+    /**
+      The DefaultResolver defines the default lookup rules to resolve
+      container lookups before consulting the container for registered
+      items:
+
+      * templates are looked up on `Ember.TEMPLATES`
+      * other names are looked up on the application after converting
+        the name. For example, `controller:post` looks up
+        `App.PostController` by default.
+      * there are some nuances (see examples below)
+
+      ### How Resolving Works
+
+      The container calls this object's `resolve` method with the
+      `fullName` argument.
+
+      It first parses the fullName into an object using `parseName`.
+
+      Then it checks for the presence of a type-specific instance
+      method of the form `resolve[Type]` and calls it if it exists.
+      For example if it was resolving 'template:post', it would call
+      the `resolveTemplate` method.
+
+      Its last resort is to call the `resolveOther` method.
+
+      The methods of this object are designed to be easy to override
+      in a subclass. For example, you could enhance how a template
+      is resolved like so:
+
+      ```javascript
+      App = Ember.Application.create({
+        Resolver: Ember.DefaultResolver.extend({
+          resolveTemplate: function(parsedName) {
+            var resolvedTemplate = this._super(parsedName);
+            if (resolvedTemplate) { return resolvedTemplate; }
+            return Ember.TEMPLATES['not_found'];
+          }
+        })
+      });
+      ```
+
+      Some examples of how names are resolved:
+
+      ```
+      'template:post' //=> Ember.TEMPLATES['post']
+      'template:posts/byline' //=> Ember.TEMPLATES['posts/byline']
+      'template:posts.byline' //=> Ember.TEMPLATES['posts/byline']
+      'template:blogPost' //=> Ember.TEMPLATES['blogPost']
+                          //   OR
+                          //   Ember.TEMPLATES['blog_post']
+      'controller:post' //=> App.PostController
+      'controller:posts.index' //=> App.PostsIndexController
+      'controller:blog/post' //=> Blog.PostController
+      'controller:basic' //=> Ember.Controller
+      'route:post' //=> App.PostRoute
+      'route:posts.index' //=> App.PostsIndexRoute
+      'route:blog/post' //=> Blog.PostRoute
+      'route:basic' //=> Ember.Route
+      'view:post' //=> App.PostView
+      'view:posts.index' //=> App.PostsIndexView
+      'view:blog/post' //=> Blog.PostView
+      'view:basic' //=> Ember.View
+      'foo:post' //=> App.PostFoo
+      'model:post' //=> App.Post
+      ```
+
+      @class DefaultResolver
+      @namespace Ember
+      @extends Ember.Object
+    */
+    var DefaultResolver = EmberObject.extend({
+      /**
+        This will be set to the Application instance when it is
+        created.
+
+        @property namespace
+      */
+      namespace: null,
+
+      normalize: function(fullName) {
+        var split = fullName.split(':', 2),
+            type = split[0],
+            name = split[1];
+
+        
+        if (type !== 'template') {
+          var result = name;
+
+          if (result.indexOf('.') > -1) {
+            result = result.replace(/\.(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+          }
+
+          if (name.indexOf('_') > -1) {
+            result = result.replace(/_(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+          }
+
+          return type + ':' + result;
+        } else {
+          return fullName;
+        }
+      },
+
+
+      /**
+        This method is called via the container's resolver method.
+        It parses the provided `fullName` and then looks up and
+        returns the appropriate template or class.
+
+        @method resolve
+        @param {String} fullName the lookup string
+        @return {Object} the resolved factory
+      */
+      resolve: function(fullName) {
+        var parsedName = this.parseName(fullName),
+            resolveMethodName = parsedName.resolveMethodName,
+            resolved;
+
+        if (!(parsedName.name && parsedName.type)) {
+          throw new TypeError("Invalid fullName: `" + fullName + "`, must be of the form `type:name` ");
+        }
+
+        if (this[resolveMethodName]) {
+          resolved = this[resolveMethodName](parsedName);
+        }
+
+        if (!resolved) {
+          resolved = this.resolveOther(parsedName);
+        }
+
+        if (parsedName.root && parsedName.root.LOG_RESOLVER) {
+          this._logLookup(resolved, parsedName);
+        }
+
+        return resolved;
+      },
+      /**
+        Convert the string name of the form "type:name" to
+        a Javascript object with the parsed aspects of the name
+        broken out.
+
+        @protected
+        @param {String} fullName the lookup string
+        @method parseName
+      */
+      parseName: function(fullName) {
+        var nameParts = fullName.split(":"),
+            type = nameParts[0], fullNameWithoutType = nameParts[1],
+            name = fullNameWithoutType,
+            namespace = get(this, 'namespace'),
+            root = namespace;
+
+        if (type !== 'template' && name.indexOf('/') !== -1) {
+          var parts = name.split('/');
+          name = parts[parts.length - 1];
+          var namespaceName = capitalize(parts.slice(0, -1).join('.'));
+          root = Namespace.byName(namespaceName);
+
+                  }
+
+        return {
+          fullName: fullName,
+          type: type,
+          fullNameWithoutType: fullNameWithoutType,
+          name: name,
+          root: root,
+          resolveMethodName: "resolve" + classify(type)
+        };
+      },
+
+      /**
+        Returns a human-readable description for a fullName. Used by the
+        Application namespace in assertions to describe the
+        precise name of the class that Ember is looking for, rather than
+        container keys.
+
+        @protected
+        @param {String} fullName the lookup string
+        @method lookupDescription
+      */
+      lookupDescription: function(fullName) {
+        var parsedName = this.parseName(fullName);
+
+        if (parsedName.type === 'template') {
+          return "template at " + parsedName.fullNameWithoutType.replace(/\./g, '/');
+        }
+
+        var description = parsedName.root + "." + classify(parsedName.name);
+        if (parsedName.type !== 'model') { description += classify(parsedName.type); }
+
+        return description;
+      },
+
+      makeToString: function(factory, fullName) {
+        return factory.toString();
+      },
+      /**
+        Given a parseName object (output from `parseName`), apply
+        the conventions expected by `Ember.Router`
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method useRouterNaming
+      */
+      useRouterNaming: function(parsedName) {
+        parsedName.name = parsedName.name.replace(/\./g, '_');
+        if (parsedName.name === 'basic') {
+          parsedName.name = '';
+        }
+      },
+      /**
+        Look up the template in Ember.TEMPLATES
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveTemplate
+      */
+      resolveTemplate: function(parsedName) {
+        var templateName = parsedName.fullNameWithoutType.replace(/\./g, '/');
+
+        if (Ember.TEMPLATES[templateName]) {
+          return Ember.TEMPLATES[templateName];
+        }
+
+        templateName = decamelize(templateName);
+        if (Ember.TEMPLATES[templateName]) {
+          return Ember.TEMPLATES[templateName];
+        }
+      },
+      /**
+        Lookup the view using `resolveOther`
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveView
+      */
+      resolveView: function(parsedName) {
+        this.useRouterNaming(parsedName);
+        return this.resolveOther(parsedName);
+      },
+      /**
+        Lookup the controller using `resolveOther`
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveController
+      */
+      resolveController: function(parsedName) {
+        this.useRouterNaming(parsedName);
+        return this.resolveOther(parsedName);
+      },
+      /**
+        Lookup the route using `resolveOther`
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveRoute
+      */
+      resolveRoute: function(parsedName) {
+        this.useRouterNaming(parsedName);
+        return this.resolveOther(parsedName);
+      },
+
+      /**
+        Lookup the model on the Application namespace
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveModel
+      */
+      resolveModel: function(parsedName) {
+        var className = classify(parsedName.name),
+            factory = get(parsedName.root, className);
+
+         if (factory) { return factory; }
+      },
+      /**
+        Look up the specified object (from parsedName) on the appropriate
+        namespace (usually on the Application)
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveHelper
+      */
+      resolveHelper: function(parsedName) {
+        return this.resolveOther(parsedName) || EmberHandlebars.helpers[parsedName.fullNameWithoutType];
+      },
+      /**
+        Look up the specified object (from parsedName) on the appropriate
+        namespace (usually on the Application)
+
+        @protected
+        @param {Object} parsedName a parseName object with the parsed
+          fullName lookup string
+        @method resolveOther
+      */
+      resolveOther: function(parsedName) {
+        var className = classify(parsedName.name) + classify(parsedName.type),
+            factory = get(parsedName.root, className);
+        if (factory) { return factory; }
+      },
+
+      /**
+       @method _logLookup
+       @param {Boolean} found
+       @param {Object} parsedName
+       @private
+      */
+      _logLookup: function(found, parsedName) {
+        var symbol, padding;
+
+        if (found) { symbol = '[✓]'; }
+        else          { symbol = '[ ]'; }
+
+        if (parsedName.fullName.length > 60) {
+          padding = '.';
+        } else {
+          padding = new Array(60 - parsedName.fullName.length).join('.');
+        }
+
+        Logger.info(symbol, parsedName.fullName, padding, this.lookupDescription(parsedName.fullName));
+      }
+    });
+
+    __exports__.Resolver = Resolver;
+    __exports__.DefaultResolver = DefaultResolver;
+  });
+})();
+
+(function() {
+define("ember-extension-support/container_debug_adapter",
+  ["ember-metal/core","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var typeOf = __dependency2__.typeOf;
+    var dasherize = __dependency3__.dasherize;
+    var classify = __dependency3__.classify;
+    var Namespace = __dependency4__["default"];
+    var EmberObject = __dependency5__["default"];
+
+    /**
+    @module ember
+    @submodule ember-extension-support
+    */
+
+    /**
+      The `ContainerDebugAdapter` helps the container and resolver interface
+      with tools that debug Ember such as the
+      [Ember Extension](https://github.com/tildeio/ember-extension)
+      for Chrome and Firefox.
+
+      This class can be extended by a custom resolver implementer
+      to override some of the methods with library-specific code.
+
+      The methods likely to be overridden are:
+
+      * `canCatalogEntriesByType`
+      * `catalogEntriesByType`
+
+      The adapter will need to be registered
+      in the application's container as `container-debug-adapter:main`
+
+      Example:
+
+      ```javascript
+      Application.initializer({
+        name: "containerDebugAdapter",
+
+        initialize: function(container, application) {
+          application.register('container-debug-adapter:main', require('app/container-debug-adapter'));
+        }
+      });
+      ```
+
+      @class ContainerDebugAdapter
+      @namespace Ember
+      @extends EmberObject
+      @since 1.5.0
+    */
+    var ContainerDebugAdapter = EmberObject.extend({
+      /**
+        The container of the application being debugged.
+        This property will be injected
+        on creation.
+
+        @property container
+        @default null
+      */
+      container: null,
+
+      /**
+        The resolver instance of the application
+        being debugged. This property will be injected
+        on creation.
+
+        @property resolver
+        @default null
+      */
+      resolver: null,
+
+      /**
+        Returns true if it is possible to catalog a list of available
+        classes in the resolver for a given type.
+
+        @method canCatalogEntriesByType
+        @param {string} type The type. e.g. "model", "controller", "route"
+        @return {boolean} whether a list is available for this type.
+      */
+      canCatalogEntriesByType: function(type) {
+        if (type === 'model' || type === 'template') return false;
+        return true;
+      },
+
+      /**
+        Returns the available classes a given type.
+
+        @method catalogEntriesByType
+        @param {string} type The type. e.g. "model", "controller", "route"
+        @return {Array} An array of strings.
+      */
+      catalogEntriesByType: function(type) {
+        var namespaces = Ember.A(Namespace.NAMESPACES), types = Ember.A(), self = this;
+        var typeSuffixRegex = new RegExp(classify(type) + "$");
+
+        namespaces.forEach(function(namespace) {
+          if (namespace !== Ember) {
+            for (var key in namespace) {
+              if (!namespace.hasOwnProperty(key)) { continue; }
+              if (typeSuffixRegex.test(key)) {
+                var klass = namespace[key];
+                if (typeOf(klass) === 'class') {
+                  types.push(dasherize(key.replace(typeSuffixRegex, '')));
+                }
+              }
+            }
+          }
+        });
+        return types;
+      }
+    });
+
+    __exports__["default"] = ContainerDebugAdapter;
+  });
+define("ember-extension-support/data_adapter",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/run_loop","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/native_array","ember-application/system/application","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var run = __dependency3__["default"];
+    var dasherize = __dependency4__.dasherize;
+    var Namespace = __dependency5__["default"];
+    var EmberObject = __dependency6__["default"];
+    var A = __dependency7__.A;
+    var Application = __dependency8__["default"];
+
+    /**
+    @module ember
+    @submodule ember-extension-support
+    */
+
+    /**
+      The `DataAdapter` helps a data persistence library
+      interface with tools that debug Ember such
+      as the [Ember Extension](https://github.com/tildeio/ember-extension)
+      for Chrome and Firefox.
+
+      This class will be extended by a persistence library
+      which will override some of the methods with
+      library-specific code.
+
+      The methods likely to be overridden are:
+
+      * `getFilters`
+      * `detect`
+      * `columnsForType`
+      * `getRecords`
+      * `getRecordColumnValues`
+      * `getRecordKeywords`
+      * `getRecordFilterValues`
+      * `getRecordColor`
+      * `observeRecord`
+
+      The adapter will need to be registered
+      in the application's container as `dataAdapter:main`
+
+      Example:
+
+      ```javascript
+      Application.initializer({
+        name: "data-adapter",
+
+        initialize: function(container, application) {
+          application.register('data-adapter:main', DS.DataAdapter);
+        }
+      });
+      ```
+
+      @class DataAdapter
+      @namespace Ember
+      @extends EmberObject
+    */
+    var DataAdapter = EmberObject.extend({
+      init: function() {
+        this._super();
+        this.releaseMethods = A();
+      },
+
+      /**
+        The container of the application being debugged.
+        This property will be injected
+        on creation.
+
+        @property container
+        @default null
+        @since 1.3.0
+      */
+      container: null,
+
+
+      /**
+        The container-debug-adapter which is used
+        to list all models.
+
+        @property containerDebugAdapter
+        @default undefined
+        @since 1.5.0
+      **/
+      containerDebugAdapter: undefined,
+
+      /**
+        Number of attributes to send
+        as columns. (Enough to make the record
+        identifiable).
+
+        @private
+        @property attributeLimit
+        @default 3
+        @since 1.3.0
+      */
+      attributeLimit: 3,
+
+      /**
+        Stores all methods that clear observers.
+        These methods will be called on destruction.
+
+        @private
+        @property releaseMethods
+        @since 1.3.0
+      */
+      releaseMethods: A(),
+
+      /**
+        Specifies how records can be filtered.
+        Records returned will need to have a `filterValues`
+        property with a key for every name in the returned array.
+
+        @public
+        @method getFilters
+        @return {Array} List of objects defining filters.
+         The object should have a `name` and `desc` property.
+      */
+      getFilters: function() {
+        return A();
+      },
+
+      /**
+        Fetch the model types and observe them for changes.
+
+        @public
+        @method watchModelTypes
+
+        @param {Function} typesAdded Callback to call to add types.
+        Takes an array of objects containing wrapped types (returned from `wrapModelType`).
+
+        @param {Function} typesUpdated Callback to call when a type has changed.
+        Takes an array of objects containing wrapped types.
+
+        @return {Function} Method to call to remove all observers
+      */
+      watchModelTypes: function(typesAdded, typesUpdated) {
+        var modelTypes = this.getModelTypes(),
+            self = this, typesToSend, releaseMethods = A();
+
+        typesToSend = modelTypes.map(function(type) {
+          var klass = type.klass;
+          var wrapped = self.wrapModelType(klass, type.name);
+          releaseMethods.push(self.observeModelType(klass, typesUpdated));
+          return wrapped;
+        });
+
+        typesAdded(typesToSend);
+
+        var release = function() {
+          releaseMethods.forEach(function(fn) { fn(); });
+          self.releaseMethods.removeObject(release);
+        };
+        this.releaseMethods.pushObject(release);
+        return release;
+      },
+
+      _nameToClass: function(type) {
+        if (typeof type === 'string') {
+          type = this.container.lookupFactory('model:' + type);
+        }
+        return type;
+      },
+
+      /**
+        Fetch the records of a given type and observe them for changes.
+
+        @public
+        @method watchRecords
+
+        @param {Function} recordsAdded Callback to call to add records.
+        Takes an array of objects containing wrapped records.
+        The object should have the following properties:
+          columnValues: {Object} key and value of a table cell
+          object: {Object} the actual record object
+
+        @param {Function} recordsUpdated Callback to call when a record has changed.
+        Takes an array of objects containing wrapped records.
+
+        @param {Function} recordsRemoved Callback to call when a record has removed.
+        Takes the following parameters:
+          index: the array index where the records were removed
+          count: the number of records removed
+
+        @return {Function} Method to call to remove all observers
+      */
+      watchRecords: function(type, recordsAdded, recordsUpdated, recordsRemoved) {
+        var self = this, releaseMethods = A(), records = this.getRecords(type), release;
+
+        var recordUpdated = function(updatedRecord) {
+          recordsUpdated([updatedRecord]);
+        };
+
+        var recordsToSend = records.map(function(record) {
+          releaseMethods.push(self.observeRecord(record, recordUpdated));
+          return self.wrapRecord(record);
+        });
+
+
+        var contentDidChange = function(array, idx, removedCount, addedCount) {
+          for (var i = idx; i < idx + addedCount; i++) {
+            var record = array.objectAt(i);
+            var wrapped = self.wrapRecord(record);
+            releaseMethods.push(self.observeRecord(record, recordUpdated));
+            recordsAdded([wrapped]);
+          }
+
+          if (removedCount) {
+            recordsRemoved(idx, removedCount);
+          }
+        };
+
+        var observer = { didChange: contentDidChange, willChange: Ember.K };
+        records.addArrayObserver(self, observer);
+
+        release = function() {
+          releaseMethods.forEach(function(fn) { fn(); });
+          records.removeArrayObserver(self, observer);
+          self.releaseMethods.removeObject(release);
+        };
+
+        recordsAdded(recordsToSend);
+
+        this.releaseMethods.pushObject(release);
+        return release;
+      },
+
+      /**
+        Clear all observers before destruction
+        @private
+        @method willDestroy
+      */
+      willDestroy: function() {
+        this._super();
+        this.releaseMethods.forEach(function(fn) {
+          fn();
+        });
+      },
+
+      /**
+        Detect whether a class is a model.
+
+        Test that against the model class
+        of your persistence library
+
+        @private
+        @method detect
+        @param {Class} klass The class to test
+        @return boolean Whether the class is a model class or not
+      */
+      detect: function(klass) {
+        return false;
+      },
+
+      /**
+        Get the columns for a given model type.
+
+        @private
+        @method columnsForType
+        @param {Class} type The model type
+        @return {Array} An array of columns of the following format:
+         name: {String} name of the column
+         desc: {String} Humanized description (what would show in a table column name)
+      */
+      columnsForType: function(type) {
+        return A();
+      },
+
+      /**
+        Adds observers to a model type class.
+
+        @private
+        @method observeModelType
+        @param {Class} type The model type class
+        @param {Function} typesUpdated Called when a type is modified.
+        @return {Function} The function to call to remove observers
+      */
+
+      observeModelType: function(type, typesUpdated) {
+        var self = this, records = this.getRecords(type);
+
+        var onChange = function() {
+          typesUpdated([self.wrapModelType(type)]);
+        };
+        var observer = {
+          didChange: function() {
+            run.scheduleOnce('actions', this, onChange);
+          },
+          willChange: Ember.K
+        };
+
+        records.addArrayObserver(this, observer);
+
+        var release = function() {
+          records.removeArrayObserver(self, observer);
+        };
+
+        return release;
+      },
+
+
+      /**
+        Wraps a given model type and observes changes to it.
+
+        @private
+        @method wrapModelType
+        @param {Class} type A model class
+        @param {String}  Optional name of the class
+        @return {Object} contains the wrapped type and the function to remove observers
+        Format:
+          type: {Object} the wrapped type
+            The wrapped type has the following format:
+              name: {String} name of the type
+              count: {Integer} number of records available
+              columns: {Columns} array of columns to describe the record
+              object: {Class} the actual Model type class
+          release: {Function} The function to remove observers
+      */
+      wrapModelType: function(type, name) {
+        var release, records = this.getRecords(type),
+            typeToSend, self = this;
+
+        typeToSend = {
+          name: name || type.toString(),
+          count: get(records, 'length'),
+          columns: this.columnsForType(type),
+          object: type
+        };
+
+
+        return typeToSend;
+      },
+
+
+      /**
+        Fetches all models defined in the application.
+
+        @private
+        @method getModelTypes
+        @return {Array} Array of model types
+      */
+      getModelTypes: function() {
+        var types, self = this,
+            containerDebugAdapter = this.get('containerDebugAdapter');
+
+        if (containerDebugAdapter.canCatalogEntriesByType('model')) {
+          types = containerDebugAdapter.catalogEntriesByType('model');
+        } else {
+          types = this._getObjectsOnNamespaces();
+        }
+
+        // New adapters return strings instead of classes
+        types = A(types).map(function(name) {
+          return {
+            klass: self._nameToClass(name),
+            name: name
+          };
+        });
+        types = A(types).filter(function(type) {
+          return self.detect(type.klass);
+        });
+
+        return A(types);
+      },
+
+      /**
+        Loops over all namespaces and all objects
+        attached to them
+
+        @private
+        @method _getObjectsOnNamespaces
+        @return {Array} Array of model type strings
+      */
+      _getObjectsOnNamespaces: function() {
+        var namespaces = A(Namespace.NAMESPACES),
+            types = A(),
+            self = this;
+
+        namespaces.forEach(function(namespace) {
+          for (var key in namespace) {
+            if (!namespace.hasOwnProperty(key)) { continue; }
+            // Even though we will filter again in `getModelTypes`,
+            // we should not call `lookupContainer` on non-models
+            // (especially when `Ember.MODEL_FACTORY_INJECTIONS` is `true`)
+            if (!self.detect(namespace[key])) { continue; }
+            var name = dasherize(key);
+            if (!(namespace instanceof Application) && namespace.toString()) {
+              name = namespace + '/' + name;
+            }
+            types.push(name);
+          }
+        });
+        return types;
+      },
+
+      /**
+        Fetches all loaded records for a given type.
+
+        @private
+        @method getRecords
+        @return {Array} An array of records.
+         This array will be observed for changes,
+         so it should update when new records are added/removed.
+      */
+      getRecords: function(type) {
+        return A();
+      },
+
+      /**
+        Wraps a record and observers changes to it.
+
+        @private
+        @method wrapRecord
+        @param {Object} record The record instance.
+        @return {Object} The wrapped record. Format:
+        columnValues: {Array}
+        searchKeywords: {Array}
+      */
+      wrapRecord: function(record) {
+        var recordToSend = { object: record }, columnValues = {}, self = this;
+
+        recordToSend.columnValues = this.getRecordColumnValues(record);
+        recordToSend.searchKeywords = this.getRecordKeywords(record);
+        recordToSend.filterValues = this.getRecordFilterValues(record);
+        recordToSend.color = this.getRecordColor(record);
+
+        return recordToSend;
+      },
+
+      /**
+        Gets the values for each column.
+
+        @private
+        @method getRecordColumnValues
+        @return {Object} Keys should match column names defined
+        by the model type.
+      */
+      getRecordColumnValues: function(record) {
+        return {};
+      },
+
+      /**
+        Returns keywords to match when searching records.
+
+        @private
+        @method getRecordKeywords
+        @return {Array} Relevant keywords for search.
+      */
+      getRecordKeywords: function(record) {
+        return A();
+      },
+
+      /**
+        Returns the values of filters defined by `getFilters`.
+
+        @private
+        @method getRecordFilterValues
+        @param {Object} record The record instance
+        @return {Object} The filter values
+      */
+      getRecordFilterValues: function(record) {
+        return {};
+      },
+
+      /**
+        Each record can have a color that represents its state.
+
+        @private
+        @method getRecordColor
+        @param {Object} record The record instance
+        @return {String} The record's color
+          Possible options: black, red, blue, green
+      */
+      getRecordColor: function(record) {
+        return null;
+      },
+
+      /**
+        Observes all relevant properties and re-sends the wrapped record
+        when a change occurs.
+
+        @private
+        @method observerRecord
+        @param {Object} record The record instance
+        @param {Function} recordUpdated The callback to call when a record is updated.
+        @return {Function} The function to call to remove all observers.
+      */
+      observeRecord: function(record, recordUpdated) {
+        return function(){};
+      }
+
+    });
+
+    __exports__["default"] = DataAdapter;
+  });
+define("ember-extension-support/initializers",
+  [],
+  function() {
+    "use strict";
+
+  });
+define("ember-extension-support",
+  ["ember-metal/core","ember-extension-support/data_adapter","ember-extension-support/container_debug_adapter"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
+    "use strict";
+    /**
+    Ember Extension Support
+
+    @module ember
+    @submodule ember-extension-support
+    @requires ember-application
+    */
+
+    var Ember = __dependency1__["default"];
+    var DataAdapter = __dependency2__["default"];
+    var ContainerDebugAdapter = __dependency3__["default"];
+
+    Ember.DataAdapter = DataAdapter;
+    Ember.ContainerDebugAdapter = ContainerDebugAdapter;
+  });
+})();
+
+(function() {
+define("ember-testing/adapters/adapter",
+  ["ember-metal/core","ember-metal/utils","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.K
+    var inspect = __dependency2__.inspect;
+    var EmberObject = __dependency3__["default"];
+
+    /**
+     @module ember
+     @submodule ember-testing
+    */
+
+    /**
+      The primary purpose of this class is to create hooks that can be implemented
+      by an adapter for various test frameworks.
+
+      @class Adapter
+      @namespace Ember.Test
+    */
+    var Adapter = EmberObject.extend({
+      /**
+        This callback will be called whenever an async operation is about to start.
+
+        Override this to call your framework's methods that handle async
+        operations.
+
+        @public
+        @method asyncStart
+      */
+      asyncStart: Ember.K,
+
+      /**
+        This callback will be called whenever an async operation has completed.
+
+        @public
+        @method asyncEnd
+      */
+      asyncEnd: Ember.K,
+
+      /**
+        Override this method with your testing framework's false assertion.
+        This function is called whenever an exception occurs causing the testing
+        promise to fail.
+
+        QUnit example:
+
+        ```javascript
+          exception: function(error) {
+            ok(false, error);
+          };
+        ```
+
+        @public
+        @method exception
+        @param {String} error The exception to be raised.
+      */
+      exception: function(error) {
+        throw error;
+      }
+    });
+
+    __exports__["default"] = Adapter;
+  });
+define("ember-testing/adapters/qunit",
+  ["ember-testing/adapters/adapter","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Adapter = __dependency1__["default"];
+    var inspect = __dependency2__.inspect;
+
+    /**
+      This class implements the methods defined by Ember.Test.Adapter for the
+      QUnit testing framework.
+
+      @class QUnitAdapter
+      @namespace Ember.Test
+      @extends Ember.Test.Adapter
+    */
+    var QUnitAdapter = Adapter.extend({
+      asyncStart: function() {
+        QUnit.stop();
+      },
+      asyncEnd: function() {
+        QUnit.start();
+      },
+      exception: function(error) {
+        ok(false, inspect(error));
+      }
+    });
+
+    __exports__["default"] = QUnitAdapter;
+  });
+define("ember-testing/helpers",
+  ["ember-metal/property_get","ember-metal/error","ember-metal/run_loop","ember-views/system/jquery","ember-testing/test"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+    "use strict";
+    var get = __dependency1__.get;
+    var EmberError = __dependency2__["default"];
+    var run = __dependency3__["default"];
+    var jQuery = __dependency4__["default"];
+    var Test = __dependency5__["default"];
+
+    /**
+    * @module ember
+    * @submodule ember-testing
+    */
+
+    var helper = Test.registerHelper,
+        asyncHelper = Test.registerAsyncHelper,
+        countAsync = 0;
+
+    function currentRouteName(app){
+      var appController = app.__container__.lookup('controller:application');
+
+      return get(appController, 'currentRouteName');
+    }
+
+    function currentPath(app){
+      var appController = app.__container__.lookup('controller:application');
+
+      return get(appController, 'currentPath');
+    }
+
+    function currentURL(app){
+      var router = app.__container__.lookup('router:main');
+
+      return get(router, 'location').getURL();
+    }
+
+    function visit(app, url) {
+      var router = app.__container__.lookup('router:main');
+      router.location.setURL(url);
+
+      if (app._readinessDeferrals > 0) {
+        router['initialURL'] = url;
+        run(app, 'advanceReadiness');
+        delete router['initialURL'];
+      } else {
+        run(app, app.handleURL, url);
+      }
+
+      return wait(app);
+    }
+
+    function click(app, selector, context) {
+      var $el = findWithAssert(app, selector, context);
+      run($el, 'mousedown');
+
+      if ($el.is(':input')) {
+        var type = $el.prop('type');
+        if (type !== 'checkbox' && type !== 'radio' && type !== 'hidden') {
+          run($el, function(){
+            // Firefox does not trigger the `focusin` event if the window
+            // does not have focus. If the document doesn't have focus just
+            // use trigger('focusin') instead.
+            if (!document.hasFocus || document.hasFocus()) {
+              this.focus();
+            } else {
+              this.trigger('focusin');
+            }
+          });
+        }
+      }
+
+      run($el, 'mouseup');
+      run($el, 'click');
+
+      return wait(app);
+    }
+
+    function triggerEvent(app, selector, context, type, options){
+      if (arguments.length === 3) {
+        type = context;
+        context = null;
+      }
+
+      if (typeof options === 'undefined') {
+        options = {};
+      }
+
+      var $el = findWithAssert(app, selector, context);
+
+      var event = jQuery.Event(type, options);
+
+      run($el, 'trigger', event);
+
+      return wait(app);
+    }
+
+    function keyEvent(app, selector, context, type, keyCode) {
+      if (typeof keyCode === 'undefined') {
+        keyCode = type;
+        type = context;
+        context = null;
+      }
+
+      return triggerEvent(app, selector, context, type, { keyCode: keyCode, which: keyCode });
+    }
+
+    function fillIn(app, selector, context, text) {
+      var $el;
+      if (typeof text === 'undefined') {
+        text = context;
+        context = null;
+      }
+      $el = findWithAssert(app, selector, context);
+      run(function() {
+        $el.val(text).change();
+      });
+      return wait(app);
+    }
+
+    function findWithAssert(app, selector, context) {
+      var $el = find(app, selector, context);
+      if ($el.length === 0) {
+        throw new EmberError("Element " + selector + " not found.");
+      }
+      return $el;
+    }
+
+    function find(app, selector, context) {
+      var $el;
+      context = context || get(app, 'rootElement');
+      $el = app.$(selector, context);
+
+      return $el;
+    }
+
+    function andThen(app, callback) {
+      return wait(app, callback(app));
+    }
+
+    function wait(app, value) {
+      return Test.promise(function(resolve) {
+        // If this is the first async promise, kick off the async test
+        if (++countAsync === 1) {
+          Test.adapter.asyncStart();
+        }
+
+        // Every 10ms, poll for the async thing to have finished
+        var watcher = setInterval(function() {
+          // 1. If the router is loading, keep polling
+          var routerIsLoading = !!app.__container__.lookup('router:main').router.activeTransition;
+          if (routerIsLoading) { return; }
+
+          // 2. If there are pending Ajax requests, keep polling
+          if (Test.pendingAjaxRequests) { return; }
+
+          // 3. If there are scheduled timers or we are inside of a run loop, keep polling
+          if (run.hasScheduledTimers() || run.currentRunLoop) { return; }
+          if (Test.waiters && Test.waiters.any(function(waiter) {
+            var context = waiter[0];
+            var callback = waiter[1];
+            return !callback.call(context);
+          })) { return; }
+          // Stop polling
+          clearInterval(watcher);
+
+          // If this is the last async promise, end the async test
+          if (--countAsync === 0) {
+            Test.adapter.asyncEnd();
+          }
+
+          // Synchronously resolve the promise
+          run(null, resolve, value);
+        }, 10);
+      });
+
+    }
+
+
+    /**
+    * Loads a route, sets up any controllers, and renders any templates associated
+    * with the route as though a real user had triggered the route change while
+    * using your app.
+    *
+    * Example:
+    *
+    * ```javascript
+    * visit('posts/index').then(function() {
+    *   // assert something
+    * });
+    * ```
+    *
+    * @method visit
+    * @param {String} url the name of the route
+    * @return {RSVP.Promise}
+    */
+    asyncHelper('visit', visit);
+
+    /**
+    * Clicks an element and triggers any actions triggered by the element's `click`
+    * event.
+    *
+    * Example:
+    *
+    * ```javascript
+    * click('.some-jQuery-selector').then(function() {
+    *   // assert something
+    * });
+    * ```
+    *
+    * @method click
+    * @param {String} selector jQuery selector for finding element on the DOM
+    * @return {RSVP.Promise}
+    */
+    asyncHelper('click', click);
+
+    /**
+    * Simulates a key event, e.g. `keypress`, `keydown`, `keyup` with the desired keyCode
+    *
+    * Example:
+    *
+    * ```javascript
+    * keyEvent('.some-jQuery-selector', 'keypress', 13).then(function() {
+    *  // assert something
+    * });
+    * ```
+    *
+    * @method keyEvent
+    * @param {String} selector jQuery selector for finding element on the DOM
+    * @param {String} type the type of key event, e.g. `keypress`, `keydown`, `keyup`
+    * @param {Number} keyCode the keyCode of the simulated key event
+    * @return {RSVP.Promise}
+    * @since 1.5.0
+    */
+    asyncHelper('keyEvent', keyEvent);
+
+    /**
+    * Fills in an input element with some text.
+    *
+    * Example:
+    *
+    * ```javascript
+    * fillIn('#email', 'you@example.com').then(function() {
+    *   // assert something
+    * });
+    * ```
+    *
+    * @method fillIn
+    * @param {String} selector jQuery selector finding an input element on the DOM
+    * to fill text with
+    * @param {String} text text to place inside the input element
+    * @return {RSVP.Promise}
+    */
+    asyncHelper('fillIn', fillIn);
+
+    /**
+    * Finds an element in the context of the app's container element. A simple alias
+    * for `app.$(selector)`.
+    *
+    * Example:
+    *
+    * ```javascript
+    * var $el = find('.my-selector');
+    * ```
+    *
+    * @method find
+    * @param {String} selector jQuery string selector for element lookup
+    * @return {Object} jQuery object representing the results of the query
+    */
+    helper('find', find);
+
+    /**
+    * Like `find`, but throws an error if the element selector returns no results.
+    *
+    * Example:
+    *
+    * ```javascript
+    * var $el = findWithAssert('.doesnt-exist'); // throws error
+    * ```
+    *
+    * @method findWithAssert
+    * @param {String} selector jQuery selector string for finding an element within
+    * the DOM
+    * @return {Object} jQuery object representing the results of the query
+    * @throws {Error} throws error if jQuery object returned has a length of 0
+    */
+    helper('findWithAssert', findWithAssert);
+
+    /**
+      Causes the run loop to process any pending events. This is used to ensure that
+      any async operations from other helpers (or your assertions) have been processed.
+
+      This is most often used as the return value for the helper functions (see 'click',
+      'fillIn','visit',etc).
+
+      Example:
+
+      ```javascript
+      Ember.Test.registerAsyncHelper('loginUser', function(app, username, password) {
+        visit('secured/path/here')
+        .fillIn('#username', username)
+        .fillIn('#password', username)
+        .click('.submit')
+
+        return wait();
+      });
+
+      @method wait
+      @param {Object} value The value to be returned.
+      @return {RSVP.Promise}
+    */
+    asyncHelper('wait', wait);
+    asyncHelper('andThen', andThen);
+
+
+    /**
+      Returns the currently active route name.
+
+    Example:
+
+    ```javascript
+    function validateRouteName(){
+    equal(currentRouteName(), 'some.path', "correct route was transitioned into.");
+    }
+
+    visit('/some/path').then(validateRouteName)
+    ```
+
+    @method currentRouteName
+    @return {Object} The name of the currently active route.
+    @since 1.5.0
+    */
+    helper('currentRouteName', currentRouteName);
+
+    /**
+      Returns the current path.
+
+    Example:
+
+    ```javascript
+    function validateURL(){
+    equal(currentPath(), 'some.path.index', "correct path was transitioned into.");
+    }
+
+    click('#some-link-id').then(validateURL);
+    ```
+
+    @method currentPath
+    @return {Object} The currently active path.
+    @since 1.5.0
+    */
+    helper('currentPath', currentPath);
+
+    /**
+      Returns the current URL.
+
+    Example:
+
+    ```javascript
+    function validateURL(){
+    equal(currentURL(), '/some/path', "correct URL was transitioned into.");
+    }
+
+    click('#some-link-id').then(validateURL);
+    ```
+
+    @method currentURL
+    @return {Object} The currently active URL.
+    @since 1.5.0
+    */
+    helper('currentURL', currentURL);
+
+    /**
+      Triggers the given event on the element identified by the provided selector.
+
+      Example:
+
+      ```javascript
+      triggerEvent('#some-elem-id', 'blur');
+      ```
+
+      This is actually used internally by the `keyEvent` helper like so:
+
+      ```javascript
+      triggerEvent('#some-elem-id', 'keypress', { keyCode: 13 });
+      ```
+
+     @method triggerEvent
+     @param {String} selector jQuery selector for finding element on the DOM
+     @param {String} type The event type to be triggered.
+     @param {String} options The options to be passed to jQuery.Event.
+     @return {RSVP.Promise}
+     @since 1.5.0
+    */
+    asyncHelper('triggerEvent', triggerEvent);
+  });
+define("ember-testing/initializers",
+  ["ember-runtime/system/lazy_load"],
+  function(__dependency1__) {
+    "use strict";
+    var onLoad = __dependency1__.onLoad;
+
+    var name = 'deferReadiness in `testing` mode';
+
+    onLoad('Ember.Application', function(Application) {
+      if (!Application.initializers[name]) {
+        Application.initializer({
+          name: name,
+
+          initialize: function(container, application){
+            if (application.testing) {
+              application.deferReadiness();
+            }
+          }
+        });
+      }
+    });
+  });
+define("ember-testing",
+  ["ember-metal/core","ember-testing/initializers","ember-testing/support","ember-testing/setup_for_testing","ember-testing/test","ember-testing/adapters/adapter","ember-testing/adapters/qunit","ember-testing/helpers"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+
+    // to setup initializer
+         // to handle various edge cases
+
+    var setupForTesting = __dependency4__["default"];
+    var Test = __dependency5__["default"];
+    var Adapter = __dependency6__["default"];
+    var QUnitAdapter = __dependency7__["default"];
+         // adds helpers to helpers object in Test
+
+    /**
+      Ember Testing
+
+      @module ember
+      @submodule ember-testing
+      @requires ember-application
+    */
+
+    Ember.Test = Test;
+    Ember.Test.Adapter = Adapter;
+    Ember.Test.QUnitAdapter = QUnitAdapter;
+    Ember.setupForTesting = setupForTesting;
+  });
+define("ember-testing/setup_for_testing",
+  ["ember-metal/core","ember-testing/adapters/qunit","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // import Test from "ember-testing/test";  // ES6TODO: fix when cycles are supported
+    var QUnitAdapter = __dependency2__["default"];
+    var jQuery = __dependency3__["default"];
+
+    var Test;
+
+    function incrementAjaxPendingRequests(){
+      Test.pendingAjaxRequests++;
+    }
+
+    function decrementAjaxPendingRequests(){
+            Test.pendingAjaxRequests--;
+    }
+
+    /**
+      Sets Ember up for testing. This is useful to perform
+      basic setup steps in order to unit test.
+
+      Use `App.setupForTesting` to perform integration tests (full
+      application testing).
+
+      @method setupForTesting
+      @namespace Ember
+      @since 1.5.0
+    */
+    function setupForTesting() {
+      if (!Test) { Test = requireModule('ember-testing/test')['default']; }
+
+      Ember.testing = true;
+
+      // if adapter is not manually set default to QUnit
+      if (!Test.adapter) {
+        Test.adapter = QUnitAdapter.create();
+      }
+
+      if (!Test.pendingAjaxRequests) {
+        Test.pendingAjaxRequests = 0;
+      }
+
+      jQuery(document).off('ajaxSend', incrementAjaxPendingRequests);
+      jQuery(document).off('ajaxComplete', decrementAjaxPendingRequests);
+      jQuery(document).on('ajaxSend', incrementAjaxPendingRequests);
+      jQuery(document).on('ajaxComplete', decrementAjaxPendingRequests);
+    };
+
+    __exports__["default"] = setupForTesting;
+  });
+define("ember-testing/support",
+  ["ember-metal/core","ember-views/system/jquery"],
+  function(__dependency1__, __dependency2__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var jQuery = __dependency2__["default"];
+
+    /**
+      @module ember
+      @submodule ember-testing
+     */
+
+    var $ = jQuery;
+
+    /**
+      This method creates a checkbox and triggers the click event to fire the
+      passed in handler. It is used to correct for a bug in older versions
+      of jQuery (e.g 1.8.3).
+
+      @private
+      @method testCheckboxClick
+    */
+    function testCheckboxClick(handler) {
+      $('<input type="checkbox">')
+        .css({ position: 'absolute', left: '-1000px', top: '-1000px' })
+        .appendTo('body')
+        .on('click', handler)
+        .trigger('click')
+        .remove();
+    }
+
+    $(function() {
+      /*
+        Determine whether a checkbox checked using jQuery's "click" method will have
+        the correct value for its checked property.
+
+        If we determine that the current jQuery version exhibits this behavior,
+        patch it to work correctly as in the commit for the actual fix:
+        https://github.com/jquery/jquery/commit/1fb2f92.
+      */
+      testCheckboxClick(function() {
+        if (!this.checked && !$.event.special.click) {
+          $.event.special.click = {
+            // For checkbox, fire native event so checked state will be right
+            trigger: function() {
+              if ($.nodeName( this, "input" ) && this.type === "checkbox" && this.click) {
+                this.click();
+                return false;
+              }
+            }
+          };
+        }
+      });
+
+      // Try again to verify that the patch took effect or blow up.
+      testCheckboxClick(function() {
+              });
+    });
+  });
+define("ember-testing/test",
+  ["ember-metal/core","ember-metal/run_loop","ember-metal/platform","ember-runtime/compare","ember-runtime/ext/rsvp","ember-testing/setup_for_testing","ember-application/system/application","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var emberRun = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var compare = __dependency4__["default"];
+    var RSVP = __dependency5__["default"];
+    var setupForTesting = __dependency6__["default"];
+    var EmberApplication = __dependency7__["default"];
+
+    /**
+      @module ember
+      @submodule ember-testing
+     */
+    var slice = [].slice,
+        helpers = {},
+        injectHelpersCallbacks = [];
+
+    /**
+      This is a container for an assortment of testing related functionality:
+
+      * Choose your default test adapter (for your framework of choice).
+      * Register/Unregister additional test helpers.
+      * Setup callbacks to be fired when the test helpers are injected into
+        your application.
+
+      @class Test
+      @namespace Ember
+    */
+    var Test = {
+
+      /**
+        `registerHelper` is used to register a test helper that will be injected
+        when `App.injectTestHelpers` is called.
+
+        The helper method will always be called with the current Application as
+        the first parameter.
+
+        For example:
+
+        ```javascript
+        Ember.Test.registerHelper('boot', function(app) {
+          Ember.run(app, app.advanceReadiness);
+        });
+        ```
+
+        This helper can later be called without arguments because it will be
+        called with `app` as the first parameter.
+
+        ```javascript
+        App = Ember.Application.create();
+        App.injectTestHelpers();
+        boot();
+        ```
+
+        @public
+        @method registerHelper
+        @param {String} name The name of the helper method to add.
+        @param {Function} helperMethod
+        @param options {Object}
+      */
+      registerHelper: function(name, helperMethod) {
+        helpers[name] = {
+          method: helperMethod,
+          meta: { wait: false }
+        };
+      },
+
+      /**
+        `registerAsyncHelper` is used to register an async test helper that will be injected
+        when `App.injectTestHelpers` is called.
+
+        The helper method will always be called with the current Application as
+        the first parameter.
+
+        For example:
+
+        ```javascript
+        Ember.Test.registerAsyncHelper('boot', function(app) {
+          Ember.run(app, app.advanceReadiness);
+        });
+        ```
+
+        The advantage of an async helper is that it will not run
+        until the last async helper has completed.  All async helpers
+        after it will wait for it complete before running.
+
+
+        For example:
+
+        ```javascript
+        Ember.Test.registerAsyncHelper('deletePost', function(app, postId) {
+          click('.delete-' + postId);
+        });
+
+        // ... in your test
+        visit('/post/2');
+        deletePost(2);
+        visit('/post/3');
+        deletePost(3);
+        ```
+
+        @public
+        @method registerAsyncHelper
+        @param {String} name The name of the helper method to add.
+        @param {Function} helperMethod
+        @since 1.2.0
+      */
+      registerAsyncHelper: function(name, helperMethod) {
+        helpers[name] = {
+          method: helperMethod,
+          meta: { wait: true }
+        };
+      },
+
+      /**
+        Remove a previously added helper method.
+
+        Example:
+
+        ```javascript
+        Ember.Test.unregisterHelper('wait');
+        ```
+
+        @public
+        @method unregisterHelper
+        @param {String} name The helper to remove.
+      */
+      unregisterHelper: function(name) {
+        delete helpers[name];
+        delete Test.Promise.prototype[name];
+      },
+
+      /**
+        Used to register callbacks to be fired whenever `App.injectTestHelpers`
+        is called.
+
+        The callback will receive the current application as an argument.
+
+        Example:
+
+        ```javascript
+        Ember.Test.onInjectHelpers(function() {
+          Ember.$(document).ajaxSend(function() {
+            Test.pendingAjaxRequests++;
+          });
+
+          Ember.$(document).ajaxComplete(function() {
+            Test.pendingAjaxRequests--;
+          });
+        });
+        ```
+
+        @public
+        @method onInjectHelpers
+        @param {Function} callback The function to be called.
+      */
+      onInjectHelpers: function(callback) {
+        injectHelpersCallbacks.push(callback);
+      },
+
+      /**
+        This returns a thenable tailored for testing.  It catches failed
+        `onSuccess` callbacks and invokes the `Ember.Test.adapter.exception`
+        callback in the last chained then.
+
+        This method should be returned by async helpers such as `wait`.
+
+        @public
+        @method promise
+        @param {Function} resolver The function used to resolve the promise.
+      */
+      promise: function(resolver) {
+        return new Test.Promise(resolver);
+      },
+
+      /**
+       Used to allow ember-testing to communicate with a specific testing
+       framework.
+
+       You can manually set it before calling `App.setupForTesting()`.
+
+       Example:
+
+       ```javascript
+       Ember.Test.adapter = MyCustomAdapter.create()
+       ```
+
+       If you do not set it, ember-testing will default to `Ember.Test.QUnitAdapter`.
+
+       @public
+       @property adapter
+       @type {Class} The adapter to be used.
+       @default Ember.Test.QUnitAdapter
+      */
+      adapter: null,
+
+      /**
+        Replacement for `Ember.RSVP.resolve`
+        The only difference is this uses
+        and instance of `Ember.Test.Promise`
+
+        @public
+        @method resolve
+        @param {Mixed} The value to resolve
+        @since 1.2.0
+      */
+      resolve: function(val) {
+        return Test.promise(function(resolve) {
+          return resolve(val);
+        });
+      },
+
+      /**
+         This allows ember-testing to play nicely with other asynchronous
+         events, such as an application that is waiting for a CSS3
+         transition or an IndexDB transaction.
+
+         For example:
+
+         ```javascript
+         Ember.Test.registerWaiter(function() {
+           return myPendingTransactions() == 0;
+         });
+         ```
+         The `context` argument allows you to optionally specify the `this`
+         with which your callback will be invoked.
+
+         For example:
+
+         ```javascript
+         Ember.Test.registerWaiter(MyDB, MyDB.hasPendingTransactions);
+         ```
+
+         @public
+         @method registerWaiter
+         @param {Object} context (optional)
+         @param {Function} callback
+         @since 1.2.0
+      */
+      registerWaiter: function(context, callback) {
+        if (arguments.length === 1) {
+          callback = context;
+          context = null;
+        }
+        if (!this.waiters) {
+          this.waiters = Ember.A();
+        }
+        this.waiters.push([context, callback]);
+      },
+      /**
+         `unregisterWaiter` is used to unregister a callback that was
+         registered with `registerWaiter`.
+
+         @public
+         @method unregisterWaiter
+         @param {Object} context (optional)
+         @param {Function} callback
+         @since 1.2.0
+      */
+      unregisterWaiter: function(context, callback) {
+        var pair;
+        if (!this.waiters) { return; }
+        if (arguments.length === 1) {
+          callback = context;
+          context = null;
+        }
+        pair = [context, callback];
+        this.waiters = Ember.A(this.waiters.filter(function(elt) {
+          return compare(elt, pair)!==0;
+        }));
+      }
+    };
+
+    function helper(app, name) {
+      var fn = helpers[name].method,
+          meta = helpers[name].meta;
+
+      return function() {
+        var args = slice.call(arguments),
+            lastPromise = Test.lastPromise;
+
+        args.unshift(app);
+
+        // some helpers are not async and
+        // need to return a value immediately.
+        // example: `find`
+        if (!meta.wait) {
+          return fn.apply(app, args);
+        }
+
+        if (!lastPromise) {
+          // It's the first async helper in current context
+          lastPromise = fn.apply(app, args);
+        } else {
+          // wait for last helper's promise to resolve
+          // and then execute
+          run(function() {
+            lastPromise = Test.resolve(lastPromise).then(function() {
+              return fn.apply(app, args);
+            });
+          });
+        }
+
+        return lastPromise;
+      };
+    }
+
+    function run(fn) {
+      if (!emberRun.currentRunLoop) {
+        emberRun(fn);
+      } else {
+        fn();
+      }
+    }
+
+    EmberApplication.reopen({
+      /**
+       This property contains the testing helpers for the current application. These
+       are created once you call `injectTestHelpers` on your `Ember.Application`
+       instance. The included helpers are also available on the `window` object by
+       default, but can be used from this object on the individual application also.
+
+        @property testHelpers
+        @type {Object}
+        @default {}
+      */
+      testHelpers: {},
+
+      /**
+       This property will contain the original methods that were registered
+       on the `helperContainer` before `injectTestHelpers` is called.
+
+       When `removeTestHelpers` is called, these methods are restored to the
+       `helperContainer`.
+
+        @property originalMethods
+        @type {Object}
+        @default {}
+        @private
+        @since 1.3.0
+      */
+      originalMethods: {},
+
+
+      /**
+      This property indicates whether or not this application is currently in
+      testing mode. This is set when `setupForTesting` is called on the current
+      application.
+
+      @property testing
+      @type {Boolean}
+      @default false
+      @since 1.3.0
+      */
+      testing: false,
+
+      /**
+       This hook defers the readiness of the application, so that you can start
+       the app when your tests are ready to run. It also sets the router's
+       location to 'none', so that the window's location will not be modified
+       (preventing both accidental leaking of state between tests and interference
+       with your testing framework).
+
+       Example:
+
+      ```
+      App.setupForTesting();
+      ```
+
+        @method setupForTesting
+      */
+      setupForTesting: function() {
+        setupForTesting();
+
+        this.testing = true;
+
+        this.Router.reopen({
+          location: 'none'
+        });
+      },
+
+      /**
+        This will be used as the container to inject the test helpers into. By
+        default the helpers are injected into `window`.
+
+        @property helperContainer
+        @type {Object} The object to be used for test helpers.
+        @default window
+        @since 1.2.0
+      */
+      helperContainer: window,
+
+      /**
+        This injects the test helpers into the `helperContainer` object. If an object is provided
+        it will be used as the helperContainer. If `helperContainer` is not set it will default
+        to `window`. If a function of the same name has already been defined it will be cached
+        (so that it can be reset if the helper is removed with `unregisterHelper` or
+        `removeTestHelpers`).
+
+       Any callbacks registered with `onInjectHelpers` will be called once the
+       helpers have been injected.
+
+      Example:
+      ```
+      App.injectTestHelpers();
+      ```
+
+        @method injectTestHelpers
+      */
+      injectTestHelpers: function(helperContainer) {
+        if (helperContainer) { this.helperContainer = helperContainer; }
+
+        this.testHelpers = {};
+        for (var name in helpers) {
+          this.originalMethods[name] = this.helperContainer[name];
+          this.testHelpers[name] = this.helperContainer[name] = helper(this, name);
+          protoWrap(Test.Promise.prototype, name, helper(this, name), helpers[name].meta.wait);
+        }
+
+        for(var i = 0, l = injectHelpersCallbacks.length; i < l; i++) {
+          injectHelpersCallbacks[i](this);
+        }
+      },
+
+      /**
+        This removes all helpers that have been registered, and resets and functions
+        that were overridden by the helpers.
+
+        Example:
+
+        ```javascript
+        App.removeTestHelpers();
+        ```
+
+        @public
+        @method removeTestHelpers
+      */
+      removeTestHelpers: function() {
+        for (var name in helpers) {
+          this.helperContainer[name] = this.originalMethods[name];
+          delete this.testHelpers[name];
+          delete this.originalMethods[name];
+        }
+      }
+    });
+
+    // This method is no longer needed
+    // But still here for backwards compatibility
+    // of helper chaining
+    function protoWrap(proto, name, callback, isAsync) {
+      proto[name] = function() {
+        var args = arguments;
+        if (isAsync) {
+          return callback.apply(this, args);
+        } else {
+          return this.then(function() {
+            return callback.apply(this, args);
+          });
+        }
+      };
+    }
+
+    Test.Promise = function() {
+      RSVP.Promise.apply(this, arguments);
+      Test.lastPromise = this;
+    };
+
+    Test.Promise.prototype = create(RSVP.Promise.prototype);
+    Test.Promise.prototype.constructor = Test.Promise;
+
+    // Patch `then` to isolate async methods
+    // specifically `Ember.Test.lastPromise`
+    var originalThen = RSVP.Promise.prototype.then;
+    Test.Promise.prototype.then = function(onSuccess, onFailure) {
+      return originalThen.call(this, function(val) {
+        return isolate(onSuccess, val);
+      }, onFailure);
+    };
+
+    // This method isolates nested async methods
+    // so that they don't conflict with other last promises.
+    //
+    // 1. Set `Ember.Test.lastPromise` to null
+    // 2. Invoke method
+    // 3. Return the last promise created during method
+    // 4. Restore `Ember.Test.lastPromise` to original value
+    function isolate(fn, val) {
+      var value, lastPromise;
+
+      // Reset lastPromise for nested helpers
+      Test.lastPromise = null;
+
+      value = fn(val);
+
+      lastPromise = Test.lastPromise;
+
+      // If the method returned a promise
+      // return that promise. If not,
+      // return the last async helper's promise
+      if ((value && (value instanceof Test.Promise)) || !lastPromise) {
+        return value;
+      } else {
+        run(function() {
+          lastPromise = Test.resolve(lastPromise).then(function() {
+            return value;
+          });
+        });
+        return lastPromise;
+      }
+    }
+
+    __exports__["default"] = Test;
+  });
+})();
+
+define("container/container",
+  ["container/inheriting_dict","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var InheritingDict = __dependency1__["default"];
+
+    // A lightweight container that helps to assemble and decouple components.
+    // Public api for the container is still in flux.
+    // The public api, specified on the application namespace should be considered the stable api.
+    function Container(parent) {
+      this.parent = parent;
+      this.children = [];
+
+      this.resolver = parent && parent.resolver || function() {};
+
+      this.registry = new InheritingDict(parent && parent.registry);
+      this.cache = new InheritingDict(parent && parent.cache);
+      this.factoryCache = new InheritingDict(parent && parent.factoryCache);
+      this.resolveCache = new InheritingDict(parent && parent.resolveCache);
+      this.typeInjections = new InheritingDict(parent && parent.typeInjections);
+      this.injections = {};
+
+      this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
+      this.factoryInjections = {};
+
+      this._options = new InheritingDict(parent && parent._options);
+      this._typeOptions = new InheritingDict(parent && parent._typeOptions);
+    }
+
+    Container.prototype = {
+
+      /**
+        @property parent
+        @type Container
+        @default null
+      */
+      parent: null,
+
+      /**
+        @property children
+        @type Array
+        @default []
+      */
+      children: null,
+
+      /**
+        @property resolver
+        @type function
+      */
+      resolver: null,
+
+      /**
+        @property registry
+        @type InheritingDict
+      */
+      registry: null,
+
+      /**
+        @property cache
+        @type InheritingDict
+      */
+      cache: null,
+
+      /**
+        @property typeInjections
+        @type InheritingDict
+      */
+      typeInjections: null,
+
+      /**
+        @property injections
+        @type Object
+        @default {}
+      */
+      injections: null,
+
+      /**
+        @private
+
+        @property _options
+        @type InheritingDict
+        @default null
+      */
+      _options: null,
+
+      /**
+        @private
+
+        @property _typeOptions
+        @type InheritingDict
+      */
+      _typeOptions: null,
+
+      /**
+        Returns a new child of the current container. These children are configured
+        to correctly inherit from the current container.
+
+        @method child
+        @return {Container}
+      */
+      child: function() {
+        var container = new Container(this);
+        this.children.push(container);
+        return container;
+      },
+
+      /**
+        Sets a key-value pair on the current container. If a parent container,
+        has the same key, once set on a child, the parent and child will diverge
+        as expected.
+
+        @method set
+        @param {Object} object
+        @param {String} key
+        @param {any} value
+      */
+      set: function(object, key, value) {
+        object[key] = value;
+      },
+
+      /**
+        Registers a factory for later injection.
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('model:user', Person, {singleton: false });
+        container.register('fruit:favorite', Orange);
+        container.register('communication:main', Email, {singleton: false});
+        ```
+
+        @method register
+        @param {String} fullName
+        @param {Function} factory
+        @param {Object} options
+      */
+      register: function(fullName, factory, options) {
+        validateFullName(fullName);
+
+        if (factory === undefined) {
+          throw new TypeError('Attempting to register an unknown factory: `' + fullName + '`');
+        }
+
+        var normalizedName = this.normalize(fullName);
+
+        if (this.cache.has(normalizedName)) {
+          throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
+        }
+
+        this.registry.set(normalizedName, factory);
+        this._options.set(normalizedName, options || {});
+      },
+
+      /**
+        Unregister a fullName
+
+        ```javascript
+        var container = new Container();
+        container.register('model:user', User);
+
+        container.lookup('model:user') instanceof User //=> true
+
+        container.unregister('model:user')
+        container.lookup('model:user') === undefined //=> true
+        ```
+
+        @method unregister
+        @param {String} fullName
+       */
+      unregister: function(fullName) {
+        validateFullName(fullName);
+
+        var normalizedName = this.normalize(fullName);
+
+        this.registry.remove(normalizedName);
+        this.cache.remove(normalizedName);
+        this.factoryCache.remove(normalizedName);
+        this.resolveCache.remove(normalizedName);
+        this._options.remove(normalizedName);
+      },
+
+      /**
+        Given a fullName return the corresponding factory.
+
+        By default `resolve` will retrieve the factory from
+        its container's registry.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        container.resolve('api:twitter') // => Twitter
+        ```
+
+        Optionally the container can be provided with a custom resolver.
+        If provided, `resolve` will first provide the custom resolver
+        the opportunity to resolve the fullName, otherwise it will fallback
+        to the registry.
+
+        ```javascript
+        var container = new Container();
+        container.resolver = function(fullName) {
+          // lookup via the module system of choice
+        };
+
+        // the twitter factory is added to the module system
+        container.resolve('api:twitter') // => Twitter
+        ```
+
+        @method resolve
+        @param {String} fullName
+        @return {Function} fullName's factory
+      */
+      resolve: function(fullName) {
+        validateFullName(fullName);
+
+        var normalizedName = this.normalize(fullName);
+        var cached = this.resolveCache.get(normalizedName);
+
+        if (cached) { return cached; }
+
+        var resolved = this.resolver(normalizedName) || this.registry.get(normalizedName);
+
+        this.resolveCache.set(normalizedName, resolved);
+
+        return resolved;
+      },
+
+      /**
+        A hook that can be used to describe how the resolver will
+        attempt to find the factory.
+
+        For example, the default Ember `.describe` returns the full
+        class name (including namespace) where Ember's resolver expects
+        to find the `fullName`.
+
+        @method describe
+        @param {String} fullName
+        @return {string} described fullName
+      */
+      describe: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        A hook to enable custom fullName normalization behaviour
+
+        @method normalize
+        @param {String} fullName
+        @return {string} normalized fullName
+      */
+      normalize: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        @method makeToString
+
+        @param {any} factory
+        @param {string} fullName
+        @return {function} toString function
+      */
+      makeToString: function(factory, fullName) {
+        return factory.toString();
+      },
+
+      /**
+        Given a fullName return a corresponding instance.
+
+        The default behaviour is for lookup to return a singleton instance.
+        The singleton is scoped to the container, allowing multiple containers
+        to all have their own locally scoped singletons.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        var twitter = container.lookup('api:twitter');
+
+        twitter instanceof Twitter; // => true
+
+        // by default the container will return singletons
+        var twitter2 = container.lookup('api:twitter');
+        twitter2 instanceof Twitter; // => true
+
+        twitter === twitter2; //=> true
+        ```
+
+        If singletons are not wanted an optional flag can be provided at lookup.
+
+        ```javascript
+        var container = new Container();
+        container.register('api:twitter', Twitter);
+
+        var twitter = container.lookup('api:twitter', { singleton: false });
+        var twitter2 = container.lookup('api:twitter', { singleton: false });
+
+        twitter === twitter2; //=> false
+        ```
+
+        @method lookup
+        @param {String} fullName
+        @param {Object} options
+        @return {any}
+      */
+      lookup: function(fullName, options) {
+        validateFullName(fullName);
+        return lookup(this, this.normalize(fullName), options);
+      },
+
+      /**
+        Given a fullName return the corresponding factory.
+
+        @method lookupFactory
+        @param {String} fullName
+        @return {any}
+      */
+      lookupFactory: function(fullName) {
+        validateFullName(fullName);
+        return factoryFor(this, this.normalize(fullName));
+      },
+
+      /**
+        Given a fullName check if the container is aware of its factory
+        or singleton instance.
+
+        @method has
+        @param {String} fullName
+        @return {Boolean}
+      */
+      has: function(fullName) {
+        validateFullName(fullName);
+        return has(this, this.normalize(fullName));
+      },
+
+      /**
+        Allow registering options for all factories of a type.
+
+        ```javascript
+        var container = new Container();
+
+        // if all of type `connection` must not be singletons
+        container.optionsForType('connection', { singleton: false });
+
+        container.register('connection:twitter', TwitterConnection);
+        container.register('connection:facebook', FacebookConnection);
+
+        var twitter = container.lookup('connection:twitter');
+        var twitter2 = container.lookup('connection:twitter');
+
+        twitter === twitter2; // => false
+
+        var facebook = container.lookup('connection:facebook');
+        var facebook2 = container.lookup('connection:facebook');
+
+        facebook === facebook2; // => false
+        ```
+
+        @method optionsForType
+        @param {String} type
+        @param {Object} options
+      */
+      optionsForType: function(type, options) {
+        if (this.parent) { illegalChildOperation('optionsForType'); }
+
+        this._typeOptions.set(type, options);
+      },
+
+      /**
+        @method options
+        @param {String} type
+        @param {Object} options
+      */
+      options: function(type, options) {
+        this.optionsForType(type, options);
+      },
+
+      /**
+        Used only via `injection`.
+
+        Provides a specialized form of injection, specifically enabling
+        all objects of one type to be injected with a reference to another
+        object.
+
+        For example, provided each object of type `controller` needed a `router`.
+        one would do the following:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('router:main', Router);
+        container.register('controller:user', UserController);
+        container.register('controller:post', PostController);
+
+        container.typeInjection('controller', 'router', 'router:main');
+
+        var user = container.lookup('controller:user');
+        var post = container.lookup('controller:post');
+
+        user.router instanceof Router; //=> true
+        post.router instanceof Router; //=> true
+
+        // both controllers share the same router
+        user.router === post.router; //=> true
+        ```
+
+        @private
+        @method typeInjection
+        @param {String} type
+        @param {String} property
+        @param {String} fullName
+      */
+      typeInjection: function(type, property, fullName) {
+        validateFullName(fullName);
+        if (this.parent) { illegalChildOperation('typeInjection'); }
+
+        var fullNameType = fullName.split(':')[0];
+        if(fullNameType === type) {
+          throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
+        }
+        addTypeInjection(this.typeInjections, type, property, fullName);
+      },
+
+      /**
+        Defines injection rules.
+
+        These rules are used to inject dependencies onto objects when they
+        are instantiated.
+
+        Two forms of injections are possible:
+
+        * Injecting one fullName on another fullName
+        * Injecting one fullName on a type
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('source:main', Source);
+        container.register('model:user', User);
+        container.register('model:post', Post);
+
+        // injecting one fullName on another fullName
+        // eg. each user model gets a post model
+        container.injection('model:user', 'post', 'model:post');
+
+        // injecting one fullName on another type
+        container.injection('model', 'source', 'source:main');
+
+        var user = container.lookup('model:user');
+        var post = container.lookup('model:post');
+
+        user.source instanceof Source; //=> true
+        post.source instanceof Source; //=> true
+
+        user.post instanceof Post; //=> true
+
+        // and both models share the same source
+        user.source === post.source; //=> true
+        ```
+
+        @method injection
+        @param {String} factoryName
+        @param {String} property
+        @param {String} injectionName
+      */
+      injection: function(fullName, property, injectionName) {
+        if (this.parent) { illegalChildOperation('injection'); }
+
+        validateFullName(injectionName);
+        var normalizedInjectionName = this.normalize(injectionName);
+
+        if (fullName.indexOf(':') === -1) {
+          return this.typeInjection(fullName, property, normalizedInjectionName);
+        }
+
+        validateFullName(fullName);
+        var normalizedName = this.normalize(fullName);
+
+        addInjection(this.injections, normalizedName, property, normalizedInjectionName);
+      },
+
+
+      /**
+        Used only via `factoryInjection`.
+
+        Provides a specialized form of injection, specifically enabling
+        all factory of one type to be injected with a reference to another
+        object.
+
+        For example, provided each factory of type `model` needed a `store`.
+        one would do the following:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('store:main', SomeStore);
+
+        container.factoryTypeInjection('model', 'store', 'store:main');
+
+        var store = container.lookup('store:main');
+        var UserFactory = container.lookupFactory('model:user');
+
+        UserFactory.store instanceof SomeStore; //=> true
+        ```
+
+        @private
+        @method factoryTypeInjection
+        @param {String} type
+        @param {String} property
+        @param {String} fullName
+      */
+      factoryTypeInjection: function(type, property, fullName) {
+        if (this.parent) { illegalChildOperation('factoryTypeInjection'); }
+
+        addTypeInjection(this.factoryTypeInjections, type, property, this.normalize(fullName));
+      },
+
+      /**
+        Defines factory injection rules.
+
+        Similar to regular injection rules, but are run against factories, via
+        `Container#lookupFactory`.
+
+        These rules are used to inject objects onto factories when they
+        are looked up.
+
+        Two forms of injections are possible:
+
+      * Injecting one fullName on another fullName
+      * Injecting one fullName on a type
+
+        Example:
+
+        ```javascript
+        var container = new Container();
+
+        container.register('store:main', Store);
+        container.register('store:secondary', OtherStore);
+        container.register('model:user', User);
+        container.register('model:post', Post);
+
+        // injecting one fullName on another type
+        container.factoryInjection('model', 'store', 'store:main');
+
+        // injecting one fullName on another fullName
+        container.factoryInjection('model:post', 'secondaryStore', 'store:secondary');
+
+        var UserFactory = container.lookupFactory('model:user');
+        var PostFactory = container.lookupFactory('model:post');
+        var store = container.lookup('store:main');
+
+        UserFactory.store instanceof Store; //=> true
+        UserFactory.secondaryStore instanceof OtherStore; //=> false
+
+        PostFactory.store instanceof Store; //=> true
+        PostFactory.secondaryStore instanceof OtherStore; //=> true
+
+        // and both models share the same source instance
+        UserFactory.store === PostFactory.store; //=> true
+        ```
+
+        @method factoryInjection
+        @param {String} factoryName
+        @param {String} property
+        @param {String} injectionName
+      */
+      factoryInjection: function(fullName, property, injectionName) {
+        if (this.parent) { illegalChildOperation('injection'); }
+
+        var normalizedName = this.normalize(fullName);
+        var normalizedInjectionName = this.normalize(injectionName);
+
+        validateFullName(injectionName);
+
+        if (fullName.indexOf(':') === -1) {
+          return this.factoryTypeInjection(normalizedName, property, normalizedInjectionName);
+        }
+
+        validateFullName(fullName);
+
+        addInjection(this.factoryInjections, normalizedName, property, normalizedInjectionName);
+      },
+
+      /**
+        A depth first traversal, destroying the container, its descendant containers and all
+        their managed objects.
+
+        @method destroy
+      */
+      destroy: function() {
+        for (var i=0, l=this.children.length; i<l; i++) {
+          this.children[i].destroy();
+        }
+
+        this.children = [];
+
+        eachDestroyable(this, function(item) {
+          item.destroy();
+        });
+
+        this.parent = undefined;
+        this.isDestroyed = true;
+      },
+
+      /**
+        @method reset
+      */
+      reset: function() {
+        for (var i=0, l=this.children.length; i<l; i++) {
+          resetCache(this.children[i]);
+        }
+        resetCache(this);
+      }
+    };
+
+    function has(container, fullName){
+      if (container.cache.has(fullName)) {
+        return true;
+      }
+
+      return !!container.resolve(fullName);
+    }
+
+    function lookup(container, fullName, options) {
+      options = options || {};
+
+      if (container.cache.has(fullName) && options.singleton !== false) {
+        return container.cache.get(fullName);
+      }
+
+      var value = instantiate(container, fullName);
+
+      if (value === undefined) { return; }
+
+      if (isSingleton(container, fullName) && options.singleton !== false) {
+        container.cache.set(fullName, value);
+      }
+
+      return value;
+    }
+
+    function illegalChildOperation(operation) {
+      throw new Error(operation + " is not currently supported on child containers");
+    }
+
+    function isSingleton(container, fullName) {
+      var singleton = option(container, fullName, 'singleton');
+
+      return singleton !== false;
+    }
+
+    function buildInjections(container, injections) {
+      var hash = {};
+
+      if (!injections) { return hash; }
+
+      var injection, injectable;
+
+      for (var i=0, l=injections.length; i<l; i++) {
+        injection = injections[i];
+        injectable = lookup(container, injection.fullName);
+
+        if (injectable !== undefined) {
+          hash[injection.property] = injectable;
+        } else {
+          throw new Error('Attempting to inject an unknown injection: `' + injection.fullName + '`');
+        }
+      }
+
+      return hash;
+    }
+
+    function option(container, fullName, optionName) {
+      var options = container._options.get(fullName);
+
+      if (options && options[optionName] !== undefined) {
+        return options[optionName];
+      }
+
+      var type = fullName.split(":")[0];
+      options = container._typeOptions.get(type);
+
+      if (options) {
+        return options[optionName];
+      }
+    }
+
+    function factoryFor(container, fullName) {
+      var name = fullName;
+      var factory = container.resolve(name);
+      var injectedFactory;
+      var cache = container.factoryCache;
+      var type = fullName.split(":")[0];
+
+      if (factory === undefined) { return; }
+
+      if (cache.has(fullName)) {
+        return cache.get(fullName);
+      }
+
+      if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
+        // TODO: think about a 'safe' merge style extension
+        // for now just fallback to create time injection
+        return factory;
+      } else {
+
+        var injections        = injectionsFor(container, fullName);
+        var factoryInjections = factoryInjectionsFor(container, fullName);
+
+        factoryInjections._toString = container.makeToString(factory, fullName);
+
+        injectedFactory = factory.extend(injections);
+        injectedFactory.reopenClass(factoryInjections);
+
+        cache.set(fullName, injectedFactory);
+
+        return injectedFactory;
+      }
+    }
+
+    function injectionsFor(container, fullName) {
+      var splitName = fullName.split(":"),
+        type = splitName[0],
+        injections = [];
+
+      injections = injections.concat(container.typeInjections.get(type) || []);
+      injections = injections.concat(container.injections[fullName] || []);
+
+      injections = buildInjections(container, injections);
+      injections._debugContainerKey = fullName;
+      injections.container = container;
+
+      return injections;
+    }
+
+    function factoryInjectionsFor(container, fullName) {
+      var splitName = fullName.split(":"),
+        type = splitName[0],
+        factoryInjections = [];
+
+      factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
+      factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
+
+      factoryInjections = buildInjections(container, factoryInjections);
+      factoryInjections._debugContainerKey = fullName;
+
+      return factoryInjections;
+    }
+
+    function instantiate(container, fullName) {
+      var factory = factoryFor(container, fullName);
+
+      if (option(container, fullName, 'instantiate') === false) {
+        return factory;
+      }
+
+      if (factory) {
+        if (typeof factory.extend === 'function') {
+          // assume the factory was extendable and is already injected
+          return factory.create();
+        } else {
+          // assume the factory was extendable
+          // to create time injections
+          // TODO: support new'ing for instantiation and merge injections for pure JS Functions
+          return factory.create(injectionsFor(container, fullName));
+        }
+      }
+    }
+
+    function eachDestroyable(container, callback) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        callback(value);
+      });
+    }
+
+    function resetCache(container) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        value.destroy();
+      });
+      container.cache.dict = {};
+    }
+
+    function addTypeInjection(rules, type, property, fullName) {
+      var injections = rules.get(type);
+
+      if (!injections) {
+        injections = [];
+        rules.set(type, injections);
+      }
+
+      injections.push({
+        property: property,
+        fullName: fullName
+      });
+    }
+
+    var VALID_FULL_NAME_REGEXP = /^[^:]+.+:[^:]+$/;
+    function validateFullName(fullName) {
+      if (!VALID_FULL_NAME_REGEXP.test(fullName)) {
+        throw new TypeError('Invalid Fullname, expected: `type:name` got: ' + fullName);
+      }
+    }
+
+    function addInjection(rules, factoryName, property, injectionName) {
+      var injections = rules[factoryName] = rules[factoryName] || [];
+      injections.push({ property: property, fullName: injectionName });
+    }
+
+    __exports__["default"] = Container;
+  });define("ember-runtime/ext/rsvp",
+  ["ember-metal/core","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var Logger = __dependency2__["default"];
+
+    var RSVP = requireModule("rsvp");
+    var Test, testModuleName = 'ember-testing/test';
+
+    RSVP.onerrorDefault = function(error) {
+      if (error instanceof Error) {
+        if (Ember.testing) {
+          // ES6TODO: remove when possible
+          if (!Test && Ember.__loader.registry[testModuleName]) {
+            Test = requireModule(testModuleName)['default'];
+          }
+
+          if (Test && Test.adapter) {
+            Test.adapter.exception(error);
+          } else {
+            throw error;
+          }
+        } else if (Ember.onerror) {
+          Ember.onerror(error);
+        } else {
+          Logger.error(error.stack);
+                  }
+      }
+    };
+
+    RSVP.on('error', RSVP.onerrorDefault);
+
+    __exports__["default"] = RSVP;
+  });define("ember-runtime/system/container",
+  ["ember-metal/property_set","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var set = __dependency1__["default"];
+
+    var Container = requireModule('container')["default"];
+    Container.set = set;
+
+    __exports__["default"] = Container;
+  });(function() {
+// ensure that minispade loads the following modules first
+// ensure that the global exports have occurred for above
+// required packages
+requireModule('ember-metal');
+requireModule('ember-runtime');
+requireModule('ember-handlebars');
+requireModule('ember-views');
+requireModule('ember-routing');
+requireModule('ember-application');
+requireModule('ember-extension-support');
+
+// do this to ensure that Ember.Test is defined properly on the global
+// if it is present.
+if (Ember.__loader.registry['ember-testing']) {
+  requireModule('ember-testing');
+}
+
+/**
+Ember
+
+@module ember
+*/
+
+function throwWithMessage(msg) {
+  return function() {
+    throw new Ember.Error(msg);
+  };
+}
+
+function generateRemovedClass(className) {
+  var msg = " has been moved into a plugin: https://github.com/emberjs/ember-states";
+
+  return {
+    extend: throwWithMessage(className + msg),
+    create: throwWithMessage(className + msg)
+  };
+}
+
+Ember.StateManager = generateRemovedClass("Ember.StateManager");
+
+/**
+  This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
+
+  @class StateManager
+  @namespace Ember
+*/
+
+Ember.State = generateRemovedClass("Ember.State");
+
+/**
+  This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
+
+  @class State
+  @namespace Ember
+*/
+
+})();
+
+
+})();
+
+
+if (typeof location !== 'undefined' && (location.hostname === 'localhost' || location.hostname === '127.0.0.1')) {
+  Ember.Logger.warn("You are running a production build of Ember on localhost and won't receive detailed error messages. "+
+               "If you want full error messages please use the non-minified build provided on the Ember website.");
+}

From a20d0da066b78496b4774dff15ed2e74ff5e9820 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Fri, 19 Jan 2024 10:17:52 +0000
Subject: [PATCH 027/241] deps: add a comment to explain why ember versions
 don't match

---
 Gemfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e74c3d4d..8cec83326 100644
--- a/Gemfile
+++ b/Gemfile
@@ -172,13 +172,15 @@ gem 'bootstrap-sass', '2.3.2.2' # TODO: latest 3.4.1 @ 2019. Can't upgrade unles
 
 # Ember
 gem 'ember-rails', '~> 0.21.0' # Latest @ 2017
-# gem 'ember-rails', '0.14.1' # TODO: upgrade to latest after Rails 5
 
-gem 'ember-source', '1.8.0' # TODO: just a wrapwrapper. Any update will change the ember.js version.
-# gem 'ember-source', '1.6.1' # TODO: just a wrapwrapper. Any update will change the ember.js version.
+# NOTE: These old versions are necessary to avoid bundler fetcing newer versions
+# of ember-source and ember-data-source, but actually we use even older versions
+# added to version control generated by:
+#
+#     $ rails generate ember:install --tag=v1.6.1 --ember
+#     $ rails generate ember:install --tag=v0.14 --ember-data
 
-gem 'ember-data-source', '1.13.0' # TODO: just a wrapwrapper. Any update will change the JS ember-data version.
-# gem 'ember-data-source', '0.14' # TODO: just a wrapwrapper. Any update will change the JS ember-data version.
+gem 'ember-source', '1.8.0' # NOTE: not what we actually use
+gem 'ember-data-source', '1.13.0' # NOTE: not what we actually use
 
 gem 'handlebars-source', '1.0.12' # TODO: just a wrapwrapper. Any update will change the handlebars.js version.
-# gem 'handlebars-source', '1.0.12' # TODO: just a wrapwrapper. Any update will change the handlebars.js version.

From 7789207c53a795b65f63d6ffd96782eaeccc1253 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Fri, 19 Jan 2024 10:36:13 +0000
Subject: [PATCH 028/241] fix: assets with the plus symbol in the name were
 returning 404s

---
 .../{species+_logo.png => species_plus_logo.png}    | Bin
 ...logo_header.png => species_plus_logo_header.png} | Bin
 ...small.png => species_plus_logo_header_small.png} | Bin
 ...es+_logo_text.png => species_plus_logo_text.png} | Bin
 ...t_small.png => species_plus_logo_text_small.png} | Bin
 app/assets/stylesheets/species/all.scss             |   8 ++++----
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename app/assets/images/species/{species+_logo.png => species_plus_logo.png} (100%)
 rename app/assets/images/species/{species+_logo_header.png => species_plus_logo_header.png} (100%)
 rename app/assets/images/species/{species+_logo_header_small.png => species_plus_logo_header_small.png} (100%)
 rename app/assets/images/species/{species+_logo_text.png => species_plus_logo_text.png} (100%)
 rename app/assets/images/species/{species+_logo_text_small.png => species_plus_logo_text_small.png} (100%)

diff --git a/app/assets/images/species/species+_logo.png b/app/assets/images/species/species_plus_logo.png
similarity index 100%
rename from app/assets/images/species/species+_logo.png
rename to app/assets/images/species/species_plus_logo.png
diff --git a/app/assets/images/species/species+_logo_header.png b/app/assets/images/species/species_plus_logo_header.png
similarity index 100%
rename from app/assets/images/species/species+_logo_header.png
rename to app/assets/images/species/species_plus_logo_header.png
diff --git a/app/assets/images/species/species+_logo_header_small.png b/app/assets/images/species/species_plus_logo_header_small.png
similarity index 100%
rename from app/assets/images/species/species+_logo_header_small.png
rename to app/assets/images/species/species_plus_logo_header_small.png
diff --git a/app/assets/images/species/species+_logo_text.png b/app/assets/images/species/species_plus_logo_text.png
similarity index 100%
rename from app/assets/images/species/species+_logo_text.png
rename to app/assets/images/species/species_plus_logo_text.png
diff --git a/app/assets/images/species/species+_logo_text_small.png b/app/assets/images/species/species_plus_logo_text_small.png
similarity index 100%
rename from app/assets/images/species/species+_logo_text_small.png
rename to app/assets/images/species/species_plus_logo_text_small.png
diff --git a/app/assets/stylesheets/species/all.scss b/app/assets/stylesheets/species/all.scss
index 006060dde..24341a674 100755
--- a/app/assets/stylesheets/species/all.scss
+++ b/app/assets/stylesheets/species/all.scss
@@ -110,14 +110,14 @@ p.browsehappy a {
   float: left;
   text-indent: -9999px;
   overflow: hidden;
-  background: image-url('species/species+_logo_header.png') no-repeat;
+  background: image-url('species/species_plus_logo_header.png') no-repeat;
   background-size:100%;
 }
 
 html.lt-ie9 #header .logo{
   background: none;
   filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(
-  src='species/species+_logo_header.png',
+  src='species/species_plus_logo_header.png',
   sizingMethod='scale');
 }
 
@@ -256,7 +256,7 @@ span.beta{
   display: inline-block;
   overflow: hidden;
   text-indent: -9999px;
-  background: image-url('species/species+_logo_text.png') no-repeat;
+  background: image-url('species/species_plus_logo_text.png') no-repeat;
   background-size: 100%;
 }
 .text-species {
@@ -271,7 +271,7 @@ span.beta{
 html.lt-ie9 .text-species{
   background: none;
   filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(
-  src='species/species+_logo_text.png',
+  src='species/species_plus_logo_text.png',
   sizingMethod='scale');
 }
 a.learn-more {

From 65ae7b7182398a868d085d3dc122234693d04ecd Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 11:46:04 +0000
Subject: [PATCH 029/241] remove gem Clerk, and reimplement it, to remove
 dependency. Clerk broken Rails 5.0 belongs_to.

---
 Gemfile                                       |  3 +--
 Gemfile.lock                                  |  8 +------
 app/controllers/application_controller.rb     |  6 ++++-
 app/models/annotation.rb                      |  2 +-
 app/models/cites_process.rb                   |  2 +-
 app/models/comment.rb                         |  2 +-
 app/models/common_name.rb                     |  2 +-
 app/models/concerns/track_who_does_it.rb      | 23 +++++++++++++++++++
 app/models/distribution.rb                    |  2 +-
 app/models/distribution_reference.rb          |  2 +-
 app/models/document.rb                        |  2 +-
 app/models/document_citation.rb               |  2 +-
 app/models/document_citation_geo_entity.rb    |  2 +-
 app/models/document_citation_taxon_concept.rb |  2 +-
 app/models/eu_decision.rb                     |  2 +-
 app/models/event.rb                           |  2 +-
 app/models/listing_change.rb                  |  2 +-
 app/models/listing_distribution.rb            |  2 +-
 app/models/nomenclature_change.rb             |  2 +-
 app/models/nomenclature_change/input.rb       |  2 +-
 app/models/nomenclature_change/output.rb      |  2 +-
 .../reassignment_helpers.rb                   |  2 +-
 .../reassignment_target.rb                    |  2 +-
 app/models/reference.rb                       |  2 +-
 app/models/taxon_common.rb                    |  2 +-
 app/models/taxon_concept.rb                   |  2 +-
 app/models/taxon_concept_reference.rb         |  2 +-
 app/models/taxon_instrument.rb                |  2 +-
 app/models/taxon_relationship.rb              |  2 +-
 app/models/trade/annual_report_upload.rb      |  2 +-
 app/models/trade/shipment.rb                  |  2 +-
 app/models/trade_restriction.rb               |  2 +-
 app/models/trade_restriction_purpose.rb       |  2 +-
 app/models/trade_restriction_source.rb        |  2 +-
 app/models/trade_restriction_term.rb          |  2 +-
 app/models/user.rb                            |  1 -
 spec/models/user_spec.rb                      |  2 +-
 spec/spec_helper.rb                           |  4 ++--
 38 files changed, 64 insertions(+), 45 deletions(-)
 create mode 100644 app/models/concerns/track_who_does_it.rb

diff --git a/Gemfile b/Gemfile
index 1237c5559..575430d83 100644
--- a/Gemfile
+++ b/Gemfile
@@ -136,8 +136,7 @@ end
 
 gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest version is 1.6.4 @ 2018
 
-# track who created or edited a given object
-gem 'clerk', '0.2.3' # TODO: Need update to 1.0.0 when upgrade to Rails 5. I would say should update our code and just use paper_trail. This gem last update at 2018.
+gem 'request_store', '~> 1.5', '>= 1.5.1'
 gem 'paper_trail', '4.2.0' # TODO: latest is 15.1.0. Need upgrade to v5 for Rails 5.
 
 gem 'dotenv-rails', '2.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 49f95f034..0525c8450 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -128,10 +128,6 @@ GEM
     chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
-    clerk (0.2.3)
-      activerecord (> 3)
-      railties (> 3.1)
-      sentient_user (>= 0.3.3)
     codeclimate-test-reporter (0.1.1)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.3)
@@ -464,8 +460,6 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sentient_user (0.4.0)
-      railties (>= 3.1)
     sidekiq (4.2.10)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
@@ -578,7 +572,6 @@ DEPENDENCIES
   capybara (= 2.2.1)
   carrierwave (= 1.3.1)
   chartkick (= 2.3.5)
-  clerk (= 0.2.3)
   codeclimate-test-reporter (= 0.1.1)
   coffee-rails (= 4.2.2)
   coveralls (= 0.7.1)
@@ -622,6 +615,7 @@ DEPENDENCIES
   rbnacl (= 4.0.2)
   rbnacl-libsodium (= 1.0.16)
   redis-rails (= 5.0.2)
+  request_store (~> 1.5, >= 1.5.1)
   responders (~> 2.0)
   rest-client (= 1.8.0)
   rspec-collection_matchers (= 1.1.3)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 204d41073..48e18c211 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  include SentientController
+  before_filter :track_who_does_it_current_user
   before_filter :set_locale
   before_filter :configure_permitted_parameters, if: :devise_controller?
 
@@ -45,6 +45,10 @@ def configure_permitted_parameters
 
   private
 
+  def track_who_does_it_current_user
+    RequestStore.store[:track_who_does_it_current_user] = current_user
+  end
+
   def set_locale
     I18n.locale = params[:locale] || I18n.default_locale
   end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 600b0f2d0..631ff0a46 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -23,7 +23,7 @@
 #
 
 class Annotation < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :listing_change_id, :symbol, :parent_symbol, :short_note_en,
     :full_note_en, :short_note_fr, :full_note_fr, :short_note_es, :full_note_es,
     :display_in_index, :display_in_footnote, :event_id
diff --git a/app/models/cites_process.rb b/app/models/cites_process.rb
index b9a96dcc4..2b412bd57 100644
--- a/app/models/cites_process.rb
+++ b/app/models/cites_process.rb
@@ -1,5 +1,5 @@
 class CitesProcess < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :start_event_id, :geo_entity_id, :resolution, :start_date,
                   :taxon_concept_id, :notes, :status, :document, :document_title,
                   :created_by_id, :updated_by_id
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 9fdd19dba..5042bcf96 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -14,7 +14,7 @@
 #
 
 class Comment < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :comment_type, :commentable_id, :commentable_type, :note,
     :created_by_id, :updated_by_id
   belongs_to :commentable, polymorphic: true
diff --git a/app/models/common_name.rb b/app/models/common_name.rb
index d43fe50e1..a400f2efe 100644
--- a/app/models/common_name.rb
+++ b/app/models/common_name.rb
@@ -12,7 +12,7 @@
 #
 
 class CommonName < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :language_id, :name,
     :created_by_id, :updated_by_id
   belongs_to :language
diff --git a/app/models/concerns/track_who_does_it.rb b/app/models/concerns/track_who_does_it.rb
new file mode 100644
index 000000000..ddb46b772
--- /dev/null
+++ b/app/models/concerns/track_who_does_it.rb
@@ -0,0 +1,23 @@
+module TrackWhoDoesIt
+  extend ActiveSupport::Concern
+
+  included do
+    before_create :track_who_does_it_create_callback
+    before_update :track_who_does_it_update_callback
+    belongs_to :creator, class_name: 'User', foreign_key: 'created_by_id'#, optional: true # TODO, enable that for Rails 5
+    belongs_to :updater, class_name: 'User', foreign_key: 'updated_by_id'#, optional: true # TODO, enable that for Rails 5
+  end
+
+  private
+
+  def track_who_does_it_create_callback
+    current_user = RequestStore.store[:track_who_does_it_current_user]
+    self.creator = current_user if respond_to?(:creator) && current_user
+    self.updater = current_user if respond_to?(:updater) && current_user
+  end
+
+  def track_who_does_it_update_callback
+    current_user = RequestStore.store[:track_who_does_it_current_user]
+    self.updater = current_user if respond_to?(:updater) && current_user
+  end
+end
diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index 7d61ccb33..1694e5ada 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -13,7 +13,7 @@
 #
 
 class Distribution < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :geo_entity_id, :taxon_concept_id, :tag_list,
     :references_attributes, :internal_notes, :created_by_id, :updated_by_id
   acts_as_taggable
diff --git a/app/models/distribution_reference.rb b/app/models/distribution_reference.rb
index 5010c832d..c105e97a0 100644
--- a/app/models/distribution_reference.rb
+++ b/app/models/distribution_reference.rb
@@ -12,7 +12,7 @@
 #
 
 class DistributionReference < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :reference_id, :distribution_id, :created_by_id,
     :updated_by_id
 
diff --git a/app/models/document.rb b/app/models/document.rb
index 92a571a97..d9de67b0f 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -29,7 +29,7 @@ class Document < ActiveRecord::Base
   pg_search_scope :search_by_title, :against => :title,
     :using => { :tsearch => { :prefix => true } },
     :order_within_rank => "documents.date, documents.title, documents.id"
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :event_id, :filename, :date, :type, :title, :is_public,
     :language_id, :citations_attributes,
     :sort_index, :discussion_id, :discussion_sort_index,
diff --git a/app/models/document_citation.rb b/app/models/document_citation.rb
index 424f5f495..50221caf1 100644
--- a/app/models/document_citation.rb
+++ b/app/models/document_citation.rb
@@ -12,7 +12,7 @@
 #
 
 class DocumentCitation < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :document_id, :stringy_taxon_concept_ids, :geo_entity_ids
   has_many :document_citation_taxon_concepts, dependent: :destroy, autosave: true
   has_many :taxon_concepts, through: :document_citation_taxon_concepts
diff --git a/app/models/document_citation_geo_entity.rb b/app/models/document_citation_geo_entity.rb
index 4110c7f60..772cb88a4 100644
--- a/app/models/document_citation_geo_entity.rb
+++ b/app/models/document_citation_geo_entity.rb
@@ -12,7 +12,7 @@
 #
 
 class DocumentCitationGeoEntity < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :created_by_id, :document_citation_id, :geo_entity_id, :updated_by_id
   belongs_to :geo_entity
   belongs_to :document_citation, touch: true
diff --git a/app/models/document_citation_taxon_concept.rb b/app/models/document_citation_taxon_concept.rb
index 02877f825..d84c568db 100644
--- a/app/models/document_citation_taxon_concept.rb
+++ b/app/models/document_citation_taxon_concept.rb
@@ -12,7 +12,7 @@
 #
 
 class DocumentCitationTaxonConcept < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :created_by_id, :document_citation_id, :taxon_concept_id, :updated_by_id,
     :updated_at
   belongs_to :taxon_concept
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index e138c0dc5..c82a3ce4b 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -29,7 +29,7 @@
 require 'digest/sha1'
 require 'csv'
 class EuDecision < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :end_date, :end_event_id, :geo_entity_id, :internal_notes,
     :is_current, :notes, :start_date, :start_event_id, :eu_decision_type_id,
     :taxon_concept_id, :type, :conditions_apply, :term_id, :source_id,
diff --git a/app/models/event.rb b/app/models/event.rb
index 5d0bd51eb..bfa1fafee 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -24,7 +24,7 @@
 #
 
 class Event < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :name, :designation_id, :description, :extended_description,
     :url, :private_url, :multilingual_url, :published_at, :effective_at, :is_current, :end_date,
     :created_by_id, :updated_by_id
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 7373e8645..d47c0a187 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -27,7 +27,7 @@
 #
 
 class ListingChange < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :taxon_concept_id, :species_listing_id, :change_type_id,
     :effective_at, :is_current, :parent_id, :geo_entity_ids,
     :party_listing_distribution_attributes, :inclusion_taxon_concept_id,
diff --git a/app/models/listing_distribution.rb b/app/models/listing_distribution.rb
index 1d5550933..c0715e1a7 100644
--- a/app/models/listing_distribution.rb
+++ b/app/models/listing_distribution.rb
@@ -14,7 +14,7 @@
 #
 
 class ListingDistribution < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :geo_entity_id, :listing_change_id, :is_party
   belongs_to :geo_entity
   belongs_to :listing_change
diff --git a/app/models/nomenclature_change.rb b/app/models/nomenclature_change.rb
index 832305892..29bc129d2 100644
--- a/app/models/nomenclature_change.rb
+++ b/app/models/nomenclature_change.rb
@@ -16,7 +16,7 @@ class NomenclatureChange < ActiveRecord::Base
   include Dictionary
   include StatusDictionary
   build_steps
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :event_id, :status
 
   belongs_to :event
diff --git a/app/models/nomenclature_change/input.rb b/app/models/nomenclature_change/input.rb
index f2ea35e01..07d410d38 100644
--- a/app/models/nomenclature_change/input.rb
+++ b/app/models/nomenclature_change/input.rb
@@ -18,7 +18,7 @@
 # Represents an input of a nomenclature change.
 # Inputs are required to be existing taxon concepts.
 class NomenclatureChange::Input < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :nomenclature_change_id, :taxon_concept_id,
     :note_en, :note_es, :note_fr, :internal_note,
     :parent_reassignments_attributes,
diff --git a/app/models/nomenclature_change/output.rb b/app/models/nomenclature_change/output.rb
index 57129c727..a2dccea4e 100644
--- a/app/models/nomenclature_change/output.rb
+++ b/app/models/nomenclature_change/output.rb
@@ -33,7 +33,7 @@
 # Outputs may be new taxon concepts, created as a result of the nomenclature
 # change.
 class NomenclatureChange::Output < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessor :output_type # New taxon, Existing subspecies, Existing taxon
   attr_accessible :nomenclature_change_id, :taxon_concept_id,
     :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
diff --git a/app/models/nomenclature_change/reassignment_helpers.rb b/app/models/nomenclature_change/reassignment_helpers.rb
index 210f2eee6..32d70c6d5 100644
--- a/app/models/nomenclature_change/reassignment_helpers.rb
+++ b/app/models/nomenclature_change/reassignment_helpers.rb
@@ -2,7 +2,7 @@ module NomenclatureChange::ReassignmentHelpers
 
   def self.included(base)
     base.class_eval do
-      track_who_does_it
+      include TrackWhoDoesIt
       attr_accessible :type, :reassignable_id, :reassignable_type,
         :nomenclature_change_input_id, :nomenclature_change_output_id,
         :note_en, :note_es, :note_fr, :internal_note, :output_ids
diff --git a/app/models/nomenclature_change/reassignment_target.rb b/app/models/nomenclature_change/reassignment_target.rb
index 8afc362e1..783fc1b1a 100644
--- a/app/models/nomenclature_change/reassignment_target.rb
+++ b/app/models/nomenclature_change/reassignment_target.rb
@@ -12,7 +12,7 @@
 #
 
 class NomenclatureChange::ReassignmentTarget < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :nomenclature_change_output_id,
     :nomenclature_change_reassignment_id, :note
   belongs_to :output, :class_name => NomenclatureChange::Output,
diff --git a/app/models/reference.rb b/app/models/reference.rb
index 9f82c49ab..c4bd5ca80 100644
--- a/app/models/reference.rb
+++ b/app/models/reference.rb
@@ -17,7 +17,7 @@
 #
 
 class Reference < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :citation, :created_by_id, :updated_by_id
 
   validates :citation, :presence => true
diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index fb7c4dea2..489895f0b 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -12,7 +12,7 @@
 #
 
 class TaxonCommon < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :common_name_id, :taxon_concept_id, :created_by_id,
     :updated_by_id, :name, :language_id
   attr_accessor :name, :language_id
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index 9eb2da679..c890d6fd4 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -31,7 +31,7 @@
 #
 
 class TaxonConcept < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   has_paper_trail class_name: 'TaxonConceptVersion', on: :destroy,
     meta: {
       taxon_concept_id: :id,
diff --git a/app/models/taxon_concept_reference.rb b/app/models/taxon_concept_reference.rb
index 06d5fbc7d..ea20a4501 100644
--- a/app/models/taxon_concept_reference.rb
+++ b/app/models/taxon_concept_reference.rb
@@ -15,7 +15,7 @@
 #
 
 class TaxonConceptReference < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
     :excluded_taxon_concepts_ids, :reference_attributes,
     :created_by_id, :updated_by_id
diff --git a/app/models/taxon_instrument.rb b/app/models/taxon_instrument.rb
index 3d5667ada..39a0f74b0 100644
--- a/app/models/taxon_instrument.rb
+++ b/app/models/taxon_instrument.rb
@@ -13,7 +13,7 @@
 #
 
 class TaxonInstrument < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :effective_from, :instrument_id, :taxon_concept_id
 
   belongs_to :instrument
diff --git a/app/models/taxon_relationship.rb b/app/models/taxon_relationship.rb
index 6a96cc205..214b0d8ab 100644
--- a/app/models/taxon_relationship.rb
+++ b/app/models/taxon_relationship.rb
@@ -13,7 +13,7 @@
 #
 
 class TaxonRelationship < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
     :created_by_id, :updated_by_id
   belongs_to :taxon_relationship_type
diff --git a/app/models/trade/annual_report_upload.rb b/app/models/trade/annual_report_upload.rb
index 5a7f3f6a7..d6bed2046 100644
--- a/app/models/trade/annual_report_upload.rb
+++ b/app/models/trade/annual_report_upload.rb
@@ -20,7 +20,7 @@
 require 'csv_column_headers_validator'
 class Trade::AnnualReportUpload < ActiveRecord::Base
   include ActiveModel::ForbiddenAttributesProtection
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :csv_source_file, :trading_country_id, :point_of_view,
                   :submitted_at, :submitted_by_id, :number_of_rows,
                   :number_of_records_submitted, :aws_storage_path
diff --git a/app/models/trade/shipment.rb b/app/models/trade/shipment.rb
index cd769d34f..f454ffc37 100644
--- a/app/models/trade/shipment.rb
+++ b/app/models/trade/shipment.rb
@@ -32,7 +32,7 @@
 #
 
 class Trade::Shipment < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :annual_report_upload_id, :appendix,
     :country_of_origin_id, :origin_permit_id,
     :exporter_id, :import_permit_id, :importer_id, :purpose_id,
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index b3a3abda4..cc6d0f510 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -33,7 +33,7 @@
 require 'digest/sha1'
 require 'csv'
 class TradeRestriction < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :end_date, :geo_entity_id, :is_current,
     :notes, :publication_date, :purpose_ids, :quota, :type,
     :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
diff --git a/app/models/trade_restriction_purpose.rb b/app/models/trade_restriction_purpose.rb
index cbe4887cb..6f4039384 100644
--- a/app/models/trade_restriction_purpose.rb
+++ b/app/models/trade_restriction_purpose.rb
@@ -12,7 +12,7 @@
 #
 
 class TradeRestrictionPurpose < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :purpose_id, :trade_restriction_id
   belongs_to :trade_restriction
   belongs_to :purpose, :class_name => 'TradeCode'
diff --git a/app/models/trade_restriction_source.rb b/app/models/trade_restriction_source.rb
index 408bd3458..6b0a2eebe 100644
--- a/app/models/trade_restriction_source.rb
+++ b/app/models/trade_restriction_source.rb
@@ -12,7 +12,7 @@
 #
 
 class TradeRestrictionSource < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :source_id, :trade_restriction_id
   belongs_to :trade_restriction
   belongs_to :source, :class_name => 'TradeCode'
diff --git a/app/models/trade_restriction_term.rb b/app/models/trade_restriction_term.rb
index 5e8c3f8b2..eea418844 100644
--- a/app/models/trade_restriction_term.rb
+++ b/app/models/trade_restriction_term.rb
@@ -12,7 +12,7 @@
 #
 
 class TradeRestrictionTerm < ActiveRecord::Base
-  track_who_does_it
+  include TrackWhoDoesIt
   attr_accessible :term_id, :trade_restriction_id
   belongs_to :trade_restriction
   belongs_to :term, :class_name => 'TradeCode'
diff --git a/app/models/user.rb b/app/models/user.rb
index 0193057aa..ccf326093 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,7 +24,6 @@
 #
 
 class User < ActiveRecord::Base
-  include SentientUser
   devise :database_authenticatable, :registerable, :recoverable, :rememberable,
     :trackable, :validatable
   attr_accessible :email, :name, :password, :password_confirmation,
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 94508582d..60f50ff35 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -41,7 +41,7 @@
     context "when dependent objects attached" do
       let(:user) { create(:user) }
       before(:each) do
-        user.make_current
+        RequestStore.store[:track_who_does_it_current_user] = user
         create(:shipment)
       end
       specify { expect(user.destroy).to be_falsey }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6ecce131b..2c55f9bae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -57,7 +57,7 @@
   config.before(:all) do
     DatabaseCleaner.clean_with(:deletion, { :cache_tables => false })
     @user = create(:user)
-    @user.make_current
+    RequestStore.store[:track_who_does_it_current_user] = @user
   end
 
   config.before(:each) do
@@ -77,7 +77,7 @@
     DatabaseCleaner.clean
     # this is duplicated here because of the :drops_tables specs
     @user = create(:user)
-    @user.make_current
+    RequestStore.store[:track_who_does_it_current_user] = @user
   end
 
   config.before(:each) do |example|

From 3dc4495df66169014f8d2b8aca6be537be7d0799 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 24 Jan 2024 10:14:42 +0000
Subject: [PATCH 030/241] add more tests to help isolate the document citation
 touch issue

---
 app/models/document_search.rb       |   1 +
 spec/models/document_search_spec.rb | 146 +++++++++++++++++++++++++---
 2 files changed, 131 insertions(+), 16 deletions(-)

diff --git a/app/models/document_search.rb b/app/models/document_search.rb
index 37c900223..c3ea39460 100644
--- a/app/models/document_search.rb
+++ b/app/models/document_search.rb
@@ -234,6 +234,7 @@ def self.documents_need_refreshing?
   end
 
   def self.citations_need_refreshing?
+    puts DocumentCitation.where('updated_at > ?', REFRESH_INTERVAL.minutes.ago).to_sql
     DocumentCitation.where('updated_at > ?', REFRESH_INTERVAL.minutes.ago).limit(1).count > 0 ||
     DocumentCitation.count < DocumentCitation.select('DISTINCT id').
       from('document_citations_mview AS citations').count
diff --git a/spec/models/document_search_spec.rb b/spec/models/document_search_spec.rb
index 244dfb2ad..622e8c481 100644
--- a/spec/models/document_search_spec.rb
+++ b/spec/models/document_search_spec.rb
@@ -289,77 +289,191 @@
   end
 
   describe :documents_need_refreshing? do
+    # Where DocumentSearch::REFRESH_INTERVAL is 5,
+    #
+    # - @d is a Document::Proposal created 6 minutes ago
+    # - refresh_citations_and_documents has been run, so api_documents_mview
+    #   should be up-to-date.
+    #
+    # In these tests we will check that making changes to @d 4 minutes ago
+    # causes documents_need_refreshing to become true.
+
     before(:each) do
       @d = nil
+
       travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL + 1).minutes) do
         @d = create(:proposal)
         DocumentSearch.refresh_citations_and_documents
       end
     end
+
     context "when no changes in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
       specify { expect(DocumentSearch.documents_need_refreshing?).to be_falsey }
     end
+
     context "when document created in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
       specify do
         travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
           create(:proposal)
         end
+
         expect(DocumentSearch.documents_need_refreshing?).to be_truthy
       end
     end
+
     context "when document destroyed in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
       specify do
         travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
           @d.destroy
         end
+
         expect(DocumentSearch.documents_need_refreshing?).to be_truthy
       end
     end
+
     context "when document updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
       specify do
         travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
-          @d.update_attributes(is_public: true) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          @d.update_attributes!(is_public: true) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
         end
+
         expect(DocumentSearch.documents_need_refreshing?).to be_truthy
       end
     end
   end
 
   describe :citations_need_refreshing? do
+    # Where DocumentSearch::REFRESH_INTERVAL is 5,
+    #
+    # - @refresh_threshold is 5 minutes ago
+    # - @recent_time is 4 minutes ago
+    # - @d is a Document::Proposal created 6 minutes ago, as are the following:
+    # - @c is a DocumentCitation, belonging to @d
+    # - @c_tc is a DocumentCitationTaxonConcept belonging to @c
+    # - @c_ge is a DocumentCitationGeoEntity belonging to @c
+    # - refresh_citations_and_documents has been run, so api_documents_mview
+    #   should be up-to-date.
+    #
+    # In these tests we will check that making changes 4 minutes ago to any of
+    # the models which depend directly or indirectly on the Document model will
+    # cause documents_need_refreshing to become true.
+
     before(:each) do
       @d = nil
+      @ge2 = create(
+        :geo_entity,
+        geo_entity_type: country_geo_entity_type,
+        name: 'Brazil',
+        iso_code2: 'BR'
+      )
+
       travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL + 1).minutes) do
         @d = create(:proposal)
         @c = create(:document_citation, document: @d)
         @c_tc = create(:document_citation_taxon_concept, document_citation: @c)
+        @c_ge = create(:document_citation_geo_entity, document_citation: @c)
+
         DocumentSearch.refresh_citations_and_documents
       end
     end
+
     context "when no changes in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
       specify { expect(DocumentSearch.citations_need_refreshing?).to be_falsey }
     end
-    context "when citation created in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
-      specify do
-        travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
-          create(:document_citation_taxon_concept, document_citation: @c)
+
+    context 'when DocumentCitation' do
+      context "created in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            create(:document_citation, document: @d)
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
+        end
+      end
+
+      context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            @c.update_attributes!(elib_legacy_id: 1) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
+        end
+      end
+
+      context "destroyed in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            @c.destroy
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
-        expect(DocumentSearch.citations_need_refreshing?).to be_truthy
       end
     end
-    context "when citation destroyed in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
-      specify do
-        travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
-          @c_tc.destroy
+
+    context 'when DocumentCitationTaxonConcept' do
+      context "created in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            create(:document_citation_taxon_concept, document_citation: @c)
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
+        end
+      end
+
+      context "destroyed in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            @c_tc.destroy
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
+        end
+      end
+
+      context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            @c_tc.update_attributes!(taxon_concept_id: create_cites_eu_species.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
-        expect(DocumentSearch.citations_need_refreshing?).to be_truthy
       end
     end
-    context "when citation updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
-      specify do
-        travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
-          @c_tc.update_attributes(taxon_concept_id: create_cites_eu_species.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+
+    context 'when DocumentCitationGeoEntity' do
+      context "created in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            create(:document_citation_taxon_concept, document_citation: @c)
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
+        end
+      end
+
+      context "destroyed in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            @c_ge.destroy
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
+        end
+      end
+
+      context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
+        specify do
+          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+            @c_ge.update_attributes!(geo_entity_id: @ge2.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          end
+
+          expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
-        expect(DocumentSearch.citations_need_refreshing?).to be_truthy
       end
     end
   end

From 8c310a99fda3ba6fd06a33209a43958bf52377cd Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 24 Jan 2024 11:52:57 +0000
Subject: [PATCH 031/241] in spec, refactor out @recent_time

---
 spec/models/document_search_spec.rb | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/spec/models/document_search_spec.rb b/spec/models/document_search_spec.rb
index 622e8c481..96d20d2ee 100644
--- a/spec/models/document_search_spec.rb
+++ b/spec/models/document_search_spec.rb
@@ -356,10 +356,15 @@
     #
     # In these tests we will check that making changes 4 minutes ago to any of
     # the models which depend directly or indirectly on the Document model will
-    # cause documents_need_refreshing to become true.
+    # cause documents_need_refreshing to become true, by amending the attribute
+    # updated_at on @c and @d
 
     before(:each) do
+      @refresh_threshold = Time.now - (DocumentSearch::REFRESH_INTERVAL).minutes
+      @recent_time = Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes
+
       @d = nil
+
       @ge2 = create(
         :geo_entity,
         geo_entity_type: country_geo_entity_type,
@@ -384,7 +389,7 @@
     context 'when DocumentCitation' do
       context "created in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             create(:document_citation, document: @d)
           end
 
@@ -394,7 +399,7 @@
 
       context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             @c.update_attributes!(elib_legacy_id: 1) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           end
 
@@ -404,7 +409,7 @@
 
       context "destroyed in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             @c.destroy
           end
 
@@ -416,7 +421,7 @@
     context 'when DocumentCitationTaxonConcept' do
       context "created in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             create(:document_citation_taxon_concept, document_citation: @c)
           end
 
@@ -426,7 +431,7 @@
 
       context "destroyed in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             @c_tc.destroy
           end
 
@@ -436,7 +441,7 @@
 
       context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             @c_tc.update_attributes!(taxon_concept_id: create_cites_eu_species.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           end
 
@@ -448,7 +453,7 @@
     context 'when DocumentCitationGeoEntity' do
       context "created in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             create(:document_citation_taxon_concept, document_citation: @c)
           end
 
@@ -458,7 +463,7 @@
 
       context "destroyed in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             @c_ge.destroy
           end
 
@@ -468,7 +473,7 @@
 
       context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
-          travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
+          travel_to(@recent_time) do
             @c_ge.update_attributes!(geo_entity_id: @ge2.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           end
 

From 6b1d2458630267150709684ee8b9a1c656532351 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 24 Jan 2024 12:07:32 +0000
Subject: [PATCH 032/241] Add more detailed tests on behaviour of
 DocumentSearch

---
 spec/models/document_search_spec.rb | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/spec/models/document_search_spec.rb b/spec/models/document_search_spec.rb
index 96d20d2ee..1d668d96b 100644
--- a/spec/models/document_search_spec.rb
+++ b/spec/models/document_search_spec.rb
@@ -383,7 +383,12 @@
     end
 
     context "when no changes in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
-      specify { expect(DocumentSearch.citations_need_refreshing?).to be_falsey }
+      specify do
+        expect(@c.reload.updated_at).to be < @refresh_threshold
+        expect(@d.reload.updated_at).to be < @refresh_threshold
+
+        expect(DocumentSearch.citations_need_refreshing?).to be_falsey
+      end
     end
 
     context 'when DocumentCitation' do
@@ -393,6 +398,7 @@
             create(:document_citation, document: @d)
           end
 
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end
@@ -403,6 +409,8 @@
             @c.update_attributes!(elib_legacy_id: 1) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           end
 
+          expect(@c.reload.updated_at).to be > @refresh_threshold
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end
@@ -413,6 +421,7 @@
             @c.destroy
           end
 
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end
@@ -425,6 +434,8 @@
             create(:document_citation_taxon_concept, document_citation: @c)
           end
 
+          expect(@c.reload.updated_at).to be > @refresh_threshold
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end
@@ -435,6 +446,8 @@
             @c_tc.destroy
           end
 
+          expect(@c.reload.updated_at).to be > @refresh_threshold
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end
@@ -445,6 +458,8 @@
             @c_tc.update_attributes!(taxon_concept_id: create_cites_eu_species.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           end
 
+          expect(@c.reload.updated_at).to be > @refresh_threshold
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end
@@ -457,6 +472,8 @@
             create(:document_citation_taxon_concept, document_citation: @c)
           end
 
+          expect(@c.reload.updated_at).to be > @refresh_threshold
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end
@@ -467,6 +484,8 @@
             @c_ge.destroy
           end
 
+          expect(@c.reload.updated_at).to be > @refresh_threshold
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end
@@ -477,6 +496,8 @@
             @c_ge.update_attributes!(geo_entity_id: @ge2.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
           end
 
+          expect(@c.reload.updated_at).to be > @refresh_threshold
+          expect(@d.reload.updated_at).to be > @refresh_threshold
           expect(DocumentSearch.citations_need_refreshing?).to be_truthy
         end
       end

From 0df258e0154094f000841cb1d77f552bf58399af Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 16:06:58 +0000
Subject: [PATCH 033/241] Remove gem Traco, migrate to Mobility. Traco breaks
 Rails 5.0 belongs_to.

---
 Gemfile                                     |   2 +-
 Gemfile.lock                                |   7 +-
 app/models/annotation.rb                    |   1 +
 app/models/change_type.rb                   |   1 +
 app/models/eu_decision.rb                   |   1 +
 app/models/geo_entity.rb                    |   1 +
 app/models/language.rb                      |   1 +
 app/models/listing_change.rb                |   1 +
 app/models/m_auto_complete_taxon_concept.rb |   1 +
 app/models/m_listing_change.rb              |   8 +-
 app/models/m_taxon_concept.rb               |   1 +
 app/models/rank.rb                          |   1 +
 app/models/taxon_concept.rb                 |   1 +
 app/models/trade_code.rb                    |   1 +
 app/models/trade_restriction.rb             |   1 +
 config/application.rb                       |   3 +
 config/initializers/mobility.rb             | 116 ++++++++++++++++++++
 17 files changed, 141 insertions(+), 7 deletions(-)
 create mode 100644 config/initializers/mobility.rb

diff --git a/Gemfile b/Gemfile
index fa1259cba..db632803d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'pg_search', '2.3.0' # TODO: can upgrade to newer version after Rails 5
 gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
 gem 'inherited_resources', '1.9.0' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
-gem 'traco', '~> 5.3', '>= 5.3.3' # TODO: latest version @ 2021. Suggest migrate to Mobility gem.
+gem 'mobility', '~> 1.2', '>= 1.2.9'
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
 gem 'cancancan', '1.17.0' # TODO, can upgrade to 2.0 after Rails 5
 gem 'ahoy_matey', '2.2.1' # TODO: latest 5.0.2. Can't upgrade to 3.0 until upgrade to Rails 5
diff --git a/Gemfile.lock b/Gemfile.lock
index 806297250..4b9135dbe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -291,6 +291,9 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.15.0)
+    mobility (1.2.9)
+      i18n (>= 0.6.10, < 2)
+      request_store (~> 1.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mutex_m (0.2.0)
@@ -516,8 +519,6 @@ GEM
     timeout (0.4.0)
     tins (1.32.1)
       sync
-    traco (5.3.3)
-      activerecord (>= 4.2)
     ttfunk (1.0.3)
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
@@ -599,6 +600,7 @@ DEPENDENCIES
   json_spec (= 1.1.5)
   kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
+  mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
   nokogiri (= 1.12.5)
@@ -634,7 +636,6 @@ DEPENDENCIES
   strong_migrations (~> 0.3.1)
   susy (~> 2.2, >= 2.2.14)
   test-unit (= 3.1.5)
-  traco (~> 5.3, >= 5.3.3)
   uglifier (>= 1.3.0)
   uuidtools (~> 2.2)
   web-console (~> 2.0)
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 7e2ca6de5..2a061065f 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -23,6 +23,7 @@
 #
 
 class Annotation < ActiveRecord::Base
+  extend Mobility
   include TrackWhoDoesIt
 
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/change_type.rb b/app/models/change_type.rb
index 66fd7aeec..060900d33 100644
--- a/app/models/change_type.rb
+++ b/app/models/change_type.rb
@@ -13,6 +13,7 @@
 #
 
 class ChangeType < ActiveRecord::Base
+  extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
   #   :designation_id
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index 77817ba79..854fc7261 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -29,6 +29,7 @@
 require 'digest/sha1'
 require 'csv'
 class EuDecision < ActiveRecord::Base
+  extend Mobility
   include TrackWhoDoesIt
 
 
diff --git a/app/models/geo_entity.rb b/app/models/geo_entity.rb
index a5a89b34b..0e418a7d7 100644
--- a/app/models/geo_entity.rb
+++ b/app/models/geo_entity.rb
@@ -18,6 +18,7 @@
 #
 
 class GeoEntity < ActiveRecord::Base
+  extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_type_id, :iso_code2, :iso_code3,
   #   :legacy_id, :legacy_type, :long_name, :name_en, :name_es, :name_fr,
diff --git a/app/models/language.rb b/app/models/language.rb
index 61a919e56..e3b76dca1 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -13,6 +13,7 @@
 #
 
 class Language < ActiveRecord::Base
+  extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :iso_code1, :iso_code3, :name_en, :name_fr, :name_es
   translates :name
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 5ac25bcb8..7028f4c0b 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -27,6 +27,7 @@
 #
 
 class ListingChange < ActiveRecord::Base
+  extend Mobility
   include TrackWhoDoesIt
 
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/m_auto_complete_taxon_concept.rb b/app/models/m_auto_complete_taxon_concept.rb
index cfe60dad2..2a447a2bb 100644
--- a/app/models/m_auto_complete_taxon_concept.rb
+++ b/app/models/m_auto_complete_taxon_concept.rb
@@ -23,6 +23,7 @@
 #
 
 class MAutoCompleteTaxonConcept < ActiveRecord::Base
+  extend Mobility
   self.table_name = :auto_complete_taxon_concepts_mview
   self.primary_key = :id
   scope :by_cites_eu_taxonomy, -> { where(:taxonomy_is_cites_eu => true) }
diff --git a/app/models/m_listing_change.rb b/app/models/m_listing_change.rb
index 3d4dcb174..321070239 100644
--- a/app/models/m_listing_change.rb
+++ b/app/models/m_listing_change.rb
@@ -2,15 +2,17 @@ module MListingChange
 
   def self.included(base)
     base.class_eval do
+      extend Mobility
+
       belongs_to :designation
       belongs_to :taxon_concept, :class_name => 'MTaxonConcept'
       belongs_to :listing_change, :foreign_key => :id
       belongs_to :event
-      translates :short_note, fallback: false
-      translates :full_note, fallback: false
+      translates :short_note, fallbacks: false
+      translates :full_note, fallbacks: false
       translates :hash_full_note, :inherited_short_note, :inherited_full_note,
         :auto_note, :party_full_name
-      translates :nomenclature_note, fallback: false
+      translates :nomenclature_note, fallbacks: false
     end
   end
 
diff --git a/app/models/m_taxon_concept.rb b/app/models/m_taxon_concept.rb
index 99c72c9b6..ad230430a 100644
--- a/app/models/m_taxon_concept.rb
+++ b/app/models/m_taxon_concept.rb
@@ -105,6 +105,7 @@
 #
 
 class MTaxonConcept < ActiveRecord::Base
+  extend Mobility
   self.table_name = :taxon_concepts_mview
   self.primary_key = :id
 
diff --git a/app/models/rank.rb b/app/models/rank.rb
index 765a9aacc..4608892c0 100644
--- a/app/models/rank.rb
+++ b/app/models/rank.rb
@@ -14,6 +14,7 @@
 #
 
 class Rank < ActiveRecord::Base
+  extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
   #   :taxonomic_position, :fixed_order
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index 3633218a7..f9452a59a 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -31,6 +31,7 @@
 #
 
 class TaxonConcept < ActiveRecord::Base
+  extend Mobility
   include TrackWhoDoesIt
   has_paper_trail class_name: 'TaxonConceptVersion', on: :destroy,
     meta: {
diff --git a/app/models/trade_code.rb b/app/models/trade_code.rb
index d633df6a4..b12939fe8 100644
--- a/app/models/trade_code.rb
+++ b/app/models/trade_code.rb
@@ -13,6 +13,7 @@
 #
 
 class TradeCode < ActiveRecord::Base
+  extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :code, :type, :name_en, :name_es, :name_fr
   translates :name
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index 9d562ef52..9ace89d75 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -33,6 +33,7 @@
 require 'digest/sha1'
 require 'csv'
 class TradeRestriction < ActiveRecord::Base
+  extend Mobility
   include TrackWhoDoesIt
 
   # Migrated to controller (Strong Parameters)
diff --git a/config/application.rb b/config/application.rb
index f078f6c5f..43df53c59 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -74,5 +74,8 @@ class Application < Rails::Application
     # config.handlebars.templates_root = "trade/templates"
 
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
+
+    config.i18n.available_locales = %i[en es fr]
+    config.i18n.default_locale = :en
   end
 end
diff --git a/config/initializers/mobility.rb b/config/initializers/mobility.rb
new file mode 100644
index 000000000..f4442f0ab
--- /dev/null
+++ b/config/initializers/mobility.rb
@@ -0,0 +1,116 @@
+Mobility.configure do
+  # PLUGINS
+  plugins do
+    # Backend
+    #
+    # Sets the default backend to use in models. This can be overridden in models
+    # by passing +backend: ...+ to +translates+.
+    #
+    # To default to a different backend globally, replace +:key_value+ by another
+    # backend name.
+    #
+    backend :column
+
+    # ActiveRecord
+    #
+    # Defines ActiveRecord as ORM, and enables ActiveRecord-specific plugins.
+    active_record
+
+    # Accessors
+    #
+    # Define reader and writer methods for translated attributes. Remove either
+    # to disable globally, or pass +reader: false+ or +writer: false+ to
+    # +translates+ in any translated model.
+    #
+    reader
+    writer
+
+    # Backend Reader
+    #
+    # Defines reader to access the backend for any attribute, of the form
+    # +<attribute>_backend+.
+    #
+    backend_reader
+    #
+    # Or pass an interpolation string to define a different pattern:
+    # backend_reader "%s_translations"
+
+    # Query
+    #
+    # Defines a scope on the model class which allows querying on
+    # translated attributes. The default scope is named +i18n+, pass a different
+    # name as default to change the global default, or to +translates+ in any
+    # model to change it for that model alone.
+    #
+    # query
+
+    # Cache
+    #
+    # Comment out to disable caching reads and writes.
+    #
+    cache
+
+    # Dirty
+    #
+    # Uncomment this line to include and enable globally:
+    # dirty # Doesn't work in Rails 4.2
+    #
+    # Or uncomment this line to include but disable by default, and only enable
+    # per model by passing +dirty: true+ to +translates+.
+    # dirty false
+
+    # Fallbacks
+    #
+    # Uncomment line below to enable fallbacks, using +I18n.fallbacks+.
+    fallbacks
+    #
+    # Or uncomment this line to enable fallbacks with a global default.
+    # fallbacks { :pt => :en }
+
+    # Presence
+    #
+    # Converts blank strings to nil on reads and writes. Comment out to
+    # disable.
+    #
+    presence
+
+    # Default
+    #
+    # Set a default translation per attributes. When enabled, passing +default:
+    # 'foo'+ sets a default translation string to show in case no translation is
+    # present. Can also be passed a proc.
+    #
+    # default 'foo'
+
+    # Fallthrough Accessors
+    #
+    # Uses method_missing to define locale-specific accessor methods like
+    # +title_en+, +title_en=+, +title_fr+, +title_fr=+ for each translated
+    # attribute. If you know what set of locales you want to support, it's
+    # generally better to use Locale Accessors (or both together) since
+    # +method_missing+ is very slow.  (You can use both fallthrough and locale
+    # accessor plugins together without conflict.)
+    #
+    # fallthrough_accessors
+
+    # Locale Accessors
+    #
+    # Uses +def+ to define accessor methods for a set of locales. By default uses
+    # +I18n.available_locales+, but you can pass the set of locales with
+    # +translates+ and/or set a global default here.
+    #
+    locale_accessors
+    #
+    # Or define specific defaults by uncommenting line below
+    # locale_accessors [:en, :ja]
+
+    # Attribute Methods
+    #
+    # Adds translated attributes to +attributes+ hash, and defines methods
+    # +translated_attributes+ and +untranslated_attributes+ which return hashes
+    # with translated and untranslated attributes, respectively. Be aware that
+    # this plugin can create conflicts with other gems.
+    #
+    # attribute_methods
+  end
+end

From 2a7667e4128f2a2510c1f470ce9c226b83b60b91 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 15:36:40 +0000
Subject: [PATCH 034/241] re-implement Traco's locale_columns methods and admin
 helper.

---
 app/helpers/admin_helper.rb                     | 17 +++++++++++++++++
 .../cites_suspensions/_form_shared.html.erb     |  2 +-
 app/views/admin/eu_opinions/_form.html.erb      |  2 +-
 app/views/admin/hash_annotations/_form.html.erb |  2 +-
 app/views/admin/taxon_concepts/_form.html.erb   |  2 +-
 .../admin/taxon_concepts/_n_name_form.html.erb  |  2 +-
 .../admin/taxon_eu_suspensions/_form.html.erb   |  2 +-
 .../admin/taxon_listing_changes/_form.html.erb  |  6 +++---
 app/views/admin/taxon_quotas/_form.html.erb     |  2 +-
 9 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index d09313dfc..76351f3c7 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -195,4 +195,21 @@ def admin_simple_search
     end
   end
 
+  # Re-implement Traco's locale_columns method. (https://github.com/barsoom/traco#usage)
+  # Returns an array like [:title_sv, :title_en] sorted with current locale first, then default locale, and then
+  # alphabetically.
+  def traco_locale_columns(column_name)
+    all_locales = I18n.available_locales
+    current_locale = I18n.locale
+    result = ["#{column_name}_#{current_locale}"] # current locale 1st.
+    remaining_locales = all_locales - [current_locale]
+    unless I18n.locale == I18n.default_locale
+      result << "#{column_name}_#{I18n.default_locale}" # default locale 2nd.
+      remaining_locales -= I18n.default_locale
+    end
+    remaining_locales.sort.each do |locale| # alphabetically all remaining locales.
+      result << "#{column_name}_#{locale}"
+    end
+    result.map(&:to_sym)
+  end
 end
diff --git a/app/views/admin/cites_suspensions/_form_shared.html.erb b/app/views/admin/cites_suspensions/_form_shared.html.erb
index 7be93932c..fa445688a 100644
--- a/app/views/admin/cites_suspensions/_form_shared.html.erb
+++ b/app/views/admin/cites_suspensions/_form_shared.html.erb
@@ -125,7 +125,7 @@
   <%= render :partial => 'admin/shared/nomenclature_notes_form',
     locals: {
       f: f,
-      locale_columns: CitesSuspension.locale_columns(:nomenclature_note)
+      locale_columns: traco_locale_columns(:nomenclature_note)
     }
   %>
 
diff --git a/app/views/admin/eu_opinions/_form.html.erb b/app/views/admin/eu_opinions/_form.html.erb
index 9c3706967..c0ebb8bf6 100644
--- a/app/views/admin/eu_opinions/_form.html.erb
+++ b/app/views/admin/eu_opinions/_form.html.erb
@@ -126,7 +126,7 @@
   <%= render :partial => 'admin/shared/nomenclature_notes_form',
     locals: {
       f: f,
-      locale_columns: EuOpinion.locale_columns(:nomenclature_note)
+      locale_columns: traco_locale_columns(:nomenclature_note)
     }
   %>
 
diff --git a/app/views/admin/hash_annotations/_form.html.erb b/app/views/admin/hash_annotations/_form.html.erb
index 599c4976c..7694e431a 100644
--- a/app/views/admin/hash_annotations/_form.html.erb
+++ b/app/views/admin/hash_annotations/_form.html.erb
@@ -10,7 +10,7 @@
   <%= f.label :symbol %>
   <%= f.text_field :symbol %>
 
-  <% Annotation.locale_columns(:full_note).each do |column| %>
+  <% traco_locale_columns(:full_note).each do |column| %>
     <%= f.label column %>
     <%= f.text_area column %>
   <% end %>
diff --git a/app/views/admin/taxon_concepts/_form.html.erb b/app/views/admin/taxon_concepts/_form.html.erb
index 52b23acb7..862625fa6 100644
--- a/app/views/admin/taxon_concepts/_form.html.erb
+++ b/app/views/admin/taxon_concepts/_form.html.erb
@@ -57,7 +57,7 @@
   <%= render :partial => 'admin/shared/nomenclature_notes_form',
     locals: {
       f: f,
-      locale_columns: TaxonConcept.locale_columns(:nomenclature_note)
+      locale_columns: traco_locale_columns(:nomenclature_note)
     }
   %>
 <% end %>
diff --git a/app/views/admin/taxon_concepts/_n_name_form.html.erb b/app/views/admin/taxon_concepts/_n_name_form.html.erb
index 808e5385b..76937c268 100644
--- a/app/views/admin/taxon_concepts/_n_name_form.html.erb
+++ b/app/views/admin/taxon_concepts/_n_name_form.html.erb
@@ -57,7 +57,7 @@
   <%= render :partial => 'admin/shared/nomenclature_notes_form',
     locals: {
       f: f,
-      locale_columns: TaxonConcept.locale_columns(:nomenclature_note)
+      locale_columns: traco_locale_columns(:nomenclature_note)
     }
   %>
 <% end %>
diff --git a/app/views/admin/taxon_eu_suspensions/_form.html.erb b/app/views/admin/taxon_eu_suspensions/_form.html.erb
index fa04e185e..db55f34d6 100644
--- a/app/views/admin/taxon_eu_suspensions/_form.html.erb
+++ b/app/views/admin/taxon_eu_suspensions/_form.html.erb
@@ -102,7 +102,7 @@
   <%= render :partial => 'admin/shared/nomenclature_notes_form',
     locals: {
       f: f,
-      locale_columns: EuSuspension.locale_columns(:nomenclature_note)
+      locale_columns: traco_locale_columns(:nomenclature_note)
     }
   %>
 
diff --git a/app/views/admin/taxon_listing_changes/_form.html.erb b/app/views/admin/taxon_listing_changes/_form.html.erb
index c2e373869..88429e11c 100644
--- a/app/views/admin/taxon_listing_changes/_form.html.erb
+++ b/app/views/admin/taxon_listing_changes/_form.html.erb
@@ -194,12 +194,12 @@
 
   <%= f.fields_for :annotation do |ff| %>
     <% if @designation.is_cites? %>
-      <% Annotation.locale_columns(:short_note).each do |column| %>
+      <% traco_locale_columns(:short_note).each do |column| %>
         <%= ff.label column %>
         <%= ff.text_field column, :class => :annotation %>
       <% end %>
     <% end %>
-    <% Annotation.locale_columns(:full_note).each do |column| %>
+    <% traco_locale_columns(:full_note).each do |column| %>
       <%= ff.label column %>
       <%= ff.text_area column, :class => :annotation %>
     <% end %>
@@ -221,7 +221,7 @@
     <%= render :partial => 'admin/shared/nomenclature_notes_form',
       locals: {
         f: f,
-        locale_columns: ListingChange.locale_columns(:nomenclature_note)
+        locale_columns: traco_locale_columns(:nomenclature_note)
       }
     %>
   </div>
diff --git a/app/views/admin/taxon_quotas/_form.html.erb b/app/views/admin/taxon_quotas/_form.html.erb
index 4927b6ad3..f799d8431 100644
--- a/app/views/admin/taxon_quotas/_form.html.erb
+++ b/app/views/admin/taxon_quotas/_form.html.erb
@@ -119,7 +119,7 @@
   <%= render :partial => 'admin/shared/nomenclature_notes_form',
     locals: {
       f: f,
-      locale_columns: Quota.locale_columns(:nomenclature_note)
+      locale_columns: traco_locale_columns(:nomenclature_note)
     }
   %>
 

From 74ac3fcbccb484b2140f82ef45979ec7e358b6ef Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 18:50:17 +0000
Subject: [PATCH 035/241] upgrade rails to 5.0.7.2; able to start the web
 server, but rspec fail.

---
 Gemfile      |   4 +-
 Gemfile.lock | 136 +++++++++++++++++++++++++++------------------------
 2 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/Gemfile b/Gemfile
index db632803d..79b8f863f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,8 @@ source 'https://rubygems.org'
 
 ruby '2.5.9'
 
-gem 'rails', '4.2.11.3'
-# gem 'rails', '5.0.7.2'
+# gem 'rails', '4.2.11.3'
+gem 'rails', '5.0.7.2'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b9135dbe..4005993ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,47 +2,50 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actionmailer (4.2.11.3)
-      actionpack (= 4.2.11.3)
-      actionview (= 4.2.11.3)
-      activejob (= 4.2.11.3)
+    actioncable (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11.3)
-      actionview (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.7.2)
+      actionview (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
     actionpack-page_caching (1.1.1)
       actionpack (>= 4.0.0, < 6)
-    actionview (4.2.11.3)
-      activesupport (= 4.2.11.3)
+    actionview (5.0.7.2)
+      activesupport (= 5.0.7.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active-model-adapter-source (2.1.1)
       ember-data-source (>= 1.13, < 3.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (4.2.11.3)
-      activesupport (= 4.2.11.3)
-      globalid (>= 0.3.0)
-    activemodel (4.2.11.3)
-      activesupport (= 4.2.11.3)
-      builder (~> 3.1)
-    activerecord (4.2.11.3)
-      activemodel (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      arel (~> 6.0)
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
+    activejob (5.0.7.2)
+      activesupport (= 5.0.7.2)
+      globalid (>= 0.3.6)
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      arel (~> 7.0)
+    activesupport (5.0.7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     acts-as-taggable-on (5.0.0)
       activerecord (>= 4.2.8)
@@ -66,7 +69,7 @@ GEM
     appsignal (1.3.3)
       rack
       thread_safe
-    arel (6.0.4)
+    arel (7.1.4)
     ast (2.4.2)
     aws-eventstream (1.3.0)
     aws-sdk (2.11.632)
@@ -143,7 +146,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     coveralls (0.7.1)
       multi_json (~> 1.3)
@@ -208,8 +211,8 @@ GEM
     formatador (1.1.0)
     geocoder (1.8.2)
     geoip (1.3.5)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
     gon (6.4.0)
       actionpack (>= 3.0.20)
       i18n (>= 0.7)
@@ -241,7 +244,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     inherited_resources (1.9.0)
       actionpack (>= 4.2, < 5.3)
@@ -320,6 +323,7 @@ GEM
       timeout
     net-ssh (6.1.0)
     netrc (0.11.0)
+    nio4r (2.7.0)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
@@ -354,38 +358,40 @@ GEM
       method_source (~> 1.0)
     public_suffix (4.0.7)
     racc (1.7.3)
-    rack (1.6.13)
+    rack (2.2.8)
     rack-cors (0.3.0)
     rack-livereload (0.3.11)
       rack
     rack-protection (2.2.4)
       rack
+    rack-session (1.0.2)
+      rack (< 3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.11.3)
-      actionmailer (= 4.2.11.3)
-      actionpack (= 4.2.11.3)
-      actionview (= 4.2.11.3)
-      activejob (= 4.2.11.3)
-      activemodel (= 4.2.11.3)
-      activerecord (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11.3)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.4)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rails (5.0.7.2)
+      actioncable (= 5.0.7.2)
+      actionmailer (= 5.0.7.2)
+      actionpack (= 5.0.7.2)
+      actionview (= 5.0.7.2)
+      activejob (= 5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activerecord (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      bundler (>= 1.3.0)
+      railties (= 5.0.7.2)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (4.2.11.3)
-      actionpack (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
+    railties (5.0.7.2)
+      actionpack (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
@@ -401,15 +407,15 @@ GEM
     rbnacl-libsodium (1.0.16)
       rbnacl (>= 3.0.1)
     redis (3.3.5)
-    redis-actionpack (5.1.0)
-      actionpack (>= 4.0, < 7)
-      redis-rack (>= 1, < 3)
+    redis-actionpack (5.4.0)
+      actionpack (>= 5, < 8)
+      redis-rack (>= 2.1.0, < 4)
       redis-store (>= 1.1.0, < 2)
     redis-activesupport (5.3.0)
       activesupport (>= 3, < 8)
       redis-store (>= 1.3, < 2)
-    redis-rack (2.0.6)
-      rack (>= 1.5, < 3)
+    redis-rack (3.0.0)
+      rack-session (>= 0.2.0)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
@@ -522,23 +528,25 @@ GEM
     ttfunk (1.0.3)
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (4.2.0)
+      execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
     user_agent_parser (2.16.0)
     uuidtools (2.2.0)
-    warden (1.2.7)
-      rack (>= 1.0)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
     webrick (1.3.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
     whenever (0.11.0)
       chronic (>= 0.6.3)
     wicked (1.3.4)
@@ -613,7 +621,7 @@ DEPENDENCIES
   prawn (= 0.13.2)
   rack-cors (= 0.3.0)
   rack-livereload (= 0.3.11)
-  rails (= 4.2.11.3)
+  rails (= 5.0.7.2)
   rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)
   rbnacl-libsodium (= 1.0.16)

From fc96163e3537f8830c4c2a7d72a44bc3c9006b61 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 18 Jan 2024 18:50:43 +0000
Subject: [PATCH 036/241] DEPRECATION WARNING: before_filter is deprecated and
 will be removed in Rails 5.1. Use before_action instead.

---
 app/controllers/admin/admin_controller.rb              |  2 +-
 app/controllers/admin/children_controller.rb           |  2 +-
 .../admin/cites_captivity_processes_controller.rb      |  4 ++--
 app/controllers/admin/cites_suspensions_controller.rb  |  2 +-
 app/controllers/admin/distributions_controller.rb      |  4 ++--
 app/controllers/admin/eu_opinions_controller.rb        |  4 ++--
 app/controllers/admin/geo_entities_controller.rb       |  2 +-
 app/controllers/admin/geo_relationships_controller.rb  |  4 ++--
 .../admin/hybrid_relationships_controller.rb           |  2 +-
 app/controllers/admin/names_controller.rb              |  2 +-
 .../admin/nomenclature_changes/build_controller.rb     |  6 +++---
 .../admin/synonym_relationships_controller.rb          |  2 +-
 .../admin/taxon_cites_suspensions_controller.rb        |  4 ++--
 .../admin/taxon_concept_comments_controller.rb         |  2 +-
 .../admin/taxon_concept_references_controller.rb       |  2 +-
 .../admin/taxon_concept_term_pairs_controller.rb       |  2 +-
 app/controllers/admin/taxon_concepts_controller.rb     | 10 +++++-----
 .../admin/taxon_eu_suspensions_controller.rb           |  4 ++--
 app/controllers/admin/taxon_instruments_controller.rb  |  2 +-
 .../admin/taxon_listing_changes_controller.rb          |  2 +-
 app/controllers/admin/taxon_quotas_controller.rb       |  4 ++--
 .../admin/taxon_relationships_controller.rb            |  4 ++--
 .../admin/term_trade_codes_pairs_controller.rb         |  4 ++--
 .../admin/trade_name_relationships_controller.rb       |  2 +-
 .../api/v1/document_geo_entities_controller.rb         |  2 +-
 app/controllers/api/v1/shipments_controller.rb         |  4 ++--
 app/controllers/application_controller.rb              |  8 ++++----
 app/controllers/species/exports_controller.rb          |  2 +-
 app/controllers/trade_controller.rb                    |  6 +++---
 29 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb
index c6e74cd71..240d65b04 100644
--- a/app/controllers/admin/admin_controller.rb
+++ b/app/controllers/admin/admin_controller.rb
@@ -1,4 +1,4 @@
 class Admin::AdminController < ApplicationController
   layout 'admin'
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
 end
diff --git a/app/controllers/admin/children_controller.rb b/app/controllers/admin/children_controller.rb
index 66fd84d8c..ca55d3b02 100644
--- a/app/controllers/admin/children_controller.rb
+++ b/app/controllers/admin/children_controller.rb
@@ -1,6 +1,6 @@
 class Admin::ChildrenController < Admin::SimpleCrudController
   belongs_to :taxon_concept
-  before_filter :load_search
+  before_action :load_search
   layout 'taxon_concepts'
 
   def index
diff --git a/app/controllers/admin/cites_captivity_processes_controller.rb b/app/controllers/admin/cites_captivity_processes_controller.rb
index 956df325a..4ec81b2fb 100644
--- a/app/controllers/admin/cites_captivity_processes_controller.rb
+++ b/app/controllers/admin/cites_captivity_processes_controller.rb
@@ -1,7 +1,7 @@
 class Admin::CitesCaptivityProcessesController < Admin::SimpleCrudController
   belongs_to :taxon_concept
-  before_filter :load_lib_objects
-  before_filter :load_search, :only => [:new, :index, :edit]
+  before_action :load_lib_objects
+  before_action :load_search, :only => [:new, :index, :edit]
   layout 'taxon_concepts'
 
   def update
diff --git a/app/controllers/admin/cites_suspensions_controller.rb b/app/controllers/admin/cites_suspensions_controller.rb
index 4bcce98eb..156372d49 100644
--- a/app/controllers/admin/cites_suspensions_controller.rb
+++ b/app/controllers/admin/cites_suspensions_controller.rb
@@ -1,5 +1,5 @@
 class Admin::CitesSuspensionsController < Admin::StandardAuthorizationController
-  before_filter :load_lib_objects, :only => [:new, :edit]
+  before_action :load_lib_objects, :only => [:new, :edit]
 
   def create
     create! do |success, failure|
diff --git a/app/controllers/admin/distributions_controller.rb b/app/controllers/admin/distributions_controller.rb
index 75672b1e6..4886cb23d 100644
--- a/app/controllers/admin/distributions_controller.rb
+++ b/app/controllers/admin/distributions_controller.rb
@@ -1,8 +1,8 @@
 class Admin::DistributionsController < Admin::TaxonConceptAssociatedTypesController
   respond_to :js, :only => [:new, :edit, :create, :update]
   belongs_to :taxon_concept
-  before_filter :load_tags_and_geo_entities, :only => [:new, :edit]
-  before_filter :load_search, :only => [:index]
+  before_action :load_tags_and_geo_entities, :only => [:new, :edit]
+  before_action :load_search, :only => [:index]
 
   def index
     @distributions = @taxon_concept.distributions.
diff --git a/app/controllers/admin/eu_opinions_controller.rb b/app/controllers/admin/eu_opinions_controller.rb
index f191d1fd9..bda739c57 100644
--- a/app/controllers/admin/eu_opinions_controller.rb
+++ b/app/controllers/admin/eu_opinions_controller.rb
@@ -1,7 +1,7 @@
 class Admin::EuOpinionsController < Admin::StandardAuthorizationController
   belongs_to :taxon_concept
-  before_filter :load_lib_objects
-  before_filter :load_search, :only => [:new, :index, :edit]
+  before_action :load_lib_objects
+  before_action :load_search, :only => [:new, :index, :edit]
 
   layout 'taxon_concepts'
 
diff --git a/app/controllers/admin/geo_entities_controller.rb b/app/controllers/admin/geo_entities_controller.rb
index 20b687fe9..6c006afb4 100644
--- a/app/controllers/admin/geo_entities_controller.rb
+++ b/app/controllers/admin/geo_entities_controller.rb
@@ -1,6 +1,6 @@
 class Admin::GeoEntitiesController < Admin::StandardAuthorizationController
 
-  before_filter :load_geo_entity_types, :only => [:index, :create]
+  before_action :load_geo_entity_types, :only => [:index, :create]
 
   def index
     index! do |format|
diff --git a/app/controllers/admin/geo_relationships_controller.rb b/app/controllers/admin/geo_relationships_controller.rb
index 649888d57..60ac3b25a 100644
--- a/app/controllers/admin/geo_relationships_controller.rb
+++ b/app/controllers/admin/geo_relationships_controller.rb
@@ -1,8 +1,8 @@
 class Admin::GeoRelationshipsController < Admin::StandardAuthorizationController
 
   belongs_to :geo_entity
-  before_filter :load_geo_relationship_types, :only => [:index, :create]
-  before_filter :load_geo_entities, :only => [:index, :create]
+  before_action :load_geo_relationship_types, :only => [:index, :create]
+  before_action :load_geo_entities, :only => [:index, :create]
 
   def index
     index! do
diff --git a/app/controllers/admin/hybrid_relationships_controller.rb b/app/controllers/admin/hybrid_relationships_controller.rb
index 97c690169..5f866ed2c 100644
--- a/app/controllers/admin/hybrid_relationships_controller.rb
+++ b/app/controllers/admin/hybrid_relationships_controller.rb
@@ -2,7 +2,7 @@ class Admin::HybridRelationshipsController < Admin::TaxonConceptAssociatedTypesC
   defaults :resource_class => TaxonRelationship, :collection_name => 'hybrid_relationships', :instance_name => 'hybrid_relationship'
   respond_to :js, :only => [:new, :edit, :create, :update]
   belongs_to :taxon_concept
-  before_filter :load_hybrid_relationship_type, :only => [:new, :create, :update]
+  before_action :load_hybrid_relationship_type, :only => [:new, :create, :update]
 
   authorize_resource :class => false
 
diff --git a/app/controllers/admin/names_controller.rb b/app/controllers/admin/names_controller.rb
index db97aa7e6..8032859e2 100644
--- a/app/controllers/admin/names_controller.rb
+++ b/app/controllers/admin/names_controller.rb
@@ -1,7 +1,7 @@
 class Admin::NamesController < Admin::SimpleCrudController
   belongs_to :taxon_concept
 
-  before_filter :load_search
+  before_action :load_search
   layout 'taxon_concepts'
 
   authorize_resource :class => false
diff --git a/app/controllers/admin/nomenclature_changes/build_controller.rb b/app/controllers/admin/nomenclature_changes/build_controller.rb
index c1a5cbede..810e495e2 100644
--- a/app/controllers/admin/nomenclature_changes/build_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/build_controller.rb
@@ -1,9 +1,9 @@
 class Admin::NomenclatureChanges::BuildController < Admin::AdminController
   include Wicked::Wizard
 
-  before_filter :set_nomenclature_change, :only => [:show, :update, :destroy]
-  before_filter :unset_back, only: [:update]
-  before_filter :authorise_finish, only: [:update]
+  before_action :set_nomenclature_change, :only => [:show, :update, :destroy]
+  before_action :unset_back, only: [:update]
+  before_action :authorise_finish, only: [:update]
 
   def finish_wizard_path
     admin_nomenclature_changes_path
diff --git a/app/controllers/admin/synonym_relationships_controller.rb b/app/controllers/admin/synonym_relationships_controller.rb
index 943a533ca..a6421ced1 100644
--- a/app/controllers/admin/synonym_relationships_controller.rb
+++ b/app/controllers/admin/synonym_relationships_controller.rb
@@ -2,7 +2,7 @@ class Admin::SynonymRelationshipsController < Admin::TaxonConceptAssociatedTypes
   defaults :resource_class => TaxonRelationship, :collection_name => 'synonym_relationships', :instance_name => 'synonym_relationship'
   respond_to :js, :only => [:new, :edit, :create, :update]
   belongs_to :taxon_concept
-  before_filter :load_synonym_relationship_type, :only => [:new, :create, :update]
+  before_action :load_synonym_relationship_type, :only => [:new, :create, :update]
 
   def new
     new! do |format|
diff --git a/app/controllers/admin/taxon_cites_suspensions_controller.rb b/app/controllers/admin/taxon_cites_suspensions_controller.rb
index df0486d59..cd08586ae 100644
--- a/app/controllers/admin/taxon_cites_suspensions_controller.rb
+++ b/app/controllers/admin/taxon_cites_suspensions_controller.rb
@@ -3,8 +3,8 @@ class Admin::TaxonCitesSuspensionsController < Admin::SimpleCrudController
     :collection_name => 'cites_suspensions', :instance_name => 'cites_suspension'
   belongs_to :taxon_concept
 
-  before_filter :load_lib_objects, :only => [:new, :edit]
-  before_filter :load_search, :except => [:create, :destroy]
+  before_action :load_lib_objects, :only => [:new, :edit]
+  before_action :load_search, :except => [:create, :destroy]
   layout 'taxon_concepts'
 
   authorize_resource :class => false
diff --git a/app/controllers/admin/taxon_concept_comments_controller.rb b/app/controllers/admin/taxon_concept_comments_controller.rb
index 4dbeb5632..7e990df1c 100644
--- a/app/controllers/admin/taxon_concept_comments_controller.rb
+++ b/app/controllers/admin/taxon_concept_comments_controller.rb
@@ -2,7 +2,7 @@ class Admin::TaxonConceptCommentsController < Admin::SimpleCrudController
   defaults :resource_class => Comment, :collection_name => 'comments',
     :instance_name => 'comment'
   belongs_to :taxon_concept
-  before_filter :load_search
+  before_action :load_search
   layout 'taxon_concepts'
   authorize_resource :class => false
 
diff --git a/app/controllers/admin/taxon_concept_references_controller.rb b/app/controllers/admin/taxon_concept_references_controller.rb
index 48d2e4d40..e1109138c 100644
--- a/app/controllers/admin/taxon_concept_references_controller.rb
+++ b/app/controllers/admin/taxon_concept_references_controller.rb
@@ -1,7 +1,7 @@
 class Admin::TaxonConceptReferencesController < Admin::StandardAuthorizationController
   defaults :resource_class => TaxonConceptReference, :collection_name => 'taxon_concept_references', :instance_name => 'taxon_concept_reference'
   belongs_to :taxon_concept
-  before_filter :load_search, :only => [:index]
+  before_action :load_search, :only => [:index]
   respond_to :js, :only => [:new, :create]
   layout 'taxon_concepts'
 
diff --git a/app/controllers/admin/taxon_concept_term_pairs_controller.rb b/app/controllers/admin/taxon_concept_term_pairs_controller.rb
index 4325d0249..3feeeded8 100644
--- a/app/controllers/admin/taxon_concept_term_pairs_controller.rb
+++ b/app/controllers/admin/taxon_concept_term_pairs_controller.rb
@@ -1,6 +1,6 @@
 class Admin::TaxonConceptTermPairsController < Admin::SimpleCrudController
 
-  before_filter :load_term_codes, :only => [:index, :create]
+  before_action :load_term_codes, :only => [:index, :create]
   defaults :resource_class => Trade::TaxonConceptTermPair,
     :collection_name => 'taxon_concept_term_pairs', :instance_name => 'taxon_concept_term_pair'
 
diff --git a/app/controllers/admin/taxon_concepts_controller.rb b/app/controllers/admin/taxon_concepts_controller.rb
index dc276da91..878cf4b2c 100644
--- a/app/controllers/admin/taxon_concepts_controller.rb
+++ b/app/controllers/admin/taxon_concepts_controller.rb
@@ -1,11 +1,11 @@
 class Admin::TaxonConceptsController < Admin::StandardAuthorizationController
   respond_to :json
   layout :determine_layout
-  before_filter :sanitize_search_params, :only => [:index, :autocomplete]
-  before_filter :load_taxonomies, only: [:index, :edit]
-  before_filter :load_ranks, only: [:index, :edit]
-  before_filter :load_tags, :only => [:index, :edit]
-  before_filter :split_stringified_ids_lists, only: [:create, :update]
+  before_action :sanitize_search_params, :only => [:index, :autocomplete]
+  before_action :load_taxonomies, only: [:index, :edit]
+  before_action :load_ranks, only: [:index, :edit]
+  before_action :load_tags, :only => [:index, :edit]
+  before_action :split_stringified_ids_lists, only: [:create, :update]
 
   def index
     @taxon_concept = TaxonConcept.new
diff --git a/app/controllers/admin/taxon_eu_suspensions_controller.rb b/app/controllers/admin/taxon_eu_suspensions_controller.rb
index 5b7adfd8a..6b939fe6e 100644
--- a/app/controllers/admin/taxon_eu_suspensions_controller.rb
+++ b/app/controllers/admin/taxon_eu_suspensions_controller.rb
@@ -2,8 +2,8 @@ class Admin::TaxonEuSuspensionsController < Admin::SimpleCrudController
   belongs_to :taxon_concept
   defaults :resource_class => EuSuspension,
     :collection_name => 'eu_suspensions', :instance_name => 'eu_suspension'
-  before_filter :load_lib_objects
-  before_filter :load_search, :only => [:new, :index, :edit]
+  before_action :load_lib_objects
+  before_action :load_search, :only => [:new, :index, :edit]
 
   layout 'taxon_concepts'
 
diff --git a/app/controllers/admin/taxon_instruments_controller.rb b/app/controllers/admin/taxon_instruments_controller.rb
index ce0b9a433..323537136 100644
--- a/app/controllers/admin/taxon_instruments_controller.rb
+++ b/app/controllers/admin/taxon_instruments_controller.rb
@@ -1,7 +1,7 @@
 class Admin::TaxonInstrumentsController < Admin::TaxonConceptAssociatedTypesController
   respond_to :js, :only => [:create, :update]
   belongs_to :taxon_concept
-  before_filter :load_search, :only => [:new, :index, :edit, :create]
+  before_action :load_search, :only => [:new, :index, :edit, :create]
   layout 'taxon_concepts'
 
   def index
diff --git a/app/controllers/admin/taxon_listing_changes_controller.rb b/app/controllers/admin/taxon_listing_changes_controller.rb
index ffd3a269a..48965b6f3 100644
--- a/app/controllers/admin/taxon_listing_changes_controller.rb
+++ b/app/controllers/admin/taxon_listing_changes_controller.rb
@@ -3,7 +3,7 @@ class Admin::TaxonListingChangesController < Admin::SimpleCrudController
   defaults :resource_class => ListingChange,
     :collection_name => 'listing_changes', :instance_name => 'listing_change'
   belongs_to :taxon_concept, :designation
-  before_filter :load_search, :except => [:create, :update, :destroy]
+  before_action :load_search, :except => [:create, :update, :destroy]
   layout 'taxon_concepts'
 
   authorize_resource :class => false
diff --git a/app/controllers/admin/taxon_quotas_controller.rb b/app/controllers/admin/taxon_quotas_controller.rb
index 9e9a91a32..865115045 100644
--- a/app/controllers/admin/taxon_quotas_controller.rb
+++ b/app/controllers/admin/taxon_quotas_controller.rb
@@ -3,8 +3,8 @@ class Admin::TaxonQuotasController < Admin::SimpleCrudController
     :collection_name => 'quotas', :instance_name => 'quota'
   belongs_to :taxon_concept
 
-  before_filter :load_lib_objects
-  before_filter :load_search, :except => [:destroy]
+  before_action :load_lib_objects
+  before_action :load_search, :except => [:destroy]
   layout 'taxon_concepts'
 
   authorize_resource :class => false
diff --git a/app/controllers/admin/taxon_relationships_controller.rb b/app/controllers/admin/taxon_relationships_controller.rb
index 8ce083af4..43a59d715 100644
--- a/app/controllers/admin/taxon_relationships_controller.rb
+++ b/app/controllers/admin/taxon_relationships_controller.rb
@@ -1,8 +1,8 @@
 class Admin::TaxonRelationshipsController < Admin::StandardAuthorizationController
 
   belongs_to :taxon_concept
-  before_filter :load_taxon_relationship_types, :only => [:index, :create]
-  before_filter :load_search, :except => [:create, :update, :destroy]
+  before_action :load_taxon_relationship_types, :only => [:index, :create]
+  before_action :load_search, :except => [:create, :update, :destroy]
   layout 'taxon_concepts'
 
   def index
diff --git a/app/controllers/admin/term_trade_codes_pairs_controller.rb b/app/controllers/admin/term_trade_codes_pairs_controller.rb
index 25a22df32..1a1bfb108 100644
--- a/app/controllers/admin/term_trade_codes_pairs_controller.rb
+++ b/app/controllers/admin/term_trade_codes_pairs_controller.rb
@@ -1,7 +1,7 @@
 class Admin::TermTradeCodesPairsController < Admin::StandardAuthorizationController
 
-  before_filter :load_term_codes, :only => [:index, :create]
-  before_filter :load_trade_code_types, :only => [:index, :create]
+  before_action :load_term_codes, :only => [:index, :create]
+  before_action :load_trade_code_types, :only => [:index, :create]
 
   def index
     load_associations
diff --git a/app/controllers/admin/trade_name_relationships_controller.rb b/app/controllers/admin/trade_name_relationships_controller.rb
index f8ba53d73..ddd150c8d 100644
--- a/app/controllers/admin/trade_name_relationships_controller.rb
+++ b/app/controllers/admin/trade_name_relationships_controller.rb
@@ -2,7 +2,7 @@ class Admin::TradeNameRelationshipsController < Admin::TaxonConceptAssociatedTyp
   defaults :resource_class => TaxonRelationship, :collection_name => 'trade_name_relationships', :instance_name => 'trade_name_relationship'
   respond_to :js, :only => [:new, :edit, :create, :update]
   belongs_to :taxon_concept
-  before_filter :load_trade_name_relationship_type, :only => [:new, :create, :update]
+  before_action :load_trade_name_relationship_type, :only => [:new, :create, :update]
 
   def new
     new! do |format|
diff --git a/app/controllers/api/v1/document_geo_entities_controller.rb b/app/controllers/api/v1/document_geo_entities_controller.rb
index 04ed30c27..8034bf3a1 100644
--- a/app/controllers/api/v1/document_geo_entities_controller.rb
+++ b/app/controllers/api/v1/document_geo_entities_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::DocumentGeoEntitiesController < ApplicationController
-  before_filter :set_locale
+  before_action :set_locale
 
   def index
     @geo_entities = GeoEntity.current.includes(:geo_entity_type).
diff --git a/app/controllers/api/v1/shipments_controller.rb b/app/controllers/api/v1/shipments_controller.rb
index 5c95a962b..327de27bd 100644
--- a/app/controllers/api/v1/shipments_controller.rb
+++ b/app/controllers/api/v1/shipments_controller.rb
@@ -1,8 +1,8 @@
 class Api::V1::ShipmentsController < ApplicationController
   respond_to :json
 
-  before_filter :authenticate
-  before_filter :load_grouping_type
+  before_action :authenticate
+  before_action :load_grouping_type
   after_filter only: [:grouped_query, :country_query] do
     set_pagination_headers(:data, :grouped_params)
   end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ca61285d6..0bb9daabb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,9 +1,9 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_filter :track_who_does_it_current_user
-  before_filter :set_locale
-  before_filter :configure_permitted_parameters, if: :devise_controller?
-  before_filter :set_paper_trail_whodunnit
+  before_action :track_who_does_it_current_user
+  before_action :set_locale
+  before_action :configure_permitted_parameters, if: :devise_controller?
+  before_action :set_paper_trail_whodunnit
 
   rescue_from CanCan::AccessDenied, with: :access_denied_error
 
diff --git a/app/controllers/species/exports_controller.rb b/app/controllers/species/exports_controller.rb
index 4a2b3c779..9357b4c17 100644
--- a/app/controllers/species/exports_controller.rb
+++ b/app/controllers/species/exports_controller.rb
@@ -1,5 +1,5 @@
 class Species::ExportsController < ApplicationController
-  before_filter :ensure_data_type_and_filters, :only => [:download]
+  before_action :ensure_data_type_and_filters, :only => [:download]
 
   def download
     set_csv_separator
diff --git a/app/controllers/trade_controller.rb b/app/controllers/trade_controller.rb
index d869bffe4..fad2a9235 100644
--- a/app/controllers/trade_controller.rb
+++ b/app/controllers/trade_controller.rb
@@ -1,8 +1,8 @@
 class TradeController < ApplicationController
 
-  before_filter :authenticate_user!
-  before_filter :verify_manager_or_secretariat_or_active, except: [:update, :create, :submit, :destroy]
-  before_filter :verify_manager, only: [:update, :create, :submit, :destroy, :update_batch, :destroy_batch]
+  before_action :authenticate_user!
+  before_action :verify_manager_or_secretariat_or_active, except: [:update, :create, :submit, :destroy]
+  before_action :verify_manager, only: [:update, :create, :submit, :destroy, :update_batch, :destroy_batch]
 
   def user_can_edit
     render json: { can_edit: current_user.is_manager? && current_user.is_active? }

From ca20bf388aae3c9003ad7ad8df5de385aefbe012 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 10:05:29 +0000
Subject: [PATCH 037/241] rails app:update

---
 bin/rails                                     |  2 +-
 bin/setup                                     | 29 ++++++-----
 bin/update                                    | 29 +++++++++++
 config/application.rb                         | 49 +------------------
 config/boot.rb                                |  2 +-
 config/cable.yml                              |  9 ++++
 config/environment.rb                         |  2 +-
 config/environments/development.rb            | 35 +++++++------
 config/environments/production.rb             | 43 +++++++++-------
 config/environments/test.rb                   | 12 ++---
 .../application_controller_renderer.rb        |  8 +++
 config/initializers/cookies_serializer.rb     |  4 +-
 config/initializers/new_framework_defaults.rb | 25 ++++++++++
 config/initializers/wrap_parameters.rb        |  4 +-
 config/puma.rb                                | 47 ++++++++++++++++++
 config/spring.rb                              |  6 +++
 16 files changed, 203 insertions(+), 103 deletions(-)
 create mode 100755 bin/update
 create mode 100644 config/cable.yml
 create mode 100644 config/initializers/application_controller_renderer.rb
 create mode 100644 config/initializers/new_framework_defaults.rb
 create mode 100644 config/puma.rb
 create mode 100644 config/spring.rb

diff --git a/bin/rails b/bin/rails
index 5191e6927..073966023 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/setup b/bin/setup
index acdb2c138..e620b4dad 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,29 +1,34 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end
diff --git a/bin/update b/bin/update
new file mode 100755
index 000000000..a8e4462f2
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/config/application.rb b/config/application.rb
index 43df53c59..ac6df23f1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,12 +1,7 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
-# Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "sprockets/railtie"
+require 'rails/all'
 require "susy"
-# require "rails/test_unit/railtie"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -22,10 +17,6 @@ class Application < Rails::Application
     # config.autoload_paths += %W(#{config.root}/extras)
     config.autoload_paths += %W(#{config.root}/lib/modules)
 
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
     # Activate observers that should always be running.
     config.active_record.observers = :destroy_observer, :annotation_observer,
       :cites_cop_observer, :cites_suspension_notification_observer,
@@ -37,42 +28,6 @@ class Application < Rails::Application
       :change_observer, :document_observer, :nomenclature_change_observer,
       :geo_entity_observer
 
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    config.assets.initialize_on_precompile = false
-
-    # Change Ember's template root. Doesn't seem to be working though :(
-    # config.handlebars.templates_root = "trade/templates"
-
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
 
     config.i18n.available_locales = %i[en es fr]
diff --git a/config/boot.rb b/config/boot.rb
index 6b750f00b..30f5120df 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,3 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 000000000..0bbde6f74
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,9 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1
diff --git a/config/environment.rb b/config/environment.rb
index ee8d90dc6..426333bb4 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index f0c7f2016..bd94090f8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -9,13 +9,28 @@
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  if Rails.root.join('tmp/caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => 'public, max-age=172800'
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  config.action_mailer.perform_caching = false
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
@@ -30,20 +45,12 @@
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  # Custom cache settings
-  config.cache_store = :memory_store, { size: 64.megabytes }
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
   # Custom ember settings
   config.ember.variant = :development
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7e408b015..805c63bda 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,15 +14,9 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like
-  # NGINX, varnish or squid.
-  # config.action_dispatch.rack_cache = true
-
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -31,34 +25,37 @@
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
-  config.log_level = :warn # @see https://github.com/heartcombo/devise#password-reset-tokens-and-rails-logs
+  config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  config.log_tags = [ :request_id ]
 
   # Use a different cache store in production.
   config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "sapi_#{Rails.env}"
+  config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -75,6 +72,16 @@
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger = ActiveSupport::TaggedLogging.new(logger)
+  end
+
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 6e180d753..d0706ab7b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,9 +13,11 @@
   # config.eager_load = false
   config.eager_load = true
 
-  # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => 'public, max-age=3600'
+  }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -26,15 +28,13 @@
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
+  config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Randomize the order test cases are executed.
-  config.active_support.test_order = :random
-
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 000000000..89d2efab2
--- /dev/null
+++ b/config/initializers/application_controller_renderer.rb
@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# ActiveSupport::Reloader.to_prepare do
+#   ApplicationController.renderer.defaults.merge!(
+#     http_host: 'example.org',
+#     https: false
+#   )
+# end
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index ad39a3750..b197c2e87 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,4 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-# https://guides.rubyonrails.org/v4.1/upgrading_ruby_on_rails.html#cookies-serializer
+# Specify a serializer for the signed and encrypted cookie jars.
+# Valid options are :json, :marshal, and :hybrid.
+# @see https://guides.rubyonrails.org/v4.1/upgrading_ruby_on_rails.html#cookies-serializer
 Rails.application.config.action_dispatch.cookies_serializer = :hybrid
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
new file mode 100644
index 000000000..cbf423a81
--- /dev/null
+++ b/config/initializers/new_framework_defaults.rb
@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.0 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+Rails.application.config.action_controller.raise_on_unfiltered_parameters = true
+
+# Enable per-form CSRF tokens. Previous versions had false.
+Rails.application.config.action_controller.per_form_csrf_tokens = false
+
+# Enable origin-checking CSRF mitigation. Previous versions had false.
+Rails.application.config.action_controller.forgery_protection_origin_check = false
+
+# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
+# Previous versions had false.
+ActiveSupport.to_time_preserves_timezone = false
+
+# Require `belongs_to` associations by default. Previous versions had false.
+Rails.application.config.active_record.belongs_to_required_by_default = false
+
+# Do not halt callback chains when a callback returns false. Previous versions had true.
+ActiveSupport.halt_callback_chains_on_return_false = true
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 33725e95f..bbfc3961b 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -5,10 +5,10 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+  wrap_parameters format: [:json]
 end
 
 # To enable root element in JSON for ActiveRecord objects.
 # ActiveSupport.on_load(:active_record) do
-#  self.include_root_in_json = true
+#   self.include_root_in_json = true
 # end
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 000000000..c7f311f81
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,47 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum, this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
+#
+port        ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory. If you use this option
+# you need to make sure to reconnect any threads in the `on_worker_boot`
+# block.
+#
+# preload_app!
+
+# The code in the `on_worker_boot` will be called if you are using
+# clustered mode by specifying a number of `workers`. After each worker
+# process is booted this block will be run, if you are using `preload_app!`
+# option you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, Ruby
+# cannot share connections between processes.
+#
+# on_worker_boot do
+#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+# end
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 000000000..c9119b40c
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,6 @@
+%w(
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+).each { |path| Spring.watch(path) }

From dbd7ebfd58849e797e3d848a4028cf76136e92ce Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 10:15:10 +0000
Subject: [PATCH 038/241] 
 https://guides.rubyonrails.org/v5.0/upgrading_ruby_on_rails.html#active-record-models-now-inherit-from-applicationrecord-by-default

---
 .../api/v1/trade_plus_filters_controller.rb   |  2 +-
 app/models/ahoy/event.rb                      |  2 +-
 app/models/ahoy/visit.rb                      |  2 +-
 app/models/analytics_event.rb                 |  2 +-
 app/models/annotation.rb                      |  2 +-
 app/models/api_request.rb                     |  4 +--
 app/models/application_record.rb              |  3 ++
 app/models/change_type.rb                     |  2 +-
 app/models/cites_process.rb                   |  3 +-
 app/models/cites_suspension_confirmation.rb   |  2 +-
 app/models/cms_mapping.rb                     |  2 +-
 app/models/comment.rb                         |  3 +-
 app/models/common_name.rb                     |  3 +-
 app/models/designation.rb                     |  2 +-
 app/models/designation_geo_entity.rb          |  2 +-
 app/models/distribution.rb                    |  3 +-
 app/models/distribution_reference.rb          |  3 +-
 app/models/document.rb                        |  2 +-
 app/models/document/proposal_details.rb       |  2 +-
 app/models/document/review_details.rb         |  2 +-
 app/models/document_citation.rb               |  5 ++--
 app/models/document_citation_geo_entity.rb    |  3 +-
 app/models/document_citation_taxon_concept.rb |  3 +-
 app/models/document_search.rb                 |  8 +++---
 app/models/document_tag.rb                    |  2 +-
 app/models/download.rb                        |  2 +-
 app/models/eu_country_date.rb                 |  2 +-
 app/models/eu_decision.rb                     |  4 +--
 app/models/eu_decision_confirmation.rb        |  2 +-
 app/models/eu_decision_type.rb                |  2 +-
 app/models/event.rb                           |  2 +-
 app/models/geo_entity.rb                      |  2 +-
 app/models/geo_entity_type.rb                 |  2 +-
 app/models/geo_relationship.rb                |  2 +-
 app/models/geo_relationship_type.rb           |  2 +-
 app/models/instrument.rb                      |  2 +-
 app/models/iucn_mapping.rb                    |  2 +-
 app/models/language.rb                        |  2 +-
 app/models/listing_change.rb                  |  3 +-
 app/models/listing_distribution.rb            |  3 +-
 app/models/m_auto_complete_taxon_concept.rb   |  2 +-
 app/models/m_cites_listing_change.rb          |  2 +-
 app/models/m_cms_listing_change.rb            |  2 +-
 app/models/m_eu_listing_change.rb             |  2 +-
 app/models/m_taxon_concept.rb                 |  4 +--
 ...ter_by_scientific_name_with_descendants.rb |  2 +-
 app/models/nomenclature_change.rb             |  2 +-
 .../cascading_notes_processor.rb              |  2 +-
 app/models/nomenclature_change/input.rb       |  3 +-
 app/models/nomenclature_change/output.rb      |  2 +-
 .../output_reassignment.rb                    |  2 +-
 .../nomenclature_change/reassignment.rb       |  2 +-
 .../reassignment_target.rb                    |  3 +-
 app/models/preset_tag.rb                      |  2 +-
 app/models/rank.rb                            |  2 +-
 app/models/reference.rb                       |  3 +-
 .../species/taxon_concept_prefix_matcher.rb   |  2 +-
 app/models/species_listing.rb                 |  2 +-
 app/models/srg_history.rb                     |  2 +-
 app/models/taxon_common.rb                    |  3 +-
 app/models/taxon_concept.rb                   |  4 +--
 app/models/taxon_concept_reference.rb         |  3 +-
 app/models/taxon_instrument.rb                |  3 +-
 app/models/taxon_name.rb                      |  2 +-
 app/models/taxon_relationship.rb              |  3 +-
 app/models/taxon_relationship_type.rb         |  2 +-
 app/models/taxonomy.rb                        |  2 +-
 app/models/term_trade_codes_pair.rb           |  2 +-
 app/models/trade/annual_report_upload.rb      |  2 +-
 app/models/trade/permit.rb                    |  2 +-
 app/models/trade/permit_matcher.rb            |  2 +-
 app/models/trade/sandbox.rb                   |  6 ++--
 app/models/trade/sandbox_template.rb          |  4 +--
 app/models/trade/shipment.rb                  |  3 +-
 app/models/trade/shipments_comptab_export.rb  |  4 +--
 app/models/trade/shipments_export.rb          |  4 +--
 .../trade/shipments_gross_exports_export.rb   |  6 ++--
 app/models/trade/taxon_concept_term_pair.rb   |  2 +-
 app/models/trade/trade_data_download.rb       |  2 +-
 app/models/trade/validation_error.rb          |  2 +-
 app/models/trade/validation_rule.rb           |  2 +-
 app/models/trade_code.rb                      |  2 +-
 app/models/trade_restriction.rb               |  3 +-
 app/models/trade_restriction_purpose.rb       |  3 +-
 app/models/trade_restriction_source.rb        |  3 +-
 app/models/trade_restriction_term.rb          |  2 +-
 app/models/user.rb                            |  2 +-
 app/models/year_annual_reports_by_country.rb  |  2 +-
 .../eu_regulation_activation_worker.rb        |  2 +-
 .../event_eu_suspension_copy_worker.rb        |  2 +-
 .../event_listing_changes_copy_worker.rb      |  2 +-
 app/workers/permit_cleanup_worker.rb          |  4 +--
 app/workers/quotas_copy_worker.rb             |  4 +--
 app/workers/update_taxonomy_worker.rb         |  2 +-
 .../active_record_comparison_attributes.rb    |  2 +-
 .../active_record_protected_deletion.rb       |  2 +-
 config/initializers/normalise_blank_values.rb |  2 +-
 config/puma.rb                                |  2 +-
 ...plit_taxon_concept_internal_note_into_3.rb |  2 +-
 ...53_add_empty_string_as_default_to_notes.rb |  2 +-
 ...1931_update_ndf_documents_to_be_private.rb |  2 +-
 ...stributions_empty_internal_notes_to_nil.rb |  2 +-
 ...uploads_and_update_submitted_timestamps.rb |  4 +--
 lib/modules/csv_exportable.rb                 |  2 +-
 lib/modules/material_doc_ids_retriever.rb     |  2 +-
 lib/modules/sapi/indexes.rb                   | 12 ++++----
 lib/modules/sapi/stored_procedures.rb         | 16 +++++------
 lib/modules/sapi/summary.rb                   |  2 +-
 lib/modules/trade/download_data_retriever.rb  |  2 +-
 lib/modules/trade/grouping/base.rb            |  2 +-
 .../trade/mandatory_quotas_shipments.rb       |  2 +-
 .../trade/rebuild_compliance_mviews.rb        |  4 +--
 lib/modules/trade/rebuild_trade_plus_views.rb |  4 +--
 lib/psql_command.rb                           |  2 +-
 lib/tasks/db_cleanup.rake                     |  4 +--
 lib/tasks/db_migrate_plpgsql.rake             |  8 +++---
 lib/tasks/db_trim.rake                        | 20 ++++++-------
 lib/tasks/elibrary/citations_cop_importer.rb  | 14 +++++-----
 lib/tasks/elibrary/citations_importer.rb      | 22 +++++++--------
 .../elibrary/citations_manual_importer.rb     | 18 ++++++------
 lib/tasks/elibrary/citations_rst_importer.rb  |  8 +++---
 .../elibrary/document_discussions_importer.rb |  6 ++--
 .../documents_identification_importer.rb      |  4 +--
 lib/tasks/elibrary/documents_importer.rb      | 14 +++++-----
 lib/tasks/elibrary/events_importer.rb         |  6 ++--
 ...ntification_docs_distributions_importer.rb |  6 ++--
 lib/tasks/elibrary/importable.rb              |  6 ++--
 lib/tasks/elibrary/non_cites_taxa_importer.rb |  6 ++--
 lib/tasks/elibrary/users_importer.rb          |  2 +-
 lib/tasks/export_trade_db.rake                | 10 +++----
 lib/tasks/helpers_for_import.rb               |  8 +++---
 lib/tasks/import.rake                         |  2 +-
 lib/tasks/import_authors_year.rake            |  2 +-
 lib/tasks/import_checklist_translations.rake  |  4 +--
 lib/tasks/import_cites_listings.rake          | 26 ++++++++---------
 lib/tasks/import_cites_parties.rake           |  2 +-
 lib/tasks/import_cites_quotas.rake            | 14 +++++-----
 lib/tasks/import_cites_regions.rake           |  4 +--
 lib/tasks/import_cites_suspensions.rake       |  2 +-
 lib/tasks/import_cleanup.rake                 |  4 +--
 lib/tasks/import_cms_listings.rake            | 28 +++++++++----------
 lib/tasks/import_common_names.rake            |  8 +++---
 lib/tasks/import_countries.rake               |  6 ++--
 lib/tasks/import_distribution_tags.rake       | 12 ++++----
 lib/tasks/import_distributions.rake           |  8 +++---
 lib/tasks/import_eu_decisions.rake            |  2 +-
 lib/tasks/import_eu_listings.rake             | 26 ++++++++---------
 lib/tasks/import_eu_opinions.rake             |  2 +-
 lib/tasks/import_events.rake                  |  6 ++--
 lib/tasks/import_hash_annotations.rake        |  6 ++--
 lib/tasks/import_hybrids.rake                 |  2 +-
 lib/tasks/import_languages.rake               |  2 +-
 .../import_reference_accepted_links.rake      | 14 +++++-----
 .../import_reference_distribution_links.rake  |  4 +--
 lib/tasks/import_reference_synonym_links.rake | 14 +++++-----
 lib/tasks/import_references.rake              |  2 +-
 lib/tasks/import_species.rake                 | 12 ++++----
 lib/tasks/import_species_kew_id.rake          | 12 ++++----
 lib/tasks/import_species_legacy.rake          | 12 ++++----
 .../import_standard_reference_links.rake      | 18 ++++++------
 lib/tasks/import_synonyms.rake                |  4 +--
 lib/tasks/import_synonyms_kew_id.rake         |  4 +--
 lib/tasks/import_synonyms_legacy.rake         |  4 +--
 lib/tasks/import_trade_codes.rake             |  6 ++--
 lib/tasks/import_trade_names.rake             | 12 ++++----
 lib/tasks/import_trade_permits.rake           |  2 +-
 lib/tasks/import_trade_plus_static_data.rake  |  2 +-
 lib/tasks/import_trade_shipments.rake         | 14 +++++-----
 lib/tasks/map_eu_opinions_to_ec_srgs.rake     |  2 +-
 ...uspensions_to_terminating_regulations.rake |  2 +-
 lib/tasks/set_eu_opinions_to_not_current.rake |  2 +-
 lib/tasks/transfer_eu_opinions.rake           |  4 +--
 ...date_eu_decisions_with_missing_source.rake |  2 +-
 spec/models/html_to_latex_spec.rb             |  2 ++
 spec/models/trade/sandbox_spec.rb             |  2 +-
 spec/spec_helper.rb                           |  2 +-
 176 files changed, 390 insertions(+), 408 deletions(-)
 create mode 100644 app/models/application_record.rb

diff --git a/app/controllers/api/v1/trade_plus_filters_controller.rb b/app/controllers/api/v1/trade_plus_filters_controller.rb
index e071f0979..799ca37cc 100644
--- a/app/controllers/api/v1/trade_plus_filters_controller.rb
+++ b/app/controllers/api/v1/trade_plus_filters_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::TradePlusFiltersController < ApplicationController
   def index
     filters_service = Trade::TradePlusFilters.new(params['locale'])
     filters = Rails.cache.fetch(['trade_plus_filters', params['locale']], expires_in: 4.weeks) do
-      res = ActiveRecord::Base.connection.execute(filters_service.query)
+      res = ApplicationRecord.connection.execute(filters_service.query)
       filters_service.response_ordering(res)
     end
 
diff --git a/app/models/ahoy/event.rb b/app/models/ahoy/event.rb
index 1f258223a..b53e3c649 100644
--- a/app/models/ahoy/event.rb
+++ b/app/models/ahoy/event.rb
@@ -11,7 +11,7 @@
 #
 
 module Ahoy
-  class Event < ActiveRecord::Base
+  class Event < ApplicationRecord
     self.table_name = 'ahoy_events'
 
     belongs_to :visit, class_name: 'Ahoy::Visit'
diff --git a/app/models/ahoy/visit.rb b/app/models/ahoy/visit.rb
index 1cdb35065..4f5886cd8 100644
--- a/app/models/ahoy/visit.rb
+++ b/app/models/ahoy/visit.rb
@@ -26,7 +26,7 @@
 #
 
 module Ahoy
-  class Visit < ActiveRecord::Base
+  class Visit < ApplicationRecord
     self.table_name = 'ahoy_visits'
 
     has_many :ahoy_events, class_name: 'Ahoy::Event'
diff --git a/app/models/analytics_event.rb b/app/models/analytics_event.rb
index c2b4bd14f..483820447 100644
--- a/app/models/analytics_event.rb
+++ b/app/models/analytics_event.rb
@@ -1,4 +1,4 @@
-class AnalyticsEvent < ActiveRecord::Base
+class AnalyticsEvent < ApplicationRecord
   # Can use enum once upgraded to > Rails 4.1
   EVENT_TYPES = %w( download )
   EVENT_NAMES = %w( full_database_download )
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 2a061065f..e665d77a4 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -22,7 +22,7 @@
 #  updated_by_id       :integer
 #
 
-class Annotation < ActiveRecord::Base
+class Annotation < ApplicationRecord
   extend Mobility
   include TrackWhoDoesIt
 
diff --git a/app/models/api_request.rb b/app/models/api_request.rb
index db1f36e95..925dc2282 100644
--- a/app/models/api_request.rb
+++ b/app/models/api_request.rb
@@ -15,7 +15,7 @@
 #  updated_at      :datetime         not null
 #
 
-class ApiRequest < ActiveRecord::Base
+class ApiRequest < ApplicationRecord
   serialize :params, JSON
 
   belongs_to :user
@@ -67,7 +67,7 @@ def self.requests_by_controller(user = nil)
   private
 
   def self.hash_aggregate_by_keys(key_name, key_ary, subquery)
-    sql = ActiveRecord::Base.send(:sanitize_sql_array, [
+    sql = ApplicationRecord.send(:sanitize_sql_array, [
       "SELECT JSON_OBJECT_AGG(#{key_name}_1, COALESCE(cnt, 0))
       FROM UNNEST(ARRAY[:key_ary]) #{key_name}_1
       LEFT JOIN (
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
new file mode 100644
index 000000000..10a4cba84
--- /dev/null
+++ b/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/app/models/change_type.rb b/app/models/change_type.rb
index 060900d33..28fb8c732 100644
--- a/app/models/change_type.rb
+++ b/app/models/change_type.rb
@@ -12,7 +12,7 @@
 #  display_name_fr :text
 #
 
-class ChangeType < ActiveRecord::Base
+class ChangeType < ApplicationRecord
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
diff --git a/app/models/cites_process.rb b/app/models/cites_process.rb
index 9f496597b..7bb653101 100644
--- a/app/models/cites_process.rb
+++ b/app/models/cites_process.rb
@@ -1,6 +1,5 @@
-class CitesProcess < ActiveRecord::Base
+class CitesProcess < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :start_event_id, :geo_entity_id, :resolution, :start_date,
   #                 :taxon_concept_id, :notes, :status, :document, :document_title,
diff --git a/app/models/cites_suspension_confirmation.rb b/app/models/cites_suspension_confirmation.rb
index 68b86bfef..156581481 100644
--- a/app/models/cites_suspension_confirmation.rb
+++ b/app/models/cites_suspension_confirmation.rb
@@ -9,7 +9,7 @@
 #  updated_at                       :datetime         not null
 #
 
-class CitesSuspensionConfirmation < ActiveRecord::Base
+class CitesSuspensionConfirmation < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :cites_suspension_notification_id
   belongs_to :confirmation_notification, :class_name => 'CitesSuspensionNotification',
diff --git a/app/models/cms_mapping.rb b/app/models/cms_mapping.rb
index fb3b3febb..3e7e4cf56 100644
--- a/app/models/cms_mapping.rb
+++ b/app/models/cms_mapping.rb
@@ -13,7 +13,7 @@
 #  updated_at       :datetime         not null
 #
 
-class CmsMapping < ActiveRecord::Base
+class CmsMapping < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :accepted_name_id, :cms_author, :cms_taxon_name, :cms_uuid, :details, :taxon_concept_id
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 614389672..ed942902d 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -13,9 +13,8 @@
 #  updated_at       :datetime         not null
 #
 
-class Comment < ActiveRecord::Base
+class Comment < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :comment_type, :commentable_id, :commentable_type, :note,
   #   :created_by_id, :updated_by_id
diff --git a/app/models/common_name.rb b/app/models/common_name.rb
index daf255982..130a0689e 100644
--- a/app/models/common_name.rb
+++ b/app/models/common_name.rb
@@ -11,9 +11,8 @@
 #  updated_by_id :integer
 #
 
-class CommonName < ActiveRecord::Base
+class CommonName < ApplicationRecord
   include TrackWhoDoesIt
-
   # Used by app/models/taxon_common.rb
   # attr_accessible :language_id, :name,
   #   :created_by_id, :updated_by_id
diff --git a/app/models/designation.rb b/app/models/designation.rb
index 3efc3307d..b49873465 100644
--- a/app/models/designation.rb
+++ b/app/models/designation.rb
@@ -9,7 +9,7 @@
 #  taxonomy_id :integer          default(1), not null
 #
 
-class Designation < ActiveRecord::Base
+class Designation < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :taxonomy_id
   include Dictionary
diff --git a/app/models/designation_geo_entity.rb b/app/models/designation_geo_entity.rb
index 6295a5002..1849c3a48 100644
--- a/app/models/designation_geo_entity.rb
+++ b/app/models/designation_geo_entity.rb
@@ -9,7 +9,7 @@
 #  updated_at     :datetime         not null
 #
 
-class DesignationGeoEntity < ActiveRecord::Base
+class DesignationGeoEntity < ApplicationRecord
   # Relationship table between Designation and GeoEntity.
   # attr_accessible :designation_id, :geo_entity_id
   belongs_to :designation
diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index f05c06bb1..42c456265 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -12,9 +12,8 @@
 #  internal_notes   :text
 #
 
-class Distribution < ActiveRecord::Base
+class Distribution < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_id, :taxon_concept_id, :tag_list,
   #   :references_attributes, :internal_notes, :created_by_id, :updated_by_id
diff --git a/app/models/distribution_reference.rb b/app/models/distribution_reference.rb
index 92393c378..c9daaab02 100644
--- a/app/models/distribution_reference.rb
+++ b/app/models/distribution_reference.rb
@@ -11,9 +11,8 @@
 #  created_by_id   :integer
 #
 
-class DistributionReference < ActiveRecord::Base
+class DistributionReference < ApplicationRecord
   include TrackWhoDoesIt
-
   # Used by app/models/cms_mapping_manager.rb
   # attr_accessible :reference_id, :distribution_id, :created_by_id,
   #   :updated_by_id
diff --git a/app/models/document.rb b/app/models/document.rb
index a250b5ea1..c8f3b2f0a 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -24,7 +24,7 @@
 #  designation_id               :integer
 #
 
-class Document < ActiveRecord::Base
+class Document < ApplicationRecord
   include PgSearch::Model
 
   pg_search_scope :search_by_title, :against => :title,
diff --git a/app/models/document/proposal_details.rb b/app/models/document/proposal_details.rb
index 6c9c2ec95..f95e7373f 100644
--- a/app/models/document/proposal_details.rb
+++ b/app/models/document/proposal_details.rb
@@ -12,7 +12,7 @@
 #  proposal_number     :text
 #
 
-class Document::ProposalDetails < ActiveRecord::Base
+class Document::ProposalDetails < ApplicationRecord
   # Used in DocumentsController
   # attr_accessible :document_id, :proposal_nature, :proposal_outcome_id,
   #   :representation, :proposal_number
diff --git a/app/models/document/review_details.rb b/app/models/document/review_details.rb
index 5af2d2949..eb9e62d26 100644
--- a/app/models/document/review_details.rb
+++ b/app/models/document/review_details.rb
@@ -11,7 +11,7 @@
 #  updated_at           :datetime         not null
 #
 
-class Document::ReviewDetails < ActiveRecord::Base
+class Document::ReviewDetails < ApplicationRecord
   # Used by DocumentController.
   # attr_accessible :document_id, :review_phase_id, :process_stage_id, :recommended_category
   self.table_name = 'review_details'
diff --git a/app/models/document_citation.rb b/app/models/document_citation.rb
index e17d4d368..c42103052 100644
--- a/app/models/document_citation.rb
+++ b/app/models/document_citation.rb
@@ -11,9 +11,8 @@
 #  elib_legacy_id :integer
 #
 
-class DocumentCitation < ActiveRecord::Base
+class DocumentCitation < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :document_id, :stringy_taxon_concept_ids, :geo_entity_ids
 
@@ -49,7 +48,7 @@ def duplicates(comparison_attributes_override = {})
     geo_entities_ids = document_citation_geo_entities.pluck(:geo_entity_id)
     if !geo_entities_ids.empty?
       relation = relation.joins(
-        ActiveRecord::Base.send(:sanitize_sql_array, [
+        ApplicationRecord.send(:sanitize_sql_array, [
           "JOIN (
             SELECT document_citation_id, CASE
               WHEN ARRAY_AGG(geo_entity_id) @> ARRAY[:geo_entities_ids]::INT[] THEN TRUE
diff --git a/app/models/document_citation_geo_entity.rb b/app/models/document_citation_geo_entity.rb
index 404e583e7..f8c5b0acf 100644
--- a/app/models/document_citation_geo_entity.rb
+++ b/app/models/document_citation_geo_entity.rb
@@ -11,9 +11,8 @@
 #  updated_at           :datetime         not null
 #
 
-class DocumentCitationGeoEntity < ActiveRecord::Base
+class DocumentCitationGeoEntity < ApplicationRecord
   include TrackWhoDoesIt
-
   # Used by app/models/nomenclature_change/reassignment_copy_processor.rb and lib/tasks/elibrary/identification_docs_distributions_importer.rb
   # attr_accessible :created_by_id, :document_citation_id, :geo_entity_id, :updated_by_id
 
diff --git a/app/models/document_citation_taxon_concept.rb b/app/models/document_citation_taxon_concept.rb
index 8284275ab..750250123 100644
--- a/app/models/document_citation_taxon_concept.rb
+++ b/app/models/document_citation_taxon_concept.rb
@@ -11,9 +11,8 @@
 #  updated_at           :datetime         not null
 #
 
-class DocumentCitationTaxonConcept < ActiveRecord::Base
+class DocumentCitationTaxonConcept < ApplicationRecord
   include TrackWhoDoesIt
-
   # Used by other models, not controllers.
   # attr_accessible :created_by_id, :document_citation_id, :taxon_concept_id, :updated_by_id,
   #   :updated_at
diff --git a/app/models/document_search.rb b/app/models/document_search.rb
index c3ea39460..3c3a08e16 100644
--- a/app/models/document_search.rb
+++ b/app/models/document_search.rb
@@ -23,7 +23,7 @@ def total_cnt
       @query.count(:all)
     else
       query = "SELECT count(*) AS count_all FROM (#{@query.to_sql}) x"
-      count = ActiveRecord::Base.connection.execute(query).first.try(:[], "count_all").to_i
+      count = ApplicationRecord.connection.execute(query).first.try(:[], "count_all").to_i
     end
   end
 
@@ -151,7 +151,7 @@ def add_geo_entities_condition
   end
 
   def filter_by_citations(condition_string, condition_values)
-    join_sql = ActiveRecord::Base.send(
+    join_sql = ApplicationRecord.send(
       :sanitize_sql_array,
       [
         "JOIN (
@@ -241,12 +241,12 @@ def self.citations_need_refreshing?
   end
 
   def self.refresh_documents
-    ActiveRecord::Base.connection.execute('REFRESH MATERIALIZED VIEW api_documents_mview')
+    ApplicationRecord.connection.execute('REFRESH MATERIALIZED VIEW api_documents_mview')
     DocumentSearch.increment_cache_iterator
   end
 
   def self.refresh_citations_and_documents
-    ActiveRecord::Base.connection.execute('REFRESH MATERIALIZED VIEW document_citations_mview')
+    ApplicationRecord.connection.execute('REFRESH MATERIALIZED VIEW document_citations_mview')
     refresh_documents
   end
 
diff --git a/app/models/document_tag.rb b/app/models/document_tag.rb
index ff573a982..3d7d74b89 100644
--- a/app/models/document_tag.rb
+++ b/app/models/document_tag.rb
@@ -9,7 +9,7 @@
 #  updated_at :datetime         not null
 #
 
-class DocumentTag < ActiveRecord::Base
+class DocumentTag < ApplicationRecord
   # Only created by seed and rake task.
   # attr_accessible :name
 
diff --git a/app/models/download.rb b/app/models/download.rb
index f144ddc97..445befd2f 100644
--- a/app/models/download.rb
+++ b/app/models/download.rb
@@ -13,7 +13,7 @@
 #  display_name :string(255)
 #
 
-class Download < ActiveRecord::Base
+class Download < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :format, :doc_type
 
diff --git a/app/models/eu_country_date.rb b/app/models/eu_country_date.rb
index 0643cfd4f..c113d1877 100644
--- a/app/models/eu_country_date.rb
+++ b/app/models/eu_country_date.rb
@@ -1,4 +1,4 @@
-class EuCountryDate < ActiveRecord::Base
+class EuCountryDate < ApplicationRecord
   # Used by rake task.
   # attr_accessible :eu_accession_year, :eu_exit_year, :geo_entity
 
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index 854fc7261..ee9b9c5c2 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -28,11 +28,9 @@
 
 require 'digest/sha1'
 require 'csv'
-class EuDecision < ActiveRecord::Base
+class EuDecision < ApplicationRecord
   extend Mobility
   include TrackWhoDoesIt
-
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :end_date, :end_event_id, :geo_entity_id, :internal_notes,
   #   :is_current, :notes, :start_date, :start_event_id, :eu_decision_type_id,
diff --git a/app/models/eu_decision_confirmation.rb b/app/models/eu_decision_confirmation.rb
index 3d2dc4cba..799dcce5d 100644
--- a/app/models/eu_decision_confirmation.rb
+++ b/app/models/eu_decision_confirmation.rb
@@ -9,7 +9,7 @@
 #  updated_at     :datetime         not null
 #
 
-class EuDecisionConfirmation < ActiveRecord::Base
+class EuDecisionConfirmation < ApplicationRecord
   # Relationship table between Event and EuDecision
   # attr_accessible :eu_decision_id, :event_id
 
diff --git a/app/models/eu_decision_type.rb b/app/models/eu_decision_type.rb
index 69339af37..b0391f24a 100644
--- a/app/models/eu_decision_type.rb
+++ b/app/models/eu_decision_type.rb
@@ -10,7 +10,7 @@
 #  decision_type :string(255)
 #
 
-class EuDecisionType < ActiveRecord::Base
+class EuDecisionType < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :tooltip, :decision_type
   include Dictionary
diff --git a/app/models/event.rb b/app/models/event.rb
index 0f7169ecb..f77302568 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -23,7 +23,7 @@
 #  elib_legacy_id       :integer
 #
 
-class Event < ActiveRecord::Base
+class Event < ApplicationRecord
   include TrackWhoDoesIt
 
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/geo_entity.rb b/app/models/geo_entity.rb
index 0e418a7d7..33a28233c 100644
--- a/app/models/geo_entity.rb
+++ b/app/models/geo_entity.rb
@@ -17,7 +17,7 @@
 #  name_es            :string(255)
 #
 
-class GeoEntity < ActiveRecord::Base
+class GeoEntity < ApplicationRecord
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_type_id, :iso_code2, :iso_code3,
diff --git a/app/models/geo_entity_type.rb b/app/models/geo_entity_type.rb
index 31dd6c495..4efeba9c7 100644
--- a/app/models/geo_entity_type.rb
+++ b/app/models/geo_entity_type.rb
@@ -8,7 +8,7 @@
 #  updated_at :datetime         not null
 #
 
-class GeoEntityType < ActiveRecord::Base
+class GeoEntityType < ApplicationRecord
   # Look like the only place create GeoEntityType is lib/tasks/import_trade_shipments.rake
   # attr_accessible :name
 
diff --git a/app/models/geo_relationship.rb b/app/models/geo_relationship.rb
index 8c010de0c..56fbe7940 100644
--- a/app/models/geo_relationship.rb
+++ b/app/models/geo_relationship.rb
@@ -10,7 +10,7 @@
 #  updated_at               :datetime         not null
 #
 
-class GeoRelationship < ActiveRecord::Base
+class GeoRelationship < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_id, :geo_relationship_type_id, :other_geo_entity_id
   belongs_to :geo_relationship_type
diff --git a/app/models/geo_relationship_type.rb b/app/models/geo_relationship_type.rb
index 23e65f5a9..eb424ed6b 100644
--- a/app/models/geo_relationship_type.rb
+++ b/app/models/geo_relationship_type.rb
@@ -8,7 +8,7 @@
 #  updated_at :datetime         not null
 #
 
-class GeoRelationshipType < ActiveRecord::Base
+class GeoRelationshipType < ApplicationRecord
   # Used by seed only.
   # attr_accessible :name
 
diff --git a/app/models/instrument.rb b/app/models/instrument.rb
index 329b4e5bc..e5b6a4c32 100644
--- a/app/models/instrument.rb
+++ b/app/models/instrument.rb
@@ -9,7 +9,7 @@
 #  updated_at     :datetime         not null
 #
 
-class Instrument < ActiveRecord::Base
+class Instrument < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :designation_id, :name
 
diff --git a/app/models/iucn_mapping.rb b/app/models/iucn_mapping.rb
index 898ee944f..f902e706e 100644
--- a/app/models/iucn_mapping.rb
+++ b/app/models/iucn_mapping.rb
@@ -14,7 +14,7 @@
 #  accepted_name_id :integer
 #
 
-class IucnMapping < ActiveRecord::Base
+class IucnMapping < ApplicationRecord
   # Used by IucnMappingManager
   # attr_accessible :iucn_author, :iucn_category, :iucn_taxon_id,
   #   :iucn_taxon_name, :taxon_concept_id, :details, :accepted_name_id
diff --git a/app/models/language.rb b/app/models/language.rb
index e3b76dca1..fc324c2af 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -12,7 +12,7 @@
 #  updated_at :datetime         not null
 #
 
-class Language < ActiveRecord::Base
+class Language < ApplicationRecord
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :iso_code1, :iso_code3, :name_en, :name_fr, :name_es
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 7028f4c0b..d46c2699b 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -26,10 +26,9 @@
 #  internal_notes             :text
 #
 
-class ListingChange < ActiveRecord::Base
+class ListingChange < ApplicationRecord
   extend Mobility
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :species_listing_id, :change_type_id,
   #   :effective_at, :is_current, :parent_id, :geo_entity_ids,
diff --git a/app/models/listing_distribution.rb b/app/models/listing_distribution.rb
index e1bacde4c..68419cf0b 100644
--- a/app/models/listing_distribution.rb
+++ b/app/models/listing_distribution.rb
@@ -13,9 +13,8 @@
 #  updated_by_id     :integer
 #
 
-class ListingDistribution < ActiveRecord::Base
+class ListingDistribution < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_id, :listing_change_id, :is_party
 
diff --git a/app/models/m_auto_complete_taxon_concept.rb b/app/models/m_auto_complete_taxon_concept.rb
index 2a447a2bb..3b07b5c3d 100644
--- a/app/models/m_auto_complete_taxon_concept.rb
+++ b/app/models/m_auto_complete_taxon_concept.rb
@@ -22,7 +22,7 @@
 #  type_of_match             :text
 #
 
-class MAutoCompleteTaxonConcept < ActiveRecord::Base
+class MAutoCompleteTaxonConcept < ApplicationRecord
   extend Mobility
   self.table_name = :auto_complete_taxon_concepts_mview
   self.primary_key = :id
diff --git a/app/models/m_cites_listing_change.rb b/app/models/m_cites_listing_change.rb
index fdd88917a..31596cbf0 100644
--- a/app/models/m_cites_listing_change.rb
+++ b/app/models/m_cites_listing_change.rb
@@ -60,7 +60,7 @@
 #  geo_entity_type            :string(255)
 #
 
-class MCitesListingChange < ActiveRecord::Base
+class MCitesListingChange < ApplicationRecord
   self.table_name = :cites_listing_changes_mview
   self.primary_key = :id
   include MListingChange
diff --git a/app/models/m_cms_listing_change.rb b/app/models/m_cms_listing_change.rb
index 3317a9996..f2b26bf5b 100644
--- a/app/models/m_cms_listing_change.rb
+++ b/app/models/m_cms_listing_change.rb
@@ -60,7 +60,7 @@
 #  geo_entity_type            :string(255)
 #
 
-class MCmsListingChange < ActiveRecord::Base
+class MCmsListingChange < ApplicationRecord
   self.table_name = :cms_listing_changes_mview
   self.primary_key = :id
   include MListingChange
diff --git a/app/models/m_eu_listing_change.rb b/app/models/m_eu_listing_change.rb
index cdb059a52..779b951d9 100644
--- a/app/models/m_eu_listing_change.rb
+++ b/app/models/m_eu_listing_change.rb
@@ -60,7 +60,7 @@
 #  geo_entity_type            :string(255)
 #
 
-class MEuListingChange < ActiveRecord::Base
+class MEuListingChange < ApplicationRecord
   self.table_name = :eu_listing_changes_mview
   self.primary_key = :id
   include MListingChange
diff --git a/app/models/m_taxon_concept.rb b/app/models/m_taxon_concept.rb
index ad230430a..e2da848c0 100644
--- a/app/models/m_taxon_concept.rb
+++ b/app/models/m_taxon_concept.rb
@@ -104,7 +104,7 @@
 #  expiry                                   :datetime
 #
 
-class MTaxonConcept < ActiveRecord::Base
+class MTaxonConcept < ApplicationRecord
   extend Mobility
   self.table_name = :taxon_concepts_mview
   self.primary_key = :id
@@ -180,7 +180,7 @@ def self.descendants_ids(taxon_concept)
     SELECT id FROM descendents
     ORDER BY rank_id ASC, full_name
     SQL
-    res = ActiveRecord::Base.connection.execute(query)
+    res = ApplicationRecord.connection.execute(query)
     res.ntuples.zero? ? [taxon_concept.to_i] : res.map(&:values).flatten << taxon_concept.to_i
   end
 
diff --git a/app/models/m_taxon_concept_filter_by_scientific_name_with_descendants.rb b/app/models/m_taxon_concept_filter_by_scientific_name_with_descendants.rb
index a3dac71f6..21be17425 100644
--- a/app/models/m_taxon_concept_filter_by_scientific_name_with_descendants.rb
+++ b/app/models/m_taxon_concept_filter_by_scientific_name_with_descendants.rb
@@ -17,7 +17,7 @@ def relation
       'id, ARRAY_AGG_NOTNULL(matched_name) AS matched_names_ary'
     ).
     where(
-      ActiveRecord::Base.send(:sanitize_sql_array, [
+      ApplicationRecord.send(:sanitize_sql_array, [
         "name_for_matching LIKE :sci_name_prefix AND type_of_match IN (:types_of_match)",
         sci_name_prefix: "#{@scientific_name}%",
         types_of_match: types_of_match
diff --git a/app/models/nomenclature_change.rb b/app/models/nomenclature_change.rb
index 2ee597481..983305ce4 100644
--- a/app/models/nomenclature_change.rb
+++ b/app/models/nomenclature_change.rb
@@ -12,7 +12,7 @@
 #  updated_at    :datetime         not null
 #
 
-class NomenclatureChange < ActiveRecord::Base
+class NomenclatureChange < ApplicationRecord
   include Dictionary
   include StatusDictionary
 
diff --git a/app/models/nomenclature_change/cascading_notes_processor.rb b/app/models/nomenclature_change/cascading_notes_processor.rb
index d5c3d2b50..02a5673af 100644
--- a/app/models/nomenclature_change/cascading_notes_processor.rb
+++ b/app/models/nomenclature_change/cascading_notes_processor.rb
@@ -73,7 +73,7 @@ def descendents_for_note_cascading(taxon_concept)
       )
       SELECT * FROM descendents
     SQL
-    sanitized_subquery = ActiveRecord::Base.send(
+    sanitized_subquery = ApplicationRecord.send(
       :sanitize_sql_array, [subquery, taxon_concept_id: taxon_concept.id]
     )
     TaxonConcept.from(
diff --git a/app/models/nomenclature_change/input.rb b/app/models/nomenclature_change/input.rb
index bcad553cb..ebbcfb4b5 100644
--- a/app/models/nomenclature_change/input.rb
+++ b/app/models/nomenclature_change/input.rb
@@ -17,9 +17,8 @@
 
 # Represents an input of a nomenclature change.
 # Inputs are required to be existing taxon concepts.
-class NomenclatureChange::Input < ActiveRecord::Base
+class NomenclatureChange::Input < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :nomenclature_change_id, :taxon_concept_id,
   #   :note_en, :note_es, :note_fr, :internal_note,
diff --git a/app/models/nomenclature_change/output.rb b/app/models/nomenclature_change/output.rb
index d058c82ce..d3eaae19b 100644
--- a/app/models/nomenclature_change/output.rb
+++ b/app/models/nomenclature_change/output.rb
@@ -32,7 +32,7 @@
 # Represents an output of a nomenclature change.
 # Outputs may be new taxon concepts, created as a result of the nomenclature
 # change.
-class NomenclatureChange::Output < ActiveRecord::Base
+class NomenclatureChange::Output < ApplicationRecord
   include TrackWhoDoesIt
   attr_accessor :output_type # New taxon, Existing subspecies, Existing taxon
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/nomenclature_change/output_reassignment.rb b/app/models/nomenclature_change/output_reassignment.rb
index c6be0cc85..03ef2fd03 100644
--- a/app/models/nomenclature_change/output_reassignment.rb
+++ b/app/models/nomenclature_change/output_reassignment.rb
@@ -27,7 +27,7 @@
 # A polymorphic association is in place that links this object to the entitity
 # that gets reassigned.
 # For example the reassignable_type might be 'ListingChange'
-class NomenclatureChange::OutputReassignment < ActiveRecord::Base
+class NomenclatureChange::OutputReassignment < ApplicationRecord
   include NomenclatureChange::ReassignmentHelpers
 
   belongs_to :output, :class_name => NomenclatureChange::Output,
diff --git a/app/models/nomenclature_change/reassignment.rb b/app/models/nomenclature_change/reassignment.rb
index cfc946262..38be0841e 100644
--- a/app/models/nomenclature_change/reassignment.rb
+++ b/app/models/nomenclature_change/reassignment.rb
@@ -27,7 +27,7 @@
 # A polymorphic association is in place that links this object to the entitity
 # that gets reassigned.
 # For example the reassignable_type might be 'ListingChange'
-class NomenclatureChange::Reassignment < ActiveRecord::Base
+class NomenclatureChange::Reassignment < ApplicationRecord
   include NomenclatureChange::ReassignmentHelpers
 
   belongs_to :input, :class_name => NomenclatureChange::Input,
diff --git a/app/models/nomenclature_change/reassignment_target.rb b/app/models/nomenclature_change/reassignment_target.rb
index 17d0d1bbe..c3c81b767 100644
--- a/app/models/nomenclature_change/reassignment_target.rb
+++ b/app/models/nomenclature_change/reassignment_target.rb
@@ -11,9 +11,8 @@
 #  updated_at                          :datetime         not null
 #
 
-class NomenclatureChange::ReassignmentTarget < ActiveRecord::Base
+class NomenclatureChange::ReassignmentTarget < ApplicationRecord
   include TrackWhoDoesIt
-
   # Relationship table
   # attr_accessible :nomenclature_change_output_id,
   #   :nomenclature_change_reassignment_id, :note
diff --git a/app/models/preset_tag.rb b/app/models/preset_tag.rb
index cbe54e402..f87372d66 100644
--- a/app/models/preset_tag.rb
+++ b/app/models/preset_tag.rb
@@ -9,7 +9,7 @@
 #  updated_at :datetime         not null
 #
 
-class PresetTag < ActiveRecord::Base
+class PresetTag < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :model, :name
 
diff --git a/app/models/rank.rb b/app/models/rank.rb
index 4608892c0..bbd2532ab 100644
--- a/app/models/rank.rb
+++ b/app/models/rank.rb
@@ -13,7 +13,7 @@
 #  display_name_fr    :text
 #
 
-class Rank < ActiveRecord::Base
+class Rank < ApplicationRecord
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
diff --git a/app/models/reference.rb b/app/models/reference.rb
index e2cf3f813..a445a1808 100644
--- a/app/models/reference.rb
+++ b/app/models/reference.rb
@@ -16,9 +16,8 @@
 #  created_by_id :integer
 #
 
-class Reference < ActiveRecord::Base
+class Reference < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :citation, :created_by_id, :updated_by_id
 
diff --git a/app/models/species/taxon_concept_prefix_matcher.rb b/app/models/species/taxon_concept_prefix_matcher.rb
index b871d402e..4de5047ec 100644
--- a/app/models/species/taxon_concept_prefix_matcher.rb
+++ b/app/models/species/taxon_concept_prefix_matcher.rb
@@ -91,7 +91,7 @@ def initialize_query
 
     if @taxon_concept_query
       @query = @query.where(
-        ActiveRecord::Base.send(:sanitize_sql_array, [
+        ApplicationRecord.send(:sanitize_sql_array, [
           "name_for_matching LIKE :sci_name_prefix",
           :sci_name_prefix => "#{@taxon_concept_query}%"
         ])
diff --git a/app/models/species_listing.rb b/app/models/species_listing.rb
index 433371648..1d722dadd 100644
--- a/app/models/species_listing.rb
+++ b/app/models/species_listing.rb
@@ -10,7 +10,7 @@
 #  updated_at     :datetime         not null
 #
 
-class SpeciesListing < ActiveRecord::Base
+class SpeciesListing < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :designation_id, :name, :abbreviation
 
diff --git a/app/models/srg_history.rb b/app/models/srg_history.rb
index 446a99e33..3d8d4fc6a 100644
--- a/app/models/srg_history.rb
+++ b/app/models/srg_history.rb
@@ -1,4 +1,4 @@
-class SrgHistory < ActiveRecord::Base
+class SrgHistory < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :tooltip
 
diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index f65230dc3..79a65e0dd 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -11,9 +11,8 @@
 #  updated_by_id    :integer
 #
 
-class TaxonCommon < ActiveRecord::Base
+class TaxonCommon < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :common_name_id, :taxon_concept_id, :created_by_id,
   #   :updated_by_id, :name, :language_id
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index f9452a59a..a8819254b 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -30,7 +30,7 @@
 #  dependents_updated_by_id   :integer
 #
 
-class TaxonConcept < ActiveRecord::Base
+class TaxonConcept < ApplicationRecord
   extend Mobility
   include TrackWhoDoesIt
   has_paper_trail class_name: 'TaxonConceptVersion', on: :destroy,
@@ -213,7 +213,7 @@ class TaxonConcept < ActiveRecord::Base
 
   def self.fetch_taxons_full_name(taxon_ids)
     if taxon_ids.present?
-      ActiveRecord::Base.connection.execute(
+      ApplicationRecord.connection.execute(
         <<-SQL
           SELECT tc.full_name
           FROM taxon_concepts tc
diff --git a/app/models/taxon_concept_reference.rb b/app/models/taxon_concept_reference.rb
index 54b7a6512..1cd2f95ec 100644
--- a/app/models/taxon_concept_reference.rb
+++ b/app/models/taxon_concept_reference.rb
@@ -14,9 +14,8 @@
 #  updated_by_id               :integer
 #
 
-class TaxonConceptReference < ActiveRecord::Base
+class TaxonConceptReference < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
   #   :excluded_taxon_concepts_ids, :reference_attributes,
diff --git a/app/models/taxon_instrument.rb b/app/models/taxon_instrument.rb
index c8d47083a..ed9bcdc0a 100644
--- a/app/models/taxon_instrument.rb
+++ b/app/models/taxon_instrument.rb
@@ -12,9 +12,8 @@
 #  updated_by_id    :integer
 #
 
-class TaxonInstrument < ActiveRecord::Base
+class TaxonInstrument < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :effective_from, :instrument_id, :taxon_concept_id
 
diff --git a/app/models/taxon_name.rb b/app/models/taxon_name.rb
index e0254f94a..0b3759552 100644
--- a/app/models/taxon_name.rb
+++ b/app/models/taxon_name.rb
@@ -8,7 +8,7 @@
 #  updated_at      :datetime         not null
 #
 
-class TaxonName < ActiveRecord::Base
+class TaxonName < ApplicationRecord
   # Used by seed and rake task.
   # attr_accessible :basionym_id, :scientific_name
 
diff --git a/app/models/taxon_relationship.rb b/app/models/taxon_relationship.rb
index 7e0634002..91db3a8b6 100644
--- a/app/models/taxon_relationship.rb
+++ b/app/models/taxon_relationship.rb
@@ -12,9 +12,8 @@
 #  updated_by_id              :integer
 #
 
-class TaxonRelationship < ActiveRecord::Base
+class TaxonRelationship < ApplicationRecord
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
   #   :created_by_id, :updated_by_id
diff --git a/app/models/taxon_relationship_type.rb b/app/models/taxon_relationship_type.rb
index 6fd9bab4e..340262008 100644
--- a/app/models/taxon_relationship_type.rb
+++ b/app/models/taxon_relationship_type.rb
@@ -10,7 +10,7 @@
 #  updated_at        :datetime         not null
 #
 
-class TaxonRelationshipType < ActiveRecord::Base
+class TaxonRelationshipType < ApplicationRecord
   # Used by seed and rake task.
   # attr_accessible :name, :is_intertaxonomic, :is_bidirectional
 
diff --git a/app/models/taxonomy.rb b/app/models/taxonomy.rb
index fb31c3fb9..129ed4bfd 100644
--- a/app/models/taxonomy.rb
+++ b/app/models/taxonomy.rb
@@ -8,7 +8,7 @@
 #  updated_at :datetime         not null
 #
 
-class Taxonomy < ActiveRecord::Base
+class Taxonomy < ApplicationRecord
   include Dictionary
   build_dictionary :cites_eu, :cms
 
diff --git a/app/models/term_trade_codes_pair.rb b/app/models/term_trade_codes_pair.rb
index c5dd1545c..370b5a67a 100644
--- a/app/models/term_trade_codes_pair.rb
+++ b/app/models/term_trade_codes_pair.rb
@@ -10,7 +10,7 @@
 #  updated_at      :datetime         not null
 #
 
-class TermTradeCodesPair < ActiveRecord::Base
+class TermTradeCodesPair < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :trade_code_id, :trade_code_type, :term_id
 
diff --git a/app/models/trade/annual_report_upload.rb b/app/models/trade/annual_report_upload.rb
index da7da566e..427123e17 100644
--- a/app/models/trade/annual_report_upload.rb
+++ b/app/models/trade/annual_report_upload.rb
@@ -18,7 +18,7 @@
 #
 
 require 'csv_column_headers_validator'
-class Trade::AnnualReportUpload < ActiveRecord::Base
+class Trade::AnnualReportUpload < ApplicationRecord
   include ActiveModel::ForbiddenAttributesProtection
   include TrackWhoDoesIt
 
diff --git a/app/models/trade/permit.rb b/app/models/trade/permit.rb
index 6d87f748e..f7707a5bb 100644
--- a/app/models/trade/permit.rb
+++ b/app/models/trade/permit.rb
@@ -8,7 +8,7 @@
 #  updated_at :datetime         not null
 #
 
-class Trade::Permit < ActiveRecord::Base
+class Trade::Permit < ApplicationRecord
   # app/models/trade/shipment.rb is the only place create this record.
   # attr_accessible :number
 end
diff --git a/app/models/trade/permit_matcher.rb b/app/models/trade/permit_matcher.rb
index 8576bdeda..3660ce641 100644
--- a/app/models/trade/permit_matcher.rb
+++ b/app/models/trade/permit_matcher.rb
@@ -38,7 +38,7 @@ def sanitize_permit_query(query)
       if qp.blank?
         '%' # replace the wildcard
       else
-        ActiveRecord::Base.connection.quote_string(qp)
+        ApplicationRecord.connection.quote_string(qp)
       end
     end
     query_parts.join
diff --git a/app/models/trade/sandbox.rb b/app/models/trade/sandbox.rb
index 83bbd5d41..6c90f1a40 100644
--- a/app/models/trade/sandbox.rb
+++ b/app/models/trade/sandbox.rb
@@ -77,21 +77,21 @@ def create_target_table
             Trade::SandboxTemplate.create_table_stmt(@table_name)
           )
         ensure
-          ActiveRecord::Base.clear_active_connections!
+          ApplicationRecord.clear_active_connections!
         end
         begin
           Trade::SandboxTemplate.connection.execute(
             Trade::SandboxTemplate.create_indexes_stmt(@table_name)
           )
         ensure
-          ActiveRecord::Base.clear_active_connections!
+          ApplicationRecord.clear_active_connections!
         end
         begin
           Trade::SandboxTemplate.connection.execute(
             Trade::SandboxTemplate.create_view_stmt(@table_name, @annual_report_upload.id)
           )
         ensure
-          ActiveRecord::Base.clear_active_connections!
+          ApplicationRecord.clear_active_connections!
         end
       end.join
     end
diff --git a/app/models/trade/sandbox_template.rb b/app/models/trade/sandbox_template.rb
index 0dcebe97c..8cf874b12 100644
--- a/app/models/trade/sandbox_template.rb
+++ b/app/models/trade/sandbox_template.rb
@@ -20,7 +20,7 @@
 #  taxon_concept_id          :integer
 #
 
-class Trade::SandboxTemplate < ActiveRecord::Base
+class Trade::SandboxTemplate < ApplicationRecord
 
   self.table_name = :trade_sandbox_template
   has_paper_trail
@@ -42,7 +42,7 @@ def self.ar_klass(table_name)
     begin
       "Trade::#{klass_name}".constantize
     rescue NameError
-      klass = Class.new(ActiveRecord::Base) do
+      klass = Class.new(ApplicationRecord) do
         self.table_name = table_name
         has_paper_trail
         include ActiveModel::ForbiddenAttributesProtection
diff --git a/app/models/trade/shipment.rb b/app/models/trade/shipment.rb
index cab022ffd..8dc02a8fe 100644
--- a/app/models/trade/shipment.rb
+++ b/app/models/trade/shipment.rb
@@ -31,9 +31,8 @@
 #  created_by_id                 :integer
 #
 
-class Trade::Shipment < ActiveRecord::Base
+class Trade::Shipment < ApplicationRecord
   include TrackWhoDoesIt
-
   # Not sure where using this.
   # attr_accessible :annual_report_upload_id, :appendix,
   #   :country_of_origin_id, :origin_permit_id,
diff --git a/app/models/trade/shipments_comptab_export.rb b/app/models/trade/shipments_comptab_export.rb
index 66fbc73d8..9497ca3db 100644
--- a/app/models/trade/shipments_comptab_export.rb
+++ b/app/models/trade/shipments_comptab_export.rb
@@ -2,11 +2,11 @@
 class Trade::ShipmentsComptabExport < Trade::ShipmentsExport
 
   def total_cnt
-    ActiveRecord::Base.connection.execute(query_sql(:limit => false)).ntuples
+    ApplicationRecord.connection.execute(query_sql(:limit => false)).ntuples
   end
 
   def query
-    ActiveRecord::Base.connection.execute(query_sql(:limit => true))
+    ApplicationRecord.connection.execute(query_sql(:limit => true))
   end
 
   private
diff --git a/app/models/trade/shipments_export.rb b/app/models/trade/shipments_export.rb
index a5fd36b36..f150bfd59 100644
--- a/app/models/trade/shipments_export.rb
+++ b/app/models/trade/shipments_export.rb
@@ -37,7 +37,7 @@ def total_cnt
   end
 
   def query
-    ActiveRecord::Base.connection.execute(query_sql(:limit => true))
+    ApplicationRecord.connection.execute(query_sql(:limit => true))
   end
 
   def csv_column_headers
@@ -86,7 +86,7 @@ def copy_stmt
       ENCODING 'UTF8'
       CSV HEADER;
     PSQL
-    ActiveRecord::Base.send(:sanitize_sql_array, [sql, @file_name])
+    ApplicationRecord.send(:sanitize_sql_array, [sql, @file_name])
   end
 
   def to_csv
diff --git a/app/models/trade/shipments_gross_exports_export.rb b/app/models/trade/shipments_gross_exports_export.rb
index b84c5a08c..ace1e6881 100644
--- a/app/models/trade/shipments_gross_exports_export.rb
+++ b/app/models/trade/shipments_gross_exports_export.rb
@@ -100,11 +100,11 @@ def ct_subquery_sql(options)
       #{sql_crosstab_columns.join(', ')}, year, gross_quantity
       FROM (#{subquery_sql(options)}) subquery
       ORDER BY 1, #{sql_crosstab_columns.length + 2}" # order by row_name and year
-    source_sql = ActiveRecord::Base.send(:sanitize_sql_array, [source_sql, years])
-    source_sql = ActiveRecord::Base.connection.quote_string(source_sql)
+    source_sql = ApplicationRecord.send(:sanitize_sql_array, [source_sql, years])
+    source_sql = ApplicationRecord.connection.quote_string(source_sql)
     # the categories query returns values by which to pivot (years)
     categories_sql = 'SELECT * FROM UNNEST(ARRAY[?])'
-    categories_sql = ActiveRecord::Base.send(:sanitize_sql_array, [categories_sql, years.map(&:to_i)])
+    categories_sql = ApplicationRecord.send(:sanitize_sql_array, [categories_sql, years.map(&:to_i)])
     ct_columns = [
       'row_name TEXT[]',
       report_crosstab_columns.map.each_with_index { |c, i| "#{sql_crosstab_columns[i]} #{crosstab_columns[c][:pg_type]}" },
diff --git a/app/models/trade/taxon_concept_term_pair.rb b/app/models/trade/taxon_concept_term_pair.rb
index 781164679..ba6c8d161 100644
--- a/app/models/trade/taxon_concept_term_pair.rb
+++ b/app/models/trade/taxon_concept_term_pair.rb
@@ -9,7 +9,7 @@
 #  updated_at       :datetime         not null
 #
 
-class Trade::TaxonConceptTermPair < ActiveRecord::Base
+class Trade::TaxonConceptTermPair < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :term_id
   validates :taxon_concept_id, :presence => true
diff --git a/app/models/trade/trade_data_download.rb b/app/models/trade/trade_data_download.rb
index 03b332065..3934e2c4b 100644
--- a/app/models/trade/trade_data_download.rb
+++ b/app/models/trade/trade_data_download.rb
@@ -24,7 +24,7 @@
 #  organization   :string
 #
 
-class Trade::TradeDataDownload < ActiveRecord::Base
+class Trade::TradeDataDownload < ApplicationRecord
   # Used by app/models/trade/trade_data_download_logger.rb
   # attr_accessible :user_ip, :report_type, :year_from, :year_to, :taxon,
   #  :appendix, :importer, :exporter, :origin, :term, :unit, :source, :purpose,
diff --git a/app/models/trade/validation_error.rb b/app/models/trade/validation_error.rb
index fc73c1d04..5d956016d 100644
--- a/app/models/trade/validation_error.rb
+++ b/app/models/trade/validation_error.rb
@@ -1,4 +1,4 @@
-class Trade::ValidationError < ActiveRecord::Base
+class Trade::ValidationError < ApplicationRecord
   belongs_to :annual_report_upload, class_name: Trade::AnnualReportUpload
   belongs_to :validation_rule, class_name: Trade::ValidationRule
 
diff --git a/app/models/trade/validation_rule.rb b/app/models/trade/validation_rule.rb
index c80c22727..f14615d83 100644
--- a/app/models/trade/validation_rule.rb
+++ b/app/models/trade/validation_rule.rb
@@ -15,7 +15,7 @@
 #  is_strict         :boolean          default(FALSE), not null
 #
 
-class Trade::ValidationRule < ActiveRecord::Base
+class Trade::ValidationRule < ApplicationRecord
   # Used by seed.
   # attr_accessible :column_names, :run_order, :is_primary, :scope, :is_strict
   serialize :scope, ActiveRecord::Coders::NestedHstore
diff --git a/app/models/trade_code.rb b/app/models/trade_code.rb
index b12939fe8..5aef7bd60 100644
--- a/app/models/trade_code.rb
+++ b/app/models/trade_code.rb
@@ -12,7 +12,7 @@
 #  name_fr    :string(255)
 #
 
-class TradeCode < ActiveRecord::Base
+class TradeCode < ApplicationRecord
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :code, :type, :name_en, :name_es, :name_fr
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index 9ace89d75..9641ecef4 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -32,10 +32,9 @@
 
 require 'digest/sha1'
 require 'csv'
-class TradeRestriction < ActiveRecord::Base
+class TradeRestriction < ApplicationRecord
   extend Mobility
   include TrackWhoDoesIt
-
   # Migrated to controller (Strong Parameters)
   # attr_accessible :end_date, :geo_entity_id, :is_current,
   #   :notes, :publication_date, :purpose_ids, :quota, :type,
diff --git a/app/models/trade_restriction_purpose.rb b/app/models/trade_restriction_purpose.rb
index 3ce79a478..c582cdcf3 100644
--- a/app/models/trade_restriction_purpose.rb
+++ b/app/models/trade_restriction_purpose.rb
@@ -11,9 +11,8 @@
 #  updated_by_id        :integer
 #
 
-class TradeRestrictionPurpose < ActiveRecord::Base
+class TradeRestrictionPurpose < ApplicationRecord
   include TrackWhoDoesIt
-
   # Relationship model between TradeCode(purpose) and TradeRestriction
   # attr_accessible :purpose_id, :trade_restriction_id
 
diff --git a/app/models/trade_restriction_source.rb b/app/models/trade_restriction_source.rb
index f0c333166..01a8bd6b0 100644
--- a/app/models/trade_restriction_source.rb
+++ b/app/models/trade_restriction_source.rb
@@ -11,9 +11,8 @@
 #  updated_by_id        :integer
 #
 
-class TradeRestrictionSource < ActiveRecord::Base
+class TradeRestrictionSource < ApplicationRecord
   include TrackWhoDoesIt
-
   # Relationship model between TradeCode(source) and TradeRestriction
   # attr_accessible :source_id, :trade_restriction_id
 
diff --git a/app/models/trade_restriction_term.rb b/app/models/trade_restriction_term.rb
index 96904a09f..54a744919 100644
--- a/app/models/trade_restriction_term.rb
+++ b/app/models/trade_restriction_term.rb
@@ -11,7 +11,7 @@
 #  updated_by_id        :integer
 #
 
-class TradeRestrictionTerm < ActiveRecord::Base
+class TradeRestrictionTerm < ApplicationRecord
   include TrackWhoDoesIt
   # Relationship model between TradeCode(term) and TradeRestriction
   # attr_accessible :term_id, :trade_restriction_id
diff --git a/app/models/user.rb b/app/models/user.rb
index 488f61d92..5fbeba390 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -23,7 +23,7 @@
 #  is_cites_authority     :boolean          default(FALSE), not null
 #
 
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   devise :database_authenticatable, :registerable, :recoverable, :rememberable,
     :trackable, :validatable
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/year_annual_reports_by_country.rb b/app/models/year_annual_reports_by_country.rb
index d5dde3a66..66432703f 100644
--- a/app/models/year_annual_reports_by_country.rb
+++ b/app/models/year_annual_reports_by_country.rb
@@ -9,7 +9,7 @@
 #  year_created  :float
 #
 
-class YearAnnualReportsByCountry < ActiveRecord::Base
+class YearAnnualReportsByCountry < ApplicationRecord
   # No idea where using this.
   # attr_accessible :no, :name_en, :year, :reporter_type, :year_created
 end
diff --git a/app/workers/eu_regulation_activation_worker.rb b/app/workers/eu_regulation_activation_worker.rb
index ab27eccbb..74c31ced8 100644
--- a/app/workers/eu_regulation_activation_worker.rb
+++ b/app/workers/eu_regulation_activation_worker.rb
@@ -3,7 +3,7 @@ class EuRegulationActivationWorker
   sidekiq_options :queue => :admin, :retry => false, :backtrace => 50
 
   def perform(event_id, state)
-    ActiveRecord::Base.connection.execute <<-SQL
+    ApplicationRecord.connection.execute <<-SQL
       UPDATE listing_changes
       SET is_current = #{state}
       WHERE event_id = #{event_id}
diff --git a/app/workers/event_eu_suspension_copy_worker.rb b/app/workers/event_eu_suspension_copy_worker.rb
index e0e2043ba..0c67d0d66 100644
--- a/app/workers/event_eu_suspension_copy_worker.rb
+++ b/app/workers/event_eu_suspension_copy_worker.rb
@@ -3,7 +3,7 @@ class EventEuSuspensionCopyWorker
   sidekiq_options :queue => :admin, :retry => false, :backtrace => 50
 
   def perform(from_event_id, to_event_id)
-    ActiveRecord::Base.connection.execute <<-SQL
+    ApplicationRecord.connection.execute <<-SQL
       SELECT * FROM copy_eu_suspensions_across_events(
         #{from_event_id.to_i},
         #{to_event_id.to_i}
diff --git a/app/workers/event_listing_changes_copy_worker.rb b/app/workers/event_listing_changes_copy_worker.rb
index e644f2cfd..11fac52fb 100644
--- a/app/workers/event_listing_changes_copy_worker.rb
+++ b/app/workers/event_listing_changes_copy_worker.rb
@@ -3,7 +3,7 @@ class EventListingChangesCopyWorker
   sidekiq_options :queue => :admin, :retry => false, :backtrace => 50
 
   def perform(from_event_id, to_event_id)
-    ActiveRecord::Base.connection.execute <<-SQL
+    ApplicationRecord.connection.execute <<-SQL
       SELECT * FROM copy_listing_changes_across_events(
         #{from_event_id},
         #{to_event_id}
diff --git a/app/workers/permit_cleanup_worker.rb b/app/workers/permit_cleanup_worker.rb
index f521c5d19..a9e4db844 100644
--- a/app/workers/permit_cleanup_worker.rb
+++ b/app/workers/permit_cleanup_worker.rb
@@ -18,8 +18,8 @@ def perform(permits_ids = [])
       USING unused_permits
       WHERE trade_permits.id = unused_permits.id
       SQL
-    ActiveRecord::Base.connection.execute(
-      ActiveRecord::Base.send(:sanitize_sql_array, [
+    ApplicationRecord.connection.execute(
+      ApplicationRecord.send(:sanitize_sql_array, [
         sql,
         permits_ids: permits_ids.map(&:to_i)
       ])
diff --git a/app/workers/quotas_copy_worker.rb b/app/workers/quotas_copy_worker.rb
index 6e527c6c9..3fd251ee7 100644
--- a/app/workers/quotas_copy_worker.rb
+++ b/app/workers/quotas_copy_worker.rb
@@ -19,8 +19,8 @@ def perform(options)
           :url
         )
       SQL
-    ActiveRecord::Base.connection.execute(
-      ActiveRecord::Base.send(:sanitize_sql_array, [
+    ApplicationRecord.connection.execute(
+      ApplicationRecord.send(:sanitize_sql_array, [
         sql,
         :from_year => options["from_year"],
         :start_date => Date.parse(options["start_date"]),
diff --git a/app/workers/update_taxonomy_worker.rb b/app/workers/update_taxonomy_worker.rb
index 4d128e14b..993136dd2 100644
--- a/app/workers/update_taxonomy_worker.rb
+++ b/app/workers/update_taxonomy_worker.rb
@@ -3,7 +3,7 @@ class UpdateTaxonomyWorker
 
   def perform
     puts "Procedure: taxonomy"
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute(
       "SELECT * FROM rebuild_taxonomy()"
     )
 
diff --git a/config/initializers/active_record_comparison_attributes.rb b/config/initializers/active_record_comparison_attributes.rb
index abd77df56..4d447b50c 100644
--- a/config/initializers/active_record_comparison_attributes.rb
+++ b/config/initializers/active_record_comparison_attributes.rb
@@ -58,4 +58,4 @@ def duplicates(comparison_attributes_override)
 
 end
 
-ActiveRecord::Base.send :include, ComparisonAttributes
+ApplicationRecord.send :include, ComparisonAttributes
diff --git a/config/initializers/active_record_protected_deletion.rb b/config/initializers/active_record_protected_deletion.rb
index f9ffc90c4..3eb94290f 100644
--- a/config/initializers/active_record_protected_deletion.rb
+++ b/config/initializers/active_record_protected_deletion.rb
@@ -23,4 +23,4 @@ def dependent_objects_map
   end
 
 end
-ActiveRecord::Base.send :include, ProtectedDeletion
+ApplicationRecord.send :include, ProtectedDeletion
diff --git a/config/initializers/normalise_blank_values.rb b/config/initializers/normalise_blank_values.rb
index 38f3ad99e..6dbb58c2b 100644
--- a/config/initializers/normalise_blank_values.rb
+++ b/config/initializers/normalise_blank_values.rb
@@ -18,4 +18,4 @@ def normalise_blank_values
 
 end
 
-ActiveRecord::Base.send(:include, NormaliseBlankValues)
+ApplicationRecord.send(:include, NormaliseBlankValues)
diff --git a/config/puma.rb b/config/puma.rb
index c7f311f81..d2b0e4089 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -40,7 +40,7 @@
 # cannot share connections between processes.
 #
 # on_worker_boot do
-#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+#   ApplicationRecord.establish_connection if defined?(ActiveRecord)
 # end
 
 # Allow puma to be restarted by `rails restart` command.
diff --git a/db/migrate/20141003104615_split_taxon_concept_internal_note_into_3.rb b/db/migrate/20141003104615_split_taxon_concept_internal_note_into_3.rb
index 4797dbe42..9abecf90b 100644
--- a/db/migrate/20141003104615_split_taxon_concept_internal_note_into_3.rb
+++ b/db/migrate/20141003104615_split_taxon_concept_internal_note_into_3.rb
@@ -3,7 +3,7 @@ def change
     add_column :taxon_concepts, :internal_distribution_note, :text
     rename_column :taxon_concepts, :internal_notes, :internal_general_note
     # check if the internal nomenclature note exists already
-    res = ActiveRecord::Base.connection.execute(
+    res = ApplicationRecord.connection.execute(
       "SELECT column_name FROM information_schema.columns
       WHERE table_name='taxon_concepts' and column_name='internal_nomenclature_note'"
     )
diff --git a/db/migrate/20151005141953_add_empty_string_as_default_to_notes.rb b/db/migrate/20151005141953_add_empty_string_as_default_to_notes.rb
index 647343f94..c367c152a 100644
--- a/db/migrate/20151005141953_add_empty_string_as_default_to_notes.rb
+++ b/db/migrate/20151005141953_add_empty_string_as_default_to_notes.rb
@@ -7,7 +7,7 @@ def change
     change_column :nomenclature_change_outputs, :internal_note, :text, default: ''
     change_column :nomenclature_change_inputs, :internal_note, :text, default: ''
 
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute(
       <<-SQL
         UPDATE nomenclature_change_outputs
         SET note_en=''
diff --git a/db/migrate/20160304141931_update_ndf_documents_to_be_private.rb b/db/migrate/20160304141931_update_ndf_documents_to_be_private.rb
index 3440c9191..c9c48ad85 100644
--- a/db/migrate/20160304141931_update_ndf_documents_to_be_private.rb
+++ b/db/migrate/20160304141931_update_ndf_documents_to_be_private.rb
@@ -1,6 +1,6 @@
 class UpdateNdfDocumentsToBePrivate < ActiveRecord::Migration
   def change
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute(
       <<-SQL
         UPDATE documents
         SET is_public = false
diff --git a/db/migrate/20160406150331_set_distributions_empty_internal_notes_to_nil.rb b/db/migrate/20160406150331_set_distributions_empty_internal_notes_to_nil.rb
index 75d79e59d..8c6a4903c 100644
--- a/db/migrate/20160406150331_set_distributions_empty_internal_notes_to_nil.rb
+++ b/db/migrate/20160406150331_set_distributions_empty_internal_notes_to_nil.rb
@@ -1,6 +1,6 @@
 class SetDistributionsEmptyInternalNotesToNil < ActiveRecord::Migration
   def change
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute(
       <<-SQL
         UPDATE distributions
         SET internal_notes=NULL
diff --git a/db/migrate/20161107191141_remove_is_done_from_report_uploads_and_update_submitted_timestamps.rb b/db/migrate/20161107191141_remove_is_done_from_report_uploads_and_update_submitted_timestamps.rb
index 6001337fe..7f4276ef4 100644
--- a/db/migrate/20161107191141_remove_is_done_from_report_uploads_and_update_submitted_timestamps.rb
+++ b/db/migrate/20161107191141_remove_is_done_from_report_uploads_and_update_submitted_timestamps.rb
@@ -1,6 +1,6 @@
 class RemoveIsDoneFromReportUploadsAndUpdateSubmittedTimestamps < ActiveRecord::Migration
   def up
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute(
       <<-SQL
         UPDATE trade_annual_report_uploads
         SET submitted_at = updated_at, submitted_by_id = updated_by_id
@@ -15,7 +15,7 @@ def up
   def down
     add_column :trade_annual_report_uploads, :is_done, :boolean, default: false
 
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute(
       <<-SQL
         UPDATE trade_annual_report_uploads
         SET is_done = true
diff --git a/lib/modules/csv_exportable.rb b/lib/modules/csv_exportable.rb
index 431b68629..8c8397052 100644
--- a/lib/modules/csv_exportable.rb
+++ b/lib/modules/csv_exportable.rb
@@ -17,7 +17,7 @@ def copy_stmt(options)
       ENCODING :encoding
       CSV HEADER;
     PSQL
-    ActiveRecord::Base.send(
+    ApplicationRecord.send(
       :sanitize_sql_array, [sql, {
         :delimiter => options[:delimiter] || ',',
         :encoding => options[:encoding] || 'UTF8',
diff --git a/lib/modules/material_doc_ids_retriever.rb b/lib/modules/material_doc_ids_retriever.rb
index 3643ef4c0..c37d9ff9e 100644
--- a/lib/modules/material_doc_ids_retriever.rb
+++ b/lib/modules/material_doc_ids_retriever.rb
@@ -64,7 +64,7 @@ def self.locale_document(doc)
   end
 
   def self.ancestors_ids(tc_ids, taxon_name = nil, exact_match = nil)
-    res = ActiveRecord::Base.connection.execute(
+    res = ApplicationRecord.connection.execute(
       <<-SQL
       SELECT ancestor_taxon_concept_id
       FROM taxon_concepts_and_ancestors_mview
diff --git a/lib/modules/sapi/indexes.rb b/lib/modules/sapi/indexes.rb
index 53db38e3c..210b18472 100644
--- a/lib/modules/sapi/indexes.rb
+++ b/lib/modules/sapi/indexes.rb
@@ -49,13 +49,13 @@ module Indexes
 
     def self.drop_indexes
       INDEXES.each do |i|
-        ActiveRecord::Base.connection.execute("DROP INDEX IF EXISTS #{i[:name]}")
+        ApplicationRecord.connection.execute("DROP INDEX IF EXISTS #{i[:name]}")
       end
     end
 
     def self.create_indexes
       INDEXES.each do |i|
-        ActiveRecord::Base.connection.execute("CREATE INDEX #{i[:name]} ON #{i[:on]}")
+        ApplicationRecord.connection.execute("CREATE INDEX #{i[:name]} ON #{i[:on]}")
       end
     end
 
@@ -79,7 +79,7 @@ def self.drop_indexes_on_shipments
       DROP INDEX IF EXISTS index_trade_shipments_on_origin_permits_ids;
       DROP INDEX IF EXISTS index_trade_shipments_on_legacy_shipment_number;
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     def self.drop_indexes_on_trade_names
@@ -88,7 +88,7 @@ def self.drop_indexes_on_trade_names
         DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_trade_code;
         DROP INDEX IF EXISTS index_trade_species_mapping_import_cites_taxon_code;
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     def self.create_indexes_on_trade_names
@@ -103,7 +103,7 @@ def self.create_indexes_on_trade_names
           USING btree
           (cites_taxon_code);
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     def self.create_indexes_on_shipments
@@ -177,7 +177,7 @@ def self.create_indexes_on_shipments
         USING btree
         (legacy_shipment_number);
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
   end
diff --git a/lib/modules/sapi/stored_procedures.rb b/lib/modules/sapi/stored_procedures.rb
index e928f0dec..06cf8b6ac 100644
--- a/lib/modules/sapi/stored_procedures.rb
+++ b/lib/modules/sapi/stored_procedures.rb
@@ -25,7 +25,7 @@ def self.rebuild
         :trade_plus_complete_mview
       ].each { |p|
         puts "Procedure: #{p}"
-        ActiveRecord::Base.connection.execute("SELECT * FROM rebuild_#{p}()")
+        ApplicationRecord.connection.execute("SELECT * FROM rebuild_#{p}()")
       }
 
       changed_cnt = TaxonConcept.where('touched_at IS NOT NULL AND touched_at > updated_at').count
@@ -91,21 +91,21 @@ def self.rebuild_eu_taxonomy_and_listings
     def self.run_procedures(procedures)
       procedures.each { |p|
         puts "Procedure: #{p}"
-        ActiveRecord::Base.connection.execute("SELECT * FROM rebuild_#{p}()")
+        ApplicationRecord.connection.execute("SELECT * FROM rebuild_#{p}()")
       }
     end
 
     def self.rebuild_permit_numbers
       puts "Procedure: #{p}"
-      ActiveRecord::Base.connection.execute("DROP INDEX IF EXISTS index_trade_shipments_on_permits_ids")
-      ActiveRecord::Base.connection.execute("SELECT * FROM rebuild_permit_numbers()")
+      ApplicationRecord.connection.execute("DROP INDEX IF EXISTS index_trade_shipments_on_permits_ids")
+      ApplicationRecord.connection.execute("SELECT * FROM rebuild_permit_numbers()")
       sql = <<-SQL
       CREATE INDEX index_trade_shipments_on_permits_ids
         ON trade_shipments
         USING GIN
         (permits_ids);
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     def self.rebuild_compliance_mviews
@@ -116,20 +116,20 @@ def self.rebuild_compliance_mviews
         :non_compliant_shipments_view
       ].each { |p|
         puts "Procedure: #{p}"
-        ActiveRecord::Base.connection.execute("SELECT * FROM rebuild_#{p}()")
+        ApplicationRecord.connection.execute("SELECT * FROM rebuild_#{p}()")
       }
     end
 
     def self.rebuild_trade_plus_mviews
       view = 'trade_plus_complete_mview'
       puts "Procedure: #{view}"
-      ActiveRecord::Base.connection.execute("SELECT * FROM rebuild_#{view}()")
+      ApplicationRecord.connection.execute("SELECT * FROM rebuild_#{view}()")
     end
 
     def self.create_trade_plus_mview_indexes
       _function = 'create_trade_plus_complete_mview_indexes'
       puts "Procedure: #{_function}"
-      ActiveRecord::Base.connection.execute("SELECT * FROM #{_function}()")
+      ApplicationRecord.connection.execute("SELECT * FROM #{_function}()")
     end
   end
 end
diff --git a/lib/modules/sapi/summary.rb b/lib/modules/sapi/summary.rb
index 1c75c2892..5ccd18534 100644
--- a/lib/modules/sapi/summary.rb
+++ b/lib/modules/sapi/summary.rb
@@ -96,7 +96,7 @@ def self.taxonomy_kingdom_stats(taxonomy, kingdom)
         where(:taxon_concepts => { :taxonomy_id => t.id }).
         where(["(data->'kingdom_id')::INT = ?", k.id])
       stats[:distributions] = distributions.count
-      stats[:distribution_tags] = ActiveRecord::Base.connection.execute(<<-SQL
+      stats[:distribution_tags] = ApplicationRecord.connection.execute(<<-SQL
             SELECT COUNT(*) FROM taggings
               INNER JOIN distributions ON
                 taggings.taggable_id = distributions.id AND
diff --git a/lib/modules/trade/download_data_retriever.rb b/lib/modules/trade/download_data_retriever.rb
index 3e7e414e6..1774c2b61 100644
--- a/lib/modules/trade/download_data_retriever.rb
+++ b/lib/modules/trade/download_data_retriever.rb
@@ -127,6 +127,6 @@ def self.sanitize_compliance_param(param)
   end
 
   def self.query_runner(query)
-    ActiveRecord::Base.connection.execute(query)
+    ApplicationRecord.connection.execute(query)
   end
 end
diff --git a/lib/modules/trade/grouping/base.rb b/lib/modules/trade/grouping/base.rb
index d105b9147..14ec6e4c9 100644
--- a/lib/modules/trade/grouping/base.rb
+++ b/lib/modules/trade/grouping/base.rb
@@ -195,7 +195,7 @@ def get_condition_value(key, value)
   end
 
   def db
-    ActiveRecord::Base.connection
+    ApplicationRecord.connection
   end
 
 end
diff --git a/lib/modules/trade/mandatory_quotas_shipments.rb b/lib/modules/trade/mandatory_quotas_shipments.rb
index 85b275b07..5188196d2 100644
--- a/lib/modules/trade/mandatory_quotas_shipments.rb
+++ b/lib/modules/trade/mandatory_quotas_shipments.rb
@@ -88,7 +88,7 @@ def run
   end
 
   def db
-    ActiveRecord::Base.connection
+    ApplicationRecord.connection
   end
 
   def query
diff --git a/lib/modules/trade/rebuild_compliance_mviews.rb b/lib/modules/trade/rebuild_compliance_mviews.rb
index 4a07e1656..eb08021b3 100644
--- a/lib/modules/trade/rebuild_compliance_mviews.rb
+++ b/lib/modules/trade/rebuild_compliance_mviews.rb
@@ -34,7 +34,7 @@ def self.rebuild_compliance_mview(type)
   def self.recreate_mview(type, sql_view)
     view_name = "trade_shipments_#{type}_view"
     mview_name = "trade_shipments_#{type}_mview"
-    ActiveRecord::Base.transaction do
+    ApplicationRecord.transaction do
       command = "DROP MATERIALIZED VIEW IF EXISTS #{mview_name} CASCADE"
       puts command
       puts db.execute(command)
@@ -58,6 +58,6 @@ def self.recreate_non_compliant_view
   end
 
   def self.db
-    ActiveRecord::Base.connection
+    ApplicationRecord.connection
   end
 end
diff --git a/lib/modules/trade/rebuild_trade_plus_views.rb b/lib/modules/trade/rebuild_trade_plus_views.rb
index ec2a83b07..bdab2d2c5 100644
--- a/lib/modules/trade/rebuild_trade_plus_views.rb
+++ b/lib/modules/trade/rebuild_trade_plus_views.rb
@@ -31,7 +31,7 @@ def self.rebuild_trade_plus_view(type)
 
   def self.recreate_view(type, sql_view)
     view_name = "trade_plus_#{type}_view"
-    ActiveRecord::Base.transaction do
+    ApplicationRecord.transaction do
       command = "DROP VIEW IF EXISTS #{view_name} CASCADE"
       puts command
       db.execute(command)
@@ -43,6 +43,6 @@ def self.recreate_view(type, sql_view)
   end
 
   def self.db
-    ActiveRecord::Base.connection
+    ApplicationRecord.connection
   end
 end
diff --git a/lib/psql_command.rb b/lib/psql_command.rb
index ace411b47..df40d77d9 100644
--- a/lib/psql_command.rb
+++ b/lib/psql_command.rb
@@ -1,7 +1,7 @@
 class PsqlCommand
 
   def initialize(sql_cmd)
-    db_conf = ActiveRecord::Base.connection_config
+    db_conf = ApplicationRecord.connection_config
     @host = db_conf[:host] || 'localhost'
     @port = db_conf[:port] || 5432
     @username = db_conf[:username]
diff --git a/lib/tasks/db_cleanup.rake b/lib/tasks/db_cleanup.rake
index 0594afb4e..d32e39ee7 100644
--- a/lib/tasks/db_cleanup.rake
+++ b/lib/tasks/db_cleanup.rake
@@ -15,7 +15,7 @@ namespace :db do
         USING objects_to_delete
         WHERE common_names.id = objects_to_delete.id
       SQL
-      ActiveRecord::Base.connection.execute sql
+      ApplicationRecord.connection.execute sql
     end
   end
   namespace :taxon_names do
@@ -34,7 +34,7 @@ namespace :db do
         USING objects_to_delete
         WHERE taxon_names.id = objects_to_delete.id
       SQL
-      ActiveRecord::Base.connection.execute sql
+      ApplicationRecord.connection.execute sql
     end
   end
 end
diff --git a/lib/tasks/db_migrate_plpgsql.rake b/lib/tasks/db_migrate_plpgsql.rake
index 46685d251..66c3bc072 100644
--- a/lib/tasks/db_migrate_plpgsql.rake
+++ b/lib/tasks/db_migrate_plpgsql.rake
@@ -2,8 +2,8 @@ namespace :db do
   namespace :migrate do
     desc "Run custom sql scripts"
     task :sql => :environment do
-      ActiveRecord::Base.transaction do
-        connection = ActiveRecord::Base.connection
+      ApplicationRecord.transaction do
+        connection = ApplicationRecord.connection
 
         ['helpers', 'mviews', 'plpgsql'].each do |dir|
           files = Dir.glob(Rails.root.join("db/#{dir}/*.sql"))
@@ -44,9 +44,9 @@ namespace :db do
   desc "Drop all trade (shipments, permits, arus & sandboxes - use responsibly)"
   task :drop_trade => [:environment] do
     puts "Deleting shipments"
-    ActiveRecord::Base.connection.execute('DELETE FROM trade_shipments')
+    ApplicationRecord.connection.execute('DELETE FROM trade_shipments')
     puts "Deleting permits"
-    ActiveRecord::Base.connection.execute('DELETE FROM trade_permits')
+    ApplicationRecord.connection.execute('DELETE FROM trade_permits')
     puts "Deleting annual report uploads & dropping sandboxes"
     Trade::AnnualReportUpload.all.each { |aru| aru.destroy }
   end
diff --git a/lib/tasks/db_trim.rake b/lib/tasks/db_trim.rake
index 849aa80bb..8b8866a49 100644
--- a/lib/tasks/db_trim.rake
+++ b/lib/tasks/db_trim.rake
@@ -18,9 +18,9 @@ namespace :db do
   task :trim_trade => :environment do
     puts 'Deleting old shipments'
     year = Date.today.year - 5
-    ActiveRecord::Base.connection.execute "DELETE FROM trade_shipments WHERE year <= #{year}"
+    ApplicationRecord.connection.execute "DELETE FROM trade_shipments WHERE year <= #{year}"
     puts 'Clearing permit and annual report data'
-    ActiveRecord::Base.connection.execute 'UPDATE trade_shipments SET
+    ApplicationRecord.connection.execute 'UPDATE trade_shipments SET
         import_permit_number = NULL,
         export_permit_number = NULL,
         origin_permit_number = NULL,
@@ -30,11 +30,11 @@ namespace :db do
         trade_annual_report_upload_id = NULL,
         sandbox_id = NULL'
     puts 'Dropping sandboxes'
-    ActiveRecord::Base.connection.execute 'SELECT * FROM drop_trade_sandboxes()'
+    ApplicationRecord.connection.execute 'SELECT * FROM drop_trade_sandboxes()'
     puts 'Truncating annual reports'
-    ActiveRecord::Base.connection.execute 'DELETE FROM trade_annual_report_uploads'
+    ApplicationRecord.connection.execute 'DELETE FROM trade_annual_report_uploads'
     puts 'Truncating permits'
-    ActiveRecord::Base.connection.execute 'TRUNCATE trade_permits'
+    ApplicationRecord.connection.execute 'TRUNCATE trade_permits'
   end
 
   task :trim_listing_changes => :environment do
@@ -69,7 +69,7 @@ namespace :db do
       WHERE lc.id = listing_changes.id
     SQL
     puts 'Deleting old listing changes'
-    ActiveRecord::Base.connection.execute sql
+    ApplicationRecord.connection.execute sql
   end
 
   task :trim_trade_restrictions => :environment do
@@ -100,18 +100,18 @@ namespace :db do
       WHERE tr.id = trade_restrictions.id
     SQL
     puts 'Deleting old trade restrictions'
-    ActiveRecord::Base.connection.execute sql
+    ApplicationRecord.connection.execute sql
   end
 
   task :trim_eu_decisions => :environment do
     sql = 'DELETE FROM eu_decisions WHERE NOT is_current'
     puts 'Deleting old EU decisions'
-    ActiveRecord::Base.connection.execute sql
+    ApplicationRecord.connection.execute sql
   end
 
   task :trim_users => :environment do
     puts 'Clearing user data'
-    ActiveRecord::Base.connection.execute <<-SQL
+    ApplicationRecord.connection.execute <<-SQL
       UPDATE users SET
         name = 'user ' || users.id,
         email = 'user.' || users.id || '@test.org'
@@ -120,7 +120,7 @@ namespace :db do
 
   task :drop_temporary_tables => :environment do
     puts 'Dropping temporary tables'
-    ActiveRecord::Base.connection.execute 'SELECT * FROM drop_eu_lc_mviews()'
+    ApplicationRecord.connection.execute 'SELECT * FROM drop_eu_lc_mviews()'
   end
 
 end
diff --git a/lib/tasks/elibrary/citations_cop_importer.rb b/lib/tasks/elibrary/citations_cop_importer.rb
index 068935555..664e0518a 100644
--- a/lib/tasks/elibrary/citations_cop_importer.rb
+++ b/lib/tasks/elibrary/citations_cop_importer.rb
@@ -17,9 +17,9 @@ def columns_with_type
 
   def run_preparatory_queries
     super()
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET ProposalNature = NULL WHERE ProposalNature='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET ProposalOutcome = NULL WHERE ProposalOutcome='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET ProposalRepresentation = NULL WHERE ProposalRepresentation='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET ProposalNature = NULL WHERE ProposalNature='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET ProposalOutcome = NULL WHERE ProposalOutcome='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET ProposalRepresentation = NULL WHERE ProposalRepresentation='NULL'")
 
     # revert any previous CoP document duplication
     sql = <<-SQL
@@ -36,7 +36,7 @@ def run_preparatory_queries
       DELETE FROM documents
       WHERE original_id IS NOT NULL;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def run_final_queries
@@ -101,7 +101,7 @@ def run_final_queries
       FROM proposal_details_to_update pd
       WHERE proposal_details.id = pd.id;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
     # in case you need to revert
     # WITH new_docs AS (
     #   SELECT * FROM documents WHERE original_id IS NOT NULL
@@ -122,7 +122,7 @@ def run_final_queries
       proposal_details pd
       WHERE documents.id = pd.document_id;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def run_queries
@@ -140,7 +140,7 @@ def run_queries
       SELECT document_id, proposal_outcome_id, ProposalNature, ProposalRepresentation, ProposalNo, NOW(), NOW()
       FROM rows_to_insert_resolved
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
     run_final_queries
   end
 
diff --git a/lib/tasks/elibrary/citations_importer.rb b/lib/tasks/elibrary/citations_importer.rb
index ea555d39b..ee634df91 100644
--- a/lib/tasks/elibrary/citations_importer.rb
+++ b/lib/tasks/elibrary/citations_importer.rb
@@ -52,16 +52,16 @@ def columns_with_type
   end
 
   def run_preparatory_queries
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET splus_taxon_concept_id = NULL WHERE splus_taxon_concept_id LIKE '%N/A%'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET CtyISO2 = NULL WHERE CtyISO2='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET EventID = NULL WHERE EventID='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET DocumentID = NULL WHERE DocumentID='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET splus_taxon_concept_id = NULL WHERE splus_taxon_concept_id LIKE '%N/A%'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET CtyISO2 = NULL WHERE CtyISO2='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET EventID = NULL WHERE EventID='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET DocumentID = NULL WHERE DocumentID='NULL'")
   end
 
   def run_queries
-    ActiveRecord::Base.connection.execute('DROP TABLE IF EXISTS elibrary_citations_resolved_tmp')
-    ActiveRecord::Base.connection.execute('CREATE TABLE elibrary_citations_resolved_tmp (document_id INT, CitationId INT, CtyISO2 TEXT, splus_taxon_concept_id INT)')
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute('DROP TABLE IF EXISTS elibrary_citations_resolved_tmp')
+    ApplicationRecord.connection.execute('CREATE TABLE elibrary_citations_resolved_tmp (document_id INT, CitationId INT, CtyISO2 TEXT, splus_taxon_concept_id INT)')
+    ApplicationRecord.connection.execute(
       <<-SQL
       INSERT INTO elibrary_citations_resolved_tmp (document_id, CitationId, CtyISO2, splus_taxon_concept_id)
         SELECT
@@ -76,9 +76,9 @@ def run_queries
       SQL
     )
 
-    ActiveRecord::Base.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (CitationID, document_id)')
-    ActiveRecord::Base.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (CtyISO2)')
-    ActiveRecord::Base.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (splus_taxon_concept_id)')
+    ApplicationRecord.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (CitationID, document_id)')
+    ApplicationRecord.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (CtyISO2)')
+    ApplicationRecord.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (splus_taxon_concept_id)')
 
     sql = <<-SQL
       WITH inserted_citations AS (
@@ -126,7 +126,7 @@ def run_queries
       JOIN inserted_citations ON inserted_citations.elib_legacy_id = rows_to_insert_resolved.CitationID
       WHERE splus_taxon_concept_id IS NOT NULL
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def all_rows_sql
diff --git a/lib/tasks/elibrary/citations_manual_importer.rb b/lib/tasks/elibrary/citations_manual_importer.rb
index e5b1635c7..3038bdd90 100644
--- a/lib/tasks/elibrary/citations_manual_importer.rb
+++ b/lib/tasks/elibrary/citations_manual_importer.rb
@@ -21,7 +21,7 @@ def columns_with_type
   end
 
   def run_preparatory_queries
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute(
       <<-SQL
       BEGIN;
         CREATE TABLE temp_table (LIKE #{table_name});
@@ -31,7 +31,7 @@ def run_preparatory_queries
           FROM #{table_name};
 
         DROP TABLE #{table_name};
-        
+
         ALTER TABLE temp_table RENAME TO #{table_name};
       COMMIT;
       SQL
@@ -40,9 +40,9 @@ def run_preparatory_queries
 
   def run_queries
 
-    ActiveRecord::Base.connection.execute('DROP TABLE IF EXISTS elibrary_citations_resolved_tmp')
-    ActiveRecord::Base.connection.execute('CREATE TABLE elibrary_citations_resolved_tmp (document_id INT, taxon_concept_id INT)')
-    ActiveRecord::Base.connection.execute(
+    ApplicationRecord.connection.execute('DROP TABLE IF EXISTS elibrary_citations_resolved_tmp')
+    ApplicationRecord.connection.execute('CREATE TABLE elibrary_citations_resolved_tmp (document_id INT, taxon_concept_id INT)')
+    ApplicationRecord.connection.execute(
       <<-SQL
       INSERT INTO elibrary_citations_resolved_tmp (document_id, taxon_concept_id)
         SELECT
@@ -54,8 +54,8 @@ def run_queries
       SQL
     )
 
-    ActiveRecord::Base.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (document_id)')
-    ActiveRecord::Base.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (taxon_concept_id)')
+    ApplicationRecord.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (document_id)')
+    ApplicationRecord.connection.execute('CREATE INDEX ON elibrary_citations_resolved_tmp (taxon_concept_id)')
 
     sql = <<-SQL
       WITH inserted_citations AS (
@@ -86,8 +86,8 @@ def run_queries
       JOIN inserted_citations ON inserted_citations.document_id = rows_to_insert_resolved.document_id
       WHERE taxon_concept_id IS NOT NULL
     SQL
-    ActiveRecord::Base.connection.execute(sql)
-    ActiveRecord::Base.connection.execute('DROP TABLE IF EXISTS elibrary_citations_resolved_tmp')
+    ApplicationRecord.connection.execute(sql)
+    ApplicationRecord.connection.execute('DROP TABLE IF EXISTS elibrary_citations_resolved_tmp')
   end
 
   def rows_to_insert_sql
diff --git a/lib/tasks/elibrary/citations_rst_importer.rb b/lib/tasks/elibrary/citations_rst_importer.rb
index 1ac2e09c3..a2a3f9b9c 100644
--- a/lib/tasks/elibrary/citations_rst_importer.rb
+++ b/lib/tasks/elibrary/citations_rst_importer.rb
@@ -36,9 +36,9 @@ def columns_with_type
 
   def run_preparatory_queries
     super()
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET SigTradePhase = NULL WHERE SigTradePhase='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET SigTradeProcessStage = NULL WHERE SigTradeProcessStage='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET SigTradeRecommendedCategory = NULL WHERE SigTradeRecommendedCategory='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET SigTradePhase = NULL WHERE SigTradePhase='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET SigTradeProcessStage = NULL WHERE SigTradeProcessStage='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET SigTradeRecommendedCategory = NULL WHERE SigTradeRecommendedCategory='NULL'")
   end
 
   def run_queries
@@ -57,7 +57,7 @@ def run_queries
       SELECT document_id, review_phase_id, process_stage_id, SigTradeRecommendedCategory, NOW(), NOW()
       FROM rows_to_insert_resolved
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   # this performs grouping, the review meta data used to be citation-level
diff --git a/lib/tasks/elibrary/document_discussions_importer.rb b/lib/tasks/elibrary/document_discussions_importer.rb
index 51202ea49..4db5cf6ae 100644
--- a/lib/tasks/elibrary/document_discussions_importer.rb
+++ b/lib/tasks/elibrary/document_discussions_importer.rb
@@ -29,7 +29,7 @@ def columns_with_type
   end
 
   def run_preparatory_queries
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET DocumentOrder = NULL WHERE DocumentOrder='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET DocumentOrder = NULL WHERE DocumentOrder='NULL'")
   end
 
   def run_queries
@@ -44,7 +44,7 @@ def run_queries
       SELECT DiscussionTitle, 'DocumentTag::Discussion', NOW(), NOW()
       FROM missing_discussions;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     # update documents
     sql = <<-SQL
@@ -56,7 +56,7 @@ def run_queries
       FROM rows_to_insert t
       WHERE documents.id = t.id;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def all_rows_sql
diff --git a/lib/tasks/elibrary/documents_identification_importer.rb b/lib/tasks/elibrary/documents_identification_importer.rb
index edd320ff9..7c6e4e6da 100644
--- a/lib/tasks/elibrary/documents_identification_importer.rb
+++ b/lib/tasks/elibrary/documents_identification_importer.rb
@@ -72,7 +72,7 @@ def run_queries
         NOW()
       FROM rows_to_insert_resolved
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     # now insert the documents to be linked with the master document
     sql = <<-SQL
@@ -123,7 +123,7 @@ def run_queries
         NOW()
       FROM rows_with_master_document_id
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def all_rows_sql
diff --git a/lib/tasks/elibrary/documents_importer.rb b/lib/tasks/elibrary/documents_importer.rb
index b2d95725d..7bf8f3b8d 100644
--- a/lib/tasks/elibrary/documents_importer.rb
+++ b/lib/tasks/elibrary/documents_importer.rb
@@ -44,11 +44,11 @@ def columns_with_type
   end
 
   def run_preparatory_queries
-    ActiveRecord::Base.connection.execute("DELETE FROM #{table_name} WHERE DocumentTypeName LIKE 'CoP Proceedings%'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET DocumentTitle = NULL WHERE DocumentTitle='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET DocumentDate = NULL WHERE DocumentDate='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET EventDate = NULL WHERE EventDate='NULL'")
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET DocumentFileName = NULL WHERE DocumentFileName='NULL'")
+    ApplicationRecord.connection.execute("DELETE FROM #{table_name} WHERE DocumentTypeName LIKE 'CoP Proceedings%'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET DocumentTitle = NULL WHERE DocumentTitle='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET DocumentDate = NULL WHERE DocumentDate='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET EventDate = NULL WHERE EventDate='NULL'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET DocumentFileName = NULL WHERE DocumentFileName='NULL'")
   end
 
   def run_queries
@@ -91,7 +91,7 @@ def run_queries
         NOW()
       FROM rows_to_insert_resolved
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     sql = <<-SQL
       WITH rows_with_master_document_id AS (
@@ -110,7 +110,7 @@ def run_queries
       FROM rows_with_master_document_id
       WHERE rows_with_master_document_id.id = documents.id
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def all_rows_sql
diff --git a/lib/tasks/elibrary/events_importer.rb b/lib/tasks/elibrary/events_importer.rb
index 162287be8..e01b26a42 100644
--- a/lib/tasks/elibrary/events_importer.rb
+++ b/lib/tasks/elibrary/events_importer.rb
@@ -34,7 +34,7 @@ def run_preparatory_queries
       FROM cops_to_update
       WHERE events.id = cops_to_update.id
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     sql = <<-SQL
       WITH srgs_to_update AS (
@@ -46,7 +46,7 @@ def run_preparatory_queries
       FROM srgs_to_update
       WHERE events.id = srgs_to_update.id
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def run_queries
@@ -66,7 +66,7 @@ def run_queries
         NOW()
       FROM rows_to_insert
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def all_rows_sql
diff --git a/lib/tasks/elibrary/identification_docs_distributions_importer.rb b/lib/tasks/elibrary/identification_docs_distributions_importer.rb
index 55f7b4a4c..997891a9e 100644
--- a/lib/tasks/elibrary/identification_docs_distributions_importer.rb
+++ b/lib/tasks/elibrary/identification_docs_distributions_importer.rb
@@ -47,7 +47,7 @@ def self.import_species_distributions
 
     SQL
 
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   # import distribution on material documents tagged at level higher than species
@@ -67,7 +67,7 @@ def self.import_higher_taxa_distributions
     WHERE tc.countries_ids_ary IS NULL
     SQL
 
-    results = ActiveRecord::Base.connection.execute(sql)
+    results = ApplicationRecord.connection.execute(sql)
 
     results.to_a.each_slice(50) do |result|
       sql, no_distr = [], []
@@ -107,7 +107,7 @@ def self.import_higher_taxa_distributions
        ON CONFLICT (geo_entity_id, document_citation_id) DO NOTHING
 
       SQL
-      ActiveRecord::Base.connection.execute(query)
+      ApplicationRecord.connection.execute(query)
     end
   end
 
diff --git a/lib/tasks/elibrary/importable.rb b/lib/tasks/elibrary/importable.rb
index 4a0fc1320..ed4d287d3 100644
--- a/lib/tasks/elibrary/importable.rb
+++ b/lib/tasks/elibrary/importable.rb
@@ -16,13 +16,13 @@ def run
     end
 
     def drop_table_if_exists(table_name)
-      ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS #{table_name} CASCADE"
+      ApplicationRecord.connection.execute "DROP TABLE IF EXISTS #{table_name} CASCADE"
       puts "Table removed"
     end
 
     def create_table_from_column_array(table_name, db_columns_with_type)
       drop_table_if_exists(table_name)
-      ActiveRecord::Base.connection.execute "CREATE TABLE #{table_name} (#{db_columns_with_type.join(', ')})"
+      ApplicationRecord.connection.execute "CREATE TABLE #{table_name} (#{db_columns_with_type.join(', ')})"
       puts "Table created"
     end
 
@@ -45,7 +45,7 @@ def print_query_counts
       queries = { 'rows_in_import_file' => "SELECT COUNT(*) FROM #{table_name}" }
       queries['rows_to_insert'] = "SELECT COUNT(*) FROM (#{rows_to_insert_sql}) AS t"
       queries.each do |q_name, q|
-        res = ActiveRecord::Base.connection.execute(q)
+        res = ApplicationRecord.connection.execute(q)
         puts "#{res[0]['count']} #{q_name.humanize}"
       end
     end
diff --git a/lib/tasks/elibrary/non_cites_taxa_importer.rb b/lib/tasks/elibrary/non_cites_taxa_importer.rb
index dbc67c9a8..34f15423c 100644
--- a/lib/tasks/elibrary/non_cites_taxa_importer.rb
+++ b/lib/tasks/elibrary/non_cites_taxa_importer.rb
@@ -27,7 +27,7 @@ def columns_with_type
   end
 
   def run_preparatory_queries
-    ActiveRecord::Base.connection.execute("UPDATE #{table_name} SET parent_id = NULL WHERE parent_id = '#N/A'")
+    ApplicationRecord.connection.execute("UPDATE #{table_name} SET parent_id = NULL WHERE parent_id = '#N/A'")
   end
 
   def run_queries
@@ -47,7 +47,7 @@ def run_queries
         NOW()
       FROM taxon_names_to_insert
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     sql = <<-SQL
       WITH rows_to_insert AS (
@@ -67,7 +67,7 @@ def run_queries
       JOIN taxon_names
       ON normalised_name = taxon_names.scientific_name
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def all_rows_sql
diff --git a/lib/tasks/elibrary/users_importer.rb b/lib/tasks/elibrary/users_importer.rb
index 772707538..b5a4d7a58 100644
--- a/lib/tasks/elibrary/users_importer.rb
+++ b/lib/tasks/elibrary/users_importer.rb
@@ -38,7 +38,7 @@ def run_queries
         NOW()
       FROM rows_to_insert
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   def all_rows_sql
diff --git a/lib/tasks/export_trade_db.rake b/lib/tasks/export_trade_db.rake
index e51b0e7ac..545d5473a 100644
--- a/lib/tasks/export_trade_db.rake
+++ b/lib/tasks/export_trade_db.rake
@@ -56,7 +56,7 @@ namespace :export do
       while(ntuples == RECORDS_PER_FILE) do
         i = i + 1
         query = Trade::ShipmentReportQueries.full_db_query_single_file(RECORDS_PER_FILE, offset)
-        results = ActiveRecord::Base.connection.execute query
+        results = ApplicationRecord.connection.execute query
         ntuples = results.ntuples
         values = results.values
 
@@ -100,7 +100,7 @@ namespace :export do
         if (2012..2015).include?(year)
           kingdom = 'Animalia'
           query = Trade::ShipmentReportQueries.full_db_query_by_kingdom(year, kingdom)
-          results = ActiveRecord::Base.connection.execute query
+          results = ApplicationRecord.connection.execute query
           ntuples = results.ntuples
           options = {
             dir: dir,
@@ -113,7 +113,7 @@ namespace :export do
 
           kingdom = 'Plantae'
           query = Trade::ShipmentReportQueries.full_db_query_by_kingdom(year, kingdom)
-          results = ActiveRecord::Base.connection.execute query
+          results = ApplicationRecord.connection.execute query
           ntuples = results.ntuples
           options = {
             dir: dir,
@@ -125,7 +125,7 @@ namespace :export do
           process_results(results, options)
         else
           query = Trade::ShipmentReportQueries.full_db_query_by_year(year)
-          results = ActiveRecord::Base.connection.execute query
+          results = ApplicationRecord.connection.execute query
           ntuples = results.ntuples
           options = {
             dir: dir,
@@ -170,7 +170,7 @@ namespace :export do
         # Default to a full export query otherwise
         query = query ? query : Trade::ShipmentReportQueries.full_db_query(RECORDS_PER_FILE, offset)
 
-        results = ActiveRecord::Base.connection.execute query
+        results = ApplicationRecord.connection.execute query
         ntuples = results.ntuples
         options = {
           dir: dir,
diff --git a/lib/tasks/helpers_for_import.rb b/lib/tasks/helpers_for_import.rb
index 5cb1af182..2ddb9ec1a 100644
--- a/lib/tasks/helpers_for_import.rb
+++ b/lib/tasks/helpers_for_import.rb
@@ -458,20 +458,20 @@ def create_table_from_csv_headers(path_to_file, table_name)
 def create_table_from_column_array(table_name, db_columns)
   begin
     puts "Creating tmp table"
-    ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS #{table_name} CASCADE"
-    ActiveRecord::Base.connection.execute "CREATE TABLE #{table_name} (#{db_columns.join(', ')})"
+    ApplicationRecord.connection.execute "DROP TABLE IF EXISTS #{table_name} CASCADE"
+    ApplicationRecord.connection.execute "CREATE TABLE #{table_name} (#{db_columns.join(', ')})"
     puts "Table created"
   rescue Exception => e
     puts e.inspect
     puts "Tmp already exists removing data from tmp table before starting the import"
-    ActiveRecord::Base.connection.execute "DELETE FROM #{table_name};"
+    ApplicationRecord.connection.execute "DELETE FROM #{table_name};"
     puts "Data removed"
   end
 end
 
 def drop_table(table_name)
   begin
-    ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS #{table_name};"
+    ApplicationRecord.connection.execute "DROP TABLE IF EXISTS #{table_name};"
     puts "Table removed"
   rescue Exception
     puts "Could not drop table #{table_name}. It might not exist if this is the first time you are running this rake task."
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index b89225588..96567e649 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -1,7 +1,7 @@
 namespace :import do
 
   task :drop_import_tables => :environment do
-    ActiveRecord::Base.connection.execute 'SELECT * FROM drop_import_tables()'
+    ApplicationRecord.connection.execute 'SELECT * FROM drop_import_tables()'
   end
 
   namespace :cleaned do
diff --git a/lib/tasks/import_authors_year.rake b/lib/tasks/import_authors_year.rake
index b47fd5fa2..50aa042b5 100644
--- a/lib/tasks/import_authors_year.rake
+++ b/lib/tasks/import_authors_year.rake
@@ -15,7 +15,7 @@ namespace :import do
         FROM #{TMP_TABLE} t
         WHERE t.legacy_id = tc.id
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     count = TaxonConcept.where('updated_at > ?', Date.today).count
     puts "#{count} TaxonConcepts updated"
diff --git a/lib/tasks/import_checklist_translations.rake b/lib/tasks/import_checklist_translations.rake
index bea929f5b..5a9c73adc 100644
--- a/lib/tasks/import_checklist_translations.rake
+++ b/lib/tasks/import_checklist_translations.rake
@@ -17,7 +17,7 @@ namespace :import do
       FROM #{TMP_TABLE} t
       WHERE UPPER(BTRIM(t.name)) = UPPER(BTRIM(ranks.name))
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   task :change_types_translations => :environment do
@@ -32,7 +32,7 @@ namespace :import do
       FROM #{TMP_TABLE} t
       WHERE UPPER(BTRIM(t.name)) = UPPER(BTRIM(change_types.name))
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
 end
diff --git a/lib/tasks/import_cites_listings.rake b/lib/tasks/import_cites_listings.rake
index b0c32bd8c..833ad7ca2 100644
--- a/lib/tasks/import_cites_listings.rake
+++ b/lib/tasks/import_cites_listings.rake
@@ -31,16 +31,16 @@ namespace :import do
       kingdom = file.split('/').last.split('_')[0].titleize
 
       puts "CREATING temporary column and view"
-      ActiveRecord::Base.connection.execute(<<-SQL
+      ApplicationRecord.connection.execute(<<-SQL
         CREATE VIEW #{TMP_TABLE}_view AS
         SELECT ROW_NUMBER() OVER () AS row_id, * FROM #{TMP_TABLE}
         ORDER BY legacy_id, listing_date, appendix, country_iso2
       SQL
       )
-      ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes DROP COLUMN IF EXISTS import_row_id")
-      ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes ADD COLUMN import_row_id integer")
-      ActiveRecord::Base.connection.execute("ALTER TABLE annotations DROP COLUMN IF EXISTS import_row_id")
-      ActiveRecord::Base.connection.execute("ALTER TABLE annotations ADD COLUMN import_row_id integer")
+      ApplicationRecord.connection.execute("ALTER TABLE listing_changes DROP COLUMN IF EXISTS import_row_id")
+      ApplicationRecord.connection.execute("ALTER TABLE listing_changes ADD COLUMN import_row_id integer")
+      ApplicationRecord.connection.execute("ALTER TABLE annotations DROP COLUMN IF EXISTS import_row_id")
+      ApplicationRecord.connection.execute("ALTER TABLE annotations ADD COLUMN import_row_id integer")
 
       copy_data(file, TMP_TABLE)
 
@@ -118,7 +118,7 @@ namespace :import do
       SQL
 
       puts "INSERTING listing_changes"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       # add taxonomic exceptions
       sql = <<-SQL
@@ -155,7 +155,7 @@ namespace :import do
       SQL
 
       puts "INSERTING taxonomic exceptions"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       # add population exceptions
       sql = <<-SQL
@@ -189,7 +189,7 @@ namespace :import do
       SQL
 
       puts "INSERTING population exceptions (listing distributions)"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       sql = <<-SQL
       WITH listed_populations AS (
@@ -204,7 +204,7 @@ namespace :import do
       SQL
 
       puts "INSERTING listed populations (listing distributions)"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       sql = <<-SQL
           INSERT INTO listing_distributions(listing_change_id, geo_entity_id, is_party, created_at, updated_at)
@@ -215,14 +215,14 @@ namespace :import do
           WHERE TMP.country_iso2 <> 'Null' AND TMP.country_iso2 IS NOT NULL AND geo_entities.is_current = 't'
       SQL
       puts "INSERTING parties (listing distributions)"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
     end
 
     puts "DROPPING temporary column and view"
-    ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes DROP COLUMN import_row_id")
-    ActiveRecord::Base.connection.execute("ALTER TABLE annotations DROP COLUMN import_row_id")
-    ActiveRecord::Base.connection.execute("DROP VIEW cites_listings_import_view")
+    ApplicationRecord.connection.execute("ALTER TABLE listing_changes DROP COLUMN import_row_id")
+    ApplicationRecord.connection.execute("ALTER TABLE annotations DROP COLUMN import_row_id")
+    ApplicationRecord.connection.execute("DROP VIEW cites_listings_import_view")
 
     new_listings_count = ListingChange.joins(:species_listing).
       where(:species_listings => { :designation_id => designation.id }).count
diff --git a/lib/tasks/import_cites_parties.rake b/lib/tasks/import_cites_parties.rake
index 9180b1878..d01df9f05 100644
--- a/lib/tasks/import_cites_parties.rake
+++ b/lib/tasks/import_cites_parties.rake
@@ -18,6 +18,6 @@ namespace :import do
             WHERE designations.name = '#{Designation::CITES}'
       ) AS subquery
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 end
diff --git a/lib/tasks/import_cites_quotas.rake b/lib/tasks/import_cites_quotas.rake
index 9e05ef59e..22f00f6ef 100644
--- a/lib/tasks/import_cites_quotas.rake
+++ b/lib/tasks/import_cites_quotas.rake
@@ -24,14 +24,14 @@ namespace :import do
       copy_data(file, TMP_TABLE)
 
       puts "CREATING temporary column and view"
-      ActiveRecord::Base.connection.execute(<<-SQL
+      ApplicationRecord.connection.execute(<<-SQL
         CREATE VIEW #{TMP_TABLE}_view AS
         SELECT DISTINCT ROW_NUMBER() OVER () AS row_id, * FROM #{TMP_TABLE}
         ORDER BY start_date
       SQL
       )
-      ActiveRecord::Base.connection.execute("ALTER TABLE trade_restrictions DROP COLUMN IF EXISTS import_row_id")
-      ActiveRecord::Base.connection.execute("ALTER TABLE trade_restrictions ADD COLUMN import_row_id integer")
+      ApplicationRecord.connection.execute("ALTER TABLE trade_restrictions DROP COLUMN IF EXISTS import_row_id")
+      ApplicationRecord.connection.execute("ALTER TABLE trade_restrictions ADD COLUMN import_row_id integer")
 
       sql = <<-SQL
         INSERT INTO trade_restrictions(is_current, start_date, end_date, geo_entity_id, quota, publication_date,
@@ -56,7 +56,7 @@ namespace :import do
           WHERE taxon_concepts.id IS NOT NULL AND geo_entities.id IS NOT NULL
       SQL
 
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       # Add Terms & Sources Relationships
       ["terms", "sources"].each do |code|
@@ -72,12 +72,12 @@ namespace :import do
           INNER JOIN trade_codes ON UPPER(trade_codes.code) = UPPER(BTRIM(t.code)) AND trade_codes.type = '#{code.singularize.titleize}'
         SQL
         puts "Linking #{code} to quotas"
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
     end
     puts "DROPPING temporary column and view"
-    ActiveRecord::Base.connection.execute("ALTER TABLE trade_restrictions DROP COLUMN import_row_id")
-    ActiveRecord::Base.connection.execute("DROP VIEW #{TMP_TABLE}_view")
+    ApplicationRecord.connection.execute("ALTER TABLE trade_restrictions DROP COLUMN import_row_id")
+    ApplicationRecord.connection.execute("DROP VIEW #{TMP_TABLE}_view")
 
     puts "There are now #{Quota.count} CITES quotas in the database"
   end
diff --git a/lib/tasks/import_cites_regions.rake b/lib/tasks/import_cites_regions.rake
index d8f1bece8..82b5a5217 100644
--- a/lib/tasks/import_cites_regions.rake
+++ b/lib/tasks/import_cites_regions.rake
@@ -19,7 +19,7 @@ namespace :import do
           WHERE UPPER(BTRIM(name)) = UPPER(BTRIM(TMP.name)) AND geo_entity_type_id = #{regions_type.id}
         );
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     puts "There are now #{GeoEntity.count(conditions: { geo_entity_type_id: regions_type.id })} CITES Regions in the database"
   end
@@ -38,7 +38,7 @@ namespace :import do
       WHERE UPPER(BTRIM(t.name)) = UPPER(BTRIM(geo_entities.name_en))
       AND geo_entities.geo_entity_type_id = #{regions_type.id}
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
 end
diff --git a/lib/tasks/import_cites_suspensions.rake b/lib/tasks/import_cites_suspensions.rake
index d5f24042e..6a6ee4952 100644
--- a/lib/tasks/import_cites_suspensions.rake
+++ b/lib/tasks/import_cites_suspensions.rake
@@ -125,7 +125,7 @@ namespace :import do
         FROM suspensions_with_ids
       SQL
 
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     puts "There are now #{CitesSuspension.count} CITES suspensions in the database"
diff --git a/lib/tasks/import_cleanup.rake b/lib/tasks/import_cleanup.rake
index 7b98786b8..ce603b077 100644
--- a/lib/tasks/import_cleanup.rake
+++ b/lib/tasks/import_cleanup.rake
@@ -1,11 +1,11 @@
 namespace :import do
   desc 'Removes all import tables'
   task :cleanup => :environment do
-    pg_res = ActiveRecord::Base.connection.execute(
+    pg_res = ApplicationRecord.connection.execute(
       "SELECT table_name FROM information_schema.tables WHERE table_name LIKE '%_import'"
     )
     pg_res.each do |row|
-      ActiveRecord::Base.connection.execute("DROP TABLE #{row['table_name']} CASCADE")
+      ApplicationRecord.connection.execute("DROP TABLE #{row['table_name']} CASCADE")
     end
     puts "Would be useful to run VACUUM ANALYZE now"
   end
diff --git a/lib/tasks/import_cms_listings.rake b/lib/tasks/import_cms_listings.rake
index d4aa01a5d..5ec621113 100644
--- a/lib/tasks/import_cms_listings.rake
+++ b/lib/tasks/import_cms_listings.rake
@@ -28,17 +28,17 @@ namespace :import do
       kingdom = 'Animalia'
 
       puts "CREATING temporary column and view"
-      ActiveRecord::Base.connection.execute(<<-SQL
+      ApplicationRecord.connection.execute(<<-SQL
         CREATE VIEW #{TMP_TABLE}_view AS
         SELECT ROW_NUMBER() OVER () AS row_id, * FROM #{TMP_TABLE}
         WHERE #{TMP_TABLE}.appendix IN ('I', 'II')
         ORDER BY legacy_id, listing_date, appendix
       SQL
       )
-      ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes DROP COLUMN IF EXISTS import_row_id")
-      ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes ADD COLUMN import_row_id integer")
-      ActiveRecord::Base.connection.execute("ALTER TABLE annotations DROP COLUMN IF EXISTS import_row_id")
-      ActiveRecord::Base.connection.execute("ALTER TABLE annotations ADD COLUMN import_row_id integer")
+      ApplicationRecord.connection.execute("ALTER TABLE listing_changes DROP COLUMN IF EXISTS import_row_id")
+      ApplicationRecord.connection.execute("ALTER TABLE listing_changes ADD COLUMN import_row_id integer")
+      ApplicationRecord.connection.execute("ALTER TABLE annotations DROP COLUMN IF EXISTS import_row_id")
+      ApplicationRecord.connection.execute("ALTER TABLE annotations ADD COLUMN import_row_id integer")
 
       copy_data(file, TMP_TABLE)
 
@@ -108,7 +108,7 @@ namespace :import do
       SQL
 
       puts "INSERTING listing_changes"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       # add taxonomic exceptions
       sql = <<-SQL
@@ -143,7 +143,7 @@ namespace :import do
       SQL
 
       puts "INSERTING taxonomic exceptions"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       # add population exceptions
       sql = <<-SQL
@@ -177,7 +177,7 @@ namespace :import do
       SQL
 
       puts "INSERTING population exceptions (listing distributions)"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       sql = <<-SQL
       WITH listed_populations AS (
@@ -192,7 +192,7 @@ namespace :import do
       SQL
 
       puts "INSERTING listed populations (listing distributions)"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       sql = <<-SQL
         INSERT INTO instruments(name, designation_id, created_at, updated_at)
@@ -205,7 +205,7 @@ namespace :import do
         )
       SQL
       puts "INSERTING CMS instruments"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       sql = <<-SQL
         INSERT INTO taxon_instruments(taxon_concept_id, instrument_id, effective_from, created_at, updated_at)
@@ -225,13 +225,13 @@ namespace :import do
           )
       SQL
       puts "INSERTING taxon_instruments relationships"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     puts "DROPPING temporary column and view"
-    #    ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes DROP COLUMN import_row_id")
-    #    ActiveRecord::Base.connection.execute("ALTER TABLE annotations DROP COLUMN import_row_id")
-    #    ActiveRecord::Base.connection.execute("DROP VIEW cms_listings_import_view")
+    #    ApplicationRecord.connection.execute("ALTER TABLE listing_changes DROP COLUMN import_row_id")
+    #    ApplicationRecord.connection.execute("ALTER TABLE annotations DROP COLUMN import_row_id")
+    #    ApplicationRecord.connection.execute("DROP VIEW cms_listings_import_view")
 
     new_listings_count = ListingChange.joins(:species_listing).
       where(:species_listings => { :designation_id => designation.id }).count
diff --git a/lib/tasks/import_common_names.rake b/lib/tasks/import_common_names.rake
index 9902e39cc..0a2ec7006 100644
--- a/lib/tasks/import_common_names.rake
+++ b/lib/tasks/import_common_names.rake
@@ -10,7 +10,7 @@ namespace :import do
       drop_table(TMP_TABLE)
       create_table_from_csv_headers(file, TMP_TABLE)
       copy_data(file, TMP_TABLE)
-      ActiveRecord::Base.connection.execute("CREATE INDEX ON #{TMP_TABLE} (name, language, rank)")
+      ApplicationRecord.connection.execute("CREATE INDEX ON #{TMP_TABLE} (name, language, rank)")
 
       sql = <<-SQL
         INSERT INTO common_names(name, language_id, created_at, updated_at)
@@ -27,7 +27,7 @@ namespace :import do
           FROM common_names
         ) AS subquery;
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       [Taxonomy::CITES_EU, Taxonomy::CMS].each do |taxonomy_name|
         puts "Import #{taxonomy_name} common names"
@@ -53,7 +53,7 @@ namespace :import do
             FROM taxon_commons
           ) AS subquery
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
 
       # The import process allows duplicates to enter the db, as well as case-insensitive duplicates.
@@ -66,7 +66,7 @@ namespace :import do
         LEFT JOIN taxon_concepts ON taxon_concepts.id = taxon_commons.taxon_concept_id
         GROUP BY LOWER(common_names.name), common_names.language_id, taxon_commons.taxon_concept_id, taxon_concepts.taxonomy_id
       SQL
-      taxon_commons_ids_unique = ActiveRecord::Base.connection.execute(sql).values.flatten
+      taxon_commons_ids_unique = ApplicationRecord.connection.execute(sql).values.flatten
       taxon_commons_duplicates = TaxonCommon.where.not(id: taxon_commons_ids_unique)
       taxon_commons_duplicates.destroy_all
     end
diff --git a/lib/tasks/import_countries.rake b/lib/tasks/import_countries.rake
index 835c31d7a..65cec168a 100644
--- a/lib/tasks/import_countries.rake
+++ b/lib/tasks/import_countries.rake
@@ -32,7 +32,7 @@ namespace :import do
             WHERE UPPER(geo_entities.iso_code2) = UPPER(BTRIM(TMP.iso2)) AND geo_entities.legacy_type = UPPER(BTRIM(geo_entity_type))
           )
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
       link_countries
     end
     puts "There are now #{GeoEntity.count(conditions: { geo_entity_type_id: country_type.id })} countries in the database"
@@ -85,7 +85,7 @@ def link_countries
         geo_relationship_type_id = geo_relationship_types.id
       );
   SQL
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
 
   sql = <<-SQL
     INSERT INTO geo_relationships(geo_entity_id, other_geo_entity_id, geo_relationship_type_id, created_at, updated_at)
@@ -116,7 +116,7 @@ def link_countries
         geo_relationship_type_id = geo_relationship_types.id
       );
   SQL
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
 
   puts "There are now #{GeoRelationship.count} geo_relationships in the database."
 end
diff --git a/lib/tasks/import_distribution_tags.rake b/lib/tasks/import_distribution_tags.rake
index f115d9d25..2fb0c2236 100644
--- a/lib/tasks/import_distribution_tags.rake
+++ b/lib/tasks/import_distribution_tags.rake
@@ -17,7 +17,7 @@ namespace :import do
 
       # import all distinct tags to both PresetTags and Tags table
       puts "There are #{PresetTag.where(:model => 'Distribution').count} distribution tags"
-      puts "There are #{ActiveRecord::Base.connection.execute('SELECT COUNT(*) FROM tags').first["count"]} tags in the tags table"
+      puts "There are #{ApplicationRecord.connection.execute('SELECT COUNT(*) FROM tags').first["count"]} tags in the tags table"
       puts "ADDING: preset_tags and tags"
       sql = <<-SQL
         INSERT INTO preset_tags(model, name, created_at, updated_at)
@@ -41,11 +41,11 @@ namespace :import do
 
         SELECT name FROM tags;
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
       puts "There are now #{PresetTag.where(:model => 'Distribution').count} distribution tags"
-      puts "There are now #{ActiveRecord::Base.connection.execute('SELECT COUNT(*) FROM tags').first["count"]} tags in the tags table"
+      puts "There are now #{ApplicationRecord.connection.execute('SELECT COUNT(*) FROM tags').first["count"]} tags in the tags table"
 
-      puts "There are #{ActiveRecord::Base.connection.execute('SELECT COUNT(*) FROM taggings').first["count"]} distribution tags"
+      puts "There are #{ApplicationRecord.connection.execute('SELECT COUNT(*) FROM taggings').first["count"]} distribution tags"
       [Taxonomy::CITES_EU, Taxonomy::CMS].each do |taxonomy_name|
         puts "Import #{taxonomy_name} distribution tags"
         taxonomy = Taxonomy.find_by_name(taxonomy_name)
@@ -86,9 +86,9 @@ namespace :import do
           ) AS subquery;
         SQL
         puts "ADDING: distribution taggings"
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
-      puts "There are now #{ActiveRecord::Base.connection.execute('SELECT COUNT(*) FROM taggings').first["count"]} distribution tags"
+      puts "There are now #{ApplicationRecord.connection.execute('SELECT COUNT(*) FROM taggings').first["count"]} distribution tags"
     end
   end
 
diff --git a/lib/tasks/import_distributions.rake b/lib/tasks/import_distributions.rake
index 0f12d0f9f..5fceafb85 100644
--- a/lib/tasks/import_distributions.rake
+++ b/lib/tasks/import_distributions.rake
@@ -50,7 +50,7 @@ namespace :import do
           ) AS subquery
           SQL
         # TODO: do sth about those unknown distributions!
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
       if has_reference_id
         puts "There are #{DistributionReference.count} distribution references in the database."
@@ -71,7 +71,7 @@ namespace :import do
             SELECT distribution_id, reference_id FROM distribution_references
           ) AS subquery
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
       if has_reference
         puts "There are #{Reference.count} references in the database."
@@ -90,7 +90,7 @@ namespace :import do
             FROM "references" r
           ) AS subquery
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
         puts "There are now #{Reference.count} references in the database"
 
         distribution_references = DistributionReference.count
@@ -111,7 +111,7 @@ namespace :import do
             SELECT distribution_id, reference_id FROM distribution_references
           ) AS subquery
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
         puts "Extra #{DistributionReference.count - distribution_references} distribution references have been added to the database"
       end
     end
diff --git a/lib/tasks/import_eu_decisions.rake b/lib/tasks/import_eu_decisions.rake
index 11d6fd7a9..dec7b0521 100644
--- a/lib/tasks/import_eu_decisions.rake
+++ b/lib/tasks/import_eu_decisions.rake
@@ -81,7 +81,7 @@ namespace :import do
         WHERE taxon_concepts.taxonomy_id = #{taxonomy_id};
       SQL
       puts "Importing eu decision types and eu decisions"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     puts "There are now #{EuDecision.count} EU decisions in the database"
   end
diff --git a/lib/tasks/import_eu_listings.rake b/lib/tasks/import_eu_listings.rake
index 25307849b..d653fc595 100644
--- a/lib/tasks/import_eu_listings.rake
+++ b/lib/tasks/import_eu_listings.rake
@@ -30,16 +30,16 @@ namespace :import do
       kingdom = file.split('/').last.split('_')[0].titleize
 
       puts "CREATING temporary column and view"
-      ActiveRecord::Base.connection.execute(<<-SQL
+      ApplicationRecord.connection.execute(<<-SQL
         CREATE VIEW #{TMP_TABLE}_view AS
         SELECT ROW_NUMBER() OVER () AS row_id, * FROM #{TMP_TABLE}
         ORDER BY legacy_id, listing_date, annex, country_iso2
       SQL
       )
-      ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes DROP COLUMN IF EXISTS import_row_id")
-      ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes ADD COLUMN import_row_id integer")
-      ActiveRecord::Base.connection.execute("ALTER TABLE annotations DROP COLUMN IF EXISTS import_row_id")
-      ActiveRecord::Base.connection.execute("ALTER TABLE annotations ADD COLUMN import_row_id integer")
+      ApplicationRecord.connection.execute("ALTER TABLE listing_changes DROP COLUMN IF EXISTS import_row_id")
+      ApplicationRecord.connection.execute("ALTER TABLE listing_changes ADD COLUMN import_row_id integer")
+      ApplicationRecord.connection.execute("ALTER TABLE annotations DROP COLUMN IF EXISTS import_row_id")
+      ApplicationRecord.connection.execute("ALTER TABLE annotations ADD COLUMN import_row_id integer")
 
       copy_data(file, TMP_TABLE)
 
@@ -108,7 +108,7 @@ namespace :import do
       SQL
 
       puts "INSERTING listing_changes"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       # add taxonomic exceptions
       sql = <<-SQL
@@ -145,7 +145,7 @@ namespace :import do
       SQL
 
       puts "INSERTING taxonomic exceptions"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       # add population exceptions
       sql = <<-SQL
@@ -179,7 +179,7 @@ namespace :import do
       SQL
 
       puts "INSERTING population exceptions (listing distributions)"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       sql = <<-SQL
       WITH listed_populations AS (
@@ -194,7 +194,7 @@ namespace :import do
       SQL
 
       puts "INSERTING listed populations (listing distributions)"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       sql = <<-SQL
           INSERT INTO listing_distributions(listing_change_id, geo_entity_id, is_party, created_at, updated_at)
@@ -205,14 +205,14 @@ namespace :import do
           WHERE TMP.country_iso2 <> 'Null' AND TMP.country_iso2 IS NOT NULL AND geo_entities.is_current = 't'
       SQL
       puts "INSERTING parties (listing distributions)"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
     end
 
     puts "DROPPING temporary column and view"
-    ActiveRecord::Base.connection.execute("ALTER TABLE listing_changes DROP COLUMN import_row_id")
-    ActiveRecord::Base.connection.execute("ALTER TABLE annotations DROP COLUMN import_row_id")
-    ActiveRecord::Base.connection.execute("DROP VIEW eu_listings_import_view")
+    ApplicationRecord.connection.execute("ALTER TABLE listing_changes DROP COLUMN import_row_id")
+    ApplicationRecord.connection.execute("ALTER TABLE annotations DROP COLUMN import_row_id")
+    ApplicationRecord.connection.execute("DROP VIEW eu_listings_import_view")
 
     new_listings_count = ListingChange.joins(:species_listing).
       where(:species_listings => { :designation_id => designation.id }).count
diff --git a/lib/tasks/import_eu_opinions.rake b/lib/tasks/import_eu_opinions.rake
index aaf6cd762..30d1dbe41 100644
--- a/lib/tasks/import_eu_opinions.rake
+++ b/lib/tasks/import_eu_opinions.rake
@@ -42,7 +42,7 @@ namespace :import do
       SQL
 
       puts "Importing eu opinions"
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     puts "There are now #{EuOpinion.count} EU opinions in the database"
   end
diff --git a/lib/tasks/import_events.rake b/lib/tasks/import_events.rake
index 3613ba828..7ec91e12c 100644
--- a/lib/tasks/import_events.rake
+++ b/lib/tasks/import_events.rake
@@ -29,7 +29,7 @@ namespace :import do
             WHERE "events".name = #{TMP_TABLE}.name
           )
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     puts "There are now #{Event.count} events in the database"
   end
@@ -60,7 +60,7 @@ namespace :import do
       FROM eu_annex_regulations e
       WHERE e.id = events.id;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
   task :cites_cops_start_dates => [:environment] do
@@ -83,7 +83,7 @@ namespace :import do
       FROM cites_cops e
       WHERE e.id = events.id;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 
 end
diff --git a/lib/tasks/import_hash_annotations.rake b/lib/tasks/import_hash_annotations.rake
index 803940caf..9c405781b 100644
--- a/lib/tasks/import_hash_annotations.rake
+++ b/lib/tasks/import_hash_annotations.rake
@@ -28,7 +28,7 @@ namespace :import do
 
         ) AS subquery
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     puts "There are now #{Annotation.count} hash_annotations in the database"
   end
@@ -41,7 +41,7 @@ namespace :import do
     create_table_from_csv_headers(file, TMP_TABLE)
     copy_data(file, TMP_TABLE)
 
-    res = ActiveRecord::Base.connection.execute("SELECT COUNT(*) FROM #{TMP_TABLE}")
+    res = ApplicationRecord.connection.execute("SELECT COUNT(*) FROM #{TMP_TABLE}")
     puts "Attempting to import #{res[0]['count']} rows"
 
     sql = <<-SQL
@@ -66,7 +66,7 @@ namespace :import do
       WHERE ta.id = annotations.id
     SQL
 
-    res = ActiveRecord::Base.connection.execute(sql)
+    res = ApplicationRecord.connection.execute(sql)
 
     puts "Updated #{res.cmd_tuples} rows"
   end
diff --git a/lib/tasks/import_hybrids.rake b/lib/tasks/import_hybrids.rake
index 2158e21a0..e72a05d05 100644
--- a/lib/tasks/import_hybrids.rake
+++ b/lib/tasks/import_hybrids.rake
@@ -100,7 +100,7 @@ namespace :import do
         WHERE taxon_relationship_type_id = #{taxon_relationship_type_id}
       ) AS subquery;
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
       puts "There are #{TaxonConcept.where(:name_status => "H",
         :taxonomy_id => taxonomy_id).count} Hybrids in the database"
 
diff --git a/lib/tasks/import_languages.rake b/lib/tasks/import_languages.rake
index a942c3ff3..7b6df7476 100644
--- a/lib/tasks/import_languages.rake
+++ b/lib/tasks/import_languages.rake
@@ -20,7 +20,7 @@ namespace :import do
             WHERE UPPER("languages".iso_code3) = UPPER(#{TMP_TABLE}.iso_code3)
           )
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     puts "There are now #{Language.count} languages in the database"
   end
diff --git a/lib/tasks/import_reference_accepted_links.rake b/lib/tasks/import_reference_accepted_links.rake
index cdeacbc9e..3edae266d 100644
--- a/lib/tasks/import_reference_accepted_links.rake
+++ b/lib/tasks/import_reference_accepted_links.rake
@@ -5,10 +5,10 @@ namespace :import do
     TMP_TABLE = 'reference_accepted_links_import'
     puts "There are #{TaxonConceptReference.count} taxon concept references in the database."
 
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_references_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('CREATE INDEX index_taxon_concepts_on_legacy_id_and_legacy_type ON taxon_concepts (legacy_id, legacy_type)')
-    ActiveRecord::Base.connection.execute('CREATE INDEX index_references_on_legacy_id_and_legacy_type ON "references" (legacy_id, legacy_type)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS index_references_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('CREATE INDEX index_taxon_concepts_on_legacy_id_and_legacy_type ON taxon_concepts (legacy_id, legacy_type)')
+    ApplicationRecord.connection.execute('CREATE INDEX index_references_on_legacy_id_and_legacy_type ON "references" (legacy_id, legacy_type)')
 
     files = files_from_args(t, args)
     files.each do |file|
@@ -49,12 +49,12 @@ namespace :import do
               AND reference_id = "references".id
           )
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
     end
     puts "There are now #{TaxonConceptReference.count} taxon concept references in the database"
-    ActiveRecord::Base.connection.execute('DROP INDEX index_taxon_concepts_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('DROP INDEX index_references_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX index_taxon_concepts_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX index_references_on_legacy_id_and_legacy_type')
   end
 
 end
diff --git a/lib/tasks/import_reference_distribution_links.rake b/lib/tasks/import_reference_distribution_links.rake
index 301f6bcee..f089c5480 100644
--- a/lib/tasks/import_reference_distribution_links.rake
+++ b/lib/tasks/import_reference_distribution_links.rake
@@ -19,7 +19,7 @@ namespace :import do
         FROM references_legacy_id_mapping map
         WHERE map.alias_legacy_id = #{TMP_TABLE}.ref_legacy_id
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       puts "inserting reference distribution links"
       sql = <<-SQL
@@ -48,7 +48,7 @@ namespace :import do
               AND distribution_id = distributions.id
           )
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     puts "There are now #{DistributionReference.count} distribution references in the database"
   end
diff --git a/lib/tasks/import_reference_synonym_links.rake b/lib/tasks/import_reference_synonym_links.rake
index ca511bcef..7f543f166 100644
--- a/lib/tasks/import_reference_synonym_links.rake
+++ b/lib/tasks/import_reference_synonym_links.rake
@@ -5,10 +5,10 @@ namespace :import do
     TMP_TABLE = 'reference_synonym_links_import'
     puts "There are #{TaxonConceptReference.count} taxon concept references in the database."
 
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_references_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('CREATE INDEX index_taxon_concepts_on_legacy_id_and_legacy_type ON taxon_concepts (legacy_id, legacy_type)')
-    ActiveRecord::Base.connection.execute('CREATE INDEX index_references_on_legacy_id_and_legacy_type ON "references" (legacy_id, legacy_type)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS index_references_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('CREATE INDEX index_taxon_concepts_on_legacy_id_and_legacy_type ON taxon_concepts (legacy_id, legacy_type)')
+    ApplicationRecord.connection.execute('CREATE INDEX index_references_on_legacy_id_and_legacy_type ON "references" (legacy_id, legacy_type)')
 
     files = files_from_args(t, args)
     files.each do |file|
@@ -52,12 +52,12 @@ namespace :import do
               AND reference_id = "references".id
           )
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
     end
     puts "There are now #{TaxonConceptReference.count} taxon concept references in the database"
-    ActiveRecord::Base.connection.execute('DROP INDEX index_taxon_concepts_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('DROP INDEX index_references_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX index_taxon_concepts_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX index_references_on_legacy_id_and_legacy_type')
   end
 
 end
diff --git a/lib/tasks/import_references.rake b/lib/tasks/import_references.rake
index 5eb2c4c66..445bf9060 100644
--- a/lib/tasks/import_references.rake
+++ b/lib/tasks/import_references.rake
@@ -52,7 +52,7 @@ namespace :import do
               "references".legacy_type = '#{kingdom}'
           )
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
     puts "There are now #{Reference.count} references in the database"
   end
diff --git a/lib/tasks/import_species.rake b/lib/tasks/import_species.rake
index 8371d9477..162e16cdc 100644
--- a/lib/tasks/import_species.rake
+++ b/lib/tasks/import_species.rake
@@ -53,13 +53,13 @@ def import_data_for(kingdom, rank, synonyms = nil)
         OR BTRIM(#{TMP_TABLE}.Taxonomy) iLIKE '%CMS%'
       )
   SQL
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
   if synonyms
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS synonym_import_name')
-    ActiveRecord::Base.connection.execute('CREATE INDEX synonym_import_name ON synonym_import (name)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS synonym_import_name')
+    ApplicationRecord.connection.execute('CREATE INDEX synonym_import_name ON synonym_import (name)')
   else
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS species_import_name')
-    ActiveRecord::Base.connection.execute('CREATE INDEX species_import_name ON species_import (name)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS species_import_name')
+    ApplicationRecord.connection.execute('CREATE INDEX species_import_name ON species_import (name)')
   end
 
   [Taxonomy::CITES_EU, Taxonomy::CMS].each do |taxonomy_name|
@@ -130,7 +130,7 @@ def import_data_for(kingdom, rank, synonyms = nil)
     SQL
 
     # puts "#{taxonomy.name} #{rank} #{kingdom}"
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
   puts "#{TaxonConcept.where(:rank_id => rank_id).count - existing} #{rank} added"
 end
diff --git a/lib/tasks/import_species_kew_id.rake b/lib/tasks/import_species_kew_id.rake
index d7a31f09d..60ec7c4be 100644
--- a/lib/tasks/import_species_kew_id.rake
+++ b/lib/tasks/import_species_kew_id.rake
@@ -69,13 +69,13 @@ def import_data_for_kew_id(kingdom, rank, synonyms = nil)
         OR BTRIM(#{TMP_TABLE}.Taxonomy) iLIKE '%CMS%'
       )
   SQL
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
   if synonyms
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS synonym_import_name')
-    ActiveRecord::Base.connection.execute('CREATE INDEX synonym_import_name ON synonym_kew_id_import (name)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS synonym_import_name')
+    ApplicationRecord.connection.execute('CREATE INDEX synonym_import_name ON synonym_kew_id_import (name)')
   else
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS species_import_name')
-    ActiveRecord::Base.connection.execute('CREATE INDEX species_import_name ON species_kew_id_import (name)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS species_import_name')
+    ApplicationRecord.connection.execute('CREATE INDEX species_import_name ON species_kew_id_import (name)')
   end
 
   [Taxonomy::CITES_EU, Taxonomy::CMS].each do |taxonomy_name|
@@ -161,7 +161,7 @@ def import_data_for_kew_id(kingdom, rank, synonyms = nil)
     SQL
 
     # puts "#{taxonomy.name} #{rank} #{kingdom}"
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
   puts "#{TaxonConcept.where(:rank_id => rank_id).count - existing} #{rank} added"
 end
diff --git a/lib/tasks/import_species_legacy.rake b/lib/tasks/import_species_legacy.rake
index e227c2555..3908ff186 100644
--- a/lib/tasks/import_species_legacy.rake
+++ b/lib/tasks/import_species_legacy.rake
@@ -53,13 +53,13 @@ def import_data_with_legacy_for(kingdom, rank, synonyms = nil)
         OR BTRIM(#{TMP_TABLE}.Taxonomy) iLIKE '%CMS%'
       )
   SQL
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
   if synonyms
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS synonym_import_name')
-    ActiveRecord::Base.connection.execute('CREATE INDEX synonym_import_name ON synonym_import (name)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS synonym_import_name')
+    ApplicationRecord.connection.execute('CREATE INDEX synonym_import_name ON synonym_import (name)')
   else
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS species_import_name')
-    ActiveRecord::Base.connection.execute('CREATE INDEX species_import_name ON species_import (name)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS species_import_name')
+    ApplicationRecord.connection.execute('CREATE INDEX species_import_name ON species_import (name)')
   end
 
   [Taxonomy::CITES_EU, Taxonomy::CMS].each do |taxonomy_name|
@@ -138,7 +138,7 @@ def import_data_with_legacy_for(kingdom, rank, synonyms = nil)
     SQL
 
     # puts "#{taxonomy.name} #{rank} #{kingdom}"
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
   puts "#{TaxonConcept.where(:rank_id => rank_id).count - existing} #{rank} added"
 end
diff --git a/lib/tasks/import_standard_reference_links.rake b/lib/tasks/import_standard_reference_links.rake
index b9b71c7f4..1d94ed710 100644
--- a/lib/tasks/import_standard_reference_links.rake
+++ b/lib/tasks/import_standard_reference_links.rake
@@ -5,10 +5,10 @@ namespace :import do
     TMP_TABLE = 'standard_reference_links_import'
     puts "There are #{TaxonConceptReference.where(:is_standard => true).count} standard references in the database."
 
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_references_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('CREATE INDEX index_taxon_concepts_on_legacy_id_and_legacy_type ON taxon_concepts (legacy_id, legacy_type)')
-    ActiveRecord::Base.connection.execute('CREATE INDEX index_references_on_legacy_id_and_legacy_type ON "references" (legacy_id, legacy_type)')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS index_references_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('CREATE INDEX index_taxon_concepts_on_legacy_id_and_legacy_type ON taxon_concepts (legacy_id, legacy_type)')
+    ApplicationRecord.connection.execute('CREATE INDEX index_references_on_legacy_id_and_legacy_type ON "references" (legacy_id, legacy_type)')
     files = files_from_args(t, args)
     files.each do |file|
       drop_table(TMP_TABLE)
@@ -32,7 +32,7 @@ namespace :import do
         FROM references_legacy_id_mapping map
         WHERE map.alias_legacy_id = #{TMP_TABLE}.ref_legacy_id
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       puts "inserting reference links"
       # add taxon_concept_references where missing
@@ -57,7 +57,7 @@ namespace :import do
               AND reference_id = "references".id
           )
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
       puts "updating standard reference links"
       # update usr_std_ref flags
@@ -106,12 +106,12 @@ namespace :import do
       taxon_concept_references.reference_id = standard_references_as_ids.reference_id
 
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
 
     end
     puts "There are now #{TaxonConceptReference.where(:is_standard => true).count} standard references in the database"
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_id_and_legacy_type')
-    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_references_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS index_taxon_concepts_on_legacy_id_and_legacy_type')
+    ApplicationRecord.connection.execute('DROP INDEX IF EXISTS index_references_on_legacy_id_and_legacy_type')
   end
 
 end
diff --git a/lib/tasks/import_synonyms.rake b/lib/tasks/import_synonyms.rake
index e1e6aa60d..4deb96352 100644
--- a/lib/tasks/import_synonyms.rake
+++ b/lib/tasks/import_synonyms.rake
@@ -68,7 +68,7 @@ namespace :import do
 
           ) q
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
 
       sql = <<-SQL
@@ -80,7 +80,7 @@ namespace :import do
           AND taxon_concepts.full_name IS NULL
           AND q.id = taxon_concepts.id
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     puts "There are now #{TaxonRelationship.
diff --git a/lib/tasks/import_synonyms_kew_id.rake b/lib/tasks/import_synonyms_kew_id.rake
index 7ef4e5b86..7f329c536 100644
--- a/lib/tasks/import_synonyms_kew_id.rake
+++ b/lib/tasks/import_synonyms_kew_id.rake
@@ -68,7 +68,7 @@ namespace :import do
 
           ) q
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
 
       sql = <<-SQL
@@ -80,7 +80,7 @@ namespace :import do
           AND taxon_concepts.full_name IS NULL
           AND q.id = taxon_concepts.id
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     puts "There are now #{TaxonRelationship.
diff --git a/lib/tasks/import_synonyms_legacy.rake b/lib/tasks/import_synonyms_legacy.rake
index dbd291d64..2fa5f06a7 100644
--- a/lib/tasks/import_synonyms_legacy.rake
+++ b/lib/tasks/import_synonyms_legacy.rake
@@ -68,7 +68,7 @@ namespace :import do
 
           ) q
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
 
       sql = <<-SQL
@@ -80,7 +80,7 @@ namespace :import do
           AND taxon_concepts.full_name IS NULL
           AND q.id = taxon_concepts.id
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
     end
 
     puts "There are now #{TaxonRelationship.
diff --git a/lib/tasks/import_trade_codes.rake b/lib/tasks/import_trade_codes.rake
index 4abf22e0a..5bd4ea20d 100644
--- a/lib/tasks/import_trade_codes.rake
+++ b/lib/tasks/import_trade_codes.rake
@@ -43,7 +43,7 @@ namespace :import do
 
       ) as subquery;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
     puts "#{TermTradeCodesPair.where(:trade_code_type => 'Purpose').count} terms and purpose codes pairs created"
   end
 
@@ -76,7 +76,7 @@ namespace :import do
 
       ) AS subquery;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
     puts "#{TermTradeCodesPair.where(:trade_code_type => 'Unit').count} terms and unit codes pairs created"
   end
 
@@ -110,7 +110,7 @@ namespace :import do
 
       ) AS subquery;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
     puts "#{Trade::TaxonConceptTermPair.count} terms and unit codes pairs created"
   end
 
diff --git a/lib/tasks/import_trade_names.rake b/lib/tasks/import_trade_names.rake
index ca068f11b..73fdcd2f6 100644
--- a/lib/tasks/import_trade_names.rake
+++ b/lib/tasks/import_trade_names.rake
@@ -45,7 +45,7 @@ namespace :import do
       ) AS subquery;
     SQL
     puts "Inserting taxon names"
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     sql = <<-SQL
       INSERT INTO taxon_concepts (full_name,
@@ -83,7 +83,7 @@ namespace :import do
       ) AS subquery;
     SQL
     puts "Inserting the trade names into taxon_concepts table"
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     sql = <<-SQL
       INSERT INTO taxon_relationships
@@ -116,7 +116,7 @@ namespace :import do
       ) AS subquery;
     SQL
     puts "Inserting the taxon Relationships between taxon concepts and trade_names"
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
     puts "There are #{TaxonConcept.where(:name_status => "T",
       :taxonomy_id => taxonomy_id).count} Trade Names in the database"
   end
@@ -138,7 +138,7 @@ namespace :import do
     count_taxon_names = TaxonName.count
     count_trade_relationships = TaxonRelationship.where(:taxon_relationship_type_id => has_trade_name).count
     count_synonym_relationships = TaxonRelationship.where(:taxon_relationship_type_id => has_synonym).count
-    taxon_concept_ids = ActiveRecord::Base.connection.execute("SELECT cites_taxon_code, species_plus_id AS id FROM #{TMP_TABLE}").
+    taxon_concept_ids = ApplicationRecord.connection.execute("SELECT cites_taxon_code, species_plus_id AS id FROM #{TMP_TABLE}").
       map { |h| [h["cites_taxon_code"], h["id"]] }
     taxon_concept_ids.each do |cites_code, id|
       tc = TaxonConcept.find id
@@ -183,7 +183,7 @@ namespace :import do
       ) as subquery;
 
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     puts "Update trade_species_mapping_import table"
     sql = <<-SQL
@@ -200,7 +200,7 @@ namespace :import do
       FROM new_mapping
       WHERE trade_species_mapping_import.cites_taxon_code = new_mapping.cites_taxon_code;
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
 
     final_count_trade_names = TaxonConcept.where(:name_status => 'T').count
     final_count_synonyms = TaxonConcept.where(:name_status => 'S').count
diff --git a/lib/tasks/import_trade_permits.rake b/lib/tasks/import_trade_permits.rake
index 1ad5d0648..b7ef4a1d8 100644
--- a/lib/tasks/import_trade_permits.rake
+++ b/lib/tasks/import_trade_permits.rake
@@ -37,7 +37,7 @@ namespace :import do
 end
 
 def execute_query(sql)
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
 end
 
 def drop_indices(index)
diff --git a/lib/tasks/import_trade_plus_static_data.rake b/lib/tasks/import_trade_plus_static_data.rake
index c850d1063..e2ea8453b 100644
--- a/lib/tasks/import_trade_plus_static_data.rake
+++ b/lib/tasks/import_trade_plus_static_data.rake
@@ -19,6 +19,6 @@ namespace :import do
       COPY trade_plus_static(#{COLUMNS.join(',')})
       FROM '#{path_to_file}' DELIMITER ',' CSV HEADER
     SQL
-    ActiveRecord::Base.connection.execute(sql)
+    ApplicationRecord.connection.execute(sql)
   end
 end
diff --git a/lib/tasks/import_trade_shipments.rake b/lib/tasks/import_trade_shipments.rake
index 3956f76e3..d6c598801 100644
--- a/lib/tasks/import_trade_shipments.rake
+++ b/lib/tasks/import_trade_shipments.rake
@@ -30,13 +30,13 @@ namespace :import do
       sql = <<-SQL
         DELETE FROM shipments_import  WHERE shipment_number =  8122168;
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
       fix_term_codes = { 12227624 => "LIV", 12225022 => "DER", 12224783 => "DER" }
       fix_term_codes.each do |shipment_number, term_code|
         sql = <<-SQL
           UPDATE shipments_import SET term_code_1 = '#{term_code}' WHERE shipment_number =  #{shipment_number};
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
       update_country_codes
       populate_shipments
@@ -58,13 +58,13 @@ namespace :import do
       sql = <<-SQL
         DELETE FROM shipments_import  WHERE shipment_number =  8122168;
       SQL
-      ActiveRecord::Base.connection.execute(sql)
+      ApplicationRecord.connection.execute(sql)
       fix_term_codes = { 12227624 => "LIV", 12225022 => "DER", 12224783 => "DER" }
       fix_term_codes.each do |shipment_number, term_code|
         sql = <<-SQL
           UPDATE shipments_import SET term_code_1 = '#{term_code}' WHERE shipment_number =  #{shipment_number};
         SQL
-        ActiveRecord::Base.connection.execute(sql)
+        ApplicationRecord.connection.execute(sql)
       end
       update_country_codes
       # populate_shipments
@@ -142,7 +142,7 @@ def update_country_codes
     WHERE quantity_1 IS NULL;
   SQL
   puts "Cleaning Up Import Table #{Time.now.strftime("%d/%m/%Y %H:%M")}"
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
 end
 
 def populate_shipments
@@ -231,7 +231,7 @@ def populate_shipments
       (tc.name_status = 'S' AND taxon_relationships.other_taxon_concept_id = tc.id)
   SQL
   puts "Populating trade_shipments #{Time.now.strftime("%d/%m/%Y %H:%M")}"
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
 end
 
 def populate_shipments_for_trade_names
@@ -312,5 +312,5 @@ def populate_shipments_for_trade_names
     LEFT JOIN geo_entities AS origins ON si.origin_country_code = origins.iso_code2
   SQL
   puts "Populating trade_shipments with Trade Names' shipments #{Time.now.strftime("%d/%m/%Y %H:%M")}"
-  ActiveRecord::Base.connection.execute(sql)
+  ApplicationRecord.connection.execute(sql)
 end
diff --git a/lib/tasks/map_eu_opinions_to_ec_srgs.rake b/lib/tasks/map_eu_opinions_to_ec_srgs.rake
index 53e3a77be..e51ad5e6a 100644
--- a/lib/tasks/map_eu_opinions_to_ec_srgs.rake
+++ b/lib/tasks/map_eu_opinions_to_ec_srgs.rake
@@ -37,6 +37,6 @@ task :map_eu_opinions_to_ec_srgs => :environment do
     WHERE eu_opinions_matching_with_ec_srgs.id = eu_decisions.id
     RETURNING *;
   SQL
-  res = ActiveRecord::Base.connection.execute update_query
+  res = ApplicationRecord.connection.execute update_query
   puts "#{res.cmd_tuples} rows linked to EC SRG meetings"
 end
diff --git a/lib/tasks/map_eu_suspensions_to_terminating_regulations.rake b/lib/tasks/map_eu_suspensions_to_terminating_regulations.rake
index ca0573268..89dbb62e1 100644
--- a/lib/tasks/map_eu_suspensions_to_terminating_regulations.rake
+++ b/lib/tasks/map_eu_suspensions_to_terminating_regulations.rake
@@ -17,6 +17,6 @@ task :map_eu_suspensions_to_terminating_regulations => :environment do
   WHERE suspension_regulations.id = eu_decisions.start_event_id
   RETURNING *;
   SQL
-  res = ActiveRecord::Base.connection.execute update_query
+  res = ApplicationRecord.connection.execute update_query
   puts "#{res.cmd_tuples} rows linked to terminating EU Suspension Regulations"
 end
diff --git a/lib/tasks/set_eu_opinions_to_not_current.rake b/lib/tasks/set_eu_opinions_to_not_current.rake
index 4e0985871..42bb6978a 100644
--- a/lib/tasks/set_eu_opinions_to_not_current.rake
+++ b/lib/tasks/set_eu_opinions_to_not_current.rake
@@ -39,6 +39,6 @@ task :set_eu_opinions_to_not_current => :environment do
     WHERE matched_eu_opinions.id = eu_decisions.id;
   SQL
 
-  res = ActiveRecord::Base.connection.execute(query)
+  res = ApplicationRecord.connection.execute(query)
   puts "#{res.cmd_tuples} rows updated with is_current to false"
 end
diff --git a/lib/tasks/transfer_eu_opinions.rake b/lib/tasks/transfer_eu_opinions.rake
index 5ab142479..1217b11ac 100644
--- a/lib/tasks/transfer_eu_opinions.rake
+++ b/lib/tasks/transfer_eu_opinions.rake
@@ -12,7 +12,7 @@ namespace :eu_opinions do
     puts "There are #{eu_opinions.count} eu_opinions to be transferred"
 
     query = query_builder(new_decision_type_id, 'eu_decision_type', old_decision_type_ids)
-    res = ActiveRecord::Base.connection.execute query
+    res = ApplicationRecord.connection.execute query
 
     puts "#{res.cmd_tuples} rows transferred to new decision type"
   end
@@ -29,7 +29,7 @@ namespace :eu_opinions do
     puts "There are #{eu_opinions.count} eu_opinions to be transferred"
 
     query = query_builder(srg_history_id, 'srg_history', old_decision_type_ids)
-    res = ActiveRecord::Base.connection.execute query
+    res = ApplicationRecord.connection.execute query
 
     puts "#{res.cmd_tuples} rows transferred to new decision type"
   end
diff --git a/lib/tasks/update_eu_decisions_with_missing_source.rake b/lib/tasks/update_eu_decisions_with_missing_source.rake
index ab43b4232..a27c77f4f 100644
--- a/lib/tasks/update_eu_decisions_with_missing_source.rake
+++ b/lib/tasks/update_eu_decisions_with_missing_source.rake
@@ -43,7 +43,7 @@ namespace :update do
     WHERE matched_eu_decisions.id = eu_decisions.id;
     SQL
 
-    res = ActiveRecord::Base.connection.execute update_query
+    res = ApplicationRecord.connection.execute update_query
     puts "#{res.cmd_tuples} rows linked to 'W' source"
   end
 end
diff --git a/spec/models/html_to_latex_spec.rb b/spec/models/html_to_latex_spec.rb
index 5595d7909..d58f7fe45 100644
--- a/spec/models/html_to_latex_spec.rb
+++ b/spec/models/html_to_latex_spec.rb
@@ -1,4 +1,6 @@
 require 'spec_helper'
+# https://stackoverflow.com/a/46904732/556780
+require_dependency Rails.root.join('lib', 'modules', 'html_to_latex')
 
 describe HtmlToLatex do
   describe :convert do
diff --git a/spec/models/trade/sandbox_spec.rb b/spec/models/trade/sandbox_spec.rb
index 6b2a91c24..8d4d705a4 100644
--- a/spec/models/trade/sandbox_spec.rb
+++ b/spec/models/trade/sandbox_spec.rb
@@ -47,7 +47,7 @@
     specify {
       sandbox_klass = Trade::SandboxTemplate.ar_klass(subject.table_name)
       subject.destroy
-      expect(ActiveRecord::Base.connection.table_exists?('trade_sandbox_1')).to be_falsey
+      expect(ApplicationRecord.connection.table_exists?('trade_sandbox_1')).to be_falsey
     }
   end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2c55f9bae..899cd8398 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -66,7 +66,7 @@
 
   config.before(:each, :drops_tables => true) do
     DatabaseCleaner.strategy = :deletion, { :cache_tables => false }
-    ActiveRecord::Base.connection.execute('SELECT * FROM drop_trade_sandboxes()')
+    ApplicationRecord.connection.execute('SELECT * FROM drop_trade_sandboxes()')
   end
 
   config.before(:each) do

From 9d804305d8a1346f10f771b0100a9670e0350736 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 10:21:07 +0000
Subject: [PATCH 039/241] Add version in migration class

---
 db/migrate/20120530135534_setup_hstore.rb                       | 2 +-
 db/migrate/20120703141230_setup_tablefunc.rb                    | 2 +-
 db/migrate/20121004124446_mview_rebuild_procedures.rb           | 2 +-
 db/migrate/20140604100410_merged_migrations.rb                  | 2 +-
 db/migrate/20140606102740_create_nomenclature_changes.rb        | 2 +-
 db/migrate/20140606102741_create_nomenclature_change_inputs.rb  | 2 +-
 db/migrate/20140606102742_create_nomenclature_change_outputs.rb | 2 +-
 .../20140606102743_create_nomenclature_change_reassignments.rb  | 2 +-
 ...606102744_create_nomenclature_change_reassignment_targets.rb | 2 +-
 ...59_rename_synonym_id_to_accepted_name_id_in_iucn_mappings.rb | 2 +-
 db/migrate/20140612174934_create_cms_mappings.rb                | 2 +-
 .../20140618122418_add_internal_note_to_inputs_and_outputs.rb   | 2 +-
 db/migrate/20140624084138_add_is_primary_output_to_outputs.rb   | 2 +-
 ..._in_listing_changes_listing_distributions_and_annotations.rb | 2 +-
 .../20140703120106_add_old_attribute_fields_to_outputs.rb       | 2 +-
 db/migrate/20140709084707_create_ahoy_visits.rb                 | 2 +-
 db/migrate/20140709084708_create_ahoy_events.rb                 | 2 +-
 db/migrate/20140718122508_add_nomenclature_note_columns.rb      | 2 +-
 .../20140721071654_add_internal_nomenclature_note_columns.rb    | 2 +-
 db/migrate/20140730083216_add_organization_to_ahoy_visits.rb    | 2 +-
 db/migrate/20140730101120_remove_region_from_ahoy_visits.rb     | 2 +-
 db/migrate/20140806122042_create_documents.rb                   | 2 +-
 db/migrate/20140811101246_add_timestamps_to_documents.rb        | 2 +-
 ...20140812133548_document_is_public_should_default_to_false.rb | 2 +-
 db/migrate/20140814073530_create_document_citations.rb          | 2 +-
 .../20140814074009_create_document_citation_taxon_concepts.rb   | 2 +-
 .../20140814074055_create_document_citation_geo_entities.rb     | 2 +-
 db/migrate/20140902113018_add_fts_index_to_documents.rb         | 2 +-
 db/migrate/20140910124718_add_number_to_documents.rb            | 2 +-
 db/migrate/20140911100851_create_document_tags.rb               | 2 +-
 db/migrate/20140911101846_create_document_tags_documents.rb     | 2 +-
 db/migrate/20140915075649_add_extended_description_to_events.rb | 2 +-
 db/migrate/20140915204931_add_multilingual_url_to_events.rb     | 2 +-
 db/migrate/20140916154706_create_review_details.rb              | 2 +-
 db/migrate/20140918090432_create_document_proposal_details.rb   | 2 +-
 db/migrate/20140926121728_add_internal_notes_to_all_things.rb   | 2 +-
 db/migrate/20140929092236_add_rank_name_to_sandbox_views.rb     | 2 +-
 ...002065308_add_multi_lingual_notes_to_nomenclature_changes.rb | 2 +-
 ...4_add_multi_lingual_nomenclature_notes_to_all_legislation.rb | 2 +-
 .../20141003104615_split_taxon_concept_internal_note_into_3.rb  | 2 +-
 ...8_time_and_user_stamping_for_taxon_concept_internal_notes.rb | 2 +-
 db/migrate/20141004213258_create_comments.rb                    | 2 +-
 ..._change_of_plan_remove_internal_notes_from_taxon_concepts.rb | 2 +-
 ...141007145503_remove_internal_nomenclature_note_throughout.rb | 2 +-
 ...1008094314_remove_status_change_from_nomenclature_changes.rb | 2 +-
 ...20141014125738_change_multi_permit_number_columns_to_text.rb | 2 +-
 ...137_create_nomenclature_change_output_reassignments_table.rb | 2 +-
 ...023_add_not_null_constraint_to_eu_decisions_geo_entity_id.rb | 2 +-
 db/migrate/20141124163355_change_is_manager_to_role.rb          | 2 +-
 db/migrate/20141202142048_add_authentication_token_to_users.rb  | 2 +-
 ...212093310_add_nomenclature_notes_to_listing_changes_mview.rb | 2 +-
 ...d_nomenclature_notes_to_designation_listing_changes_mview.rb | 2 +-
 db/migrate/20141222103221_create_legislation_api_types.rb       | 2 +-
 db/migrate/20141222121945_create_eu_legislation_api_types.rb    | 2 +-
 db/migrate/20141222133058_use_single_language.rb                | 2 +-
 db/migrate/20141223141124_create_api_higher_taxa_type.rb        | 2 +-
 db/migrate/20141223141125_timestamp_view_definitions.rb         | 2 +-
 db/migrate/20141223160054_timestamp_api_views.rb                | 2 +-
 .../20141223164041_create_some_more_legislation_api_types.rb    | 2 +-
 .../20141223171143_create_master_listing_changes_mviews.rb      | 2 +-
 db/migrate/20141223171144_create_api_listing_changes_views.rb   | 2 +-
 db/migrate/20141228094935_update_api_cites_suspensions_view.rb  | 2 +-
 db/migrate/20141228101341_update_api_cites_quotas_view.rb       | 2 +-
 db/migrate/20141228224334_update_listing_changes_views.rb       | 2 +-
 ...41230193843_add_geo_entity_type_to_listing_changes_mviews.rb | 2 +-
 db/migrate/20141230193844_remove_id_from_api_types.rb           | 2 +-
 db/migrate/20150106100040_create_api_taxon_references_view.rb   | 2 +-
 db/migrate/20150107171940_remove_new_line_after_notes.rb        | 2 +-
 db/migrate/20150107173809_create_api_requests.rb                | 2 +-
 .../20150109134326_add_organisation_and_country_to_users.rb     | 2 +-
 ...0150112080319_add_language_names_to_api_common_names_view.rb | 2 +-
 ...50112093954_fix_duplicated_tags_in_api_distributions_view.rb | 2 +-
 db/migrate/20150112113519_speed_up_api_cites_quotas_view.rb     | 2 +-
 .../20150112124146_speed_up_api_cites_suspensions_view.rb       | 2 +-
 .../20150114084537_fix_api_quotas_and_suspensions_views.rb      | 2 +-
 ...4105024_add_higher_taxa_fields_to_api_taxon_concepts_view.rb | 2 +-
 ...150116112256_add_cites_listing_to_api_taxon_concepts_view.rb | 2 +-
 ...22122_check_for_synonym_status_in_api_taxon_concepts_view.rb | 2 +-
 ...20150121111134_add_ancestors_name_to_trade_shipments_view.rb | 2 +-
 db/migrate/20150121232443_add_id_to_api_eu_decisions_view.rb    | 2 +-
 .../20150121234014_create_eu_suspensions_applicability_view.rb  | 2 +-
 ...150122132408_add_original_start_date_to_eu_decisions_view.rb | 2 +-
 ...pendents_updated_at_to_taxon_concepts_views_for_downloads.rb | 2 +-
 ...20150126135438_simplify_eu_suspensions_applicability_view.rb | 2 +-
 db/migrate/20150126161813_add_soc_to_ec_srg_names.rb            | 2 +-
 ...50210140508_fix_eu_suspension_start_dates_in_csv_download.rb | 2 +-
 ...dd_original_taxon_concept_id_to_api_taxon_references_view.rb | 2 +-
 .../20150218141458_create_auto_complete_taxon_concepts_view.rb  | 2 +-
 ...0223115540_add_unlisted_subspecies_to_name_matching_table.rb | 2 +-
 db/migrate/20150225102903_remove_unused_permits.rb              | 2 +-
 ...20150225103133_create_unique_index_on_upper_permit_number.rb | 2 +-
 ..._excluded_taxon_concepts_ids_to_api_taxon_references_view.rb | 2 +-
 ...0304104013_add_dependents_updated_by_id_to_taxon_concepts.rb | 2 +-
 ...9_add_dependents_updated_by_id_to_internal_download_views.rb | 2 +-
 db/migrate/20150317131538_create_versions.rb                    | 2 +-
 ...50318150923_search_by_non_hyphenated_common_name_versions.rb | 2 +-
 ...include_deleted_taxon_concepts_in_api_taxon_concepts_view.rb | 2 +-
 .../20150401123614_squish_should_remove_non_breaking_spaces.rb  | 2 +-
 ...20150402111503_create_higher_or_equal_rank_names_function.rb | 2 +-
 .../20150402111504_create_taxon_concepts_and_ancestors_view.rb  | 2 +-
 db/migrate/20150402131608_speed_up_api_taxon_references_view.rb | 2 +-
 db/migrate/20150420100448_add_is_cites_authority_to_users.rb    | 2 +-
 db/migrate/20150420151952_change_default_role_to_api.rb         | 2 +-
 db/migrate/20150421063910_create_squish_null_function.rb        | 2 +-
 db/migrate/20150421071444_organisation_not_null.rb              | 2 +-
 ...421112808_create_unique_index_on_taxon_concept_references.rb | 2 +-
 ...20150422101115_index_shipments_and_taxon_concepts_on_user.rb | 2 +-
 ...427111732_create_more_indexes_on_taxon_concept_references.rb | 2 +-
 ...428071201_replace_ctes_with_subqueries_in_api_tc_ref_view.rb | 2 +-
 db/migrate/20150512124835_fix_cascading_of_cites_suspensions.rb | 2 +-
 db/migrate/20150512222755_fix_cascading_of_quotas.rb            | 2 +-
 ...0150518120700_add_applies_to_import_to_trade_restrictions.rb | 2 +-
 ...22737_add_applies_to_import_to_api_cites_suspensions_view.rb | 2 +-
 ...0518131629_add_higher_taxa_ids_to_api_taxon_concepts_view.rb | 2 +-
 db/migrate/20150518161716_create_trim_decimal_zero_function.rb  | 2 +-
 db/migrate/20150610111751_fix_trim_decimal_zero.rb              | 2 +-
 ...20150701133536_change_varchars_to_text_in_trade_downloads.rb | 2 +-
 db/migrate/20150713105852_add_elib_legacy_id_to_events.rb       | 2 +-
 db/migrate/20150714075603_add_fields_to_documents.rb            | 2 +-
 .../20150717152937_add_elib_legacy_id_to_document_citations.rb  | 2 +-
 ..._change_recommended_category_id_column_for_review_details.rb | 2 +-
 db/migrate/20150720150338_update_documents_view.rb              | 2 +-
 db/migrate/20150721121640_add_original_id_to_documents.rb       | 2 +-
 db/migrate/20150722113923_create_api_documents_view.rb          | 2 +-
 db/migrate/20150723141854_change_document_tag_name_to_text.rb   | 2 +-
 ...50723142812_add_discussion_id_and_sort_order_to_documents.rb | 2 +-
 .../20150730153305_get_is_public_from_api_documents_view.rb     | 2 +-
 db/migrate/20150806092509_update_documents_view_for_search.rb   | 2 +-
 ...0150812180311_add_outcome_and_phase_to_api_documents_view.rb | 2 +-
 .../20150817102427_add_document_date_to_api_documents_view.rb   | 2 +-
 .../20150817204542_remove_null_tags_from_documents_view.rb      | 2 +-
 db/migrate/20150818131407_add_event_id_to_api_documents_view.rb | 2 +-
 ...50819124804_add_document_tags_names_to_api_documents_view.rb | 2 +-
 db/migrate/20150820121520_add_indexes_to_document_tables.rb     | 2 +-
 .../20150820183942_small_changes_to_api_documents_view.rb       | 2 +-
 ...0929175554_add_taxonomy_id_to_nomenclature_change_outputs.rb | 2 +-
 .../20151001094410_add_output_fields_for_new_name_wizard.rb     | 2 +-
 .../20151005141953_add_empty_string_as_default_to_notes.rb      | 2 +-
 ...0151006153403_add_tag_list_to_nomenclature_changes_output.rb | 2 +-
 db/migrate/20151117145544_add_raw_date_to_api_documents_view.rb | 2 +-
 db/migrate/20151201095234_add_number_to_proposal_details.rb     | 2 +-
 db/migrate/20151201135029_create_api_documents_mview.rb         | 2 +-
 .../20151214111814_add_index_on_created_at_to_api_requests.rb   | 2 +-
 .../20151221144352_add_timestamps_to_api_documents_view.rb      | 2 +-
 db/migrate/20160223074747_add_designation_id_to_documents.rb    | 2 +-
 .../20160223104016_add_designation_to_api_documents_mview.rb    | 2 +-
 db/migrate/20160304141931_update_ndf_documents_to_be_private.rb | 2 +-
 ...0944_use_dependents_updated_at_in_api_taxon_concepts_view.rb | 2 +-
 ...07_remove_unnecessary_new_name_related_fields_from_output.rb | 2 +-
 ...trade_names_view_to_exclude_inter_taxonomic_relationships.rb | 2 +-
 ...406101826_change_unique_index_on_taxon_concept_references.rb | 2 +-
 ...60406150331_set_distributions_empty_internal_notes_to_nil.rb | 2 +-
 ...fix_order_of_distribution_tags_in_public_distribution_tab.rb | 2 +-
 ...der_of_distribution_tags_in_public_distribution_tab_again.rb | 2 +-
 ...0503073026_add_creator_and_updater_to_api_documents_mview.rb | 2 +-
 ...0504095537_change_primary_document_foreign_key_to_nullify.rb | 2 +-
 db/migrate/20160505105252_add_indexes_to_api_documents_mview.rb | 2 +-
 ...ange_foreign_key_constraint_on_delete_in_document_details.rb | 2 +-
 db/migrate/20160623105336_create_document_citations_mview.rb    | 2 +-
 db/migrate/20160630084345_create_taxon_concepts_view.rb         | 2 +-
 db/migrate/20160705093243_create_trade_validation_errors.rb     | 2 +-
 db/migrate/20160705114949_add_timestamps_to_sandbox_template.rb | 2 +-
 db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb   | 2 +-
 ...161104135655_add_epix_user_fields_to_annual_report_upload.rb | 2 +-
 ..._done_from_report_uploads_and_update_submitted_timestamps.rb | 2 +-
 ...mitted_timestamps_for_epix_users_to_annual_report_uploads.rb | 2 +-
 ...161122145302_add_validation_info_to_annual_report_uploads.rb | 2 +-
 ...14_filter_taxon_concepts_by_name_status_in_documents_view.rb | 2 +-
 ...20161128152531_add_object_changes_text_column_to_versions.rb | 2 +-
 db/migrate/20161215140343_add_epix_user_fields_to_shipments.rb  | 2 +-
 .../20161218150218_add_epix_fields_to_sandbox_template.rb       | 2 +-
 ...updated_by_id_and_created_by_id_to_trade_sandbox_template.rb | 2 +-
 ...170104215019_add_aws_storage_path_to_annual_report_upload.rb | 2 +-
 db/migrate/20170119124811_add_kew_id_to_taxon_concepts.rb       | 2 +-
 ...2_add_materialised_view_for_valid_taxon_concept_term_view.rb | 2 +-
 db/migrate/20170404125230_add_is_active_column_to_users.rb      | 2 +-
 .../20180509135814_create_trade_shipments_appendix_i_view.rb    | 2 +-
 ...180601083440_create_trade_cites_suspension_shipments_view.rb | 2 +-
 ...180627135001_create_trade_shipments_mandatory_quotas_view.rb | 2 +-
 .../20180705094119_update_trade_shipments_appendix_i_view.rb    | 2 +-
 ...80713123936_update_trade_shipments_cites_suspensions_view.rb | 2 +-
 .../20180724163021_create_non_compliant_shipments_view.rb       | 2 +-
 ...taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb | 2 +-
 ...0606174223_trade_validation_rule_column_names_to_be_array.rb | 2 +-
 db/migrate/20190724131538_create_trade_plus_static.rb           | 2 +-
 .../20190725135814_create_trade_plus_static_with_taxa_view.rb   | 2 +-
 .../20190725145613_create_trade_plus_static_complete_view.rb    | 2 +-
 .../20190806145454_destroy_trade_plus_static_with_taxa_view.rb  | 2 +-
 db/migrate/20191016175827_create_trade_plus_shipments_view.rb   | 2 +-
 db/migrate/20191017135814_create_trade_plus_group_view.rb       | 2 +-
 .../20191018135814_create_trade_plus_formatted_data_view.rb     | 2 +-
 db/migrate/20191023135814_create_trade_plus_complete_mview.rb   | 2 +-
 db/migrate/20191209215129_fix_trade_plus_formatted_data_view.rb | 2 +-
 .../20200124152531_add_manual_id_attributes_to_documents.rb     | 2 +-
 ...700_remove_year_constraint_from_trade_plus_shipments_view.rb | 2 +-
 db/migrate/20200224152531_add_subtype_attribute_to_documents.rb | 2 +-
 ...200225154202_add_subtype_and_volume_to_api_documents_view.rb | 2 +-
 ..._document_language_version_type_for_checklist_docs_search.rb | 2 +-
 ...0200228113482_add_taxon_concept_ids_to_api_documents_view.rb | 2 +-
 .../20200416170653_add_manual_id_to_api_documents_view.rb       | 2 +-
 db/migrate/20200513105319_create_srg_histories.rb               | 2 +-
 .../20200514150717_add_srg_history_to_eu_decisions_view.rb      | 2 +-
 .../20200707183529_recreate_trade_plus_formatted_data_view.rb   | 2 +-
 db/migrate/20200807112659_add_private_url_to_events.rb          | 2 +-
 ...01008133057_create_all_taxon_concepts_and_ancestors_mview.rb | 2 +-
 .../20201026123892_add_private_url_to_eu_decisions_view.rb      | 2 +-
 ...49_trade_plus_add_and_fix_formatting_rules_and_group_view.rb | 2 +-
 db/migrate/20210624131423_create_analytics_events.rb            | 2 +-
 ..._multilingual_and_fix_formatting_issue_on_trade_plus_view.rb | 2 +-
 ...220119113158_fix_formatting_rule_on_trade_plus_final_view.rb | 2 +-
 ...1024_fix_french_taxa_group_names_on_trade_plus_group_view.rb | 2 +-
 ...0223142512_fix_french_plant_name_on_trade_plus_group_view.rb | 2 +-
 ...20314110512_fix_unit_id_on_trade_plus_formatted_data_view.rb | 2 +-
 db/migrate/20220803152826_add_document_ref_to_eu_decisions.rb   | 2 +-
 .../20220808124523_add_author_year_to_autocomplete_view.rb      | 2 +-
 ...9121517_add_intersessional_decisions_to_eu_decisions_view.rb | 2 +-
 db/migrate/20220922143605_create_cites_processes.rb             | 2 +-
 db/migrate/20221011142831_create_eu_country_dates.rb            | 2 +-
 .../20221013155344_add_eu_listing_to_api_taxon_concepts_view.rb | 2 +-
 .../20221014141104_add_source_ids_to_api_cites_quotas_view.rb   | 2 +-
 ...221014141105_add_source_ids_to_api_cites_suspensions_view.rb | 2 +-
 .../20221017212659_add_document_title_to_cites_processes.rb     | 2 +-
 ...excluded_geo_entities_from_api_cites_listing_changes_view.rb | 2 +-
 db/migrate/20230620110017_setup_unaccent.rb                     | 2 +-
 ...81442_remove_language_restrictions_from_autocomplete_view.rb | 2 +-
 .../20230915113624_add_trigram_index_to_trade_permit_numbers.rb | 2 +-
 db/migrate/20240115115451_ahoy_1_4_0_upgrade_step_0.rb          | 2 +-
 db/migrate/20240115115456_ahoy_1_4_0_upgrade_step_1.rb          | 2 +-
 db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb          | 2 +-
 db/migrate/20240115115503_ahoy_1_4_0_upgrade_step_3.rb          | 2 +-
 230 files changed, 230 insertions(+), 230 deletions(-)

diff --git a/db/migrate/20120530135534_setup_hstore.rb b/db/migrate/20120530135534_setup_hstore.rb
index 9910f2925..633dadd08 100644
--- a/db/migrate/20120530135534_setup_hstore.rb
+++ b/db/migrate/20120530135534_setup_hstore.rb
@@ -1,4 +1,4 @@
-class SetupHstore < ActiveRecord::Migration
+class SetupHstore < ActiveRecord::Migration[4.2]
   def self.up
     if Rails.env.staging? or Rails.env.production?
       puts "Please add extension by hand: CREATE EXTENSION hstore"
diff --git a/db/migrate/20120703141230_setup_tablefunc.rb b/db/migrate/20120703141230_setup_tablefunc.rb
index f921e081f..227ae3ebd 100644
--- a/db/migrate/20120703141230_setup_tablefunc.rb
+++ b/db/migrate/20120703141230_setup_tablefunc.rb
@@ -1,4 +1,4 @@
-class SetupTablefunc < ActiveRecord::Migration
+class SetupTablefunc < ActiveRecord::Migration[4.2]
   def self.up
     if Rails.env.staging? or Rails.env.production?
       puts "Please add extension by hand: CREATE EXTENSION tablefunc"
diff --git a/db/migrate/20121004124446_mview_rebuild_procedures.rb b/db/migrate/20121004124446_mview_rebuild_procedures.rb
index 09651911d..87adad0e0 100644
--- a/db/migrate/20121004124446_mview_rebuild_procedures.rb
+++ b/db/migrate/20121004124446_mview_rebuild_procedures.rb
@@ -1,4 +1,4 @@
-class MviewRebuildProcedures < ActiveRecord::Migration
+class MviewRebuildProcedures < ActiveRecord::Migration[4.2]
   def change
     execute <<-SQL
     --
diff --git a/db/migrate/20140604100410_merged_migrations.rb b/db/migrate/20140604100410_merged_migrations.rb
index 532a85fe8..21699e78c 100644
--- a/db/migrate/20140604100410_merged_migrations.rb
+++ b/db/migrate/20140604100410_merged_migrations.rb
@@ -1,4 +1,4 @@
-class MergedMigrations < ActiveRecord::Migration
+class MergedMigrations < ActiveRecord::Migration[4.2]
   def change
   create_table "annotations", :force => true do |t|
     t.string   "symbol"
diff --git a/db/migrate/20140606102740_create_nomenclature_changes.rb b/db/migrate/20140606102740_create_nomenclature_changes.rb
index 11bd4d054..09ca21b15 100644
--- a/db/migrate/20140606102740_create_nomenclature_changes.rb
+++ b/db/migrate/20140606102740_create_nomenclature_changes.rb
@@ -1,4 +1,4 @@
-class CreateNomenclatureChanges < ActiveRecord::Migration
+class CreateNomenclatureChanges < ActiveRecord::Migration[4.2]
   def change
     create_table :nomenclature_changes do |t|
       t.integer :event_id
diff --git a/db/migrate/20140606102741_create_nomenclature_change_inputs.rb b/db/migrate/20140606102741_create_nomenclature_change_inputs.rb
index 9c5d042d6..511992b4d 100644
--- a/db/migrate/20140606102741_create_nomenclature_change_inputs.rb
+++ b/db/migrate/20140606102741_create_nomenclature_change_inputs.rb
@@ -1,4 +1,4 @@
-class CreateNomenclatureChangeInputs < ActiveRecord::Migration
+class CreateNomenclatureChangeInputs < ActiveRecord::Migration[4.2]
   def change
     create_table :nomenclature_change_inputs do |t|
       t.integer :nomenclature_change_id, :null => false
diff --git a/db/migrate/20140606102742_create_nomenclature_change_outputs.rb b/db/migrate/20140606102742_create_nomenclature_change_outputs.rb
index a522d4aa9..a5eb8b86f 100644
--- a/db/migrate/20140606102742_create_nomenclature_change_outputs.rb
+++ b/db/migrate/20140606102742_create_nomenclature_change_outputs.rb
@@ -1,4 +1,4 @@
-class CreateNomenclatureChangeOutputs < ActiveRecord::Migration
+class CreateNomenclatureChangeOutputs < ActiveRecord::Migration[4.2]
   def change
     create_table :nomenclature_change_outputs do |t|
       t.integer :nomenclature_change_id, :null => false
diff --git a/db/migrate/20140606102743_create_nomenclature_change_reassignments.rb b/db/migrate/20140606102743_create_nomenclature_change_reassignments.rb
index 00c7efb41..6636cb044 100644
--- a/db/migrate/20140606102743_create_nomenclature_change_reassignments.rb
+++ b/db/migrate/20140606102743_create_nomenclature_change_reassignments.rb
@@ -1,4 +1,4 @@
-class CreateNomenclatureChangeReassignments < ActiveRecord::Migration
+class CreateNomenclatureChangeReassignments < ActiveRecord::Migration[4.2]
   def change
     create_table :nomenclature_change_reassignments do |t|
       t.integer :nomenclature_change_input_id, :null => false
diff --git a/db/migrate/20140606102744_create_nomenclature_change_reassignment_targets.rb b/db/migrate/20140606102744_create_nomenclature_change_reassignment_targets.rb
index f062ed427..b552e36fd 100644
--- a/db/migrate/20140606102744_create_nomenclature_change_reassignment_targets.rb
+++ b/db/migrate/20140606102744_create_nomenclature_change_reassignment_targets.rb
@@ -1,4 +1,4 @@
-class CreateNomenclatureChangeReassignmentTargets < ActiveRecord::Migration
+class CreateNomenclatureChangeReassignmentTargets < ActiveRecord::Migration[4.2]
   def change
     create_table :nomenclature_change_reassignment_targets do |t|
       t.integer :nomenclature_change_reassignment_id, :null => false
diff --git a/db/migrate/20140611105359_rename_synonym_id_to_accepted_name_id_in_iucn_mappings.rb b/db/migrate/20140611105359_rename_synonym_id_to_accepted_name_id_in_iucn_mappings.rb
index 2208d54d0..efd3821af 100644
--- a/db/migrate/20140611105359_rename_synonym_id_to_accepted_name_id_in_iucn_mappings.rb
+++ b/db/migrate/20140611105359_rename_synonym_id_to_accepted_name_id_in_iucn_mappings.rb
@@ -1,4 +1,4 @@
-class RenameSynonymIdToAcceptedNameIdInIucnMappings < ActiveRecord::Migration
+class RenameSynonymIdToAcceptedNameIdInIucnMappings < ActiveRecord::Migration[4.2]
   def change
     rename_column :iucn_mappings, :synonym_id, :accepted_name_id
   end
diff --git a/db/migrate/20140612174934_create_cms_mappings.rb b/db/migrate/20140612174934_create_cms_mappings.rb
index 027f729b8..034896baf 100644
--- a/db/migrate/20140612174934_create_cms_mappings.rb
+++ b/db/migrate/20140612174934_create_cms_mappings.rb
@@ -1,4 +1,4 @@
-class CreateCmsMappings < ActiveRecord::Migration
+class CreateCmsMappings < ActiveRecord::Migration[4.2]
   def change
     create_table :cms_mappings do |t|
       t.integer :taxon_concept_id
diff --git a/db/migrate/20140618122418_add_internal_note_to_inputs_and_outputs.rb b/db/migrate/20140618122418_add_internal_note_to_inputs_and_outputs.rb
index 0d86041be..82c043e27 100644
--- a/db/migrate/20140618122418_add_internal_note_to_inputs_and_outputs.rb
+++ b/db/migrate/20140618122418_add_internal_note_to_inputs_and_outputs.rb
@@ -1,4 +1,4 @@
-class AddInternalNoteToInputsAndOutputs < ActiveRecord::Migration
+class AddInternalNoteToInputsAndOutputs < ActiveRecord::Migration[4.2]
   def change
     add_column :nomenclature_change_outputs, :internal_note, :text
     add_column :nomenclature_change_inputs, :internal_note, :text
diff --git a/db/migrate/20140624084138_add_is_primary_output_to_outputs.rb b/db/migrate/20140624084138_add_is_primary_output_to_outputs.rb
index cf5008f83..4c143830a 100644
--- a/db/migrate/20140624084138_add_is_primary_output_to_outputs.rb
+++ b/db/migrate/20140624084138_add_is_primary_output_to_outputs.rb
@@ -1,4 +1,4 @@
-class AddIsPrimaryOutputToOutputs < ActiveRecord::Migration
+class AddIsPrimaryOutputToOutputs < ActiveRecord::Migration[4.2]
   def change
     add_column :nomenclature_change_outputs, :is_primary_output, :boolean, :default => true
   end
diff --git a/db/migrate/20140625102632_rename_source_id_to_original_id_in_listing_changes_listing_distributions_and_annotations.rb b/db/migrate/20140625102632_rename_source_id_to_original_id_in_listing_changes_listing_distributions_and_annotations.rb
index d0bb64bc0..824ad7c6a 100644
--- a/db/migrate/20140625102632_rename_source_id_to_original_id_in_listing_changes_listing_distributions_and_annotations.rb
+++ b/db/migrate/20140625102632_rename_source_id_to_original_id_in_listing_changes_listing_distributions_and_annotations.rb
@@ -1,4 +1,4 @@
-class RenameSourceIdToOriginalIdInListingChangesListingDistributionsAndAnnotations < ActiveRecord::Migration
+class RenameSourceIdToOriginalIdInListingChangesListingDistributionsAndAnnotations < ActiveRecord::Migration[4.2]
   def change
     rename_column :listing_changes, :source_id, :original_id
     rename_column :listing_distributions, :source_id, :original_id
diff --git a/db/migrate/20140703120106_add_old_attribute_fields_to_outputs.rb b/db/migrate/20140703120106_add_old_attribute_fields_to_outputs.rb
index 76638f668..3068bafd3 100644
--- a/db/migrate/20140703120106_add_old_attribute_fields_to_outputs.rb
+++ b/db/migrate/20140703120106_add_old_attribute_fields_to_outputs.rb
@@ -1,4 +1,4 @@
-class AddOldAttributeFieldsToOutputs < ActiveRecord::Migration
+class AddOldAttributeFieldsToOutputs < ActiveRecord::Migration[4.2]
   def change
     add_column :nomenclature_change_outputs, :parent_id, :integer
     add_column :nomenclature_change_outputs, :rank_id, :integer
diff --git a/db/migrate/20140709084707_create_ahoy_visits.rb b/db/migrate/20140709084707_create_ahoy_visits.rb
index 0175282e0..aedf84da3 100644
--- a/db/migrate/20140709084707_create_ahoy_visits.rb
+++ b/db/migrate/20140709084707_create_ahoy_visits.rb
@@ -1,4 +1,4 @@
-class CreateAhoyVisits < ActiveRecord::Migration
+class CreateAhoyVisits < ActiveRecord::Migration[4.2]
   def change
     create_table :ahoy_visits, id: false do |t|
       t.uuid :id, primary_key: true
diff --git a/db/migrate/20140709084708_create_ahoy_events.rb b/db/migrate/20140709084708_create_ahoy_events.rb
index e7f39aac2..8a60e8ac7 100644
--- a/db/migrate/20140709084708_create_ahoy_events.rb
+++ b/db/migrate/20140709084708_create_ahoy_events.rb
@@ -1,4 +1,4 @@
-class CreateAhoyEvents < ActiveRecord::Migration
+class CreateAhoyEvents < ActiveRecord::Migration[4.2]
   def change
     create_table :ahoy_events, id: false do |t|
       t.uuid :id, primary_key: true
diff --git a/db/migrate/20140718122508_add_nomenclature_note_columns.rb b/db/migrate/20140718122508_add_nomenclature_note_columns.rb
index 89813ce23..ab0f8c48b 100644
--- a/db/migrate/20140718122508_add_nomenclature_note_columns.rb
+++ b/db/migrate/20140718122508_add_nomenclature_note_columns.rb
@@ -1,4 +1,4 @@
-class AddNomenclatureNoteColumns < ActiveRecord::Migration
+class AddNomenclatureNoteColumns < ActiveRecord::Migration[4.2]
   def change
     [:en, :es, :fr].each do |lng|
       add_column :taxon_concepts, :"nomenclature_note_#{lng}", :text
diff --git a/db/migrate/20140721071654_add_internal_nomenclature_note_columns.rb b/db/migrate/20140721071654_add_internal_nomenclature_note_columns.rb
index d3a7b3a85..1bec8aee4 100644
--- a/db/migrate/20140721071654_add_internal_nomenclature_note_columns.rb
+++ b/db/migrate/20140721071654_add_internal_nomenclature_note_columns.rb
@@ -1,4 +1,4 @@
-class AddInternalNomenclatureNoteColumns < ActiveRecord::Migration
+class AddInternalNomenclatureNoteColumns < ActiveRecord::Migration[4.2]
   def change
     add_column :taxon_concepts, :internal_nomenclature_note, :text
     add_column :listing_changes, :internal_nomenclature_note, :text
diff --git a/db/migrate/20140730083216_add_organization_to_ahoy_visits.rb b/db/migrate/20140730083216_add_organization_to_ahoy_visits.rb
index 04614a9cb..fb338cd45 100644
--- a/db/migrate/20140730083216_add_organization_to_ahoy_visits.rb
+++ b/db/migrate/20140730083216_add_organization_to_ahoy_visits.rb
@@ -1,4 +1,4 @@
-class AddOrganizationToAhoyVisits < ActiveRecord::Migration
+class AddOrganizationToAhoyVisits < ActiveRecord::Migration[4.2]
   def change
     add_column :ahoy_visits, :organization, :text
   end
diff --git a/db/migrate/20140730101120_remove_region_from_ahoy_visits.rb b/db/migrate/20140730101120_remove_region_from_ahoy_visits.rb
index 4925d4ed3..b415caeba 100644
--- a/db/migrate/20140730101120_remove_region_from_ahoy_visits.rb
+++ b/db/migrate/20140730101120_remove_region_from_ahoy_visits.rb
@@ -1,4 +1,4 @@
-class RemoveRegionFromAhoyVisits < ActiveRecord::Migration
+class RemoveRegionFromAhoyVisits < ActiveRecord::Migration[4.2]
   def up
     remove_column :ahoy_visits, :region
   end
diff --git a/db/migrate/20140806122042_create_documents.rb b/db/migrate/20140806122042_create_documents.rb
index 9ffb8cf5c..21ed57514 100644
--- a/db/migrate/20140806122042_create_documents.rb
+++ b/db/migrate/20140806122042_create_documents.rb
@@ -1,4 +1,4 @@
-class CreateDocuments < ActiveRecord::Migration
+class CreateDocuments < ActiveRecord::Migration[4.2]
   def change
     create_table :documents do |t|
       t.text     :title, null: false
diff --git a/db/migrate/20140811101246_add_timestamps_to_documents.rb b/db/migrate/20140811101246_add_timestamps_to_documents.rb
index 9b5ca82ab..2d915d11a 100644
--- a/db/migrate/20140811101246_add_timestamps_to_documents.rb
+++ b/db/migrate/20140811101246_add_timestamps_to_documents.rb
@@ -1,4 +1,4 @@
-class AddTimestampsToDocuments < ActiveRecord::Migration
+class AddTimestampsToDocuments < ActiveRecord::Migration[4.2]
   def change
     add_column :documents, :created_at, :datetime
     add_column :documents, :updated_at, :datetime
diff --git a/db/migrate/20140812133548_document_is_public_should_default_to_false.rb b/db/migrate/20140812133548_document_is_public_should_default_to_false.rb
index bbddad36c..8f68e601e 100644
--- a/db/migrate/20140812133548_document_is_public_should_default_to_false.rb
+++ b/db/migrate/20140812133548_document_is_public_should_default_to_false.rb
@@ -1,4 +1,4 @@
-class DocumentIsPublicShouldDefaultToFalse < ActiveRecord::Migration
+class DocumentIsPublicShouldDefaultToFalse < ActiveRecord::Migration[4.2]
   def change
     change_column :documents, :is_public, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20140814073530_create_document_citations.rb b/db/migrate/20140814073530_create_document_citations.rb
index 9c5f96d1c..54f77079d 100644
--- a/db/migrate/20140814073530_create_document_citations.rb
+++ b/db/migrate/20140814073530_create_document_citations.rb
@@ -1,4 +1,4 @@
-class CreateDocumentCitations < ActiveRecord::Migration
+class CreateDocumentCitations < ActiveRecord::Migration[4.2]
   def change
     create_table :document_citations do |t|
       t.integer :document_id
diff --git a/db/migrate/20140814074009_create_document_citation_taxon_concepts.rb b/db/migrate/20140814074009_create_document_citation_taxon_concepts.rb
index 98974e5a6..f964da3ae 100644
--- a/db/migrate/20140814074009_create_document_citation_taxon_concepts.rb
+++ b/db/migrate/20140814074009_create_document_citation_taxon_concepts.rb
@@ -1,4 +1,4 @@
-class CreateDocumentCitationTaxonConcepts < ActiveRecord::Migration
+class CreateDocumentCitationTaxonConcepts < ActiveRecord::Migration[4.2]
   def change
     create_table :document_citation_taxon_concepts do |t|
       t.integer :document_citation_id
diff --git a/db/migrate/20140814074055_create_document_citation_geo_entities.rb b/db/migrate/20140814074055_create_document_citation_geo_entities.rb
index bd9cb74fe..468056e13 100644
--- a/db/migrate/20140814074055_create_document_citation_geo_entities.rb
+++ b/db/migrate/20140814074055_create_document_citation_geo_entities.rb
@@ -1,4 +1,4 @@
-class CreateDocumentCitationGeoEntities < ActiveRecord::Migration
+class CreateDocumentCitationGeoEntities < ActiveRecord::Migration[4.2]
   def change
     create_table :document_citation_geo_entities do |t|
       t.integer :document_citation_id
diff --git a/db/migrate/20140902113018_add_fts_index_to_documents.rb b/db/migrate/20140902113018_add_fts_index_to_documents.rb
index ce2f2348c..6d7d1df5c 100644
--- a/db/migrate/20140902113018_add_fts_index_to_documents.rb
+++ b/db/migrate/20140902113018_add_fts_index_to_documents.rb
@@ -1,4 +1,4 @@
-class AddFtsIndexToDocuments < ActiveRecord::Migration
+class AddFtsIndexToDocuments < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       CREATE INDEX index_documents_on_title_to_ts_vector
diff --git a/db/migrate/20140910124718_add_number_to_documents.rb b/db/migrate/20140910124718_add_number_to_documents.rb
index e1db5e1fa..8d3fab4b2 100644
--- a/db/migrate/20140910124718_add_number_to_documents.rb
+++ b/db/migrate/20140910124718_add_number_to_documents.rb
@@ -1,4 +1,4 @@
-class AddNumberToDocuments < ActiveRecord::Migration
+class AddNumberToDocuments < ActiveRecord::Migration[4.2]
   def change
     add_column :documents, :number, :string
   end
diff --git a/db/migrate/20140911100851_create_document_tags.rb b/db/migrate/20140911100851_create_document_tags.rb
index 0bb9e1dc4..0aa0ad843 100644
--- a/db/migrate/20140911100851_create_document_tags.rb
+++ b/db/migrate/20140911100851_create_document_tags.rb
@@ -1,4 +1,4 @@
-class CreateDocumentTags < ActiveRecord::Migration
+class CreateDocumentTags < ActiveRecord::Migration[4.2]
   def change
     create_table :document_tags do |t|
       t.string :name
diff --git a/db/migrate/20140911101846_create_document_tags_documents.rb b/db/migrate/20140911101846_create_document_tags_documents.rb
index 96c2fc672..1be1637de 100644
--- a/db/migrate/20140911101846_create_document_tags_documents.rb
+++ b/db/migrate/20140911101846_create_document_tags_documents.rb
@@ -1,4 +1,4 @@
-class CreateDocumentTagsDocuments < ActiveRecord::Migration
+class CreateDocumentTagsDocuments < ActiveRecord::Migration[4.2]
   def change
     create_table :document_tags_documents, :id => false do |t|
       t.references :document
diff --git a/db/migrate/20140915075649_add_extended_description_to_events.rb b/db/migrate/20140915075649_add_extended_description_to_events.rb
index 7bfa32df7..e9f9fd8a4 100644
--- a/db/migrate/20140915075649_add_extended_description_to_events.rb
+++ b/db/migrate/20140915075649_add_extended_description_to_events.rb
@@ -1,4 +1,4 @@
-class AddExtendedDescriptionToEvents < ActiveRecord::Migration
+class AddExtendedDescriptionToEvents < ActiveRecord::Migration[4.2]
   def change
     add_column :events, :extended_description, :text
   end
diff --git a/db/migrate/20140915204931_add_multilingual_url_to_events.rb b/db/migrate/20140915204931_add_multilingual_url_to_events.rb
index e2dc5e072..e5c6dc121 100644
--- a/db/migrate/20140915204931_add_multilingual_url_to_events.rb
+++ b/db/migrate/20140915204931_add_multilingual_url_to_events.rb
@@ -1,4 +1,4 @@
-class AddMultilingualUrlToEvents < ActiveRecord::Migration
+class AddMultilingualUrlToEvents < ActiveRecord::Migration[4.2]
   def change
     add_column :events, :multilingual_url, :text
   end
diff --git a/db/migrate/20140916154706_create_review_details.rb b/db/migrate/20140916154706_create_review_details.rb
index 768973037..de0ce85b2 100644
--- a/db/migrate/20140916154706_create_review_details.rb
+++ b/db/migrate/20140916154706_create_review_details.rb
@@ -1,4 +1,4 @@
-class CreateReviewDetails < ActiveRecord::Migration
+class CreateReviewDetails < ActiveRecord::Migration[4.2]
   def change
     create_table :review_details do |t|
       t.integer :document_id
diff --git a/db/migrate/20140918090432_create_document_proposal_details.rb b/db/migrate/20140918090432_create_document_proposal_details.rb
index 87a7ca8c7..8baab6848 100644
--- a/db/migrate/20140918090432_create_document_proposal_details.rb
+++ b/db/migrate/20140918090432_create_document_proposal_details.rb
@@ -1,4 +1,4 @@
-class CreateDocumentProposalDetails < ActiveRecord::Migration
+class CreateDocumentProposalDetails < ActiveRecord::Migration[4.2]
   def change
     create_table :proposal_details do |t|
       t.integer :document_id
diff --git a/db/migrate/20140926121728_add_internal_notes_to_all_things.rb b/db/migrate/20140926121728_add_internal_notes_to_all_things.rb
index a677e26ff..a10b9a3bb 100644
--- a/db/migrate/20140926121728_add_internal_notes_to_all_things.rb
+++ b/db/migrate/20140926121728_add_internal_notes_to_all_things.rb
@@ -1,4 +1,4 @@
-class AddInternalNotesToAllThings < ActiveRecord::Migration
+class AddInternalNotesToAllThings < ActiveRecord::Migration[4.2]
   def change
     add_column :taxon_concepts, :internal_notes, :text
     add_column :listing_changes, :internal_notes, :text
diff --git a/db/migrate/20140929092236_add_rank_name_to_sandbox_views.rb b/db/migrate/20140929092236_add_rank_name_to_sandbox_views.rb
index 2b1f818ef..a4762feea 100644
--- a/db/migrate/20140929092236_add_rank_name_to_sandbox_views.rb
+++ b/db/migrate/20140929092236_add_rank_name_to_sandbox_views.rb
@@ -1,4 +1,4 @@
-class AddRankNameToSandboxViews < ActiveRecord::Migration
+class AddRankNameToSandboxViews < ActiveRecord::Migration[4.2]
   def change
     execute <<-SQL
 
diff --git a/db/migrate/20141002065308_add_multi_lingual_notes_to_nomenclature_changes.rb b/db/migrate/20141002065308_add_multi_lingual_notes_to_nomenclature_changes.rb
index a9c156827..b1b28955d 100644
--- a/db/migrate/20141002065308_add_multi_lingual_notes_to_nomenclature_changes.rb
+++ b/db/migrate/20141002065308_add_multi_lingual_notes_to_nomenclature_changes.rb
@@ -1,4 +1,4 @@
-class AddMultiLingualNotesToNomenclatureChanges < ActiveRecord::Migration
+class AddMultiLingualNotesToNomenclatureChanges < ActiveRecord::Migration[4.2]
   def change
     rename_column :nomenclature_change_inputs, :note, :note_en
     add_column :nomenclature_change_inputs, :note_es, :text
diff --git a/db/migrate/20141002104704_add_multi_lingual_nomenclature_notes_to_all_legislation.rb b/db/migrate/20141002104704_add_multi_lingual_nomenclature_notes_to_all_legislation.rb
index 15ad8ed9d..7394f270e 100644
--- a/db/migrate/20141002104704_add_multi_lingual_nomenclature_notes_to_all_legislation.rb
+++ b/db/migrate/20141002104704_add_multi_lingual_nomenclature_notes_to_all_legislation.rb
@@ -1,4 +1,4 @@
-class AddMultiLingualNomenclatureNotesToAllLegislation < ActiveRecord::Migration
+class AddMultiLingualNomenclatureNotesToAllLegislation < ActiveRecord::Migration[4.2]
   def change
     rename_column :eu_decisions, :nomenclature_note, :nomenclature_note_en
     add_column :eu_decisions, :nomenclature_note_es, :text
diff --git a/db/migrate/20141003104615_split_taxon_concept_internal_note_into_3.rb b/db/migrate/20141003104615_split_taxon_concept_internal_note_into_3.rb
index 9abecf90b..5f352ba56 100644
--- a/db/migrate/20141003104615_split_taxon_concept_internal_note_into_3.rb
+++ b/db/migrate/20141003104615_split_taxon_concept_internal_note_into_3.rb
@@ -1,4 +1,4 @@
-class SplitTaxonConceptInternalNoteInto3 < ActiveRecord::Migration
+class SplitTaxonConceptInternalNoteInto3 < ActiveRecord::Migration[4.2]
   def change
     add_column :taxon_concepts, :internal_distribution_note, :text
     rename_column :taxon_concepts, :internal_notes, :internal_general_note
diff --git a/db/migrate/20141003155548_time_and_user_stamping_for_taxon_concept_internal_notes.rb b/db/migrate/20141003155548_time_and_user_stamping_for_taxon_concept_internal_notes.rb
index 379f186bf..2f22e68b9 100644
--- a/db/migrate/20141003155548_time_and_user_stamping_for_taxon_concept_internal_notes.rb
+++ b/db/migrate/20141003155548_time_and_user_stamping_for_taxon_concept_internal_notes.rb
@@ -1,4 +1,4 @@
-class TimeAndUserStampingForTaxonConceptInternalNotes < ActiveRecord::Migration
+class TimeAndUserStampingForTaxonConceptInternalNotes < ActiveRecord::Migration[4.2]
   def change
     add_column :taxon_concepts, :internal_general_note_updated_at, :datetime
     add_column :taxon_concepts, :internal_nomenclature_note_updated_at, :datetime
diff --git a/db/migrate/20141004213258_create_comments.rb b/db/migrate/20141004213258_create_comments.rb
index a3568e718..11a115b67 100644
--- a/db/migrate/20141004213258_create_comments.rb
+++ b/db/migrate/20141004213258_create_comments.rb
@@ -1,4 +1,4 @@
-class CreateComments < ActiveRecord::Migration
+class CreateComments < ActiveRecord::Migration[4.2]
   def change
     create_table :comments do |t|
       t.integer :commentable_id
diff --git a/db/migrate/20141004214703_change_of_plan_remove_internal_notes_from_taxon_concepts.rb b/db/migrate/20141004214703_change_of_plan_remove_internal_notes_from_taxon_concepts.rb
index 614a32805..120c9f5f2 100644
--- a/db/migrate/20141004214703_change_of_plan_remove_internal_notes_from_taxon_concepts.rb
+++ b/db/migrate/20141004214703_change_of_plan_remove_internal_notes_from_taxon_concepts.rb
@@ -1,4 +1,4 @@
-class ChangeOfPlanRemoveInternalNotesFromTaxonConcepts < ActiveRecord::Migration
+class ChangeOfPlanRemoveInternalNotesFromTaxonConcepts < ActiveRecord::Migration[4.2]
   def up
     execute 'DROP VIEW IF EXISTS orphaned_taxon_concepts_view'
     execute 'DROP VIEW IF EXISTS synonyms_and_trade_names_view'
diff --git a/db/migrate/20141007145503_remove_internal_nomenclature_note_throughout.rb b/db/migrate/20141007145503_remove_internal_nomenclature_note_throughout.rb
index 82cc101fa..6587b4d9c 100644
--- a/db/migrate/20141007145503_remove_internal_nomenclature_note_throughout.rb
+++ b/db/migrate/20141007145503_remove_internal_nomenclature_note_throughout.rb
@@ -1,4 +1,4 @@
-class RemoveInternalNomenclatureNoteThroughout < ActiveRecord::Migration
+class RemoveInternalNomenclatureNoteThroughout < ActiveRecord::Migration[4.2]
   def up
     remove_column :listing_changes, :internal_nomenclature_note
     remove_column :trade_restrictions, :internal_nomenclature_note
diff --git a/db/migrate/20141008094314_remove_status_change_from_nomenclature_changes.rb b/db/migrate/20141008094314_remove_status_change_from_nomenclature_changes.rb
index b9ad5a1c6..cb89f0784 100644
--- a/db/migrate/20141008094314_remove_status_change_from_nomenclature_changes.rb
+++ b/db/migrate/20141008094314_remove_status_change_from_nomenclature_changes.rb
@@ -1,4 +1,4 @@
-class RemoveStatusChangeFromNomenclatureChanges < ActiveRecord::Migration
+class RemoveStatusChangeFromNomenclatureChanges < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       WITH status_changes AS (
diff --git a/db/migrate/20141014125738_change_multi_permit_number_columns_to_text.rb b/db/migrate/20141014125738_change_multi_permit_number_columns_to_text.rb
index 0dbc58458..f9d213d65 100644
--- a/db/migrate/20141014125738_change_multi_permit_number_columns_to_text.rb
+++ b/db/migrate/20141014125738_change_multi_permit_number_columns_to_text.rb
@@ -1,4 +1,4 @@
-class ChangeMultiPermitNumberColumnsToText < ActiveRecord::Migration
+class ChangeMultiPermitNumberColumnsToText < ActiveRecord::Migration[4.2]
   def up
     sql = <<-SQL
       CREATE OR REPLACE FUNCTION drop_trade_sandbox_views() RETURNS void
diff --git a/db/migrate/20141113153137_create_nomenclature_change_output_reassignments_table.rb b/db/migrate/20141113153137_create_nomenclature_change_output_reassignments_table.rb
index ca93550c3..d9bf4c32d 100644
--- a/db/migrate/20141113153137_create_nomenclature_change_output_reassignments_table.rb
+++ b/db/migrate/20141113153137_create_nomenclature_change_output_reassignments_table.rb
@@ -1,4 +1,4 @@
-class CreateNomenclatureChangeOutputReassignmentsTable < ActiveRecord::Migration
+class CreateNomenclatureChangeOutputReassignmentsTable < ActiveRecord::Migration[4.2]
   def change
     create_table :nomenclature_change_output_reassignments do |t|
       t.integer  :nomenclature_change_output_id, :null => false
diff --git a/db/migrate/20141120211023_add_not_null_constraint_to_eu_decisions_geo_entity_id.rb b/db/migrate/20141120211023_add_not_null_constraint_to_eu_decisions_geo_entity_id.rb
index 4baae275e..c1ef3cc8f 100644
--- a/db/migrate/20141120211023_add_not_null_constraint_to_eu_decisions_geo_entity_id.rb
+++ b/db/migrate/20141120211023_add_not_null_constraint_to_eu_decisions_geo_entity_id.rb
@@ -1,4 +1,4 @@
-class AddNotNullConstraintToEuDecisionsGeoEntityId < ActiveRecord::Migration
+class AddNotNullConstraintToEuDecisionsGeoEntityId < ActiveRecord::Migration[4.2]
   def change
     execute 'DROP VIEW IF EXISTS eu_decisions_view'
     change_column :eu_decisions, :geo_entity_id, :integer, null: false
diff --git a/db/migrate/20141124163355_change_is_manager_to_role.rb b/db/migrate/20141124163355_change_is_manager_to_role.rb
index 096d4dea2..d51a7d513 100644
--- a/db/migrate/20141124163355_change_is_manager_to_role.rb
+++ b/db/migrate/20141124163355_change_is_manager_to_role.rb
@@ -1,4 +1,4 @@
-class ChangeIsManagerToRole < ActiveRecord::Migration
+class ChangeIsManagerToRole < ActiveRecord::Migration[4.2]
   def up
     add_column :users, :role, :string, default: 'default', null: false
     execute "UPDATE users SET role='admin' WHERE is_manager"
diff --git a/db/migrate/20141202142048_add_authentication_token_to_users.rb b/db/migrate/20141202142048_add_authentication_token_to_users.rb
index 64225f8fa..34faec802 100644
--- a/db/migrate/20141202142048_add_authentication_token_to_users.rb
+++ b/db/migrate/20141202142048_add_authentication_token_to_users.rb
@@ -1,4 +1,4 @@
-class AddAuthenticationTokenToUsers < ActiveRecord::Migration
+class AddAuthenticationTokenToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :authentication_token, :string
     add_index :users, :authentication_token
diff --git a/db/migrate/20141212093310_add_nomenclature_notes_to_listing_changes_mview.rb b/db/migrate/20141212093310_add_nomenclature_notes_to_listing_changes_mview.rb
index 595bea96a..b24b6d888 100644
--- a/db/migrate/20141212093310_add_nomenclature_notes_to_listing_changes_mview.rb
+++ b/db/migrate/20141212093310_add_nomenclature_notes_to_listing_changes_mview.rb
@@ -1,4 +1,4 @@
-class AddNomenclatureNotesToListingChangesMview < ActiveRecord::Migration
+class AddNomenclatureNotesToListingChangesMview < ActiveRecord::Migration[4.2]
   def change
     if table_exists? :listing_changes_mview
       add_column :listing_changes_mview, :nomenclature_note_en, :text
diff --git a/db/migrate/20141215134420_add_nomenclature_notes_to_designation_listing_changes_mview.rb b/db/migrate/20141215134420_add_nomenclature_notes_to_designation_listing_changes_mview.rb
index a4b529769..e9a52f773 100644
--- a/db/migrate/20141215134420_add_nomenclature_notes_to_designation_listing_changes_mview.rb
+++ b/db/migrate/20141215134420_add_nomenclature_notes_to_designation_listing_changes_mview.rb
@@ -1,4 +1,4 @@
-class AddNomenclatureNotesToDesignationListingChangesMview < ActiveRecord::Migration
+class AddNomenclatureNotesToDesignationListingChangesMview < ActiveRecord::Migration[4.2]
   def change
     if table_exists? :cites_listing_changes_mview
       add_column :cites_listing_changes_mview, :nomenclature_note_en, :text
diff --git a/db/migrate/20141222103221_create_legislation_api_types.rb b/db/migrate/20141222103221_create_legislation_api_types.rb
index 450b4dcb0..b685abe28 100644
--- a/db/migrate/20141222103221_create_legislation_api_types.rb
+++ b/db/migrate/20141222103221_create_legislation_api_types.rb
@@ -1,4 +1,4 @@
-class CreateLegislationApiTypes < ActiveRecord::Migration
+class CreateLegislationApiTypes < ActiveRecord::Migration[4.2]
   def change
     execute <<-SQL
     DROP TYPE IF EXISTS api_taxon_concept CASCADE;
diff --git a/db/migrate/20141222121945_create_eu_legislation_api_types.rb b/db/migrate/20141222121945_create_eu_legislation_api_types.rb
index f4dbd3d9d..3809dbcd7 100644
--- a/db/migrate/20141222121945_create_eu_legislation_api_types.rb
+++ b/db/migrate/20141222121945_create_eu_legislation_api_types.rb
@@ -1,4 +1,4 @@
-class CreateEuLegislationApiTypes < ActiveRecord::Migration
+class CreateEuLegislationApiTypes < ActiveRecord::Migration[4.2]
   def change
     execute <<-SQL
     CREATE TYPE api_trade_code AS (
diff --git a/db/migrate/20141222133058_use_single_language.rb b/db/migrate/20141222133058_use_single_language.rb
index 004f6954e..bfcd0ec36 100644
--- a/db/migrate/20141222133058_use_single_language.rb
+++ b/db/migrate/20141222133058_use_single_language.rb
@@ -1,4 +1,4 @@
-class UseSingleLanguage < ActiveRecord::Migration
+class UseSingleLanguage < ActiveRecord::Migration[4.2]
   def change
     execute <<-SQL
     DROP TYPE api_trade_code CASCADE;
diff --git a/db/migrate/20141223141124_create_api_higher_taxa_type.rb b/db/migrate/20141223141124_create_api_higher_taxa_type.rb
index 6667168fc..239ae6259 100644
--- a/db/migrate/20141223141124_create_api_higher_taxa_type.rb
+++ b/db/migrate/20141223141124_create_api_higher_taxa_type.rb
@@ -1,4 +1,4 @@
-class CreateApiHigherTaxaType < ActiveRecord::Migration
+class CreateApiHigherTaxaType < ActiveRecord::Migration[4.2]
   def change
     execute <<-SQL
     DROP TYPE IF EXISTS api_higher_taxa CASCADE;
diff --git a/db/migrate/20141223141125_timestamp_view_definitions.rb b/db/migrate/20141223141125_timestamp_view_definitions.rb
index cca0de98f..c4a912284 100644
--- a/db/migrate/20141223141125_timestamp_view_definitions.rb
+++ b/db/migrate/20141223141125_timestamp_view_definitions.rb
@@ -1,4 +1,4 @@
-class TimestampViewDefinitions < ActiveRecord::Migration
+class TimestampViewDefinitions < ActiveRecord::Migration[4.2]
 
   def change
     execute function_sql('20141223141125', 'array_agg_not_null')
diff --git a/db/migrate/20141223160054_timestamp_api_views.rb b/db/migrate/20141223160054_timestamp_api_views.rb
index 6bf1470f3..d87827351 100644
--- a/db/migrate/20141223160054_timestamp_api_views.rb
+++ b/db/migrate/20141223160054_timestamp_api_views.rb
@@ -1,4 +1,4 @@
-class TimestampApiViews < ActiveRecord::Migration
+class TimestampApiViews < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_quotas_view"
     execute "CREATE VIEW api_cites_quotas_view AS #{view_sql('20141223160054', 'api_cites_quotas_view')}"
diff --git a/db/migrate/20141223164041_create_some_more_legislation_api_types.rb b/db/migrate/20141223164041_create_some_more_legislation_api_types.rb
index 4ce496ad8..fceffad7d 100644
--- a/db/migrate/20141223164041_create_some_more_legislation_api_types.rb
+++ b/db/migrate/20141223164041_create_some_more_legislation_api_types.rb
@@ -1,4 +1,4 @@
-class CreateSomeMoreLegislationApiTypes < ActiveRecord::Migration
+class CreateSomeMoreLegislationApiTypes < ActiveRecord::Migration[4.2]
   def change
     execute <<-SQL
     CREATE TYPE api_annotation AS (
diff --git a/db/migrate/20141223171143_create_master_listing_changes_mviews.rb b/db/migrate/20141223171143_create_master_listing_changes_mviews.rb
index 9c2ad2e7d..c1e9eb8cb 100644
--- a/db/migrate/20141223171143_create_master_listing_changes_mviews.rb
+++ b/db/migrate/20141223171143_create_master_listing_changes_mviews.rb
@@ -1,4 +1,4 @@
-class CreateMasterListingChangesMviews < ActiveRecord::Migration
+class CreateMasterListingChangesMviews < ActiveRecord::Migration[4.2]
   def change
     [:cites, :eu, :cms].each do |designation|
       listing_changes_mview = "#{designation}_listing_changes_mview"
diff --git a/db/migrate/20141223171144_create_api_listing_changes_views.rb b/db/migrate/20141223171144_create_api_listing_changes_views.rb
index a243c7907..3c1934e72 100644
--- a/db/migrate/20141223171144_create_api_listing_changes_views.rb
+++ b/db/migrate/20141223171144_create_api_listing_changes_views.rb
@@ -1,4 +1,4 @@
-class CreateApiListingChangesViews < ActiveRecord::Migration
+class CreateApiListingChangesViews < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_listing_changes_view"
     execute "CREATE VIEW api_cites_listing_changes_view AS #{view_sql('20141223171144', 'api_cites_listing_changes_view')}"
diff --git a/db/migrate/20141228094935_update_api_cites_suspensions_view.rb b/db/migrate/20141228094935_update_api_cites_suspensions_view.rb
index 721e16025..b0f7dc041 100644
--- a/db/migrate/20141228094935_update_api_cites_suspensions_view.rb
+++ b/db/migrate/20141228094935_update_api_cites_suspensions_view.rb
@@ -1,4 +1,4 @@
-class UpdateApiCitesSuspensionsView < ActiveRecord::Migration
+class UpdateApiCitesSuspensionsView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_suspensions_view"
     execute "CREATE VIEW api_cites_suspensions_view AS #{view_sql('20141228094935', 'api_cites_suspensions_view')}"
diff --git a/db/migrate/20141228101341_update_api_cites_quotas_view.rb b/db/migrate/20141228101341_update_api_cites_quotas_view.rb
index 3199825a0..fc62917fb 100644
--- a/db/migrate/20141228101341_update_api_cites_quotas_view.rb
+++ b/db/migrate/20141228101341_update_api_cites_quotas_view.rb
@@ -1,4 +1,4 @@
-class UpdateApiCitesQuotasView < ActiveRecord::Migration
+class UpdateApiCitesQuotasView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_quotas_view"
     execute "CREATE VIEW api_cites_quotas_view AS #{view_sql('20141228101341', 'api_cites_quotas_view')}"
diff --git a/db/migrate/20141228224334_update_listing_changes_views.rb b/db/migrate/20141228224334_update_listing_changes_views.rb
index 09f0071df..095f46a2d 100644
--- a/db/migrate/20141228224334_update_listing_changes_views.rb
+++ b/db/migrate/20141228224334_update_listing_changes_views.rb
@@ -1,4 +1,4 @@
-class UpdateListingChangesViews < ActiveRecord::Migration
+class UpdateListingChangesViews < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_listing_changes_view"
     execute "CREATE VIEW api_cites_listing_changes_view AS #{view_sql('20141228224334', 'api_cites_listing_changes_view')}"
diff --git a/db/migrate/20141230193843_add_geo_entity_type_to_listing_changes_mviews.rb b/db/migrate/20141230193843_add_geo_entity_type_to_listing_changes_mviews.rb
index 7c3d1e834..b1705db75 100644
--- a/db/migrate/20141230193843_add_geo_entity_type_to_listing_changes_mviews.rb
+++ b/db/migrate/20141230193843_add_geo_entity_type_to_listing_changes_mviews.rb
@@ -1,4 +1,4 @@
-class AddGeoEntityTypeToListingChangesMviews < ActiveRecord::Migration
+class AddGeoEntityTypeToListingChangesMviews < ActiveRecord::Migration[4.2]
   def change
     [:cites, :eu, :cms].each do |designation|
       listing_changes_mview = "#{designation}_listing_changes_mview"
diff --git a/db/migrate/20141230193844_remove_id_from_api_types.rb b/db/migrate/20141230193844_remove_id_from_api_types.rb
index 64ff1642c..492b6023d 100644
--- a/db/migrate/20141230193844_remove_id_from_api_types.rb
+++ b/db/migrate/20141230193844_remove_id_from_api_types.rb
@@ -1,4 +1,4 @@
-class RemoveIdFromApiTypes < ActiveRecord::Migration
+class RemoveIdFromApiTypes < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_listing_changes_view"
     execute "DROP VIEW IF EXISTS api_cites_suspensions_view"
diff --git a/db/migrate/20150106100040_create_api_taxon_references_view.rb b/db/migrate/20150106100040_create_api_taxon_references_view.rb
index 0d03deac2..ba444dd79 100644
--- a/db/migrate/20150106100040_create_api_taxon_references_view.rb
+++ b/db/migrate/20150106100040_create_api_taxon_references_view.rb
@@ -1,4 +1,4 @@
-class CreateApiTaxonReferencesView < ActiveRecord::Migration
+class CreateApiTaxonReferencesView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_taxon_references_view"
     execute "CREATE VIEW api_taxon_references_view AS #{view_sql('20150106100040', 'api_taxon_references_view')}"
diff --git a/db/migrate/20150107171940_remove_new_line_after_notes.rb b/db/migrate/20150107171940_remove_new_line_after_notes.rb
index d1763d11e..4e46c03c6 100644
--- a/db/migrate/20150107171940_remove_new_line_after_notes.rb
+++ b/db/migrate/20150107171940_remove_new_line_after_notes.rb
@@ -1,4 +1,4 @@
-class RemoveNewLineAfterNotes < ActiveRecord::Migration
+class RemoveNewLineAfterNotes < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS eu_decisions_view"
     execute "CREATE VIEW eu_decisions_view AS #{view_sql('20150107171940', 'eu_decisions_view')}"
diff --git a/db/migrate/20150107173809_create_api_requests.rb b/db/migrate/20150107173809_create_api_requests.rb
index 6bf628f3f..149c7eafa 100644
--- a/db/migrate/20150107173809_create_api_requests.rb
+++ b/db/migrate/20150107173809_create_api_requests.rb
@@ -1,4 +1,4 @@
-class CreateApiRequests < ActiveRecord::Migration
+class CreateApiRequests < ActiveRecord::Migration[4.2]
   def change
     create_table :api_requests do |t|
       t.references :user, index: true
diff --git a/db/migrate/20150109134326_add_organisation_and_country_to_users.rb b/db/migrate/20150109134326_add_organisation_and_country_to_users.rb
index 56a51809f..1b7ff68e3 100644
--- a/db/migrate/20150109134326_add_organisation_and_country_to_users.rb
+++ b/db/migrate/20150109134326_add_organisation_and_country_to_users.rb
@@ -1,4 +1,4 @@
-class AddOrganisationAndCountryToUsers < ActiveRecord::Migration
+class AddOrganisationAndCountryToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :organisation, :string
     add_column :users, :geo_entity_id, :integer
diff --git a/db/migrate/20150112080319_add_language_names_to_api_common_names_view.rb b/db/migrate/20150112080319_add_language_names_to_api_common_names_view.rb
index 001007f41..0efe8fde7 100644
--- a/db/migrate/20150112080319_add_language_names_to_api_common_names_view.rb
+++ b/db/migrate/20150112080319_add_language_names_to_api_common_names_view.rb
@@ -1,4 +1,4 @@
-class AddLanguageNamesToApiCommonNamesView < ActiveRecord::Migration
+class AddLanguageNamesToApiCommonNamesView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_common_names_view"
     execute "CREATE VIEW api_common_names_view AS #{view_sql('20150112080319', 'api_common_names_view')}"
diff --git a/db/migrate/20150112093954_fix_duplicated_tags_in_api_distributions_view.rb b/db/migrate/20150112093954_fix_duplicated_tags_in_api_distributions_view.rb
index ac40d52c9..12f2018c3 100644
--- a/db/migrate/20150112093954_fix_duplicated_tags_in_api_distributions_view.rb
+++ b/db/migrate/20150112093954_fix_duplicated_tags_in_api_distributions_view.rb
@@ -1,4 +1,4 @@
-class FixDuplicatedTagsInApiDistributionsView < ActiveRecord::Migration
+class FixDuplicatedTagsInApiDistributionsView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_distributions_view"
     execute "CREATE VIEW api_distributions_view AS #{view_sql('20150112093954', 'api_distributions_view')}"
diff --git a/db/migrate/20150112113519_speed_up_api_cites_quotas_view.rb b/db/migrate/20150112113519_speed_up_api_cites_quotas_view.rb
index 077638526..63f10ee62 100644
--- a/db/migrate/20150112113519_speed_up_api_cites_quotas_view.rb
+++ b/db/migrate/20150112113519_speed_up_api_cites_quotas_view.rb
@@ -1,4 +1,4 @@
-class SpeedUpApiCitesQuotasView < ActiveRecord::Migration
+class SpeedUpApiCitesQuotasView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_quotas_view"
     execute "CREATE VIEW api_cites_quotas_view AS #{view_sql('20150112113519', 'api_cites_quotas_view')}"
diff --git a/db/migrate/20150112124146_speed_up_api_cites_suspensions_view.rb b/db/migrate/20150112124146_speed_up_api_cites_suspensions_view.rb
index bd2c3cf23..5d33200db 100644
--- a/db/migrate/20150112124146_speed_up_api_cites_suspensions_view.rb
+++ b/db/migrate/20150112124146_speed_up_api_cites_suspensions_view.rb
@@ -1,4 +1,4 @@
-class SpeedUpApiCitesSuspensionsView < ActiveRecord::Migration
+class SpeedUpApiCitesSuspensionsView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_suspensions_view"
     execute "CREATE VIEW api_cites_suspensions_view AS #{view_sql('20150112124146', 'api_cites_suspensions_view')}"
diff --git a/db/migrate/20150114084537_fix_api_quotas_and_suspensions_views.rb b/db/migrate/20150114084537_fix_api_quotas_and_suspensions_views.rb
index ec6e4dbed..f530b70d7 100644
--- a/db/migrate/20150114084537_fix_api_quotas_and_suspensions_views.rb
+++ b/db/migrate/20150114084537_fix_api_quotas_and_suspensions_views.rb
@@ -1,4 +1,4 @@
-class FixApiQuotasAndSuspensionsViews < ActiveRecord::Migration
+class FixApiQuotasAndSuspensionsViews < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_cites_quotas_view"
     execute "CREATE VIEW api_cites_quotas_view AS #{view_sql('20150114084537', 'api_cites_quotas_view')}"
diff --git a/db/migrate/20150114105024_add_higher_taxa_fields_to_api_taxon_concepts_view.rb b/db/migrate/20150114105024_add_higher_taxa_fields_to_api_taxon_concepts_view.rb
index 7d5e31abb..266068b70 100644
--- a/db/migrate/20150114105024_add_higher_taxa_fields_to_api_taxon_concepts_view.rb
+++ b/db/migrate/20150114105024_add_higher_taxa_fields_to_api_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class AddHigherTaxaFieldsToApiTaxonConceptsView < ActiveRecord::Migration
+class AddHigherTaxaFieldsToApiTaxonConceptsView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_taxon_concepts_view"
     execute "CREATE VIEW api_taxon_concepts_view AS #{view_sql('20150114104555', 'api_taxon_concepts_view')}"
diff --git a/db/migrate/20150116112256_add_cites_listing_to_api_taxon_concepts_view.rb b/db/migrate/20150116112256_add_cites_listing_to_api_taxon_concepts_view.rb
index 9fdf19c2f..3a32ed4cf 100644
--- a/db/migrate/20150116112256_add_cites_listing_to_api_taxon_concepts_view.rb
+++ b/db/migrate/20150116112256_add_cites_listing_to_api_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class AddCitesListingToApiTaxonConceptsView < ActiveRecord::Migration
+class AddCitesListingToApiTaxonConceptsView < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS api_taxon_concepts_view"
     execute "CREATE VIEW api_taxon_concepts_view AS #{view_sql('20150116112256', 'api_taxon_concepts_view')}"
diff --git a/db/migrate/20150119122122_check_for_synonym_status_in_api_taxon_concepts_view.rb b/db/migrate/20150119122122_check_for_synonym_status_in_api_taxon_concepts_view.rb
index 17cd8f279..fcf6adc80 100644
--- a/db/migrate/20150119122122_check_for_synonym_status_in_api_taxon_concepts_view.rb
+++ b/db/migrate/20150119122122_check_for_synonym_status_in_api_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class CheckForSynonymStatusInApiTaxonConceptsView < ActiveRecord::Migration
+class CheckForSynonymStatusInApiTaxonConceptsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_concepts_view"
     execute "CREATE VIEW api_taxon_concepts_view AS #{view_sql('20150119122122', 'api_taxon_concepts_view')}"
diff --git a/db/migrate/20150121111134_add_ancestors_name_to_trade_shipments_view.rb b/db/migrate/20150121111134_add_ancestors_name_to_trade_shipments_view.rb
index 5a650c01d..6c27d3b92 100644
--- a/db/migrate/20150121111134_add_ancestors_name_to_trade_shipments_view.rb
+++ b/db/migrate/20150121111134_add_ancestors_name_to_trade_shipments_view.rb
@@ -1,4 +1,4 @@
-class AddAncestorsNameToTradeShipmentsView < ActiveRecord::Migration
+class AddAncestorsNameToTradeShipmentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_shipments_with_taxa_view"
     execute "CREATE VIEW trade_shipments_with_taxa_view AS #{view_sql('20150121111134', 'trade_shipments_with_taxa_view')}"
diff --git a/db/migrate/20150121232443_add_id_to_api_eu_decisions_view.rb b/db/migrate/20150121232443_add_id_to_api_eu_decisions_view.rb
index 75bf9af62..06280e8ee 100644
--- a/db/migrate/20150121232443_add_id_to_api_eu_decisions_view.rb
+++ b/db/migrate/20150121232443_add_id_to_api_eu_decisions_view.rb
@@ -1,4 +1,4 @@
-class AddIdToApiEuDecisionsView < ActiveRecord::Migration
+class AddIdToApiEuDecisionsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_eu_decisions_view"
     execute "CREATE VIEW api_eu_decisions_view AS #{view_sql('20150121232443', 'api_eu_decisions_view')}"
diff --git a/db/migrate/20150121234014_create_eu_suspensions_applicability_view.rb b/db/migrate/20150121234014_create_eu_suspensions_applicability_view.rb
index ea66389e6..589a93231 100644
--- a/db/migrate/20150121234014_create_eu_suspensions_applicability_view.rb
+++ b/db/migrate/20150121234014_create_eu_suspensions_applicability_view.rb
@@ -1,4 +1,4 @@
-class CreateEuSuspensionsApplicabilityView < ActiveRecord::Migration
+class CreateEuSuspensionsApplicabilityView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS eu_suspensions_applicability_view"
     execute "CREATE VIEW eu_suspensions_applicability_view AS #{view_sql('20150121234014', 'eu_suspensions_applicability_view')}"
diff --git a/db/migrate/20150122132408_add_original_start_date_to_eu_decisions_view.rb b/db/migrate/20150122132408_add_original_start_date_to_eu_decisions_view.rb
index 5b441788f..d3a3fbd9a 100644
--- a/db/migrate/20150122132408_add_original_start_date_to_eu_decisions_view.rb
+++ b/db/migrate/20150122132408_add_original_start_date_to_eu_decisions_view.rb
@@ -1,4 +1,4 @@
-class AddOriginalStartDateToEuDecisionsView < ActiveRecord::Migration
+class AddOriginalStartDateToEuDecisionsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS eu_decisions_view"
     execute "CREATE VIEW eu_decisions_view AS #{view_sql('20150122132408', 'eu_decisions_view')}"
diff --git a/db/migrate/20150126125749_add_dependents_updated_at_to_taxon_concepts_views_for_downloads.rb b/db/migrate/20150126125749_add_dependents_updated_at_to_taxon_concepts_views_for_downloads.rb
index a19400bde..fe0dded8b 100644
--- a/db/migrate/20150126125749_add_dependents_updated_at_to_taxon_concepts_views_for_downloads.rb
+++ b/db/migrate/20150126125749_add_dependents_updated_at_to_taxon_concepts_views_for_downloads.rb
@@ -1,4 +1,4 @@
-class AddDependentsUpdatedAtToTaxonConceptsViewsForDownloads < ActiveRecord::Migration
+class AddDependentsUpdatedAtToTaxonConceptsViewsForDownloads < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS taxon_concepts_names_view"
     execute "CREATE VIEW taxon_concepts_names_view AS #{view_sql('20150126125749', 'taxon_concepts_names_view')}"
diff --git a/db/migrate/20150126135438_simplify_eu_suspensions_applicability_view.rb b/db/migrate/20150126135438_simplify_eu_suspensions_applicability_view.rb
index 8df7ee2ee..78e0c8f4a 100644
--- a/db/migrate/20150126135438_simplify_eu_suspensions_applicability_view.rb
+++ b/db/migrate/20150126135438_simplify_eu_suspensions_applicability_view.rb
@@ -1,4 +1,4 @@
-class SimplifyEuSuspensionsApplicabilityView < ActiveRecord::Migration
+class SimplifyEuSuspensionsApplicabilityView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS eu_suspensions_applicability_view CASCADE"
     execute "CREATE VIEW eu_suspensions_applicability_view AS #{view_sql('20150126135438', 'eu_suspensions_applicability_view')}"
diff --git a/db/migrate/20150126161813_add_soc_to_ec_srg_names.rb b/db/migrate/20150126161813_add_soc_to_ec_srg_names.rb
index 5b06a0d2f..348b21cd4 100644
--- a/db/migrate/20150126161813_add_soc_to_ec_srg_names.rb
+++ b/db/migrate/20150126161813_add_soc_to_ec_srg_names.rb
@@ -1,4 +1,4 @@
-class AddSocToEcSrgNames < ActiveRecord::Migration
+class AddSocToEcSrgNames < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_eu_decisions_view"
     execute "CREATE VIEW api_eu_decisions_view AS #{view_sql('20150126161813', 'api_eu_decisions_view')}"
diff --git a/db/migrate/20150210140508_fix_eu_suspension_start_dates_in_csv_download.rb b/db/migrate/20150210140508_fix_eu_suspension_start_dates_in_csv_download.rb
index 2d70f5c82..16f37ecf8 100644
--- a/db/migrate/20150210140508_fix_eu_suspension_start_dates_in_csv_download.rb
+++ b/db/migrate/20150210140508_fix_eu_suspension_start_dates_in_csv_download.rb
@@ -1,4 +1,4 @@
-class FixEuSuspensionStartDatesInCsvDownload < ActiveRecord::Migration
+class FixEuSuspensionStartDatesInCsvDownload < ActiveRecord::Migration[4.2]
   def change
     execute "DROP VIEW IF EXISTS eu_decisions_view"
     execute "CREATE VIEW eu_decisions_view AS #{view_sql('20150210140508', 'eu_decisions_view')}"
diff --git a/db/migrate/20150217174539_add_original_taxon_concept_id_to_api_taxon_references_view.rb b/db/migrate/20150217174539_add_original_taxon_concept_id_to_api_taxon_references_view.rb
index 7c1449548..d6009bc4b 100644
--- a/db/migrate/20150217174539_add_original_taxon_concept_id_to_api_taxon_references_view.rb
+++ b/db/migrate/20150217174539_add_original_taxon_concept_id_to_api_taxon_references_view.rb
@@ -1,4 +1,4 @@
-class AddOriginalTaxonConceptIdToApiTaxonReferencesView < ActiveRecord::Migration
+class AddOriginalTaxonConceptIdToApiTaxonReferencesView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_references_view"
     execute "CREATE VIEW api_taxon_references_view AS #{view_sql('20150217174539', 'api_taxon_references_view')}"
diff --git a/db/migrate/20150218141458_create_auto_complete_taxon_concepts_view.rb b/db/migrate/20150218141458_create_auto_complete_taxon_concepts_view.rb
index 55c12a3f0..1d92465ab 100644
--- a/db/migrate/20150218141458_create_auto_complete_taxon_concepts_view.rb
+++ b/db/migrate/20150218141458_create_auto_complete_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class CreateAutoCompleteTaxonConceptsView < ActiveRecord::Migration
+class CreateAutoCompleteTaxonConceptsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS auto_complete_taxon_concepts_view"
     execute "CREATE VIEW auto_complete_taxon_concepts_view AS #{view_sql('20150218141458', 'auto_complete_taxon_concepts_view')}"
diff --git a/db/migrate/20150223115540_add_unlisted_subspecies_to_name_matching_table.rb b/db/migrate/20150223115540_add_unlisted_subspecies_to_name_matching_table.rb
index b6d3b0b4b..aa64e90f9 100644
--- a/db/migrate/20150223115540_add_unlisted_subspecies_to_name_matching_table.rb
+++ b/db/migrate/20150223115540_add_unlisted_subspecies_to_name_matching_table.rb
@@ -1,4 +1,4 @@
-class AddUnlistedSubspeciesToNameMatchingTable < ActiveRecord::Migration
+class AddUnlistedSubspeciesToNameMatchingTable < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS auto_complete_taxon_concepts_view"
     execute "CREATE VIEW auto_complete_taxon_concepts_view AS #{view_sql('20150223115540', 'auto_complete_taxon_concepts_view')}"
diff --git a/db/migrate/20150225102903_remove_unused_permits.rb b/db/migrate/20150225102903_remove_unused_permits.rb
index 9becc179d..0bcd6f9d5 100644
--- a/db/migrate/20150225102903_remove_unused_permits.rb
+++ b/db/migrate/20150225102903_remove_unused_permits.rb
@@ -1,4 +1,4 @@
-class RemoveUnusedPermits < ActiveRecord::Migration
+class RemoveUnusedPermits < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       WITH unused_permits(id) AS (
diff --git a/db/migrate/20150225103133_create_unique_index_on_upper_permit_number.rb b/db/migrate/20150225103133_create_unique_index_on_upper_permit_number.rb
index efc0af6f9..c6ec3a078 100644
--- a/db/migrate/20150225103133_create_unique_index_on_upper_permit_number.rb
+++ b/db/migrate/20150225103133_create_unique_index_on_upper_permit_number.rb
@@ -1,4 +1,4 @@
-class CreateUniqueIndexOnUpperPermitNumber < ActiveRecord::Migration
+class CreateUniqueIndexOnUpperPermitNumber < ActiveRecord::Migration[4.2]
   def up
     # before creating a unique index on UPPER(number) need to deal with duplicates
     # all detected duplicates will need to be removed, but first the shipments
diff --git a/db/migrate/20150302082111_add_excluded_taxon_concepts_ids_to_api_taxon_references_view.rb b/db/migrate/20150302082111_add_excluded_taxon_concepts_ids_to_api_taxon_references_view.rb
index 20b1c037f..3c7e3bc28 100644
--- a/db/migrate/20150302082111_add_excluded_taxon_concepts_ids_to_api_taxon_references_view.rb
+++ b/db/migrate/20150302082111_add_excluded_taxon_concepts_ids_to_api_taxon_references_view.rb
@@ -1,4 +1,4 @@
-class AddExcludedTaxonConceptsIdsToApiTaxonReferencesView < ActiveRecord::Migration
+class AddExcludedTaxonConceptsIdsToApiTaxonReferencesView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_references_view"
     execute "CREATE VIEW api_taxon_references_view AS #{view_sql('20150302082111', 'api_taxon_references_view')}"
diff --git a/db/migrate/20150304104013_add_dependents_updated_by_id_to_taxon_concepts.rb b/db/migrate/20150304104013_add_dependents_updated_by_id_to_taxon_concepts.rb
index 4a89a0209..7c1f7ac49 100644
--- a/db/migrate/20150304104013_add_dependents_updated_by_id_to_taxon_concepts.rb
+++ b/db/migrate/20150304104013_add_dependents_updated_by_id_to_taxon_concepts.rb
@@ -1,4 +1,4 @@
-class AddDependentsUpdatedByIdToTaxonConcepts < ActiveRecord::Migration
+class AddDependentsUpdatedByIdToTaxonConcepts < ActiveRecord::Migration[4.2]
   def change
     add_column :taxon_concepts, :dependents_updated_by_id, :integer
     add_foreign_key :taxon_concepts, :users, name: 'taxon_concepts_dependents_updated_by_id_fk',
diff --git a/db/migrate/20150310140649_add_dependents_updated_by_id_to_internal_download_views.rb b/db/migrate/20150310140649_add_dependents_updated_by_id_to_internal_download_views.rb
index ddfa21f71..065725972 100644
--- a/db/migrate/20150310140649_add_dependents_updated_by_id_to_internal_download_views.rb
+++ b/db/migrate/20150310140649_add_dependents_updated_by_id_to_internal_download_views.rb
@@ -1,4 +1,4 @@
-class AddDependentsUpdatedByIdToInternalDownloadViews < ActiveRecord::Migration
+class AddDependentsUpdatedByIdToInternalDownloadViews < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS taxon_concepts_names_view"
     execute "CREATE VIEW taxon_concepts_names_view AS #{view_sql('20150310140649', 'taxon_concepts_names_view')}"
diff --git a/db/migrate/20150317131538_create_versions.rb b/db/migrate/20150317131538_create_versions.rb
index 58e5f1313..3be110a7f 100644
--- a/db/migrate/20150317131538_create_versions.rb
+++ b/db/migrate/20150317131538_create_versions.rb
@@ -1,4 +1,4 @@
-class CreateVersions < ActiveRecord::Migration
+class CreateVersions < ActiveRecord::Migration[4.2]
   def change
     create_table :versions do |t|
       t.string   :item_type, :null => false
diff --git a/db/migrate/20150318150923_search_by_non_hyphenated_common_name_versions.rb b/db/migrate/20150318150923_search_by_non_hyphenated_common_name_versions.rb
index 1de6afe8f..6d233fb76 100644
--- a/db/migrate/20150318150923_search_by_non_hyphenated_common_name_versions.rb
+++ b/db/migrate/20150318150923_search_by_non_hyphenated_common_name_versions.rb
@@ -1,4 +1,4 @@
-class SearchByNonHyphenatedCommonNameVersions < ActiveRecord::Migration
+class SearchByNonHyphenatedCommonNameVersions < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS auto_complete_taxon_concepts_view"
     execute "CREATE VIEW auto_complete_taxon_concepts_view AS #{view_sql('20150318150923', 'auto_complete_taxon_concepts_view')}"
diff --git a/db/migrate/20150324114546_include_deleted_taxon_concepts_in_api_taxon_concepts_view.rb b/db/migrate/20150324114546_include_deleted_taxon_concepts_in_api_taxon_concepts_view.rb
index 6a229fb3e..e3778792e 100644
--- a/db/migrate/20150324114546_include_deleted_taxon_concepts_in_api_taxon_concepts_view.rb
+++ b/db/migrate/20150324114546_include_deleted_taxon_concepts_in_api_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class IncludeDeletedTaxonConceptsInApiTaxonConceptsView < ActiveRecord::Migration
+class IncludeDeletedTaxonConceptsInApiTaxonConceptsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_concepts_view"
     execute "CREATE VIEW api_taxon_concepts_view AS #{view_sql('20150324114546', 'api_taxon_concepts_view')}"
diff --git a/db/migrate/20150401123614_squish_should_remove_non_breaking_spaces.rb b/db/migrate/20150401123614_squish_should_remove_non_breaking_spaces.rb
index 9952e8469..f1e5dbe0d 100644
--- a/db/migrate/20150401123614_squish_should_remove_non_breaking_spaces.rb
+++ b/db/migrate/20150401123614_squish_should_remove_non_breaking_spaces.rb
@@ -1,4 +1,4 @@
-class SquishShouldRemoveNonBreakingSpaces < ActiveRecord::Migration
+class SquishShouldRemoveNonBreakingSpaces < ActiveRecord::Migration[4.2]
   def up
     execute function_sql('20150401123614', 'squish')
   end
diff --git a/db/migrate/20150402111503_create_higher_or_equal_rank_names_function.rb b/db/migrate/20150402111503_create_higher_or_equal_rank_names_function.rb
index 286e1f0af..74943992f 100644
--- a/db/migrate/20150402111503_create_higher_or_equal_rank_names_function.rb
+++ b/db/migrate/20150402111503_create_higher_or_equal_rank_names_function.rb
@@ -1,4 +1,4 @@
-class CreateHigherOrEqualRankNamesFunction < ActiveRecord::Migration
+class CreateHigherOrEqualRankNamesFunction < ActiveRecord::Migration[4.2]
   def up
     execute function_sql('20150402111503', 'higher_or_equal_ranks_names')
   end
diff --git a/db/migrate/20150402111504_create_taxon_concepts_and_ancestors_view.rb b/db/migrate/20150402111504_create_taxon_concepts_and_ancestors_view.rb
index 8e9c8f725..66c0bdbeb 100644
--- a/db/migrate/20150402111504_create_taxon_concepts_and_ancestors_view.rb
+++ b/db/migrate/20150402111504_create_taxon_concepts_and_ancestors_view.rb
@@ -1,4 +1,4 @@
-class CreateTaxonConceptsAndAncestorsView < ActiveRecord::Migration
+class CreateTaxonConceptsAndAncestorsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS taxon_concept_and_ancestors_mview"
     execute "CREATE MATERIALIZED VIEW taxon_concepts_and_ancestors_mview AS #{view_sql('20150402111504', 'taxon_concepts_and_ancestors_mview')}"
diff --git a/db/migrate/20150402131608_speed_up_api_taxon_references_view.rb b/db/migrate/20150402131608_speed_up_api_taxon_references_view.rb
index b0aaeba94..871d549de 100644
--- a/db/migrate/20150402131608_speed_up_api_taxon_references_view.rb
+++ b/db/migrate/20150402131608_speed_up_api_taxon_references_view.rb
@@ -1,4 +1,4 @@
-class SpeedUpApiTaxonReferencesView < ActiveRecord::Migration
+class SpeedUpApiTaxonReferencesView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_references_view"
     execute "CREATE VIEW api_taxon_references_view AS #{view_sql('20150402131608', 'api_taxon_references_view')}"
diff --git a/db/migrate/20150420100448_add_is_cites_authority_to_users.rb b/db/migrate/20150420100448_add_is_cites_authority_to_users.rb
index 65199be45..646acfd4f 100644
--- a/db/migrate/20150420100448_add_is_cites_authority_to_users.rb
+++ b/db/migrate/20150420100448_add_is_cites_authority_to_users.rb
@@ -1,4 +1,4 @@
-class AddIsCitesAuthorityToUsers < ActiveRecord::Migration
+class AddIsCitesAuthorityToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :is_cites_authority, :boolean
     execute 'UPDATE users SET is_cites_authority = false'
diff --git a/db/migrate/20150420151952_change_default_role_to_api.rb b/db/migrate/20150420151952_change_default_role_to_api.rb
index b30afb83b..0b6498ec2 100644
--- a/db/migrate/20150420151952_change_default_role_to_api.rb
+++ b/db/migrate/20150420151952_change_default_role_to_api.rb
@@ -1,4 +1,4 @@
-class ChangeDefaultRoleToApi < ActiveRecord::Migration
+class ChangeDefaultRoleToApi < ActiveRecord::Migration[4.2]
   def up
     change_column :users, :role, :text, null: false, default: 'api'
   end
diff --git a/db/migrate/20150421063910_create_squish_null_function.rb b/db/migrate/20150421063910_create_squish_null_function.rb
index 905a06239..ac196dd2f 100644
--- a/db/migrate/20150421063910_create_squish_null_function.rb
+++ b/db/migrate/20150421063910_create_squish_null_function.rb
@@ -1,4 +1,4 @@
-class CreateSquishNullFunction < ActiveRecord::Migration
+class CreateSquishNullFunction < ActiveRecord::Migration[4.2]
   def up
     execute function_sql('20150421071444', 'squish_null')
   end
diff --git a/db/migrate/20150421071444_organisation_not_null.rb b/db/migrate/20150421071444_organisation_not_null.rb
index 9f7cd687a..e98c6b133 100644
--- a/db/migrate/20150421071444_organisation_not_null.rb
+++ b/db/migrate/20150421071444_organisation_not_null.rb
@@ -1,4 +1,4 @@
-class OrganisationNotNull < ActiveRecord::Migration
+class OrganisationNotNull < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE users SET organisation = 'UNKNOWN' WHERE SQUISH_NULL(organisation) IS NULL"
     change_column :users, :organisation, :text, null: false, default: 'UNKNOWN'
diff --git a/db/migrate/20150421112808_create_unique_index_on_taxon_concept_references.rb b/db/migrate/20150421112808_create_unique_index_on_taxon_concept_references.rb
index 99f37b3ee..6503435f3 100644
--- a/db/migrate/20150421112808_create_unique_index_on_taxon_concept_references.rb
+++ b/db/migrate/20150421112808_create_unique_index_on_taxon_concept_references.rb
@@ -1,4 +1,4 @@
-class CreateUniqueIndexOnTaxonConceptReferences < ActiveRecord::Migration
+class CreateUniqueIndexOnTaxonConceptReferences < ActiveRecord::Migration[4.2]
   def up
     sql = <<-SQL
   WITH duplicated_taxon_concept_references AS (
diff --git a/db/migrate/20150422101115_index_shipments_and_taxon_concepts_on_user.rb b/db/migrate/20150422101115_index_shipments_and_taxon_concepts_on_user.rb
index 44c6d65af..e885d04e3 100644
--- a/db/migrate/20150422101115_index_shipments_and_taxon_concepts_on_user.rb
+++ b/db/migrate/20150422101115_index_shipments_and_taxon_concepts_on_user.rb
@@ -1,4 +1,4 @@
-class IndexShipmentsAndTaxonConceptsOnUser < ActiveRecord::Migration
+class IndexShipmentsAndTaxonConceptsOnUser < ActiveRecord::Migration[4.2]
   def up
     add_index :trade_shipments, [:created_by_id, :updated_by_id]
     add_index :taxon_concepts, [:created_by_id, :updated_by_id]
diff --git a/db/migrate/20150427111732_create_more_indexes_on_taxon_concept_references.rb b/db/migrate/20150427111732_create_more_indexes_on_taxon_concept_references.rb
index fa609268f..31b259ad0 100644
--- a/db/migrate/20150427111732_create_more_indexes_on_taxon_concept_references.rb
+++ b/db/migrate/20150427111732_create_more_indexes_on_taxon_concept_references.rb
@@ -1,4 +1,4 @@
-class CreateMoreIndexesOnTaxonConceptReferences < ActiveRecord::Migration
+class CreateMoreIndexesOnTaxonConceptReferences < ActiveRecord::Migration[4.2]
   def up
     add_index "taxon_concept_references", ["is_standard", "is_cascaded", "taxon_concept_id"],
       name: "index_taxon_concept_references_on_tc_id_is_std_is_cascaded"
diff --git a/db/migrate/20150428071201_replace_ctes_with_subqueries_in_api_tc_ref_view.rb b/db/migrate/20150428071201_replace_ctes_with_subqueries_in_api_tc_ref_view.rb
index e3eaa64bc..f381e66b5 100644
--- a/db/migrate/20150428071201_replace_ctes_with_subqueries_in_api_tc_ref_view.rb
+++ b/db/migrate/20150428071201_replace_ctes_with_subqueries_in_api_tc_ref_view.rb
@@ -1,4 +1,4 @@
-class ReplaceCtesWithSubqueriesInApiTcRefView < ActiveRecord::Migration
+class ReplaceCtesWithSubqueriesInApiTcRefView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_references_view"
     execute "CREATE VIEW api_taxon_references_view AS #{view_sql('20150428071201', 'api_taxon_references_view')}"
diff --git a/db/migrate/20150512124835_fix_cascading_of_cites_suspensions.rb b/db/migrate/20150512124835_fix_cascading_of_cites_suspensions.rb
index f7984a80e..b7c3a1f17 100644
--- a/db/migrate/20150512124835_fix_cascading_of_cites_suspensions.rb
+++ b/db/migrate/20150512124835_fix_cascading_of_cites_suspensions.rb
@@ -1,4 +1,4 @@
-class FixCascadingOfCitesSuspensions < ActiveRecord::Migration
+class FixCascadingOfCitesSuspensions < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_cites_suspensions_view"
     execute "CREATE VIEW api_cites_suspensions_view AS #{view_sql('20150512124835', 'api_cites_suspensions_view')}"
diff --git a/db/migrate/20150512222755_fix_cascading_of_quotas.rb b/db/migrate/20150512222755_fix_cascading_of_quotas.rb
index c0df4c36d..d4d6f34f5 100644
--- a/db/migrate/20150512222755_fix_cascading_of_quotas.rb
+++ b/db/migrate/20150512222755_fix_cascading_of_quotas.rb
@@ -1,4 +1,4 @@
-class FixCascadingOfQuotas < ActiveRecord::Migration
+class FixCascadingOfQuotas < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_cites_quotas_view"
     execute "CREATE VIEW api_cites_quotas_view AS #{view_sql('20150512222755', 'api_cites_quotas_view')}"
diff --git a/db/migrate/20150518120700_add_applies_to_import_to_trade_restrictions.rb b/db/migrate/20150518120700_add_applies_to_import_to_trade_restrictions.rb
index 628b54499..a00102acb 100644
--- a/db/migrate/20150518120700_add_applies_to_import_to_trade_restrictions.rb
+++ b/db/migrate/20150518120700_add_applies_to_import_to_trade_restrictions.rb
@@ -1,4 +1,4 @@
-class AddAppliesToImportToTradeRestrictions < ActiveRecord::Migration
+class AddAppliesToImportToTradeRestrictions < ActiveRecord::Migration[4.2]
   def change
     add_column :trade_restrictions, :applies_to_import, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20150518122737_add_applies_to_import_to_api_cites_suspensions_view.rb b/db/migrate/20150518122737_add_applies_to_import_to_api_cites_suspensions_view.rb
index b6d49e70d..526ed8a0b 100644
--- a/db/migrate/20150518122737_add_applies_to_import_to_api_cites_suspensions_view.rb
+++ b/db/migrate/20150518122737_add_applies_to_import_to_api_cites_suspensions_view.rb
@@ -1,4 +1,4 @@
-class AddAppliesToImportToApiCitesSuspensionsView < ActiveRecord::Migration
+class AddAppliesToImportToApiCitesSuspensionsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_cites_suspensions_view"
     execute "CREATE VIEW api_cites_suspensions_view AS #{view_sql('20150518122737', 'api_cites_suspensions_view')}"
diff --git a/db/migrate/20150518131629_add_higher_taxa_ids_to_api_taxon_concepts_view.rb b/db/migrate/20150518131629_add_higher_taxa_ids_to_api_taxon_concepts_view.rb
index beceb7a5d..3d082e369 100644
--- a/db/migrate/20150518131629_add_higher_taxa_ids_to_api_taxon_concepts_view.rb
+++ b/db/migrate/20150518131629_add_higher_taxa_ids_to_api_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class AddHigherTaxaIdsToApiTaxonConceptsView < ActiveRecord::Migration
+class AddHigherTaxaIdsToApiTaxonConceptsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_concepts_view"
     execute "CREATE VIEW api_taxon_concepts_view AS #{view_sql('20150518131629', 'api_taxon_concepts_view')}"
diff --git a/db/migrate/20150518161716_create_trim_decimal_zero_function.rb b/db/migrate/20150518161716_create_trim_decimal_zero_function.rb
index 0e8fa4ab7..d58265d0c 100644
--- a/db/migrate/20150518161716_create_trim_decimal_zero_function.rb
+++ b/db/migrate/20150518161716_create_trim_decimal_zero_function.rb
@@ -1,4 +1,4 @@
-class CreateTrimDecimalZeroFunction < ActiveRecord::Migration
+class CreateTrimDecimalZeroFunction < ActiveRecord::Migration[4.2]
   def up
     execute function_sql('20150518161716', 'trim_decimal_zero')
   end
diff --git a/db/migrate/20150610111751_fix_trim_decimal_zero.rb b/db/migrate/20150610111751_fix_trim_decimal_zero.rb
index d2ea19b98..99e5ed98a 100644
--- a/db/migrate/20150610111751_fix_trim_decimal_zero.rb
+++ b/db/migrate/20150610111751_fix_trim_decimal_zero.rb
@@ -1,4 +1,4 @@
-class FixTrimDecimalZero < ActiveRecord::Migration
+class FixTrimDecimalZero < ActiveRecord::Migration[4.2]
   def up
     execute function_sql('20150610111751', 'trim_decimal_zero')
   end
diff --git a/db/migrate/20150701133536_change_varchars_to_text_in_trade_downloads.rb b/db/migrate/20150701133536_change_varchars_to_text_in_trade_downloads.rb
index 489dc12f8..ce16a073b 100644
--- a/db/migrate/20150701133536_change_varchars_to_text_in_trade_downloads.rb
+++ b/db/migrate/20150701133536_change_varchars_to_text_in_trade_downloads.rb
@@ -1,4 +1,4 @@
-class ChangeVarcharsToTextInTradeDownloads < ActiveRecord::Migration
+class ChangeVarcharsToTextInTradeDownloads < ActiveRecord::Migration[4.2]
   def up
     change_column :trade_trade_data_downloads, :importer, :text
     change_column :trade_trade_data_downloads, :exporter, :text
diff --git a/db/migrate/20150713105852_add_elib_legacy_id_to_events.rb b/db/migrate/20150713105852_add_elib_legacy_id_to_events.rb
index 9b307d8f1..c32d4181e 100644
--- a/db/migrate/20150713105852_add_elib_legacy_id_to_events.rb
+++ b/db/migrate/20150713105852_add_elib_legacy_id_to_events.rb
@@ -1,4 +1,4 @@
-class AddElibLegacyIdToEvents < ActiveRecord::Migration
+class AddElibLegacyIdToEvents < ActiveRecord::Migration[4.2]
   def change
     add_column :events, :elib_legacy_id, :integer
   end
diff --git a/db/migrate/20150714075603_add_fields_to_documents.rb b/db/migrate/20150714075603_add_fields_to_documents.rb
index 94d6f2034..91340662c 100644
--- a/db/migrate/20150714075603_add_fields_to_documents.rb
+++ b/db/migrate/20150714075603_add_fields_to_documents.rb
@@ -1,4 +1,4 @@
-class AddFieldsToDocuments < ActiveRecord::Migration
+class AddFieldsToDocuments < ActiveRecord::Migration[4.2]
   def change
     execute 'DROP VIEW documents_view'
     rename_column :documents, :legacy_id, :elib_legacy_id
diff --git a/db/migrate/20150717152937_add_elib_legacy_id_to_document_citations.rb b/db/migrate/20150717152937_add_elib_legacy_id_to_document_citations.rb
index e19974ce0..1bf473980 100644
--- a/db/migrate/20150717152937_add_elib_legacy_id_to_document_citations.rb
+++ b/db/migrate/20150717152937_add_elib_legacy_id_to_document_citations.rb
@@ -1,4 +1,4 @@
-class AddElibLegacyIdToDocumentCitations < ActiveRecord::Migration
+class AddElibLegacyIdToDocumentCitations < ActiveRecord::Migration[4.2]
   def change
     add_column :document_citations, :elib_legacy_id, :integer
   end
diff --git a/db/migrate/20150720133624_change_recommended_category_id_column_for_review_details.rb b/db/migrate/20150720133624_change_recommended_category_id_column_for_review_details.rb
index 8e3541a85..dc879838f 100644
--- a/db/migrate/20150720133624_change_recommended_category_id_column_for_review_details.rb
+++ b/db/migrate/20150720133624_change_recommended_category_id_column_for_review_details.rb
@@ -1,4 +1,4 @@
-class ChangeRecommendedCategoryIdColumnForReviewDetails < ActiveRecord::Migration
+class ChangeRecommendedCategoryIdColumnForReviewDetails < ActiveRecord::Migration[4.2]
   def up
     remove_foreign_key :review_details, name: "review_details_recommended_category_id_fk"
     rename_column :review_details, :recommended_category_id, :recommended_category
diff --git a/db/migrate/20150720150338_update_documents_view.rb b/db/migrate/20150720150338_update_documents_view.rb
index c6d4368a4..11f89c2d2 100644
--- a/db/migrate/20150720150338_update_documents_view.rb
+++ b/db/migrate/20150720150338_update_documents_view.rb
@@ -1,4 +1,4 @@
-class UpdateDocumentsView < ActiveRecord::Migration
+class UpdateDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS documents_view"
     execute "CREATE VIEW documents_view AS #{view_sql('20150720150338', 'documents_view')}"
diff --git a/db/migrate/20150721121640_add_original_id_to_documents.rb b/db/migrate/20150721121640_add_original_id_to_documents.rb
index fdf294d5f..30ce83b1b 100644
--- a/db/migrate/20150721121640_add_original_id_to_documents.rb
+++ b/db/migrate/20150721121640_add_original_id_to_documents.rb
@@ -1,4 +1,4 @@
-class AddOriginalIdToDocuments < ActiveRecord::Migration
+class AddOriginalIdToDocuments < ActiveRecord::Migration[4.2]
   def change
     add_column :documents, :original_id, :integer
     add_foreign_key(:documents, :documents, column: :original_id, dependent: :nullify)
diff --git a/db/migrate/20150722113923_create_api_documents_view.rb b/db/migrate/20150722113923_create_api_documents_view.rb
index 81e5299b7..4c0542845 100644
--- a/db/migrate/20150722113923_create_api_documents_view.rb
+++ b/db/migrate/20150722113923_create_api_documents_view.rb
@@ -1,4 +1,4 @@
-class CreateApiDocumentsView < ActiveRecord::Migration
+class CreateApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "CREATE VIEW api_documents_view AS #{view_sql('20150722113923', 'api_documents_view')}"
   end
diff --git a/db/migrate/20150723141854_change_document_tag_name_to_text.rb b/db/migrate/20150723141854_change_document_tag_name_to_text.rb
index 70210cdee..683d1ac4b 100644
--- a/db/migrate/20150723141854_change_document_tag_name_to_text.rb
+++ b/db/migrate/20150723141854_change_document_tag_name_to_text.rb
@@ -1,4 +1,4 @@
-class ChangeDocumentTagNameToText < ActiveRecord::Migration
+class ChangeDocumentTagNameToText < ActiveRecord::Migration[4.2]
   def up
     change_column :document_tags, :name, :text, null: false
   end
diff --git a/db/migrate/20150723142812_add_discussion_id_and_sort_order_to_documents.rb b/db/migrate/20150723142812_add_discussion_id_and_sort_order_to_documents.rb
index 0b1a24cf2..0ab8c1a28 100644
--- a/db/migrate/20150723142812_add_discussion_id_and_sort_order_to_documents.rb
+++ b/db/migrate/20150723142812_add_discussion_id_and_sort_order_to_documents.rb
@@ -1,4 +1,4 @@
-class AddDiscussionIdAndSortOrderToDocuments < ActiveRecord::Migration
+class AddDiscussionIdAndSortOrderToDocuments < ActiveRecord::Migration[4.2]
   def change
     add_column :documents, :discussion_id, :integer
     add_column :documents, :discussion_sort_index, :integer
diff --git a/db/migrate/20150730153305_get_is_public_from_api_documents_view.rb b/db/migrate/20150730153305_get_is_public_from_api_documents_view.rb
index 45b2f8f96..1fcf9fc54 100644
--- a/db/migrate/20150730153305_get_is_public_from_api_documents_view.rb
+++ b/db/migrate/20150730153305_get_is_public_from_api_documents_view.rb
@@ -1,4 +1,4 @@
-class GetIsPublicFromApiDocumentsView < ActiveRecord::Migration
+class GetIsPublicFromApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_documents_view"
     execute "CREATE VIEW api_documents_view AS #{view_sql('20150730153305', 'api_documents_view')}"
diff --git a/db/migrate/20150806092509_update_documents_view_for_search.rb b/db/migrate/20150806092509_update_documents_view_for_search.rb
index 20d9e8590..6d6d264f8 100644
--- a/db/migrate/20150806092509_update_documents_view_for_search.rb
+++ b/db/migrate/20150806092509_update_documents_view_for_search.rb
@@ -1,4 +1,4 @@
-class UpdateDocumentsViewForSearch < ActiveRecord::Migration
+class UpdateDocumentsViewForSearch < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_documents_view"
     execute <<-SQL
diff --git a/db/migrate/20150812180311_add_outcome_and_phase_to_api_documents_view.rb b/db/migrate/20150812180311_add_outcome_and_phase_to_api_documents_view.rb
index 8d13ba7a3..c393ce784 100644
--- a/db/migrate/20150812180311_add_outcome_and_phase_to_api_documents_view.rb
+++ b/db/migrate/20150812180311_add_outcome_and_phase_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddOutcomeAndPhaseToApiDocumentsView < ActiveRecord::Migration
+class AddOutcomeAndPhaseToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_documents_view"
     execute "CREATE VIEW api_documents_view AS #{view_sql('20150812180311', 'api_documents_view')}"
diff --git a/db/migrate/20150817102427_add_document_date_to_api_documents_view.rb b/db/migrate/20150817102427_add_document_date_to_api_documents_view.rb
index 3db6072a2..2279aab2f 100644
--- a/db/migrate/20150817102427_add_document_date_to_api_documents_view.rb
+++ b/db/migrate/20150817102427_add_document_date_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddDocumentDateToApiDocumentsView < ActiveRecord::Migration
+class AddDocumentDateToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_documents_view"
     execute "CREATE VIEW api_documents_view AS #{view_sql('20150817102427', 'api_documents_view')}"
diff --git a/db/migrate/20150817204542_remove_null_tags_from_documents_view.rb b/db/migrate/20150817204542_remove_null_tags_from_documents_view.rb
index 1f6d71b5d..5bea131b1 100644
--- a/db/migrate/20150817204542_remove_null_tags_from_documents_view.rb
+++ b/db/migrate/20150817204542_remove_null_tags_from_documents_view.rb
@@ -1,4 +1,4 @@
-class RemoveNullTagsFromDocumentsView < ActiveRecord::Migration
+class RemoveNullTagsFromDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS documents_view"
     execute "CREATE VIEW documents_view AS #{view_sql('20150817204542', 'documents_view')}"
diff --git a/db/migrate/20150818131407_add_event_id_to_api_documents_view.rb b/db/migrate/20150818131407_add_event_id_to_api_documents_view.rb
index 3712fecd1..a93ddfd24 100644
--- a/db/migrate/20150818131407_add_event_id_to_api_documents_view.rb
+++ b/db/migrate/20150818131407_add_event_id_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddEventIdToApiDocumentsView < ActiveRecord::Migration
+class AddEventIdToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_documents_view"
     execute "CREATE VIEW api_documents_view AS #{view_sql('20150818131407', 'api_documents_view')}"
diff --git a/db/migrate/20150819124804_add_document_tags_names_to_api_documents_view.rb b/db/migrate/20150819124804_add_document_tags_names_to_api_documents_view.rb
index f84503857..c1a46d8a8 100644
--- a/db/migrate/20150819124804_add_document_tags_names_to_api_documents_view.rb
+++ b/db/migrate/20150819124804_add_document_tags_names_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddDocumentTagsNamesToApiDocumentsView < ActiveRecord::Migration
+class AddDocumentTagsNamesToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_documents_view"
     execute "CREATE VIEW api_documents_view AS #{view_sql('20150819124804', 'api_documents_view')}"
diff --git a/db/migrate/20150820121520_add_indexes_to_document_tables.rb b/db/migrate/20150820121520_add_indexes_to_document_tables.rb
index 8d201f925..7c3de211c 100644
--- a/db/migrate/20150820121520_add_indexes_to_document_tables.rb
+++ b/db/migrate/20150820121520_add_indexes_to_document_tables.rb
@@ -1,4 +1,4 @@
-class AddIndexesToDocumentTables < ActiveRecord::Migration
+class AddIndexesToDocumentTables < ActiveRecord::Migration[4.2]
   def change
     sql = <<-SQL
   WITH duplicated_document_citation_taxon_concepts AS (
diff --git a/db/migrate/20150820183942_small_changes_to_api_documents_view.rb b/db/migrate/20150820183942_small_changes_to_api_documents_view.rb
index d50255451..8c52b8657 100644
--- a/db/migrate/20150820183942_small_changes_to_api_documents_view.rb
+++ b/db/migrate/20150820183942_small_changes_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class SmallChangesToApiDocumentsView < ActiveRecord::Migration
+class SmallChangesToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_documents_view"
     execute "CREATE VIEW api_documents_view AS #{view_sql('20150820183942', 'api_documents_view')}"
diff --git a/db/migrate/20150929175554_add_taxonomy_id_to_nomenclature_change_outputs.rb b/db/migrate/20150929175554_add_taxonomy_id_to_nomenclature_change_outputs.rb
index d5b2b43cb..7e0150545 100644
--- a/db/migrate/20150929175554_add_taxonomy_id_to_nomenclature_change_outputs.rb
+++ b/db/migrate/20150929175554_add_taxonomy_id_to_nomenclature_change_outputs.rb
@@ -1,4 +1,4 @@
-class AddTaxonomyIdToNomenclatureChangeOutputs < ActiveRecord::Migration
+class AddTaxonomyIdToNomenclatureChangeOutputs < ActiveRecord::Migration[4.2]
   def change
     add_column :nomenclature_change_outputs, :taxonomy_id, :integer
   end
diff --git a/db/migrate/20151001094410_add_output_fields_for_new_name_wizard.rb b/db/migrate/20151001094410_add_output_fields_for_new_name_wizard.rb
index d0c235a86..8a4c2c07f 100644
--- a/db/migrate/20151001094410_add_output_fields_for_new_name_wizard.rb
+++ b/db/migrate/20151001094410_add_output_fields_for_new_name_wizard.rb
@@ -1,4 +1,4 @@
-class AddOutputFieldsForNewNameWizard < ActiveRecord::Migration
+class AddOutputFieldsForNewNameWizard < ActiveRecord::Migration[4.2]
   def change
     add_column :nomenclature_change_outputs, :accepted_taxon_ids, "INTEGER[]"
     add_column :nomenclature_change_outputs, :hybrid_parent_id, :integer
diff --git a/db/migrate/20151005141953_add_empty_string_as_default_to_notes.rb b/db/migrate/20151005141953_add_empty_string_as_default_to_notes.rb
index c367c152a..087b820d2 100644
--- a/db/migrate/20151005141953_add_empty_string_as_default_to_notes.rb
+++ b/db/migrate/20151005141953_add_empty_string_as_default_to_notes.rb
@@ -1,4 +1,4 @@
-class AddEmptyStringAsDefaultToNotes < ActiveRecord::Migration
+class AddEmptyStringAsDefaultToNotes < ActiveRecord::Migration[4.2]
   def change
     [:en, :es, :fr].each do |lng|
       change_column :nomenclature_change_outputs, :"note_#{lng}", :text, default: ''
diff --git a/db/migrate/20151006153403_add_tag_list_to_nomenclature_changes_output.rb b/db/migrate/20151006153403_add_tag_list_to_nomenclature_changes_output.rb
index 34ddf5157..157f7e724 100644
--- a/db/migrate/20151006153403_add_tag_list_to_nomenclature_changes_output.rb
+++ b/db/migrate/20151006153403_add_tag_list_to_nomenclature_changes_output.rb
@@ -1,4 +1,4 @@
-class AddTagListToNomenclatureChangesOutput < ActiveRecord::Migration
+class AddTagListToNomenclatureChangesOutput < ActiveRecord::Migration[4.2]
   def change
     add_column :nomenclature_change_outputs, :tag_list, :text, array: true, default: []
   end
diff --git a/db/migrate/20151117145544_add_raw_date_to_api_documents_view.rb b/db/migrate/20151117145544_add_raw_date_to_api_documents_view.rb
index c10c90f83..e160dfc9e 100644
--- a/db/migrate/20151117145544_add_raw_date_to_api_documents_view.rb
+++ b/db/migrate/20151117145544_add_raw_date_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddRawDateToApiDocumentsView < ActiveRecord::Migration
+class AddRawDateToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_documents_view"
     execute "CREATE VIEW api_documents_view AS #{view_sql('20151117145544', 'api_documents_view')}"
diff --git a/db/migrate/20151201095234_add_number_to_proposal_details.rb b/db/migrate/20151201095234_add_number_to_proposal_details.rb
index c6d4da605..5254013f2 100644
--- a/db/migrate/20151201095234_add_number_to_proposal_details.rb
+++ b/db/migrate/20151201095234_add_number_to_proposal_details.rb
@@ -1,4 +1,4 @@
-class AddNumberToProposalDetails < ActiveRecord::Migration
+class AddNumberToProposalDetails < ActiveRecord::Migration[4.2]
   def up
     add_column(:proposal_details, :proposal_number, :text)
     execute "DROP VIEW IF EXISTS documents_view"
diff --git a/db/migrate/20151201135029_create_api_documents_mview.rb b/db/migrate/20151201135029_create_api_documents_mview.rb
index c0da0d76f..9921eaf36 100644
--- a/db/migrate/20151201135029_create_api_documents_mview.rb
+++ b/db/migrate/20151201135029_create_api_documents_mview.rb
@@ -1,4 +1,4 @@
-class CreateApiDocumentsMview < ActiveRecord::Migration
+class CreateApiDocumentsMview < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS api_documents_mview"
     execute "CREATE MATERIALIZED VIEW api_documents_mview AS SELECT * FROM api_documents_view"
diff --git a/db/migrate/20151214111814_add_index_on_created_at_to_api_requests.rb b/db/migrate/20151214111814_add_index_on_created_at_to_api_requests.rb
index 8ef0b6cc9..f33560ffe 100644
--- a/db/migrate/20151214111814_add_index_on_created_at_to_api_requests.rb
+++ b/db/migrate/20151214111814_add_index_on_created_at_to_api_requests.rb
@@ -1,4 +1,4 @@
-class AddIndexOnCreatedAtToApiRequests < ActiveRecord::Migration
+class AddIndexOnCreatedAtToApiRequests < ActiveRecord::Migration[4.2]
   def change
     add_index :api_requests, [:created_at]
   end
diff --git a/db/migrate/20151221144352_add_timestamps_to_api_documents_view.rb b/db/migrate/20151221144352_add_timestamps_to_api_documents_view.rb
index c73585cda..d88eaa700 100644
--- a/db/migrate/20151221144352_add_timestamps_to_api_documents_view.rb
+++ b/db/migrate/20151221144352_add_timestamps_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddTimestampsToApiDocumentsView < ActiveRecord::Migration
+class AddTimestampsToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS documents_view"
     execute "DROP MATERIALIZED VIEW IF EXISTS api_documents_mview"
diff --git a/db/migrate/20160223074747_add_designation_id_to_documents.rb b/db/migrate/20160223074747_add_designation_id_to_documents.rb
index 1755bd12a..3375c71e0 100644
--- a/db/migrate/20160223074747_add_designation_id_to_documents.rb
+++ b/db/migrate/20160223074747_add_designation_id_to_documents.rb
@@ -1,4 +1,4 @@
-class AddDesignationIdToDocuments < ActiveRecord::Migration
+class AddDesignationIdToDocuments < ActiveRecord::Migration[4.2]
   def change
     add_column(:documents, :designation_id, :integer)
     add_foreign_key(:documents, :designations, dependent: :nullify)
diff --git a/db/migrate/20160223104016_add_designation_to_api_documents_mview.rb b/db/migrate/20160223104016_add_designation_to_api_documents_mview.rb
index 845b5abf5..c9eb8f7e7 100644
--- a/db/migrate/20160223104016_add_designation_to_api_documents_mview.rb
+++ b/db/migrate/20160223104016_add_designation_to_api_documents_mview.rb
@@ -1,4 +1,4 @@
-class AddDesignationToApiDocumentsMview < ActiveRecord::Migration
+class AddDesignationToApiDocumentsMview < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS api_documents_mview"
     execute "DROP VIEW IF EXISTS api_documents_view"
diff --git a/db/migrate/20160304141931_update_ndf_documents_to_be_private.rb b/db/migrate/20160304141931_update_ndf_documents_to_be_private.rb
index c9c48ad85..e7d8d5759 100644
--- a/db/migrate/20160304141931_update_ndf_documents_to_be_private.rb
+++ b/db/migrate/20160304141931_update_ndf_documents_to_be_private.rb
@@ -1,4 +1,4 @@
-class UpdateNdfDocumentsToBePrivate < ActiveRecord::Migration
+class UpdateNdfDocumentsToBePrivate < ActiveRecord::Migration[4.2]
   def change
     ApplicationRecord.connection.execute(
       <<-SQL
diff --git a/db/migrate/20160317080944_use_dependents_updated_at_in_api_taxon_concepts_view.rb b/db/migrate/20160317080944_use_dependents_updated_at_in_api_taxon_concepts_view.rb
index d85364ce0..3c44714d3 100644
--- a/db/migrate/20160317080944_use_dependents_updated_at_in_api_taxon_concepts_view.rb
+++ b/db/migrate/20160317080944_use_dependents_updated_at_in_api_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class UseDependentsUpdatedAtInApiTaxonConceptsView < ActiveRecord::Migration
+class UseDependentsUpdatedAtInApiTaxonConceptsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_concepts_view"
     execute "CREATE VIEW api_taxon_concepts_view AS #{view_sql('20160317080944', 'api_taxon_concepts_view')}"
diff --git a/db/migrate/20160317154107_remove_unnecessary_new_name_related_fields_from_output.rb b/db/migrate/20160317154107_remove_unnecessary_new_name_related_fields_from_output.rb
index 2cb44e295..75781f9a9 100644
--- a/db/migrate/20160317154107_remove_unnecessary_new_name_related_fields_from_output.rb
+++ b/db/migrate/20160317154107_remove_unnecessary_new_name_related_fields_from_output.rb
@@ -1,4 +1,4 @@
-class RemoveUnnecessaryNewNameRelatedFieldsFromOutput < ActiveRecord::Migration
+class RemoveUnnecessaryNewNameRelatedFieldsFromOutput < ActiveRecord::Migration[4.2]
   def up
     remove_column :nomenclature_change_outputs, :accepted_taxon_ids
     remove_column :nomenclature_change_outputs, :hybrid_parent_id
diff --git a/db/migrate/20160405104833_fix_synonyms_and_trade_names_view_to_exclude_inter_taxonomic_relationships.rb b/db/migrate/20160405104833_fix_synonyms_and_trade_names_view_to_exclude_inter_taxonomic_relationships.rb
index a0288cf2d..d6f9261d2 100644
--- a/db/migrate/20160405104833_fix_synonyms_and_trade_names_view_to_exclude_inter_taxonomic_relationships.rb
+++ b/db/migrate/20160405104833_fix_synonyms_and_trade_names_view_to_exclude_inter_taxonomic_relationships.rb
@@ -1,4 +1,4 @@
-class FixSynonymsAndTradeNamesViewToExcludeInterTaxonomicRelationships < ActiveRecord::Migration
+class FixSynonymsAndTradeNamesViewToExcludeInterTaxonomicRelationships < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS synonyms_and_trade_names_view"
     execute "CREATE VIEW synonyms_and_trade_names_view AS #{view_sql('20160405104833', 'synonyms_and_trade_names_view')}"
diff --git a/db/migrate/20160406101826_change_unique_index_on_taxon_concept_references.rb b/db/migrate/20160406101826_change_unique_index_on_taxon_concept_references.rb
index 49407338a..0df1bacfb 100644
--- a/db/migrate/20160406101826_change_unique_index_on_taxon_concept_references.rb
+++ b/db/migrate/20160406101826_change_unique_index_on_taxon_concept_references.rb
@@ -1,4 +1,4 @@
-class ChangeUniqueIndexOnTaxonConceptReferences < ActiveRecord::Migration
+class ChangeUniqueIndexOnTaxonConceptReferences < ActiveRecord::Migration[4.2]
   def up
     remove_index "taxon_concept_references",
       name: "index_taxon_concept_references_on_tc_id_is_std_is_cascaded"
diff --git a/db/migrate/20160406150331_set_distributions_empty_internal_notes_to_nil.rb b/db/migrate/20160406150331_set_distributions_empty_internal_notes_to_nil.rb
index 8c6a4903c..4e8d6442a 100644
--- a/db/migrate/20160406150331_set_distributions_empty_internal_notes_to_nil.rb
+++ b/db/migrate/20160406150331_set_distributions_empty_internal_notes_to_nil.rb
@@ -1,4 +1,4 @@
-class SetDistributionsEmptyInternalNotesToNil < ActiveRecord::Migration
+class SetDistributionsEmptyInternalNotesToNil < ActiveRecord::Migration[4.2]
   def change
     ApplicationRecord.connection.execute(
       <<-SQL
diff --git a/db/migrate/20160421083820_fix_order_of_distribution_tags_in_public_distribution_tab.rb b/db/migrate/20160421083820_fix_order_of_distribution_tags_in_public_distribution_tab.rb
index 64b6e3a6d..2a712c5d2 100644
--- a/db/migrate/20160421083820_fix_order_of_distribution_tags_in_public_distribution_tab.rb
+++ b/db/migrate/20160421083820_fix_order_of_distribution_tags_in_public_distribution_tab.rb
@@ -1,4 +1,4 @@
-class FixOrderOfDistributionTagsInPublicDistributionTab < ActiveRecord::Migration
+class FixOrderOfDistributionTagsInPublicDistributionTab < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_distributions_view"
     execute "CREATE VIEW api_distributions_view AS #{view_sql('20160421083820', 'api_distributions_view')}"
diff --git a/db/migrate/20160425091139_fix_order_of_distribution_tags_in_public_distribution_tab_again.rb b/db/migrate/20160425091139_fix_order_of_distribution_tags_in_public_distribution_tab_again.rb
index bb240f18b..d47acf29d 100644
--- a/db/migrate/20160425091139_fix_order_of_distribution_tags_in_public_distribution_tab_again.rb
+++ b/db/migrate/20160425091139_fix_order_of_distribution_tags_in_public_distribution_tab_again.rb
@@ -1,4 +1,4 @@
-class FixOrderOfDistributionTagsInPublicDistributionTabAgain < ActiveRecord::Migration
+class FixOrderOfDistributionTagsInPublicDistributionTabAgain < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_distributions_view"
     execute "CREATE VIEW api_distributions_view AS #{view_sql('20160425091139', 'api_distributions_view')}"
diff --git a/db/migrate/20160503073026_add_creator_and_updater_to_api_documents_mview.rb b/db/migrate/20160503073026_add_creator_and_updater_to_api_documents_mview.rb
index 6b351d0d6..2e968d5dc 100644
--- a/db/migrate/20160503073026_add_creator_and_updater_to_api_documents_mview.rb
+++ b/db/migrate/20160503073026_add_creator_and_updater_to_api_documents_mview.rb
@@ -1,4 +1,4 @@
-class AddCreatorAndUpdaterToApiDocumentsMview < ActiveRecord::Migration
+class AddCreatorAndUpdaterToApiDocumentsMview < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS api_documents_mview"
     execute "DROP VIEW IF EXISTS api_documents_view"
diff --git a/db/migrate/20160504095537_change_primary_document_foreign_key_to_nullify.rb b/db/migrate/20160504095537_change_primary_document_foreign_key_to_nullify.rb
index ac1076e63..95d35b022 100644
--- a/db/migrate/20160504095537_change_primary_document_foreign_key_to_nullify.rb
+++ b/db/migrate/20160504095537_change_primary_document_foreign_key_to_nullify.rb
@@ -1,4 +1,4 @@
-class ChangePrimaryDocumentForeignKeyToNullify < ActiveRecord::Migration
+class ChangePrimaryDocumentForeignKeyToNullify < ActiveRecord::Migration[4.2]
   def up
     remove_foreign_key :documents,
       name: 'documents_primary_language_document_id_fk'
diff --git a/db/migrate/20160505105252_add_indexes_to_api_documents_mview.rb b/db/migrate/20160505105252_add_indexes_to_api_documents_mview.rb
index dcc1dd901..ff8cffbbb 100644
--- a/db/migrate/20160505105252_add_indexes_to_api_documents_mview.rb
+++ b/db/migrate/20160505105252_add_indexes_to_api_documents_mview.rb
@@ -1,4 +1,4 @@
-class AddIndexesToApiDocumentsMview < ActiveRecord::Migration
+class AddIndexesToApiDocumentsMview < ActiveRecord::Migration[4.2]
   def up
     add_index :api_documents_mview, [:event_id],
       name: 'index_documents_mview_on_event_id'
diff --git a/db/migrate/20160621093131_change_foreign_key_constraint_on_delete_in_document_details.rb b/db/migrate/20160621093131_change_foreign_key_constraint_on_delete_in_document_details.rb
index 4c118e057..c064e8e30 100644
--- a/db/migrate/20160621093131_change_foreign_key_constraint_on_delete_in_document_details.rb
+++ b/db/migrate/20160621093131_change_foreign_key_constraint_on_delete_in_document_details.rb
@@ -1,4 +1,4 @@
-class ChangeForeignKeyConstraintOnDeleteInDocumentDetails < ActiveRecord::Migration
+class ChangeForeignKeyConstraintOnDeleteInDocumentDetails < ActiveRecord::Migration[4.2]
   def change
     remove_foreign_key(:proposal_details, :documents)
     remove_foreign_key(:review_details, :documents)
diff --git a/db/migrate/20160623105336_create_document_citations_mview.rb b/db/migrate/20160623105336_create_document_citations_mview.rb
index 03c8eb69f..a9e88ab4d 100644
--- a/db/migrate/20160623105336_create_document_citations_mview.rb
+++ b/db/migrate/20160623105336_create_document_citations_mview.rb
@@ -1,4 +1,4 @@
-class CreateDocumentCitationsMview < ActiveRecord::Migration
+class CreateDocumentCitationsMview < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS api_documents_mview"
     execute "DROP VIEW IF EXISTS api_documents_view"
diff --git a/db/migrate/20160630084345_create_taxon_concepts_view.rb b/db/migrate/20160630084345_create_taxon_concepts_view.rb
index 4dcf41018..49459d7e5 100644
--- a/db/migrate/20160630084345_create_taxon_concepts_view.rb
+++ b/db/migrate/20160630084345_create_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class CreateTaxonConceptsView < ActiveRecord::Migration
+class CreateTaxonConceptsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS taxon_concepts_view"
     execute "CREATE VIEW taxon_concepts_view AS #{view_sql('20160630084345', 'taxon_concepts_view')}"
diff --git a/db/migrate/20160705093243_create_trade_validation_errors.rb b/db/migrate/20160705093243_create_trade_validation_errors.rb
index 1533106be..d965c99a2 100644
--- a/db/migrate/20160705093243_create_trade_validation_errors.rb
+++ b/db/migrate/20160705093243_create_trade_validation_errors.rb
@@ -1,4 +1,4 @@
-class CreateTradeValidationErrors < ActiveRecord::Migration
+class CreateTradeValidationErrors < ActiveRecord::Migration[4.2]
   def up
     create_table :trade_validation_errors do |t|
       t.references :annual_report_upload, null: false
diff --git a/db/migrate/20160705114949_add_timestamps_to_sandbox_template.rb b/db/migrate/20160705114949_add_timestamps_to_sandbox_template.rb
index 60675221f..fe0423e35 100644
--- a/db/migrate/20160705114949_add_timestamps_to_sandbox_template.rb
+++ b/db/migrate/20160705114949_add_timestamps_to_sandbox_template.rb
@@ -1,4 +1,4 @@
-class AddTimestampsToSandboxTemplate < ActiveRecord::Migration
+class AddTimestampsToSandboxTemplate < ActiveRecord::Migration[4.2]
   def up
     add_column :trade_sandbox_template, :created_at, :datetime
     add_column :trade_sandbox_template, :updated_at, :datetime
diff --git a/db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb b/db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb
index 8c7b052d8..10d20b48f 100644
--- a/db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb
+++ b/db/migrate/20161103110635_add_more_fields_to_trade_uploads.rb
@@ -1,4 +1,4 @@
-class AddMoreFieldsToTradeUploads < ActiveRecord::Migration
+class AddMoreFieldsToTradeUploads < ActiveRecord::Migration[4.2]
   def change
     add_column :trade_annual_report_uploads, :is_from_epix, :boolean, default: false
     add_column :trade_annual_report_uploads, :is_from_web_service, :boolean, default: false
diff --git a/db/migrate/20161104135655_add_epix_user_fields_to_annual_report_upload.rb b/db/migrate/20161104135655_add_epix_user_fields_to_annual_report_upload.rb
index 22406fb94..8a0f8118c 100644
--- a/db/migrate/20161104135655_add_epix_user_fields_to_annual_report_upload.rb
+++ b/db/migrate/20161104135655_add_epix_user_fields_to_annual_report_upload.rb
@@ -1,4 +1,4 @@
-class AddEpixUserFieldsToAnnualReportUpload < ActiveRecord::Migration
+class AddEpixUserFieldsToAnnualReportUpload < ActiveRecord::Migration[4.2]
   def change
     add_column :trade_annual_report_uploads, :epix_created_by_id, :integer
     add_column :trade_annual_report_uploads, :epix_created_at, :datetime
diff --git a/db/migrate/20161107191141_remove_is_done_from_report_uploads_and_update_submitted_timestamps.rb b/db/migrate/20161107191141_remove_is_done_from_report_uploads_and_update_submitted_timestamps.rb
index 7f4276ef4..6f1fd0719 100644
--- a/db/migrate/20161107191141_remove_is_done_from_report_uploads_and_update_submitted_timestamps.rb
+++ b/db/migrate/20161107191141_remove_is_done_from_report_uploads_and_update_submitted_timestamps.rb
@@ -1,4 +1,4 @@
-class RemoveIsDoneFromReportUploadsAndUpdateSubmittedTimestamps < ActiveRecord::Migration
+class RemoveIsDoneFromReportUploadsAndUpdateSubmittedTimestamps < ActiveRecord::Migration[4.2]
   def up
     ApplicationRecord.connection.execute(
       <<-SQL
diff --git a/db/migrate/20161111114955_add_submitted_timestamps_for_epix_users_to_annual_report_uploads.rb b/db/migrate/20161111114955_add_submitted_timestamps_for_epix_users_to_annual_report_uploads.rb
index e4f4d459a..0e81d8548 100644
--- a/db/migrate/20161111114955_add_submitted_timestamps_for_epix_users_to_annual_report_uploads.rb
+++ b/db/migrate/20161111114955_add_submitted_timestamps_for_epix_users_to_annual_report_uploads.rb
@@ -1,4 +1,4 @@
-class AddSubmittedTimestampsForEpixUsersToAnnualReportUploads < ActiveRecord::Migration
+class AddSubmittedTimestampsForEpixUsersToAnnualReportUploads < ActiveRecord::Migration[4.2]
   def change
     add_column :trade_annual_report_uploads, :epix_submitted_by_id, :integer
     add_column :trade_annual_report_uploads, :epix_submitted_at, :datetime
diff --git a/db/migrate/20161122145302_add_validation_info_to_annual_report_uploads.rb b/db/migrate/20161122145302_add_validation_info_to_annual_report_uploads.rb
index 47cfdcf7b..5c397f7e9 100644
--- a/db/migrate/20161122145302_add_validation_info_to_annual_report_uploads.rb
+++ b/db/migrate/20161122145302_add_validation_info_to_annual_report_uploads.rb
@@ -1,4 +1,4 @@
-class AddValidationInfoToAnnualReportUploads < ActiveRecord::Migration
+class AddValidationInfoToAnnualReportUploads < ActiveRecord::Migration[4.2]
   def change
     add_column :trade_annual_report_uploads, :validated_at, :datetime
     add_column :trade_annual_report_uploads, :validation_report, :jsonb
diff --git a/db/migrate/20161123103614_filter_taxon_concepts_by_name_status_in_documents_view.rb b/db/migrate/20161123103614_filter_taxon_concepts_by_name_status_in_documents_view.rb
index eccf34375..af3824636 100644
--- a/db/migrate/20161123103614_filter_taxon_concepts_by_name_status_in_documents_view.rb
+++ b/db/migrate/20161123103614_filter_taxon_concepts_by_name_status_in_documents_view.rb
@@ -1,4 +1,4 @@
-class FilterTaxonConceptsByNameStatusInDocumentsView < ActiveRecord::Migration
+class FilterTaxonConceptsByNameStatusInDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS document_citations_mview CASCADE"
     execute "DROP VIEW IF EXISTS document_citations_view"
diff --git a/db/migrate/20161128152531_add_object_changes_text_column_to_versions.rb b/db/migrate/20161128152531_add_object_changes_text_column_to_versions.rb
index 770aa12e9..b81c794a3 100644
--- a/db/migrate/20161128152531_add_object_changes_text_column_to_versions.rb
+++ b/db/migrate/20161128152531_add_object_changes_text_column_to_versions.rb
@@ -1,4 +1,4 @@
-class AddObjectChangesTextColumnToVersions < ActiveRecord::Migration
+class AddObjectChangesTextColumnToVersions < ActiveRecord::Migration[4.2]
   def change
     add_column :versions, :object_changes, :text
   end
diff --git a/db/migrate/20161215140343_add_epix_user_fields_to_shipments.rb b/db/migrate/20161215140343_add_epix_user_fields_to_shipments.rb
index aa0a1cc56..ca378ba3d 100644
--- a/db/migrate/20161215140343_add_epix_user_fields_to_shipments.rb
+++ b/db/migrate/20161215140343_add_epix_user_fields_to_shipments.rb
@@ -1,4 +1,4 @@
-class AddEpixUserFieldsToShipments < ActiveRecord::Migration
+class AddEpixUserFieldsToShipments < ActiveRecord::Migration[4.2]
   def up
     change_column_null :trade_shipments, :created_at, true
     change_column_null :trade_shipments, :updated_at, true
diff --git a/db/migrate/20161218150218_add_epix_fields_to_sandbox_template.rb b/db/migrate/20161218150218_add_epix_fields_to_sandbox_template.rb
index 6299ab8f5..c2d743566 100644
--- a/db/migrate/20161218150218_add_epix_fields_to_sandbox_template.rb
+++ b/db/migrate/20161218150218_add_epix_fields_to_sandbox_template.rb
@@ -1,4 +1,4 @@
-class AddEpixFieldsToSandboxTemplate < ActiveRecord::Migration
+class AddEpixFieldsToSandboxTemplate < ActiveRecord::Migration[4.2]
   def change
     add_column :trade_sandbox_template, :epix_created_at, :timestamp
     add_column :trade_sandbox_template, :epix_updated_at, :timestamp
diff --git a/db/migrate/20161219204239_add_updated_by_id_and_created_by_id_to_trade_sandbox_template.rb b/db/migrate/20161219204239_add_updated_by_id_and_created_by_id_to_trade_sandbox_template.rb
index 0764fee1d..195bb0eb5 100644
--- a/db/migrate/20161219204239_add_updated_by_id_and_created_by_id_to_trade_sandbox_template.rb
+++ b/db/migrate/20161219204239_add_updated_by_id_and_created_by_id_to_trade_sandbox_template.rb
@@ -1,4 +1,4 @@
-class AddUpdatedByIdAndCreatedByIdToTradeSandboxTemplate < ActiveRecord::Migration
+class AddUpdatedByIdAndCreatedByIdToTradeSandboxTemplate < ActiveRecord::Migration[4.2]
   def change
     add_column :trade_sandbox_template, :updated_by_id, :integer
     add_column :trade_sandbox_template, :created_by_id, :integer
diff --git a/db/migrate/20170104215019_add_aws_storage_path_to_annual_report_upload.rb b/db/migrate/20170104215019_add_aws_storage_path_to_annual_report_upload.rb
index 946c053a2..f44b5a579 100644
--- a/db/migrate/20170104215019_add_aws_storage_path_to_annual_report_upload.rb
+++ b/db/migrate/20170104215019_add_aws_storage_path_to_annual_report_upload.rb
@@ -1,4 +1,4 @@
-class AddAwsStoragePathToAnnualReportUpload < ActiveRecord::Migration
+class AddAwsStoragePathToAnnualReportUpload < ActiveRecord::Migration[4.2]
   def change
     add_column :trade_annual_report_uploads, :aws_storage_path, :string
   end
diff --git a/db/migrate/20170119124811_add_kew_id_to_taxon_concepts.rb b/db/migrate/20170119124811_add_kew_id_to_taxon_concepts.rb
index 255a298fd..041b12d7a 100644
--- a/db/migrate/20170119124811_add_kew_id_to_taxon_concepts.rb
+++ b/db/migrate/20170119124811_add_kew_id_to_taxon_concepts.rb
@@ -1,4 +1,4 @@
-class AddKewIdToTaxonConcepts < ActiveRecord::Migration
+class AddKewIdToTaxonConcepts < ActiveRecord::Migration[4.2]
   def change
     add_column :taxon_concepts, :kew_id, :integer
   end
diff --git a/db/migrate/20170224133932_add_materialised_view_for_valid_taxon_concept_term_view.rb b/db/migrate/20170224133932_add_materialised_view_for_valid_taxon_concept_term_view.rb
index c0c518cbc..56f7ea894 100644
--- a/db/migrate/20170224133932_add_materialised_view_for_valid_taxon_concept_term_view.rb
+++ b/db/migrate/20170224133932_add_materialised_view_for_valid_taxon_concept_term_view.rb
@@ -1,4 +1,4 @@
-class AddMaterialisedViewForValidTaxonConceptTermView < ActiveRecord::Migration
+class AddMaterialisedViewForValidTaxonConceptTermView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS valid_taxon_concept_term_mview"
     execute "CREATE MATERIALIZED VIEW valid_taxon_concept_term_mview AS SELECT * FROM valid_taxon_concept_term_view"
diff --git a/db/migrate/20170404125230_add_is_active_column_to_users.rb b/db/migrate/20170404125230_add_is_active_column_to_users.rb
index 23b3c5a64..743059aa5 100644
--- a/db/migrate/20170404125230_add_is_active_column_to_users.rb
+++ b/db/migrate/20170404125230_add_is_active_column_to_users.rb
@@ -1,4 +1,4 @@
-class AddIsActiveColumnToUsers < ActiveRecord::Migration
+class AddIsActiveColumnToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :is_active, :boolean, default: true, null: false
   end
diff --git a/db/migrate/20180509135814_create_trade_shipments_appendix_i_view.rb b/db/migrate/20180509135814_create_trade_shipments_appendix_i_view.rb
index 350d70dc4..94d27200a 100644
--- a/db/migrate/20180509135814_create_trade_shipments_appendix_i_view.rb
+++ b/db/migrate/20180509135814_create_trade_shipments_appendix_i_view.rb
@@ -1,4 +1,4 @@
-class CreateTradeShipmentsAppendixIView < ActiveRecord::Migration
+class CreateTradeShipmentsAppendixIView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_shipments_appendix_i_mview CASCADE"
     execute "DROP VIEW IF EXISTS trade_shipments_appendix_i_view"
diff --git a/db/migrate/20180601083440_create_trade_cites_suspension_shipments_view.rb b/db/migrate/20180601083440_create_trade_cites_suspension_shipments_view.rb
index f299e09c9..413d4a2f1 100644
--- a/db/migrate/20180601083440_create_trade_cites_suspension_shipments_view.rb
+++ b/db/migrate/20180601083440_create_trade_cites_suspension_shipments_view.rb
@@ -1,4 +1,4 @@
-class CreateTradeCitesSuspensionShipmentsView < ActiveRecord::Migration
+class CreateTradeCitesSuspensionShipmentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_shipments_cites_suspensions_mview CASCADE"
     execute "DROP VIEW IF EXISTS trade_shipments_cites_suspensions_view"
diff --git a/db/migrate/20180627135001_create_trade_shipments_mandatory_quotas_view.rb b/db/migrate/20180627135001_create_trade_shipments_mandatory_quotas_view.rb
index 3c6775f4b..b97050682 100644
--- a/db/migrate/20180627135001_create_trade_shipments_mandatory_quotas_view.rb
+++ b/db/migrate/20180627135001_create_trade_shipments_mandatory_quotas_view.rb
@@ -1,4 +1,4 @@
-class CreateTradeShipmentsMandatoryQuotasView < ActiveRecord::Migration
+class CreateTradeShipmentsMandatoryQuotasView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_shipments_mandatory_quotas_mview CASCADE"
     execute "DROP VIEW IF EXISTS trade_shipments_mandatory_quotas_view"
diff --git a/db/migrate/20180705094119_update_trade_shipments_appendix_i_view.rb b/db/migrate/20180705094119_update_trade_shipments_appendix_i_view.rb
index ecf141552..2a1b6ef68 100644
--- a/db/migrate/20180705094119_update_trade_shipments_appendix_i_view.rb
+++ b/db/migrate/20180705094119_update_trade_shipments_appendix_i_view.rb
@@ -1,4 +1,4 @@
-class UpdateTradeShipmentsAppendixIView < ActiveRecord::Migration
+class UpdateTradeShipmentsAppendixIView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_shipments_appendix_i_mview CASCADE"
     execute "DROP VIEW IF EXISTS trade_shipments_appendix_i_view"
diff --git a/db/migrate/20180713123936_update_trade_shipments_cites_suspensions_view.rb b/db/migrate/20180713123936_update_trade_shipments_cites_suspensions_view.rb
index 01e0fd726..654ed4712 100644
--- a/db/migrate/20180713123936_update_trade_shipments_cites_suspensions_view.rb
+++ b/db/migrate/20180713123936_update_trade_shipments_cites_suspensions_view.rb
@@ -1,4 +1,4 @@
-class UpdateTradeShipmentsCitesSuspensionsView < ActiveRecord::Migration
+class UpdateTradeShipmentsCitesSuspensionsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_shipments_cites_suspensions_mview CASCADE"
     execute "DROP VIEW IF EXISTS trade_shipments_cites_suspensions_view"
diff --git a/db/migrate/20180724163021_create_non_compliant_shipments_view.rb b/db/migrate/20180724163021_create_non_compliant_shipments_view.rb
index 7a7eff691..c42ab4e07 100644
--- a/db/migrate/20180724163021_create_non_compliant_shipments_view.rb
+++ b/db/migrate/20180724163021_create_non_compliant_shipments_view.rb
@@ -1,4 +1,4 @@
-class CreateNonCompliantShipmentsView < ActiveRecord::Migration
+class CreateNonCompliantShipmentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS non_compliant_shipments_view"
     execute "CREATE VIEW non_compliant_shipments_view AS #{view_sql('20180724163021', 'non_compliant_shipments_view')}"
diff --git a/db/migrate/20190524142939_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb b/db/migrate/20190524142939_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
index 8edb50807..5a3f71a25 100644
--- a/db/migrate/20190524142939_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+++ b/db/migrate/20190524142939_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
@@ -1,5 +1,5 @@
 # This migration comes from acts_as_taggable_on_engine (originally 3)
-class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[4.2]
   def self.up
     add_column :tags, :taggings_count, :integer, default: 0
 
diff --git a/db/migrate/20190606174223_trade_validation_rule_column_names_to_be_array.rb b/db/migrate/20190606174223_trade_validation_rule_column_names_to_be_array.rb
index 2297566d1..4709adff1 100644
--- a/db/migrate/20190606174223_trade_validation_rule_column_names_to_be_array.rb
+++ b/db/migrate/20190606174223_trade_validation_rule_column_names_to_be_array.rb
@@ -1,4 +1,4 @@
-class TradeValidationRuleColumnNamesToBeArray < ActiveRecord::Migration
+class TradeValidationRuleColumnNamesToBeArray < ActiveRecord::Migration[4.2]
   def change
     unless Trade::ValidationRule.columns_hash["column_names"].array
       change_column :trade_validation_rules, :column_names, "varchar[] USING (string_to_array(column_names, ','))"
diff --git a/db/migrate/20190724131538_create_trade_plus_static.rb b/db/migrate/20190724131538_create_trade_plus_static.rb
index aa2b3204f..439a58197 100644
--- a/db/migrate/20190724131538_create_trade_plus_static.rb
+++ b/db/migrate/20190724131538_create_trade_plus_static.rb
@@ -1,4 +1,4 @@
-class CreateTradePlusStatic < ActiveRecord::Migration
+class CreateTradePlusStatic < ActiveRecord::Migration[4.2]
   def change
     create_table :trade_plus_static do |t|
       t.integer :year
diff --git a/db/migrate/20190725135814_create_trade_plus_static_with_taxa_view.rb b/db/migrate/20190725135814_create_trade_plus_static_with_taxa_view.rb
index 1b04e7925..0b3836f9b 100644
--- a/db/migrate/20190725135814_create_trade_plus_static_with_taxa_view.rb
+++ b/db/migrate/20190725135814_create_trade_plus_static_with_taxa_view.rb
@@ -1,4 +1,4 @@
-class CreateTradePlusStaticWithTaxaView < ActiveRecord::Migration
+class CreateTradePlusStaticWithTaxaView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_plus_static_with_taxa_view"
     execute "CREATE VIEW trade_plus_static_with_taxa_view AS #{view_sql('20190725111134', 'trade_plus_static_with_taxa_view')}"
diff --git a/db/migrate/20190725145613_create_trade_plus_static_complete_view.rb b/db/migrate/20190725145613_create_trade_plus_static_complete_view.rb
index e8eaa0525..76c28e597 100644
--- a/db/migrate/20190725145613_create_trade_plus_static_complete_view.rb
+++ b/db/migrate/20190725145613_create_trade_plus_static_complete_view.rb
@@ -1,4 +1,4 @@
-class CreateTradePlusStaticCompleteView < ActiveRecord::Migration
+class CreateTradePlusStaticCompleteView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_plus_static_complete_view"
     execute "CREATE VIEW trade_plus_static_complete_view AS #{view_sql('20190725122634', 'trade_plus_static_complete_view')}"
diff --git a/db/migrate/20190806145454_destroy_trade_plus_static_with_taxa_view.rb b/db/migrate/20190806145454_destroy_trade_plus_static_with_taxa_view.rb
index 755cf1a1c..08a45c550 100644
--- a/db/migrate/20190806145454_destroy_trade_plus_static_with_taxa_view.rb
+++ b/db/migrate/20190806145454_destroy_trade_plus_static_with_taxa_view.rb
@@ -1,4 +1,4 @@
-class DestroyTradePlusStaticWithTaxaView < ActiveRecord::Migration
+class DestroyTradePlusStaticWithTaxaView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_plus_static_complete_view"
     execute "DROP VIEW IF EXISTS trade_plus_static_with_taxa_view"
diff --git a/db/migrate/20191016175827_create_trade_plus_shipments_view.rb b/db/migrate/20191016175827_create_trade_plus_shipments_view.rb
index aea854339..cb0a2c7db 100644
--- a/db/migrate/20191016175827_create_trade_plus_shipments_view.rb
+++ b/db/migrate/20191016175827_create_trade_plus_shipments_view.rb
@@ -1,4 +1,4 @@
-class CreateTradePlusShipmentsView < ActiveRecord::Migration
+class CreateTradePlusShipmentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_plus_shipments_view"
     execute "CREATE VIEW trade_plus_shipments_view AS #{view_sql('20191029163326', 'trade_plus_shipments_view')}"
diff --git a/db/migrate/20191017135814_create_trade_plus_group_view.rb b/db/migrate/20191017135814_create_trade_plus_group_view.rb
index bdaee6330..801b9e52c 100644
--- a/db/migrate/20191017135814_create_trade_plus_group_view.rb
+++ b/db/migrate/20191017135814_create_trade_plus_group_view.rb
@@ -1,4 +1,4 @@
-class CreateTradePlusGroupView < ActiveRecord::Migration
+class CreateTradePlusGroupView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_plus_group_view"
     execute "CREATE VIEW trade_plus_group_view AS #{view_sql('20191030154249', 'trade_plus_group_view')}"
diff --git a/db/migrate/20191018135814_create_trade_plus_formatted_data_view.rb b/db/migrate/20191018135814_create_trade_plus_formatted_data_view.rb
index 8beea3276..650517600 100644
--- a/db/migrate/20191018135814_create_trade_plus_formatted_data_view.rb
+++ b/db/migrate/20191018135814_create_trade_plus_formatted_data_view.rb
@@ -1,4 +1,4 @@
-class CreateTradePlusFormattedDataView < ActiveRecord::Migration
+class CreateTradePlusFormattedDataView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_plus_with_taxa_view"
     execute "DROP VIEW IF EXISTS trade_plus_formatted_data_view"
diff --git a/db/migrate/20191023135814_create_trade_plus_complete_mview.rb b/db/migrate/20191023135814_create_trade_plus_complete_mview.rb
index c2b0e319f..dbc5719fa 100644
--- a/db/migrate/20191023135814_create_trade_plus_complete_mview.rb
+++ b/db/migrate/20191023135814_create_trade_plus_complete_mview.rb
@@ -1,4 +1,4 @@
-class CreateTradePlusCompleteMview < ActiveRecord::Migration
+class CreateTradePlusCompleteMview < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
     execute "CREATE VIEW trade_plus_complete_view AS #{view_sql('20191023141810', 'trade_plus_complete_view')}"
diff --git a/db/migrate/20191209215129_fix_trade_plus_formatted_data_view.rb b/db/migrate/20191209215129_fix_trade_plus_formatted_data_view.rb
index 99637997f..58cde649c 100644
--- a/db/migrate/20191209215129_fix_trade_plus_formatted_data_view.rb
+++ b/db/migrate/20191209215129_fix_trade_plus_formatted_data_view.rb
@@ -1,4 +1,4 @@
-class FixTradePlusFormattedDataView < ActiveRecord::Migration
+class FixTradePlusFormattedDataView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_plus_complete_mview"
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
diff --git a/db/migrate/20200124152531_add_manual_id_attributes_to_documents.rb b/db/migrate/20200124152531_add_manual_id_attributes_to_documents.rb
index ff534a761..775526b44 100644
--- a/db/migrate/20200124152531_add_manual_id_attributes_to_documents.rb
+++ b/db/migrate/20200124152531_add_manual_id_attributes_to_documents.rb
@@ -1,4 +1,4 @@
-class AddManualIdAttributesToDocuments < ActiveRecord::Migration
+class AddManualIdAttributesToDocuments < ActiveRecord::Migration[4.2]
   def change
     add_column :documents, :manual_id, :text
     add_column :documents, :volume, :integer
diff --git a/db/migrate/20200206150700_remove_year_constraint_from_trade_plus_shipments_view.rb b/db/migrate/20200206150700_remove_year_constraint_from_trade_plus_shipments_view.rb
index 0843a92cb..ac87f3262 100644
--- a/db/migrate/20200206150700_remove_year_constraint_from_trade_plus_shipments_view.rb
+++ b/db/migrate/20200206150700_remove_year_constraint_from_trade_plus_shipments_view.rb
@@ -1,4 +1,4 @@
-class RemoveYearConstraintFromTradePlusShipmentsView < ActiveRecord::Migration
+class RemoveYearConstraintFromTradePlusShipmentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS trade_plus_shipments_view CASCADE"
     execute "CREATE VIEW trade_plus_shipments_view AS #{view_sql('20200206150700', 'trade_plus_shipments_view')}"
diff --git a/db/migrate/20200224152531_add_subtype_attribute_to_documents.rb b/db/migrate/20200224152531_add_subtype_attribute_to_documents.rb
index fa90b5ffe..e7472b60b 100644
--- a/db/migrate/20200224152531_add_subtype_attribute_to_documents.rb
+++ b/db/migrate/20200224152531_add_subtype_attribute_to_documents.rb
@@ -1,4 +1,4 @@
-class AddSubtypeAttributeToDocuments < ActiveRecord::Migration
+class AddSubtypeAttributeToDocuments < ActiveRecord::Migration[4.2]
   def change
     add_column :documents, :general_subtype, :boolean
   end
diff --git a/db/migrate/20200225154202_add_subtype_and_volume_to_api_documents_view.rb b/db/migrate/20200225154202_add_subtype_and_volume_to_api_documents_view.rb
index e0a4e12e0..169ee75fe 100644
--- a/db/migrate/20200225154202_add_subtype_and_volume_to_api_documents_view.rb
+++ b/db/migrate/20200225154202_add_subtype_and_volume_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddSubtypeAndVolumeToApiDocumentsView < ActiveRecord::Migration
+class AddSubtypeAndVolumeToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS api_documents_mview"
     execute "DROP VIEW IF EXISTS api_documents_view"
diff --git a/db/migrate/20200227092509_update_document_language_version_type_for_checklist_docs_search.rb b/db/migrate/20200227092509_update_document_language_version_type_for_checklist_docs_search.rb
index 3842edbb9..8b7d1e091 100644
--- a/db/migrate/20200227092509_update_document_language_version_type_for_checklist_docs_search.rb
+++ b/db/migrate/20200227092509_update_document_language_version_type_for_checklist_docs_search.rb
@@ -1,4 +1,4 @@
-class UpdateDocumentLanguageVersionTypeForChecklistDocsSearch < ActiveRecord::Migration
+class UpdateDocumentLanguageVersionTypeForChecklistDocsSearch < ActiveRecord::Migration[4.2]
   def up
     execute "DROP TYPE document_language_version"
     execute <<-SQL
diff --git a/db/migrate/20200228113482_add_taxon_concept_ids_to_api_documents_view.rb b/db/migrate/20200228113482_add_taxon_concept_ids_to_api_documents_view.rb
index e9b235187..8b040fd80 100644
--- a/db/migrate/20200228113482_add_taxon_concept_ids_to_api_documents_view.rb
+++ b/db/migrate/20200228113482_add_taxon_concept_ids_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddTaxonConceptIdsToApiDocumentsView < ActiveRecord::Migration
+class AddTaxonConceptIdsToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS api_documents_mview"
     execute "DROP VIEW IF EXISTS api_documents_view"
diff --git a/db/migrate/20200416170653_add_manual_id_to_api_documents_view.rb b/db/migrate/20200416170653_add_manual_id_to_api_documents_view.rb
index 022684137..f163f6cd7 100644
--- a/db/migrate/20200416170653_add_manual_id_to_api_documents_view.rb
+++ b/db/migrate/20200416170653_add_manual_id_to_api_documents_view.rb
@@ -1,4 +1,4 @@
-class AddManualIdToApiDocumentsView < ActiveRecord::Migration
+class AddManualIdToApiDocumentsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS api_documents_mview"
     execute "DROP VIEW IF EXISTS api_documents_view"
diff --git a/db/migrate/20200513105319_create_srg_histories.rb b/db/migrate/20200513105319_create_srg_histories.rb
index 31375c36e..8a0c29f73 100644
--- a/db/migrate/20200513105319_create_srg_histories.rb
+++ b/db/migrate/20200513105319_create_srg_histories.rb
@@ -1,4 +1,4 @@
-class CreateSrgHistories < ActiveRecord::Migration
+class CreateSrgHistories < ActiveRecord::Migration[4.2]
   def up
     create_table :srg_histories do |t|
       t.string :name
diff --git a/db/migrate/20200514150717_add_srg_history_to_eu_decisions_view.rb b/db/migrate/20200514150717_add_srg_history_to_eu_decisions_view.rb
index 70b4701de..b649ecabc 100644
--- a/db/migrate/20200514150717_add_srg_history_to_eu_decisions_view.rb
+++ b/db/migrate/20200514150717_add_srg_history_to_eu_decisions_view.rb
@@ -1,4 +1,4 @@
-class AddSrgHistoryToEuDecisionsView < ActiveRecord::Migration
+class AddSrgHistoryToEuDecisionsView < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       CREATE TYPE api_srg_history AS (
diff --git a/db/migrate/20200707183529_recreate_trade_plus_formatted_data_view.rb b/db/migrate/20200707183529_recreate_trade_plus_formatted_data_view.rb
index 8ea870b48..2b6d460c1 100644
--- a/db/migrate/20200707183529_recreate_trade_plus_formatted_data_view.rb
+++ b/db/migrate/20200707183529_recreate_trade_plus_formatted_data_view.rb
@@ -1,4 +1,4 @@
-class RecreateTradePlusFormattedDataView < ActiveRecord::Migration
+class RecreateTradePlusFormattedDataView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_plus_complete_mview"
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
diff --git a/db/migrate/20200807112659_add_private_url_to_events.rb b/db/migrate/20200807112659_add_private_url_to_events.rb
index aa376080d..e16873673 100644
--- a/db/migrate/20200807112659_add_private_url_to_events.rb
+++ b/db/migrate/20200807112659_add_private_url_to_events.rb
@@ -1,4 +1,4 @@
-class AddPrivateUrlToEvents < ActiveRecord::Migration
+class AddPrivateUrlToEvents < ActiveRecord::Migration[4.2]
   def change
     add_column :events, :private_url, :text
   end
diff --git a/db/migrate/20201008133057_create_all_taxon_concepts_and_ancestors_mview.rb b/db/migrate/20201008133057_create_all_taxon_concepts_and_ancestors_mview.rb
index db52673c3..f0e48cac2 100644
--- a/db/migrate/20201008133057_create_all_taxon_concepts_and_ancestors_mview.rb
+++ b/db/migrate/20201008133057_create_all_taxon_concepts_and_ancestors_mview.rb
@@ -1,4 +1,4 @@
-class CreateAllTaxonConceptsAndAncestorsMview < ActiveRecord::Migration
+class CreateAllTaxonConceptsAndAncestorsMview < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS all_taxon_concepts_and_ancestors_mview"
     execute "CREATE MATERIALIZED VIEW all_taxon_concepts_and_ancestors_mview AS #{view_sql('20201008133057', 'all_taxon_concepts_and_ancestors_mview')}"
diff --git a/db/migrate/20201026123892_add_private_url_to_eu_decisions_view.rb b/db/migrate/20201026123892_add_private_url_to_eu_decisions_view.rb
index a0f4ac9ef..edd4a6d86 100644
--- a/db/migrate/20201026123892_add_private_url_to_eu_decisions_view.rb
+++ b/db/migrate/20201026123892_add_private_url_to_eu_decisions_view.rb
@@ -1,4 +1,4 @@
-class AddPrivateUrlToEuDecisionsView < ActiveRecord::Migration
+class AddPrivateUrlToEuDecisionsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_eu_decisions_view"
     execute "CREATE VIEW api_eu_decisions_view AS #{view_sql('20200807121747', 'api_eu_decisions_view')}"
diff --git a/db/migrate/20210106174249_trade_plus_add_and_fix_formatting_rules_and_group_view.rb b/db/migrate/20210106174249_trade_plus_add_and_fix_formatting_rules_and_group_view.rb
index 87b5a65be..cbae5ee28 100644
--- a/db/migrate/20210106174249_trade_plus_add_and_fix_formatting_rules_and_group_view.rb
+++ b/db/migrate/20210106174249_trade_plus_add_and_fix_formatting_rules_and_group_view.rb
@@ -1,4 +1,4 @@
-class TradePlusAddAndFixFormattingRulesAndGroupView < ActiveRecord::Migration
+class TradePlusAddAndFixFormattingRulesAndGroupView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_plus_complete_mview"
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
diff --git a/db/migrate/20210624131423_create_analytics_events.rb b/db/migrate/20210624131423_create_analytics_events.rb
index 40f8bcd21..1095a4295 100644
--- a/db/migrate/20210624131423_create_analytics_events.rb
+++ b/db/migrate/20210624131423_create_analytics_events.rb
@@ -1,4 +1,4 @@
-class CreateAnalyticsEvents < ActiveRecord::Migration
+class CreateAnalyticsEvents < ActiveRecord::Migration[4.2]
   def change
     create_table :analytics_events do |t|
       t.string :event_type
diff --git a/db/migrate/20210823165358_add_multilingual_and_fix_formatting_issue_on_trade_plus_view.rb b/db/migrate/20210823165358_add_multilingual_and_fix_formatting_issue_on_trade_plus_view.rb
index 379b1b392..f314929e8 100644
--- a/db/migrate/20210823165358_add_multilingual_and_fix_formatting_issue_on_trade_plus_view.rb
+++ b/db/migrate/20210823165358_add_multilingual_and_fix_formatting_issue_on_trade_plus_view.rb
@@ -1,4 +1,4 @@
-class AddMultilingualAndFixFormattingIssueOnTradePlusView < ActiveRecord::Migration
+class AddMultilingualAndFixFormattingIssueOnTradePlusView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_plus_complete_mview"
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
diff --git a/db/migrate/20220119113158_fix_formatting_rule_on_trade_plus_final_view.rb b/db/migrate/20220119113158_fix_formatting_rule_on_trade_plus_final_view.rb
index 31b262258..e56b3831d 100644
--- a/db/migrate/20220119113158_fix_formatting_rule_on_trade_plus_final_view.rb
+++ b/db/migrate/20220119113158_fix_formatting_rule_on_trade_plus_final_view.rb
@@ -1,4 +1,4 @@
-class FixFormattingRuleOnTradePlusFinalView < ActiveRecord::Migration
+class FixFormattingRuleOnTradePlusFinalView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_plus_complete_mview"
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
diff --git a/db/migrate/20220218161024_fix_french_taxa_group_names_on_trade_plus_group_view.rb b/db/migrate/20220218161024_fix_french_taxa_group_names_on_trade_plus_group_view.rb
index d56513c96..d38abfaed 100644
--- a/db/migrate/20220218161024_fix_french_taxa_group_names_on_trade_plus_group_view.rb
+++ b/db/migrate/20220218161024_fix_french_taxa_group_names_on_trade_plus_group_view.rb
@@ -1,4 +1,4 @@
-class FixFrenchTaxaGroupNamesOnTradePlusGroupView < ActiveRecord::Migration
+class FixFrenchTaxaGroupNamesOnTradePlusGroupView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_plus_complete_mview"
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
diff --git a/db/migrate/20220223142512_fix_french_plant_name_on_trade_plus_group_view.rb b/db/migrate/20220223142512_fix_french_plant_name_on_trade_plus_group_view.rb
index 0321a69ab..e207f9cae 100644
--- a/db/migrate/20220223142512_fix_french_plant_name_on_trade_plus_group_view.rb
+++ b/db/migrate/20220223142512_fix_french_plant_name_on_trade_plus_group_view.rb
@@ -1,4 +1,4 @@
-class FixFrenchPlantNameOnTradePlusGroupView < ActiveRecord::Migration
+class FixFrenchPlantNameOnTradePlusGroupView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_plus_complete_mview"
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
diff --git a/db/migrate/20220314110512_fix_unit_id_on_trade_plus_formatted_data_view.rb b/db/migrate/20220314110512_fix_unit_id_on_trade_plus_formatted_data_view.rb
index 8592f626d..6ea7622e6 100644
--- a/db/migrate/20220314110512_fix_unit_id_on_trade_plus_formatted_data_view.rb
+++ b/db/migrate/20220314110512_fix_unit_id_on_trade_plus_formatted_data_view.rb
@@ -1,4 +1,4 @@
-class FixUnitIdOnTradePlusFormattedDataView < ActiveRecord::Migration
+class FixUnitIdOnTradePlusFormattedDataView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP MATERIALIZED VIEW IF EXISTS trade_plus_complete_mview"
     execute "DROP VIEW IF EXISTS trade_plus_complete_view"
diff --git a/db/migrate/20220803152826_add_document_ref_to_eu_decisions.rb b/db/migrate/20220803152826_add_document_ref_to_eu_decisions.rb
index 010a6e140..9ac9afd02 100644
--- a/db/migrate/20220803152826_add_document_ref_to_eu_decisions.rb
+++ b/db/migrate/20220803152826_add_document_ref_to_eu_decisions.rb
@@ -1,4 +1,4 @@
-class AddDocumentRefToEuDecisions < ActiveRecord::Migration
+class AddDocumentRefToEuDecisions < ActiveRecord::Migration[4.2]
   def change
     add_reference :eu_decisions, :document, index: true
   end
diff --git a/db/migrate/20220808124523_add_author_year_to_autocomplete_view.rb b/db/migrate/20220808124523_add_author_year_to_autocomplete_view.rb
index 59f86dd41..46f82aaf9 100644
--- a/db/migrate/20220808124523_add_author_year_to_autocomplete_view.rb
+++ b/db/migrate/20220808124523_add_author_year_to_autocomplete_view.rb
@@ -1,4 +1,4 @@
-class AddAuthorYearToAutocompleteView < ActiveRecord::Migration
+class AddAuthorYearToAutocompleteView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS auto_complete_taxon_concepts_view"
     execute "CREATE VIEW auto_complete_taxon_concepts_view AS #{view_sql('20220808123526', 'auto_complete_taxon_concepts_view')}"
diff --git a/db/migrate/20220819121517_add_intersessional_decisions_to_eu_decisions_view.rb b/db/migrate/20220819121517_add_intersessional_decisions_to_eu_decisions_view.rb
index e81f1bce5..d5e55e21d 100644
--- a/db/migrate/20220819121517_add_intersessional_decisions_to_eu_decisions_view.rb
+++ b/db/migrate/20220819121517_add_intersessional_decisions_to_eu_decisions_view.rb
@@ -1,4 +1,4 @@
-class AddIntersessionalDecisionsToEuDecisionsView < ActiveRecord::Migration
+class AddIntersessionalDecisionsToEuDecisionsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_eu_decisions_view"
     execute "CREATE VIEW api_eu_decisions_view AS #{view_sql('20220808165846', 'api_eu_decisions_view')}"
diff --git a/db/migrate/20220922143605_create_cites_processes.rb b/db/migrate/20220922143605_create_cites_processes.rb
index ab192c559..0a109dbbc 100644
--- a/db/migrate/20220922143605_create_cites_processes.rb
+++ b/db/migrate/20220922143605_create_cites_processes.rb
@@ -1,4 +1,4 @@
-class CreateCitesProcesses < ActiveRecord::Migration
+class CreateCitesProcesses < ActiveRecord::Migration[4.2]
   def change
     create_table :cites_processes do |t|
       t.string :resolution
diff --git a/db/migrate/20221011142831_create_eu_country_dates.rb b/db/migrate/20221011142831_create_eu_country_dates.rb
index 40605f39a..7d04ea754 100644
--- a/db/migrate/20221011142831_create_eu_country_dates.rb
+++ b/db/migrate/20221011142831_create_eu_country_dates.rb
@@ -1,4 +1,4 @@
-class CreateEuCountryDates < ActiveRecord::Migration
+class CreateEuCountryDates < ActiveRecord::Migration[4.2]
   def change
     create_table :eu_country_dates do |t|
       t.references :geo_entity
diff --git a/db/migrate/20221013155344_add_eu_listing_to_api_taxon_concepts_view.rb b/db/migrate/20221013155344_add_eu_listing_to_api_taxon_concepts_view.rb
index a179a94c5..4346dcfbd 100644
--- a/db/migrate/20221013155344_add_eu_listing_to_api_taxon_concepts_view.rb
+++ b/db/migrate/20221013155344_add_eu_listing_to_api_taxon_concepts_view.rb
@@ -1,4 +1,4 @@
-class AddEuListingToApiTaxonConceptsView < ActiveRecord::Migration
+class AddEuListingToApiTaxonConceptsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_taxon_concepts_view CASCADE"
     execute "CREATE VIEW api_taxon_concepts_view AS #{view_sql('20221013155232', 'api_taxon_concepts_view')}"
diff --git a/db/migrate/20221014141104_add_source_ids_to_api_cites_quotas_view.rb b/db/migrate/20221014141104_add_source_ids_to_api_cites_quotas_view.rb
index ebe468591..a79bcc9ed 100644
--- a/db/migrate/20221014141104_add_source_ids_to_api_cites_quotas_view.rb
+++ b/db/migrate/20221014141104_add_source_ids_to_api_cites_quotas_view.rb
@@ -1,4 +1,4 @@
-class AddSourceIdsToApiCitesQuotasView < ActiveRecord::Migration
+class AddSourceIdsToApiCitesQuotasView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_cites_quotas_view"
     execute "CREATE VIEW api_cites_quotas_view AS #{view_sql('20221014151355', 'api_cites_quotas_view')}"
diff --git a/db/migrate/20221014141105_add_source_ids_to_api_cites_suspensions_view.rb b/db/migrate/20221014141105_add_source_ids_to_api_cites_suspensions_view.rb
index 11bae3091..c09f7986e 100644
--- a/db/migrate/20221014141105_add_source_ids_to_api_cites_suspensions_view.rb
+++ b/db/migrate/20221014141105_add_source_ids_to_api_cites_suspensions_view.rb
@@ -1,4 +1,4 @@
-class AddSourceIdsToApiCitesSuspensionsView < ActiveRecord::Migration
+class AddSourceIdsToApiCitesSuspensionsView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS api_cites_suspensions_view"
     execute "CREATE VIEW api_cites_suspensions_view AS #{view_sql('20221014151355', 'api_cites_suspensions_view')}"
diff --git a/db/migrate/20221017212659_add_document_title_to_cites_processes.rb b/db/migrate/20221017212659_add_document_title_to_cites_processes.rb
index 0eded4d5c..4209f70a7 100644
--- a/db/migrate/20221017212659_add_document_title_to_cites_processes.rb
+++ b/db/migrate/20221017212659_add_document_title_to_cites_processes.rb
@@ -1,4 +1,4 @@
-class AddDocumentTitleToCitesProcesses < ActiveRecord::Migration
+class AddDocumentTitleToCitesProcesses < ActiveRecord::Migration[4.2]
   def change
     add_column :cites_processes, :document_title, :text
   end
diff --git a/db/migrate/20230510221244_add_listed_and_excluded_geo_entities_from_api_cites_listing_changes_view.rb b/db/migrate/20230510221244_add_listed_and_excluded_geo_entities_from_api_cites_listing_changes_view.rb
index 0ebe06f85..19adc9211 100644
--- a/db/migrate/20230510221244_add_listed_and_excluded_geo_entities_from_api_cites_listing_changes_view.rb
+++ b/db/migrate/20230510221244_add_listed_and_excluded_geo_entities_from_api_cites_listing_changes_view.rb
@@ -1,4 +1,4 @@
-class AddListedAndExcludedGeoEntitiesFromApiCitesListingChangesView < ActiveRecord::Migration
+class AddListedAndExcludedGeoEntitiesFromApiCitesListingChangesView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS taxa_with_eu_listings_export_view"
     execute "DROP VIEW IF EXISTS api_cites_listing_changes_view"
diff --git a/db/migrate/20230620110017_setup_unaccent.rb b/db/migrate/20230620110017_setup_unaccent.rb
index c698aac0f..fa07f5d7c 100644
--- a/db/migrate/20230620110017_setup_unaccent.rb
+++ b/db/migrate/20230620110017_setup_unaccent.rb
@@ -1,4 +1,4 @@
-class SetupUnaccent < ActiveRecord::Migration
+class SetupUnaccent < ActiveRecord::Migration[4.2]
   def self.up
     if Rails.env.staging? or Rails.env.production?
       puts "Please add extension by hand: CREATE EXTENSION unaccent"
diff --git a/db/migrate/20230803181442_remove_language_restrictions_from_autocomplete_view.rb b/db/migrate/20230803181442_remove_language_restrictions_from_autocomplete_view.rb
index 192839d59..eea2c1169 100644
--- a/db/migrate/20230803181442_remove_language_restrictions_from_autocomplete_view.rb
+++ b/db/migrate/20230803181442_remove_language_restrictions_from_autocomplete_view.rb
@@ -1,4 +1,4 @@
-class RemoveLanguageRestrictionsFromAutocompleteView < ActiveRecord::Migration
+class RemoveLanguageRestrictionsFromAutocompleteView < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW IF EXISTS auto_complete_taxon_concepts_view"
     execute "CREATE VIEW auto_complete_taxon_concepts_view AS #{view_sql('20230803181442', 'auto_complete_taxon_concepts_view')}"
diff --git a/db/migrate/20230915113624_add_trigram_index_to_trade_permit_numbers.rb b/db/migrate/20230915113624_add_trigram_index_to_trade_permit_numbers.rb
index 72876244d..541a7bd39 100644
--- a/db/migrate/20230915113624_add_trigram_index_to_trade_permit_numbers.rb
+++ b/db/migrate/20230915113624_add_trigram_index_to_trade_permit_numbers.rb
@@ -1,4 +1,4 @@
-class AddTrigramIndexToTradePermitNumbers < ActiveRecord::Migration
+class AddTrigramIndexToTradePermitNumbers < ActiveRecord::Migration[4.2]
   def up
     # Index to optimise LIKE queries
     if Rails.env.staging? or Rails.env.production?
diff --git a/db/migrate/20240115115451_ahoy_1_4_0_upgrade_step_0.rb b/db/migrate/20240115115451_ahoy_1_4_0_upgrade_step_0.rb
index 5be588515..4bc380e99 100644
--- a/db/migrate/20240115115451_ahoy_1_4_0_upgrade_step_0.rb
+++ b/db/migrate/20240115115451_ahoy_1_4_0_upgrade_step_0.rb
@@ -1,5 +1,5 @@
 # https://github.com/ankane/ahoy/tree/v1.6.1#140
-class Ahoy140UpgradeStep0 < ActiveRecord::Migration
+class Ahoy140UpgradeStep0 < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def change
diff --git a/db/migrate/20240115115456_ahoy_1_4_0_upgrade_step_1.rb b/db/migrate/20240115115456_ahoy_1_4_0_upgrade_step_1.rb
index 39bb38d15..daaa00587 100644
--- a/db/migrate/20240115115456_ahoy_1_4_0_upgrade_step_1.rb
+++ b/db/migrate/20240115115456_ahoy_1_4_0_upgrade_step_1.rb
@@ -1,5 +1,5 @@
 # https://github.com/ankane/ahoy/tree/v1.6.1#140
-class Ahoy140UpgradeStep1 < ActiveRecord::Migration
+class Ahoy140UpgradeStep1 < ActiveRecord::Migration[4.2]
   def change
     safety_assured {
       rename_column :ahoy_events, :properties, :properties_json
diff --git a/db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb b/db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb
index 2848f2dc3..a9684f1f1 100644
--- a/db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb
+++ b/db/migrate/20240115115459_ahoy_1_4_0_upgrade_step_2.rb
@@ -1,6 +1,6 @@
 # https://github.com/ankane/ahoy/tree/v1.6.1#140
 # https://stackoverflow.com/a/31672314/556780
-class Ahoy140UpgradeStep2 < ActiveRecord::Migration
+class Ahoy140UpgradeStep2 < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
   def up
     Ahoy::Event.where(properties: nil).select(:id).find_in_batches do |events|
diff --git a/db/migrate/20240115115503_ahoy_1_4_0_upgrade_step_3.rb b/db/migrate/20240115115503_ahoy_1_4_0_upgrade_step_3.rb
index 5fdbbbf64..15596a03a 100644
--- a/db/migrate/20240115115503_ahoy_1_4_0_upgrade_step_3.rb
+++ b/db/migrate/20240115115503_ahoy_1_4_0_upgrade_step_3.rb
@@ -1,5 +1,5 @@
 # https://github.com/ankane/ahoy/tree/v1.6.1#140
-class Ahoy140UpgradeStep3 < ActiveRecord::Migration
+class Ahoy140UpgradeStep3 < ActiveRecord::Migration[4.2]
   def change
     safety_assured {
       remove_column :ahoy_events, :properties_json

From 6b0cc58c98106fe0edc8221152047eb44f0e41ed Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 10:25:23 +0000
Subject: [PATCH 040/241] 
 https://guides.rubyonrails.org/v5.0/upgrading_ruby_on_rails.html#rails-controller-testing

---
 Gemfile      | 1 +
 Gemfile.lock | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 79b8f863f..1fe469a6c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -128,6 +128,7 @@ group :test, :development do
 end
 
 group :test do
+  gem 'rails-controller-testing'
   gem "codeclimate-test-reporter", '0.1.1', require: nil # TODO, should be removed
   gem "factory_girl_rails", '4.2.1'
   gem 'simplecov', '0.22.0', :require => false # TODO: latest
diff --git a/Gemfile.lock b/Gemfile.lock
index 4005993ef..e9958c6a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -380,6 +380,10 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.0.7.2)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -622,6 +626,7 @@ DEPENDENCIES
   rack-cors (= 0.3.0)
   rack-livereload (= 0.3.11)
   rails (= 5.0.7.2)
+  rails-controller-testing
   rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)
   rbnacl-libsodium (= 1.0.16)

From 2c2f75a245bd15f8e79c0533494fd3c752528485 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 11:17:52 +0000
Subject: [PATCH 041/241] remove monkey patch, no longer needed for Arel 7

---
 config/initializers/arel_patch.rb | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 config/initializers/arel_patch.rb

diff --git a/config/initializers/arel_patch.rb b/config/initializers/arel_patch.rb
deleted file mode 100644
index eeaf7e698..000000000
--- a/config/initializers/arel_patch.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# TODO: May need to remove this file when upgrade Rails.
-# https://github.com/rails/arel/pull/470
-# Backport Arel 8.0.0 code to 6.0.4, to fix eq(nil) generate `= NULL` instead of `IS NULL`.
-# https://github.com/rails/arel/blob/d6af2090b16f7d061aa43913d610c6fada58b7e2/lib/arel/nodes/casted.rb#L27
-
-module Arel
-  module Nodes
-    class Quoted < Arel::Nodes::Unary # :nodoc:
-      alias :val :value # <-- Backport
-      def nil?; val.nil?; end # <-- Backport
-    end
-  end
-end

From 415678389bb212037a0f5ead06a2987b6b5f1d2c Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 11:21:21 +0000
Subject: [PATCH 042/241] rails diff, and remove some old gems for development
 only

---
 .gitignore                                    | 11 ++-
 Gemfile                                       | 53 ++++++++-------
 Gemfile.lock                                  | 67 ++++++-------------
 Guardfile                                     | 17 -----
 Rakefile                                      |  2 +-
 app/assets/config/mainfest.js                 |  3 +
 app/assets/javascripts/application.js         |  2 +-
 app/assets/javascripts/cable.js               | 13 ++++
 app/assets/javascripts/channels/.keep         |  0
 app/assets/stylesheets/application.css        |  4 +-
 app/channels/application_cable/channel.rb     |  4 ++
 app/channels/application_cable/connection.rb  |  4 ++
 app/jobs/application_job.rb                   |  2 +
 config.ru                                     |  3 +-
 config/initializers/new_framework_defaults.rb |  4 --
 .../to_time_preserves_timezone.rb             | 10 ---
 config/secrets.yml                            | 12 ++++
 db/seeds.rb                                   |  2 +-
 public/404.html                               | 12 ++--
 public/422.html                               | 12 ++--
 public/500.html                               | 12 ++--
 tmp/.keep                                     |  0
 22 files changed, 119 insertions(+), 130 deletions(-)
 delete mode 100644 Guardfile
 create mode 100644 app/assets/config/mainfest.js
 create mode 100644 app/assets/javascripts/cable.js
 create mode 100644 app/assets/javascripts/channels/.keep
 create mode 100644 app/channels/application_cable/channel.rb
 create mode 100644 app/channels/application_cable/connection.rb
 create mode 100644 app/jobs/application_job.rb
 delete mode 100644 config/initializers/to_time_preserves_timezone.rb
 create mode 100644 tmp/.keep

diff --git a/.gitignore b/.gitignore
index 93a1d3534..19dd992c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,16 @@
 /.bundle
 
 # Ignore all logfiles and tempfiles.
-/coverage
-/rdoc
 /log/*
+/tmp/*
 !/log/.keep
-/tmp
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history
+
+/coverage
+/rdoc
 /private
 /public/system
 /public/downloads/*.pdf
diff --git a/Gemfile b/Gemfile
index 1fe469a6c..991df6786 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,26 @@
 source 'https://rubygems.org'
 
-ruby '2.5.9'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
 
-# gem 'rails', '4.2.11.3'
-gem 'rails', '5.0.7.2'
+ruby '2.5.9'
 
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.0.7', '>= 5.0.7.2'
+# Use sqlite3 as the database for Active Record
+# gem 'sqlite3'
+# Use Puma as the app server
+gem 'puma', '~> 3.0'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
 
 gem 'actionpack-action_caching', '~> 1.2', '>= 1.2.2' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
 gem 'actionpack-page_caching', '1.1.1' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this. # TODO, can update after upgrade to rails 5
@@ -58,27 +72,17 @@ gem 'wkhtmltopdf-binary', '~> 0.12.6.6'
 gem 'aws-sdk', '~> 2' # TODO: v2 Deprecated, need to upgrade to v3
 gem 'rails-observers', '~> 0.1.5' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
 
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
-
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', :platforms => :ruby
 
 gem 'strong_migrations', '~> 0.3.1' # TODO: should upgrade when we upgrade to rails 5
 
 
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
 
 # To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
+# gem 'jbuilder', '~> 2.5'
 
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
@@ -86,14 +90,14 @@ gem 'strong_migrations', '~> 0.3.1' # TODO: should upgrade when we upgrade to ra
 gem 'rest-client', '1.8.0', require: false # TODO, should upgrade for better compatibility with newer Ruby but breaking change. Seems not many place using it, worth a try.
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 2.0'
-  gem "guard-livereload", '1.1.3'
-  gem "rack-livereload", '0.3.11'
-  gem "guard-bundler", '1.0.0'
-  gem 'annotate', "2.5.0"
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '~> 3.0.5'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 	gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+
+  gem 'annotate', "2.5.0"
   # gem 'sextant'
   # Deploy with Capistrano
   gem 'capistrano', '3.11.0', require: false
@@ -107,7 +111,6 @@ group :development do
   gem 'slackistrano', '0.1.9', require: false
   gem 'brightbox', '2.3.9'
   gem 'rack-cors', '0.3.0' ,:require => 'rack/cors' # TODO: remove when upgrade Rails.
-  gem 'webrick', '1.3.1'
   gem 'jslint_on_rails', '1.1.1'
   gem 'rubocop', '0.40.0', require: false
   gem 'rbnacl', '4.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index e9958c6a9..0360e28d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,8 +90,7 @@ GEM
       execjs (>= 1.2, < 3)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.0)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
+    bindex (0.8.1)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     brightbox (2.3.9)
@@ -138,7 +137,6 @@ GEM
       numerizer (~> 0.1.1)
     codeclimate-test-reporter (0.1.1)
       simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.3)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -157,7 +155,6 @@ GEM
     crass (1.0.6)
     dalli (2.7.10)
     database_cleaner (1.2.0)
-    debug_inspector (1.2.0)
     device_detector (1.0.7)
     devise (4.4.3)
       bcrypt (~> 3.0)
@@ -174,9 +171,6 @@ GEM
     dotenv-rails (2.0.1)
       dotenv (= 2.0.1)
     ed25519 (1.2.4)
-    em-websocket (0.5.3)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0)
     ember-cli-assets (0.0.37)
     ember-data-source (1.13.0)
       ember-source (>= 1.8, < 3.0)
@@ -200,7 +194,6 @@ GEM
       handlebars-source (~> 1.0)
     errbase (0.2.2)
     erubis (2.7.0)
-    eventmachine (1.2.7)
     execjs (2.9.1)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
@@ -208,7 +201,6 @@ GEM
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     ffi (1.16.3)
-    formatador (1.1.0)
     geocoder (1.8.2)
     geoip (1.3.5)
     globalid (1.1.0)
@@ -220,19 +212,6 @@ GEM
       request_store (>= 1.0)
     groupdate (4.1.2)
       activesupport (>= 4.2)
-    guard (1.8.3)
-      formatador (>= 0.2.4)
-      listen (~> 1.3)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-bundler (1.0.0)
-      bundler (~> 1.0)
-      guard (~> 1.1)
-    guard-livereload (1.1.3)
-      em-websocket (>= 0.2.0)
-      guard (>= 1.5.0)
-      multi_json (~> 1.0)
     handlebars-source (1.0.12)
     has_scope (0.7.2)
       actionpack (>= 4.1)
@@ -240,7 +219,6 @@ GEM
     hashery (2.1.2)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    http_parser.rb (0.8.0)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
@@ -276,14 +254,12 @@ GEM
     kaminari-core (1.2.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lumberjack (1.2.10)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -353,15 +329,11 @@ GEM
       pdf-reader (~> 1.2)
       ruby-rc4
       ttfunk (~> 1.0.3)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     public_suffix (4.0.7)
+    puma (3.12.6)
     racc (1.7.3)
     rack (2.2.8)
     rack-cors (0.3.0)
-    rack-livereload (0.3.11)
-      rack
     rack-protection (2.2.4)
       rack
     rack-session (1.0.2)
@@ -404,8 +376,6 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.8)
-      ffi (>= 0.5.0)
     rbnacl (4.0.2)
       ffi
     rbnacl-libsodium (1.0.16)
@@ -500,7 +470,10 @@ GEM
     slackistrano (0.1.9)
       capistrano (>= 3.0.1)
       json
-    spring (3.1.1)
+    spring (2.1.1)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -542,12 +515,11 @@ GEM
     uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (2.3.0)
-      activemodel (>= 4.0)
-      binding_of_caller (>= 0.7.2)
-      railties (>= 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-    webrick (1.3.1)
+    web-console (3.7.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -603,8 +575,6 @@ DEPENDENCIES
   geoip (= 1.3.5)
   gon (~> 6.4)
   groupdate (= 4.1.2)
-  guard-bundler (= 1.0.0)
-  guard-livereload (= 1.1.3)
   handlebars-source (= 1.0.12)
   httparty (~> 0.21.0)
   inherited_resources (= 1.9.0)
@@ -613,6 +583,7 @@ DEPENDENCIES
   kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
   mobility (~> 1.2, >= 1.2.9)
+  listen (~> 3.0.5)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
   nokogiri (= 1.12.5)
@@ -623,9 +594,9 @@ DEPENDENCIES
   pg_array_parser (~> 0.0.9)
   pg_search (= 2.3.0)
   prawn (= 0.13.2)
+  puma (~> 3.0)
   rack-cors (= 0.3.0)
-  rack-livereload (= 0.3.11)
-  rails (= 5.0.7.2)
+  rails (~> 5.0.7, >= 5.0.7.2)
   rails-controller-testing
   rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)
@@ -646,13 +617,13 @@ DEPENDENCIES
   sitemap_generator (~> 6.3)
   slackistrano (= 0.1.9)
   spring
+  spring-watcher-listen (~> 2.0.0)
   strong_migrations (~> 0.3.1)
   susy (~> 2.2, >= 2.2.14)
   test-unit (= 3.1.5)
   uglifier (>= 1.3.0)
   uuidtools (~> 2.2)
-  web-console (~> 2.0)
-  webrick (= 1.3.1)
+  web-console (>= 3.3.0)
   whenever (= 0.11.0)
   wicked (= 1.3.4)
   wkhtmltopdf-binary (~> 0.12.6.6)
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index 85996ad9a..000000000
--- a/Guardfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'bundler' do
-  watch('Gemfile')
-  # Uncomment next line if Gemfile contain `gemspec' command
-  # watch(/^.+\.gemspec/)
-end
-
-guard 'livereload' do
-  watch(%r{app/views/.+\.(erb|haml|slim)})
-  watch(%r{app/helpers/.+\.rb})
-  watch(%r{public/.+\.(css|js|html)})
-  watch(%r{config/locales/.+\.yml})
-  # Rails Assets Pipeline
-  watch(%r{(app|vendor)/assets/\w+/(.+\.(css|js|html)).*}) { |m| "/assets/#{m[2]}" }
-end
diff --git a/Rakefile b/Rakefile
index fcf22053e..874ef803b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,7 +2,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 require 'jslint/tasks' if Rails.env.development?
 require 'sitemap_generator/tasks'
 
diff --git a/app/assets/config/mainfest.js b/app/assets/config/mainfest.js
new file mode 100644
index 000000000..b16e53d6d
--- /dev/null
+++ b/app/assets/config/mainfest.js
@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index cef27ce30..031aefca7 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -5,7 +5,7 @@
 // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
new file mode 100644
index 000000000..10657b665
--- /dev/null
+++ b/app/assets/javascripts/cable.js
@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the rails generate channel command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function () {
+this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);
diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 48d80f6e9..5d5b89282 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -6,7 +6,9 @@
  * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
  *= require_self
  */
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 000000000..d67269728
--- /dev/null
+++ b/app/channels/application_cable/channel.rb
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
new file mode 100644
index 000000000..0ff5442f4
--- /dev/null
+++ b/app/channels/application_cable/connection.rb
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
new file mode 100644
index 000000000..a009ace51
--- /dev/null
+++ b/app/jobs/application_job.rb
@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end
diff --git a/config.ru b/config.ru
index bd83b2541..f7ba0b527 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,5 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative 'config/environment'
+
 run Rails.application
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
index cbf423a81..e8d3249f8 100644
--- a/config/initializers/new_framework_defaults.rb
+++ b/config/initializers/new_framework_defaults.rb
@@ -14,10 +14,6 @@
 # Enable origin-checking CSRF mitigation. Previous versions had false.
 Rails.application.config.action_controller.forgery_protection_origin_check = false
 
-# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
-# Previous versions had false.
-ActiveSupport.to_time_preserves_timezone = false
-
 # Require `belongs_to` associations by default. Previous versions had false.
 Rails.application.config.active_record.belongs_to_required_by_default = false
 
diff --git a/config/initializers/to_time_preserves_timezone.rb b/config/initializers/to_time_preserves_timezone.rb
deleted file mode 100644
index 8674be322..000000000
--- a/config/initializers/to_time_preserves_timezone.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Preserve the timezone of the receiver when calling to `to_time`.
-# Ruby 2.4 will change the behavior of `to_time` to preserve the timezone
-# when converting to an instance of `Time` instead of the previous behavior
-# of converting to the local system timezone.
-#
-# Rails 5.0 introduced this config option so that apps made with earlier
-# versions of Rails are not affected when upgrading.
-ActiveSupport.to_time_preserves_timezone = true
diff --git a/config/secrets.yml b/config/secrets.yml
index 9598e19f7..d168b81a4 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -1,3 +1,15 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rails secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
 common: &defaults
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
   mailer:
diff --git a/db/seeds.rb b/db/seeds.rb
index 0806df409..e207e7a58 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,5 +1,5 @@
 # This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
 #
 # Examples:
 #
diff --git a/public/404.html b/public/404.html
index 2c1219109..f028a6e83 100644
--- a/public/404.html
+++ b/public/404.html
@@ -5,7 +5,7 @@
   <title>The page you were looking for doesn't exist (404)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-    body {
+    .rails-default-error-page {
       background-color: #EFEFEF;
       color: #2E2F30;
       text-align: center;
@@ -13,13 +13,13 @@
       margin: 0;
     }
 
-    div.dialog {
+    .rails-default-error-page div.dialog {
       width: 95%;
       max-width: 33em;
       margin: 4em auto 0;
     }
 
-    div.dialog>div {
+    .rails-default-error-page div.dialog>div {
       border: 1px solid #CCC;
       border-right-color: #999;
       border-left-color: #999;
@@ -32,13 +32,13 @@
       box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
     }
 
-    h1 {
+    .rails-default-error-page h1 {
       font-size: 100%;
       color: #730E15;
       line-height: 1.5em;
     }
 
-    div.dialog>p {
+    .rails-default-error-page div.dialog>p {
       margin: 0 0 1em;
       padding: 1em;
       background-color: #F7F7F7;
@@ -55,7 +55,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/404.html -->
   <div class="dialog">
     <div>
diff --git a/public/422.html b/public/422.html
index ea2dac362..33dda348e 100644
--- a/public/422.html
+++ b/public/422.html
@@ -5,7 +5,7 @@
   <title>The change you wanted was rejected (422)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-    body {
+    .rails-default-error-page {
       background-color: #EFEFEF;
       color: #2E2F30;
       text-align: center;
@@ -13,13 +13,13 @@
       margin: 0;
     }
 
-    div.dialog {
+    .rails-default-error-page div.dialog {
       width: 95%;
       max-width: 33em;
       margin: 4em auto 0;
     }
 
-    div.dialog>div {
+    .rails-default-error-page div.dialog>div {
       border: 1px solid #CCC;
       border-right-color: #999;
       border-left-color: #999;
@@ -32,13 +32,13 @@
       box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
     }
 
-    h1 {
+    .rails-default-error-page h1 {
       font-size: 100%;
       color: #730E15;
       line-height: 1.5em;
     }
 
-    div.dialog>p {
+    .rails-default-error-page div.dialog>p {
       margin: 0 0 1em;
       padding: 1em;
       background-color: #F7F7F7;
@@ -55,7 +55,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <div>
diff --git a/public/500.html b/public/500.html
index 35bad156a..90beade75 100644
--- a/public/500.html
+++ b/public/500.html
@@ -5,7 +5,7 @@
   <title>We're sorry, but something went wrong (500)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-    body {
+    .rails-default-error-page {
       background-color: #EFEFEF;
       color: #2E2F30;
       text-align: center;
@@ -13,13 +13,13 @@
       margin: 0;
     }
 
-    div.dialog {
+    .rails-default-error-page div.dialog {
       width: 95%;
       max-width: 33em;
       margin: 4em auto 0;
     }
 
-    div.dialog>div {
+    .rails-default-error-page div.dialog>div {
       border: 1px solid #CCC;
       border-right-color: #999;
       border-left-color: #999;
@@ -32,13 +32,13 @@
       box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
     }
 
-    h1 {
+    .rails-default-error-page h1 {
       font-size: 100%;
       color: #730E15;
       line-height: 1.5em;
     }
 
-    div.dialog>p {
+    .rails-default-error-page div.dialog>p {
       margin: 0 0 1em;
       padding: 1em;
       background-color: #F7F7F7;
@@ -55,7 +55,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <div>
diff --git a/tmp/.keep b/tmp/.keep
new file mode 100644
index 000000000..e69de29bb

From 7e0d30c404009867ec0839323a6c48b5186a206a Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 11:25:39 +0000
Subject: [PATCH 043/241] DEPRECATION WARNING: after_filter is deprecated and
 will be removed in Rails 5.1. Use after_action instead.

---
 app/controllers/api/v1/shipments_controller.rb      | 2 +-
 app/controllers/api/v1/taxon_concepts_controller.rb | 4 ++--
 config/initializers/devise.rb                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/shipments_controller.rb b/app/controllers/api/v1/shipments_controller.rb
index 327de27bd..25abe42be 100644
--- a/app/controllers/api/v1/shipments_controller.rb
+++ b/app/controllers/api/v1/shipments_controller.rb
@@ -3,7 +3,7 @@ class Api::V1::ShipmentsController < ApplicationController
 
   before_action :authenticate
   before_action :load_grouping_type
-  after_filter only: [:grouped_query, :country_query] do
+  after_action only: [:grouped_query, :country_query] do
     set_pagination_headers(:data, :grouped_params)
   end
 
diff --git a/app/controllers/api/v1/taxon_concepts_controller.rb b/app/controllers/api/v1/taxon_concepts_controller.rb
index 32349af71..6739c5cbf 100644
--- a/app/controllers/api/v1/taxon_concepts_controller.rb
+++ b/app/controllers/api/v1/taxon_concepts_controller.rb
@@ -2,8 +2,8 @@ class Api::V1::TaxonConceptsController < ApplicationController
 
   # makes params available to the ActiveModel::Serializers
   serialization_scope :view_context
-  after_filter :track_index, :only => :index
-  after_filter :track_show, :only => :show
+  after_action :track_index, :only => :index
+  after_action :track_show, :only => :show
 
   def index
     @search = Species::Search.new(params)
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index cb44a8a1a..3d515674d 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -259,8 +259,8 @@
   Rails.application.config.to_prepare do
     Devise::RegistrationsController.layout "pages"
     Devise::PasswordsController.layout "pages"
-    Devise::PasswordsController.after_filter :save_email, only: [:create]
-    Devise::PasswordsController.after_filter :delete_email, only: [:update]
+    Devise::PasswordsController.after_action :save_email, only: [:create]
+    Devise::PasswordsController.after_action :delete_email, only: [:update]
   end
 
   # custom redirection when login fails

From 7e98d81a9c8678bcd3648b08d63ddb024e57cb04 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 12:07:11 +0000
Subject: [PATCH 044/241] upgrade gems for rails 5

---
 Gemfile                                       | 16 ++---
 Gemfile.lock                                  | 67 ++++++++++---------
 app/uploaders/document_file_uploader.rb       |  2 +-
 .../trade/csv_source_file_uploader.rb         |  2 +-
 4 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/Gemfile b/Gemfile
index 991df6786..9830d0b94 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'coffee-rails', '~> 4.2'
 # gem 'therubyracer', platforms: :ruby
 
 gem 'actionpack-action_caching', '~> 1.2', '>= 1.2.2' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
-gem 'actionpack-page_caching', '1.1.1' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this. # TODO, can update after upgrade to rails 5
+gem 'actionpack-page_caching', '~> 1.2', '>= 1.2.4' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
 gem 'active_model_serializers', '0.8.4' # Deprecated
 gem 'dalli', '2.7.10' # TODO: latest is 3.2.6. I believe should be fine to upgrade but we have no way to test.
 gem 'pg', '0.21.0' # TODO: latest 1.5.4, need Rails 5 to upgrade to 1.0.0
@@ -35,17 +35,16 @@ gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New ver
 gem 'inherited_resources', '1.9.0' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
 gem 'mobility', '~> 1.2', '>= 1.2.9'
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
-gem 'cancancan', '1.17.0' # TODO, can upgrade to 2.0 after Rails 5
-gem 'ahoy_matey', '2.2.1' # TODO: latest 5.0.2. Can't upgrade to 3.0 until upgrade to Rails 5
+gem 'cancancan', '2.3.0' # TODO, can upgrade to 3.0 after Rails 6
+gem 'ahoy_matey', '3.3.0' # TODO: latest 5.0.2. Can't upgrade to 4.0 until upgrade to Rails 5.2
 gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
-gem 'browser', '2.5.3' # Latest 5.3.1 @ 2021, doesn't work with this project, maybe try again after upgrade ruby > 2.5 and rails >= 5
 
 # TODO: starting from v1.4, it break our test due to redirection changes:
 #   rspec ./spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb:147
 #   rspec ./spec/controllers/admin/nomenclature_changes/split_controller_spec.rb:191
 gem 'wicked', '1.3.4'
 
-gem 'groupdate', '4.1.2' # TODO: can upgrade after rails 5 and newer ruby
+gem 'groupdate', '5.2.4' # TODO: can upgrade after rails 5.2 and newer ruby 2.6
 
 gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
@@ -61,8 +60,8 @@ gem 'httparty', '~> 0.21.0'
 # gem 'sprockets', '2.12.5' # upgrading to 3 breaks handlebars/tilt
 gem 'kaminari', '~> 1.2', '>= 1.2.2' # TODO: Suggest migrate to pagy gem.
 
-gem 'acts-as-taggable-on', '5.0.0' # TODO: latest v10 @ 2023. Need upgrade after upgrade to Rails 5.
-gem 'carrierwave', '1.3.1' # TODO: latest is 3.0.5 @ 2023. can upgrade to v2 after Rails 5
+gem 'acts-as-taggable-on', '8.1.0' # TODO: latest v10 @ 2023. Can upgrade after upgrade to Rails 6.
+gem 'carrierwave', '2.2.5' # TODO: latest is 3.0.5 @ 2023. can upgrade to v3 after Rails 6
 
 # PDF
 gem 'prawn', '0.13.2'
@@ -75,8 +74,7 @@ gem 'rails-observers', '~> 0.1.5' # A feature that removed from core in Rails 4.
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', :platforms => :ruby
 
-gem 'strong_migrations', '~> 0.3.1' # TODO: should upgrade when we upgrade to rails 5
-
+gem 'strong_migrations', '0.7.9' # TODO: should upgrade when we upgrade to rails 5.2
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0360e28d6..ffcc76ce7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,8 +21,8 @@ GEM
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
-    actionpack-page_caching (1.1.1)
-      actionpack (>= 4.0.0, < 6)
+    actionpack-page_caching (1.2.4)
+      actionpack (>= 4.0.0)
     actionview (5.0.7.2)
       activesupport (= 5.0.7.2)
       builder (~> 3.1)
@@ -47,21 +47,16 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (5.0.0)
-      activerecord (>= 4.2.8)
+    acts-as-taggable-on (8.1.0)
+      activerecord (>= 5.0, < 6.2)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
-    ahoy_matey (2.2.1)
-      addressable
-      browser (~> 2.0)
+    ahoy_matey (3.3.0)
+      activesupport (>= 5)
       device_detector
       geocoder (>= 1.4.5)
-      railties (>= 4.2)
-      referer-parser (>= 0.3)
-      request_store
       safely_block (>= 0.2.1)
-      user_agent_parser
     airbrussh (1.5.1)
       sshkit (>= 1.6.1, != 1.7.0)
     annotate (2.5.0)
@@ -95,10 +90,9 @@ GEM
       sass (~> 3.2)
     brightbox (2.3.9)
       capistrano (>= 2.5)
-    browser (2.5.3)
     builder (3.2.4)
     byebug (11.1.3)
-    cancancan (1.17.0)
+    cancancan (2.3.0)
     capistrano (3.11.0)
       airbrussh (>= 1.0.0)
       i18n
@@ -127,10 +121,14 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (1.3.1)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
+    carrierwave (2.2.5)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      marcel (~> 1.0.0)
+      mini_mime (>= 0.1.3)
+      ssrf_filter (~> 1.0)
     chartkick (2.3.5)
     chronic (0.10.2)
     chronic_duration (0.10.6)
@@ -210,8 +208,8 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    groupdate (4.1.2)
-      activesupport (>= 4.2)
+    groupdate (5.2.4)
+      activesupport (>= 5)
     handlebars-source (1.0.12)
     has_scope (0.7.2)
       actionpack (>= 4.1)
@@ -224,6 +222,9 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.2)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     inherited_resources (1.9.0)
       actionpack (>= 4.2, < 5.3)
       has_scope (~> 0.6)
@@ -265,8 +266,10 @@ GEM
       net-imap
       net-pop
       net-smtp
+    marcel (1.0.2)
     method_source (1.0.0)
     mime-types (2.99.3)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.15.0)
@@ -397,8 +400,7 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.6.0)
       redis (>= 2.2, < 5)
-    referer-parser (0.3.0)
-    request_store (1.5.1)
+    request_store (1.4.1)
       rack (>= 1.4)
     responders (2.4.1)
       actionpack (>= 4.2.0, < 6.0)
@@ -438,6 +440,8 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
+    ruby-vips (2.2.0)
+      ffi (~> 1.12)
     rubyzip (2.3.2)
     safely_block (0.3.0)
       errbase (>= 0.1.1)
@@ -486,8 +490,9 @@ GEM
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    strong_migrations (0.3.1)
-      activerecord (>= 3.2.0)
+    ssrf_filter (1.0.8)
+    strong_migrations (0.7.9)
+      activerecord (>= 5)
     strscan (3.0.8)
     susy (2.2.14)
       sass (>= 3.3.0, < 3.5)
@@ -511,7 +516,6 @@ GEM
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
-    user_agent_parser (2.16.0)
     uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -536,19 +540,18 @@ PLATFORMS
 
 DEPENDENCIES
   actionpack-action_caching (~> 1.2, >= 1.2.2)
-  actionpack-page_caching (= 1.1.1)
+  actionpack-page_caching (~> 1.2, >= 1.2.4)
   active_model_serializers (= 0.8.4)
-  acts-as-taggable-on (= 5.0.0)
-  ahoy_matey (= 2.2.1)
+  acts-as-taggable-on (= 8.1.0)
+  ahoy_matey (= 3.3.0)
   annotate (= 2.5.0)
   appsignal (= 1.3.3)
   aws-sdk (~> 2)
   bcrypt_pbkdf (= 1.1.0)
   bootstrap-sass (= 2.3.2.2)
   brightbox (= 2.3.9)
-  browser (= 2.5.3)
   byebug
-  cancancan (= 1.17.0)
+  cancancan (= 2.3.0)
   capistrano (= 3.11.0)
   capistrano-bundler (= 1.5.0)
   capistrano-local-precompile (= 1.2.0)
@@ -558,7 +561,7 @@ DEPENDENCIES
   capistrano-rvm (= 0.1.2)
   capistrano-sidekiq (= 1.0.2)
   capybara (= 2.2.1)
-  carrierwave (= 1.3.1)
+  carrierwave (= 2.2.5)
   chartkick (= 2.3.5)
   codeclimate-test-reporter (= 0.1.1)
   coffee-rails (~> 4.2)
@@ -574,7 +577,7 @@ DEPENDENCIES
   factory_girl_rails (= 4.2.1)
   geoip (= 1.3.5)
   gon (~> 6.4)
-  groupdate (= 4.1.2)
+  groupdate (= 5.2.4)
   handlebars-source (= 1.0.12)
   httparty (~> 0.21.0)
   inherited_resources (= 1.9.0)
@@ -618,7 +621,7 @@ DEPENDENCIES
   slackistrano (= 0.1.9)
   spring
   spring-watcher-listen (~> 2.0.0)
-  strong_migrations (~> 0.3.1)
+  strong_migrations (= 0.7.9)
   susy (~> 2.2, >= 2.2.14)
   test-unit (= 3.1.5)
   uglifier (>= 1.3.0)
diff --git a/app/uploaders/document_file_uploader.rb b/app/uploaders/document_file_uploader.rb
index 2175948a5..2bbddca9d 100644
--- a/app/uploaders/document_file_uploader.rb
+++ b/app/uploaders/document_file_uploader.rb
@@ -42,7 +42,7 @@ def cache_dir
 
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
-  def extension_whitelist
+  def extension_allowlist
     %w(jpg jpeg gif png bmp tif tiff ppt pptx xls xlsx rtf txt doc docx pdf csv tsv odt ods odp)
   end
 
diff --git a/app/uploaders/trade/csv_source_file_uploader.rb b/app/uploaders/trade/csv_source_file_uploader.rb
index 59d1f72c2..1d92b664d 100644
--- a/app/uploaders/trade/csv_source_file_uploader.rb
+++ b/app/uploaders/trade/csv_source_file_uploader.rb
@@ -73,7 +73,7 @@ def convert_to_utf8
 
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
-  def extension_whitelist
+  def extension_allowlist
     %w(csv)
   end
 

From f1268595a910e2ec8708f03b4d7cac00ce613d65 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 12:22:25 +0000
Subject: [PATCH 045/241] upgrade rspec

---
 Gemfile      |  6 +++---
 Gemfile.lock | 44 ++++++++++++++++++++++----------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9830d0b94..60b897225 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,10 +119,10 @@ group :development do
 end
 
 group :test, :development do
-  gem "rspec-rails", '3.9.1'
-  gem 'rspec-collection_matchers', '1.1.3'
+  gem "rspec-rails", '4.1.1' # TODO: should upgrade once to rails 5.2
+  gem 'rspec-collection_matchers', '~> 1.2', '>= 1.2.1'
   gem "json_spec", '1.1.5'
-  gem "database_cleaner", "1.2.0" # TODO, should remove after upgrade Rails.
+  gem "database_cleaner", "1.2.0" # TODO, should remove after upgrade to Rails 5.1. (https://stackoverflow.com/questions/49246124/is-databasecleaner-still-necessary-with-rails-system-specs)
   gem "launchy", '2.4.3'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
diff --git a/Gemfile.lock b/Gemfile.lock
index ffcc76ce7..71d1659cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -409,29 +409,29 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-collection_matchers (1.1.3)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.4)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
+      rspec-support (~> 3.12.0)
+    rspec-rails (4.1.1)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.12.1)
     rubocop (0.40.0)
       parser (>= 2.3.1.0, < 3.0)
       powerpack (~> 0.1)
@@ -608,8 +608,8 @@ DEPENDENCIES
   request_store (~> 1.5, >= 1.5.1)
   responders (~> 2.0)
   rest-client (= 1.8.0)
-  rspec-collection_matchers (= 1.1.3)
-  rspec-rails (= 3.9.1)
+  rspec-collection_matchers (~> 1.2, >= 1.2.1)
+  rspec-rails (= 4.1.1)
   rubocop (= 0.40.0)
   rubyzip (~> 2.3, >= 2.3.2)
   sass-rails (~> 5.0)

From 94049ec95a2140dab5859f2b28aa93a5febe3de2 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 13:13:22 +0000
Subject: [PATCH 046/241] upgrade sidekiq and related gems

---
 Gemfile                                 |  9 +++-----
 Gemfile.lock                            | 30 +++++++++++++++----------
 app/workers/refresh_documents_worker.rb |  2 +-
 config/initializers/sidekiq.rb          |  6 +++++
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index 60b897225..d8a2f70fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,9 +49,9 @@ gem 'groupdate', '5.2.4' # TODO: can upgrade after rails 5.2 and newer ruby 2.6
 gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
 
-gem 'sidekiq', '4.2.10' # TODO, Ruby 2.7 need version 6.0.5 sidekiq
-gem 'sidekiq-status', '1.1.4' # TODO: latest is 3.0.3 @ 2023
-gem 'sidekiq-unique-jobs', '4.0.18' # TODO: latest is 8.0.5 @ 2023
+gem 'sidekiq', '5.2.10' # TODO, Ruby 2.7 need version 6.0.5 sidekiq
+gem 'sidekiq-status', '2.1.3' # TODO: upgrade to v3 when Sidekiq upgrade to 6
+gem 'sidekiq-unique-jobs', '7.1.31' # TODO: can upgrade to latest when sidekiq upgrade to 7
 gem 'redis-rails', '5.0.2' # TODO: latest, may remove this Gem when upgrade to Rails 5.2. (https://github.com/redis-store/redis-rails/tree/master#a-quick-note-about-rails-52)
 
 gem 'whenever', '0.11.0', :require => false # TODO: latest version 1.0 @ 2019. Should migrate to sidekiq-cron.
@@ -82,9 +82,6 @@ gem 'strong_migrations', '0.7.9' # TODO: should upgrade when we upgrade to rails
 # To use Jbuilder templates for JSON
 # gem 'jbuilder', '~> 2.5'
 
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
 gem 'rest-client', '1.8.0', require: false # TODO, should upgrade for better compatibility with newer Ruby but breaking change. Seems not many place using it, worth a try.
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 71d1659cc..59ec2e488 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,6 +90,9 @@ GEM
       sass (~> 3.2)
     brightbox (2.3.9)
       capistrano (>= 2.5)
+    brpoplpush-redis_script (0.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.5)
+      redis (>= 1.0, < 6)
     builder (3.2.4)
     byebug (11.1.3)
     cancancan (2.3.0)
@@ -383,7 +386,7 @@ GEM
       ffi
     rbnacl-libsodium (1.0.16)
       rbnacl (>= 3.0.1)
-    redis (3.3.5)
+    redis (4.5.1)
     redis-actionpack (5.4.0)
       actionpack (>= 5, < 8)
       redis-rack (>= 2.1.0, < 4)
@@ -398,8 +401,8 @@ GEM
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
       redis-store (>= 1.2, < 2)
-    redis-store (1.6.0)
-      redis (>= 2.2, < 5)
+    redis-store (1.10.0)
+      redis (>= 4, < 6)
     request_store (1.4.1)
       rack (>= 1.4)
     responders (2.4.1)
@@ -456,13 +459,16 @@ GEM
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    sidekiq-status (1.1.4)
+      redis (~> 4.5, < 4.6.0)
+    sidekiq-status (2.1.3)
       chronic_duration
-      sidekiq (>= 3.0)
-    sidekiq-unique-jobs (4.0.18)
-      sidekiq (>= 2.6)
-      thor
+      sidekiq (>= 5.0)
+    sidekiq-unique-jobs (7.1.31)
+      brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.5)
+      redis (< 5.0)
+      sidekiq (>= 5.0, < 7.0)
+      thor (>= 0.20, < 3.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -613,9 +619,9 @@ DEPENDENCIES
   rubocop (= 0.40.0)
   rubyzip (~> 2.3, >= 2.3.2)
   sass-rails (~> 5.0)
-  sidekiq (= 4.2.10)
-  sidekiq-status (= 1.1.4)
-  sidekiq-unique-jobs (= 4.0.18)
+  sidekiq (= 5.2.10)
+  sidekiq-status (= 2.1.3)
+  sidekiq-unique-jobs (= 7.1.31)
   simplecov (= 0.22.0)
   sitemap_generator (~> 6.3)
   slackistrano (= 0.1.9)
diff --git a/app/workers/refresh_documents_worker.rb b/app/workers/refresh_documents_worker.rb
index a8f689238..a7bb2385e 100644
--- a/app/workers/refresh_documents_worker.rb
+++ b/app/workers/refresh_documents_worker.rb
@@ -1,6 +1,6 @@
 class RefreshDocumentsWorker
   include Sidekiq::Worker
-  sidekiq_options queue: :admin, backtrace: 50, unique: :until_and_while_executing
+  sidekiq_options queue: :admin, backtrace: 50, lock: :until_and_while_executing
 
   def perform
     if DocumentSearch.citations_need_refreshing?
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index dc0b40144..f16373caf 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,9 +1,11 @@
 require 'sidekiq'
 require 'sidekiq-status'
+require "sidekiq-unique-jobs"
 
 Sidekiq.configure_client do |config|
   config.client_middleware do |chain|
     chain.add Sidekiq::Status::ClientMiddleware unless Rails.env.test?
+    chain.add SidekiqUniqueJobs::Middleware::Client
   end
   config.redis = {
     url: Rails.application.secrets.redis['url']
@@ -13,11 +15,15 @@
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
     chain.add Sidekiq::Status::ServerMiddleware, expiration: 30.minutes
+    chain.add SidekiqUniqueJobs::Middleware::Server
   end
   config.client_middleware do |chain|
     chain.add Sidekiq::Status::ClientMiddleware unless Rails.env.test?
+    chain.add SidekiqUniqueJobs::Middleware::Client
   end
   config.redis = {
     url: Rails.application.secrets.redis['url']
   }
+
+  SidekiqUniqueJobs::Server.configure(config)
 end

From f3d2dbb3b85b84fa23f2e852c9aeeb383fb73eb9 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 13:14:55 +0000
Subject: [PATCH 047/241] type_cast_from_database

---
 app/models/common_name.rb             | 3 +--
 app/models/document_batch.rb          | 3 +--
 lib/modules/search_param_sanitiser.rb | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/models/common_name.rb b/app/models/common_name.rb
index 130a0689e..11290709e 100644
--- a/app/models/common_name.rb
+++ b/app/models/common_name.rb
@@ -33,7 +33,6 @@ def self.english_to_pdf(common_name)
   # might need to be reviewed: TODO
   def convention_language
     value = self[:convention_language]
-    ActiveRecord::Type::Boolean.new.type_cast_from_database(value) # Rails 4
-    # ActiveRecord::Type::Boolean.new.cast(value) # TODO Rails 5
+    ActiveRecord::Type::Boolean.new.cast(value)
   end
 end
diff --git a/app/models/document_batch.rb b/app/models/document_batch.rb
index 29821bfa4..f861b01ce 100644
--- a/app/models/document_batch.rb
+++ b/app/models/document_batch.rb
@@ -51,8 +51,7 @@ def initialize_documents(documents_attributes, files)
   def common_attributes
     # Coalesce nil to false, because there is a NOT NULL constraint on this field,
     # with a DEFAULT of FALSE. (This was not required prior to Rails 4.2).
-    is_public = ActiveRecord::Type::Boolean.new.type_cast_from_database(@is_public) || false # Rails 4
-    # is_public = ActiveRecord::Type::Boolean.new.cast(@is_public) || false # TODO Rails 5
+    is_public = ActiveRecord::Type::Boolean.new.cast(@is_public) || false
 
     {
       'event_id' => @event_id,
diff --git a/lib/modules/search_param_sanitiser.rb b/lib/modules/search_param_sanitiser.rb
index 852cb7dd7..e33a63418 100644
--- a/lib/modules/search_param_sanitiser.rb
+++ b/lib/modules/search_param_sanitiser.rb
@@ -15,8 +15,7 @@ def sanitise_symbol(s, default = nil)
   end
 
   def sanitise_boolean(b, default = nil)
-    b && ActiveRecord::Type::Boolean.new.type_cast_from_database(b) || default # Rails 4
-    # b && ActiveRecord::Type::Boolean.new.cast(b) || default # TODO Rails 5
+    b && ActiveRecord::Type::Boolean.new.cast(b) || default
   end
 
   def sanitise_positive_integer(i, default = nil)

From da7959726556ff7caf3dc0cf571ae26388f2fd78 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 14:01:07 +0000
Subject: [PATCH 048/241] fix DEPRECATION WARNING

---
 app/models/taxon_concept.rb                            |  2 +-
 app/models/trade/inclusion_validation_rule.rb          | 10 +++++-----
 app/models/trade/sandbox.rb                            |  2 +-
 .../taxon_concept_appendix_year_validation_rule.rb     |  8 ++++----
 spec/models/trade/sandbox_spec.rb                      |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index a8819254b..916cf0516 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -33,7 +33,7 @@
 class TaxonConcept < ApplicationRecord
   extend Mobility
   include TrackWhoDoesIt
-  has_paper_trail class_name: 'TaxonConceptVersion', on: :destroy,
+  has_paper_trail versions: { class_name: "TaxonConceptVersion" }, on: :destroy,
     meta: {
       taxon_concept_id: :id,
       taxonomy_name: :taxonomy_name,
diff --git a/app/models/trade/inclusion_validation_rule.rb b/app/models/trade/inclusion_validation_rule.rb
index e92c98658..17c4038d9 100644
--- a/app/models/trade/inclusion_validation_rule.rb
+++ b/app/models/trade/inclusion_validation_rule.rb
@@ -80,7 +80,7 @@ def validation_errors_for_shipment(shipment)
     return nil unless shipment_in_scope?(shipment)
     # if it is, check if it has a match in valid values view
     v = Arel::Table.new(valid_values_view)
-    arel_nodes = shipments_columns.map { |c| v[c].eq(shipment.send(c)) }
+    arel_nodes = shipments_columns.map { |c| v[c].eq(Arel::Nodes::Quoted.new(shipment.send(c))) }
     return nil if Trade::Shipment.find_by_sql(v.project(Arel.star).where(arel_nodes.inject(&:and))).any?
     error_message
   end
@@ -190,11 +190,11 @@ def scoped_records_arel(s)
     scope_nodes = sanitized_sandbox_scope.map do |scope_column, scope_def|
       tmp = []
       if scope_def['inclusion']
-        inclusion_nodes = scope_def['inclusion'].map { |value| s[scope_column].eq(value) }
+        inclusion_nodes = scope_def['inclusion'].map { |value| s[scope_column].eq(Arel::Nodes::Quoted.new(value)) }
         tmp << inclusion_nodes.inject(&:or)
       end
       if scope_def['exclusion']
-        exclusion_nodes = scope_def['exclusion'].map { |value| s[scope_column].not_eq(value) }
+        exclusion_nodes = scope_def['exclusion'].map { |value| s[scope_column].not_eq(Arel::Nodes::Quoted.new(value)) }
         tmp << exclusion_nodes.inject(&:or)
       end
       if scope_def['blank']
@@ -216,11 +216,11 @@ def matching_records_arel(table_name)
     v = Arel::Table.new(valid_values_view)
     arel_nodes = column_names_for_matching.map do |c|
       if required_column_names.include? c
-        v[c].eq(s[c])
+        v[c].eq(Arel::Nodes::Quoted.new(s[c]))
       else
         # if optional, check if NULL is allowed for this particular combination
         # e.g. unit code can be blank only if paired with certain terms
-        v[c].eq(s[c]).or(v[c].eq(nil).and(s[c].eq(nil)))
+        v[c].eq(Arel::Nodes::Quoted.new(s[c])).or(v[c].eq(nil).and(s[c].eq(nil)))
       end
     end
     valid_values = s.project(s[Arel.star]).join(v).on(arel_nodes.inject(&:and))
diff --git a/app/models/trade/sandbox.rb b/app/models/trade/sandbox.rb
index 6c90f1a40..14178b730 100644
--- a/app/models/trade/sandbox.rb
+++ b/app/models/trade/sandbox.rb
@@ -70,7 +70,7 @@ def shipments=(new_shipments)
   private
 
   def create_target_table
-    unless Trade::SandboxTemplate.connection.table_exists? @table_name
+    unless Trade::SandboxTemplate.connection.data_source_exists? @table_name
       Thread.new do
         begin
           Trade::SandboxTemplate.connection.execute(
diff --git a/app/models/trade/taxon_concept_appendix_year_validation_rule.rb b/app/models/trade/taxon_concept_appendix_year_validation_rule.rb
index 838972afa..13224e432 100644
--- a/app/models/trade/taxon_concept_appendix_year_validation_rule.rb
+++ b/app/models/trade/taxon_concept_appendix_year_validation_rule.rb
@@ -21,11 +21,11 @@ def validation_errors_for_shipment(shipment)
     return nil unless shipment_in_scope?(shipment)
     # if it is, check if it has a match in valid values view
     v = Arel::Table.new(valid_values_view)
-    appendix_node = v['appendix'].eq(shipment.appendix)
+    appendix_node = v['appendix'].eq(Arel::Nodes::Quoted.new(shipment.appendix))
     effective_from = Arel::Nodes::NamedFunction.new "DATE_PART", [Arel::Nodes.build_quoted("year"), v['effective_from']]
     effective_to = Arel::Nodes::NamedFunction.new "DATE_PART", [Arel::Nodes.build_quoted("year"), v['effective_to']]
     year_node = effective_from.lteq(shipment.year).and(effective_to.gteq(shipment.year).or(effective_to.eq(nil)))
-    taxon_concept_node = v['taxon_concept_id'].eq(shipment.taxon_concept_id)
+    taxon_concept_node = v['taxon_concept_id'].eq(Arel::Nodes::Quoted.new(shipment.taxon_concept_id))
     conditions = appendix_node.and(year_node).and(taxon_concept_node)
     return nil if Trade::Shipment.find_by_sql(v.project(Arel.star).where(conditions)).any?
     error_message
@@ -41,11 +41,11 @@ def year_join_node(s, v)
   end
 
   def taxon_concept_join_node(s, v)
-    s['taxon_concept_id'].eq(v['taxon_concept_id'])
+    s['taxon_concept_id'].eq(Arel::Nodes::Quoted.new(v['taxon_concept_id']))
   end
 
   def appendix_join_node(s, v)
-    s['appendix'].eq(v['appendix'])
+    s['appendix'].eq(Arel::Nodes::Quoted.new(v['appendix']))
   end
 
   # Difference from superclass: rather than equality, check if appendix
diff --git a/spec/models/trade/sandbox_spec.rb b/spec/models/trade/sandbox_spec.rb
index 8d4d705a4..9ea19b3dd 100644
--- a/spec/models/trade/sandbox_spec.rb
+++ b/spec/models/trade/sandbox_spec.rb
@@ -47,7 +47,7 @@
     specify {
       sandbox_klass = Trade::SandboxTemplate.ar_klass(subject.table_name)
       subject.destroy
-      expect(ApplicationRecord.connection.table_exists?('trade_sandbox_1')).to be_falsey
+      expect(ApplicationRecord.connection.data_source_exists?('trade_sandbox_1')).to be_falsey
     }
   end
 

From b58875dd63cd27bb9b0473730c5fbf5a881ce06f Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 14:36:54 +0000
Subject: [PATCH 049/241] fix DEPRECATION WARNING

---
 app/controllers/species/exports_controller.rb | 3 ++-
 app/models/cites_suspension_notification.rb   | 2 +-
 app/models/document_observer.rb               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/species/exports_controller.rb b/app/controllers/species/exports_controller.rb
index 9357b4c17..bdb95ae04 100644
--- a/app/controllers/species/exports_controller.rb
+++ b/app/controllers/species/exports_controller.rb
@@ -55,7 +55,8 @@ def set_csv_separator
 
   def ensure_data_type_and_filters
     unless params[:data_type] && params[:filters]
-      render(:nothing => true, :status => :unprocessable_entity) && (return false)
+      head :unprocessable_entity
+      false
     end
   end
 end
diff --git a/app/models/cites_suspension_notification.rb b/app/models/cites_suspension_notification.rb
index 1c2e2aad1..0bf6af6ff 100644
--- a/app/models/cites_suspension_notification.rb
+++ b/app/models/cites_suspension_notification.rb
@@ -44,7 +44,7 @@ def handle_new_subtype
   end
 
   def self.bases_for_suspension
-    select(:subtype).uniq
+    select(:subtype).distinct
   end
 
   private
diff --git a/app/models/document_observer.rb b/app/models/document_observer.rb
index 91a70706e..923f37b42 100644
--- a/app/models/document_observer.rb
+++ b/app/models/document_observer.rb
@@ -20,7 +20,7 @@ def sync_sort_index(document)
           document.sort_index
         )
       else
-        document.secondary_language_documents(true).each do |d|
+        document.secondary_language_documents.reload.each do |d|
           d.update_attribute(
             :sort_index,
             document.sort_index

From 46c8e90c71fe465f568c0008338f480fd4909480 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 14:56:56 +0000
Subject: [PATCH 050/241] fix rails 5 load lib issue
 (https://gist.github.com/maxivak/381f1e964923f1d469c8d39da8e2522f)

---
 .rubocop.yml                                  |  1 -
 app/models/distribution.rb                    | 11 ++++++++--
 config/application.rb                         |  5 ++++-
 config/initializers/normalise_blank_values.rb | 21 -------------------
 4 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 config/initializers/normalise_blank_values.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 34250ebe7..791673bba 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -31,7 +31,6 @@ Style/IndentationConsistency:
   EnforcedStyle: normal
   Exclude:
     - 'db/migrate/*'
-    - 'config/initializers/normalise_blank_values.rb'
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: symmetrical, new_line, same_line
diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index 42c456265..b432395ff 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -20,8 +20,6 @@ class Distribution < ApplicationRecord
 
   acts_as_taggable
 
-  normalise_blank_values
-
   belongs_to :geo_entity
   belongs_to :taxon_concept
   has_many :distribution_references, :dependent => :destroy
@@ -33,6 +31,7 @@ class Distribution < ApplicationRecord
   accepts_nested_attributes_for :references, :allow_destroy => true
 
   validates :taxon_concept_id, :uniqueness => { :scope => :geo_entity_id, :message => 'already has this distribution' }
+  before_save :normalise_blank_values
 
   def add_existing_references(ids)
     reference_ids = ids.split(",")
@@ -48,4 +47,12 @@ def add_existing_references(ids)
       end
     end
   end
+
+  private
+
+  def normalise_blank_values
+    attributes.each do |column, value|
+      self[column].present? || self[column] = nil
+    end
+  end
 end
diff --git a/config/application.rb b/config/application.rb
index ac6df23f1..5c3977435 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,9 +13,12 @@ class Application < Rails::Application
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
+    # @see https://gist.github.com/maxivak/381f1e964923f1d469c8d39da8e2522f
+    # TODO: Rails 7.1 https://stackoverflow.com/a/77198784/556780
     # Custom directories with classes and modules you want to be autoloadable.
     # config.autoload_paths += %W(#{config.root}/extras)
-    config.autoload_paths += %W(#{config.root}/lib/modules)
+    config.autoload_paths << Rails.root.join("lib", "modules")
+    config.eager_load_paths << Rails.root.join("lib", "modules")
 
     # Activate observers that should always be running.
     config.active_record.observers = :destroy_observer, :annotation_observer,
diff --git a/config/initializers/normalise_blank_values.rb b/config/initializers/normalise_blank_values.rb
deleted file mode 100644
index 6dbb58c2b..000000000
--- a/config/initializers/normalise_blank_values.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module NormaliseBlankValues extend ActiveSupport::Concern
-
-  def self.included(base)
-    base.extend ClassMethods
-  end
-
-  def normalise_blank_values
-    attributes.each do |column, value|
-      self[column].present? || self[column] = nil
-    end
-  end
-
-  module ClassMethods
-    def normalise_blank_values
-      before_save :normalise_blank_values
-    end
-  end
-
-end
-
-ApplicationRecord.send(:include, NormaliseBlankValues)

From b8489b9b6b21dec0425d145a006c3cfb373b481f Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 15:18:47 +0000
Subject: [PATCH 051/241] add comment

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index d8a2f70fc..9cb554d05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,7 @@ gem 'groupdate', '5.2.4' # TODO: can upgrade after rails 5.2 and newer ruby 2.6
 gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
 
+# TODO: need Sidekiq 6 and Rails 6, before we can migrate worker to job, due to sidekiq_options (https://github.com/sidekiq/sidekiq/issues/4281)
 gem 'sidekiq', '5.2.10' # TODO, Ruby 2.7 need version 6.0.5 sidekiq
 gem 'sidekiq-status', '2.1.3' # TODO: upgrade to v3 when Sidekiq upgrade to 6
 gem 'sidekiq-unique-jobs', '7.1.31' # TODO: can upgrade to latest when sidekiq upgrade to 7

From af15a878cc1969b68e2da96ac6897276666bcac0 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 15:37:45 +0000
Subject: [PATCH 052/241] change "from_value" to "from_clause.value"

---
 .../m_taxon_concept_filter_by_appendix_population_query.rb      | 2 +-
 app/models/m_taxon_concept_filter_by_appendix_query.rb          | 2 +-
 app/models/m_taxon_concept_filter_by_id_with_descendants.rb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/m_taxon_concept_filter_by_appendix_population_query.rb b/app/models/m_taxon_concept_filter_by_appendix_population_query.rb
index bb45216a4..eb1624a8f 100644
--- a/app/models/m_taxon_concept_filter_by_appendix_population_query.rb
+++ b/app/models/m_taxon_concept_filter_by_appendix_population_query.rb
@@ -6,7 +6,7 @@ def initialize(relation, appendix_abbreviations, geo_entities_ids = [])
     @original_geo_entities_ids = geo_entities_ids
     @geo_entities_ids = GeoEntity.nodes_and_descendants(geo_entities_ids).map(&:id)
     @geo_entities_in_clause = @geo_entities_ids.compact.join(',')
-    @table = @relation.from_value ? @relation.from_value.first : 'taxon_concepts_mview'
+    @table = @relation.from_clause.value || 'taxon_concepts_mview'
   end
 
   def relation(designation_name = 'CITES')
diff --git a/app/models/m_taxon_concept_filter_by_appendix_query.rb b/app/models/m_taxon_concept_filter_by_appendix_query.rb
index fa0cee115..08d540cef 100644
--- a/app/models/m_taxon_concept_filter_by_appendix_query.rb
+++ b/app/models/m_taxon_concept_filter_by_appendix_query.rb
@@ -3,7 +3,7 @@ class MTaxonConceptFilterByAppendixQuery
   def initialize(relation = MTaxonConcept.all, appendix_abbreviations = [])
     @relation = relation
     @appendix_abbreviations = appendix_abbreviations
-    @table = @relation.from_value ? @relation.from_value.first : 'taxon_concepts_mview'
+    @table = @relation.from_clause.value || 'taxon_concepts_mview'
   end
 
   def initialize_species_listings_conditions(designation_name = 'CITES')
diff --git a/app/models/m_taxon_concept_filter_by_id_with_descendants.rb b/app/models/m_taxon_concept_filter_by_id_with_descendants.rb
index 9c9e3fb84..6ae92e2b8 100644
--- a/app/models/m_taxon_concept_filter_by_id_with_descendants.rb
+++ b/app/models/m_taxon_concept_filter_by_id_with_descendants.rb
@@ -3,7 +3,7 @@ class MTaxonConceptFilterByIdWithDescendants
   def initialize(relation, ids)
     @relation = relation || MTaxonConcept.all
     @ids = ids
-    @table = @relation.from_value ? @relation.from_value.first : 'taxon_concepts_mview'
+    @table = @relation.from_clause.value || 'taxon_concepts_mview'
   end
 
   def relation(ancestor_ranks = nil)

From 7f9cf288c95c0f1524ea3bc915692219ed638c4b Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 16:10:00 +0000
Subject: [PATCH 053/241] 
 https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/19792/diffs

---
 app/models/trade/batch_update.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trade/batch_update.rb b/app/models/trade/batch_update.rb
index 16af73263..81b7b2592 100644
--- a/app/models/trade/batch_update.rb
+++ b/app/models/trade/batch_update.rb
@@ -20,7 +20,7 @@ def execute(update_params)
     affected_shipments = nil
     Trade::Shipment.transaction do
       affected_shipments = @shipments.count
-      @shipments.update_all(update_params)
+      @shipments.update_all(update_params.to_h)
       DownloadsCacheCleanupWorker.perform_async(:shipments)
     end
     PermitCleanupWorker.perform_async(disconnected_permits_ids)

From 9fc36189ad5854738267b1da24b2faaea6a943bf Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 16:10:17 +0000
Subject: [PATCH 054/241] fix spec (strong params)

---
 .../admin/taxon_concept_references_controller_spec.rb     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/admin/taxon_concept_references_controller_spec.rb b/spec/controllers/admin/taxon_concept_references_controller_spec.rb
index b6808948e..9e761bdc3 100644
--- a/spec/controllers/admin/taxon_concept_references_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concept_references_controller_spec.rb
@@ -22,7 +22,9 @@
       xhr :post, :create,
         :taxon_concept_id => @taxon_concept.id,
         :taxon_concept_reference => {
-          :reference_attributes => {}
+          :reference_attributes => {
+            dummy: 'test'
+          }
         }
       expect(response).to render_template("new")
     end
@@ -71,7 +73,9 @@
         :taxon_concept_id => @taxon_concept.id,
         :id => @taxon_concept_reference.id,
         :taxon_concept_reference => {
-          :reference_attributes => {}
+          :reference_attributes => {
+            dummy: 'test'
+          }
         }
       expect(response).to render_template('new')
     end

From a4d172c02192ebb55d2f51302dd070c8e2d850ad Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 16:10:44 +0000
Subject: [PATCH 055/241] fix strong params to hash

---
 app/models/species/csv_copy_export.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/species/csv_copy_export.rb b/app/models/species/csv_copy_export.rb
index 010aa9f06..24fc0fdcf 100644
--- a/app/models/species/csv_copy_export.rb
+++ b/app/models/species/csv_copy_export.rb
@@ -51,9 +51,13 @@ def initialize_csv_separator(csv_separator)
   end
 
   def initialize_file_name
-    digest = Digest::SHA1.hexdigest(
-      @filters.to_hash.symbolize_keys!.sort.to_s
-    )
+    value =
+      if @filters.is_a?(ActionController::Parameters)
+        @filters.permit!.to_hash.symbolize_keys!.sort.to_s
+      else
+        @filters.to_hash.symbolize_keys!.sort.to_s
+      end
+    digest = Digest::SHA1.hexdigest(value)
     # Include locale string to differentiate cached files.
     locale_string = I18n.locale&.to_s
     @file_name = "#{path}#{digest}#{locale_string}.csv"

From 38cd2f7e8e8ad1d65f7a1dc69f03608c6046233b Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 16:48:28 +0000
Subject: [PATCH 056/241] rename variables, more readable, and easier under
 byebug console

---
 app/models/trade/inclusion_validation_rule.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/models/trade/inclusion_validation_rule.rb b/app/models/trade/inclusion_validation_rule.rb
index 17c4038d9..aaab9438b 100644
--- a/app/models/trade/inclusion_validation_rule.rb
+++ b/app/models/trade/inclusion_validation_rule.rb
@@ -212,19 +212,18 @@ def scoped_records_arel(s)
   # The valid_values_view should have the same column names and data types as
   # the sandbox columns specified in column_names.
   def matching_records_arel(table_name)
-    s = Arel::Table.new("#{table_name}_view")
-    v = Arel::Table.new(valid_values_view)
-    arel_nodes = column_names_for_matching.map do |c|
-      if required_column_names.include? c
-        v[c].eq(Arel::Nodes::Quoted.new(s[c]))
+    table_s = Arel::Table.new("#{table_name}_view")
+    table_v = Arel::Table.new(valid_values_view)
+    arel_nodes = column_names_for_matching.map do |column_name|
+      if required_column_names.include?(column_name)
+        table_v[column_name].eq(table_s[column_name])
       else
         # if optional, check if NULL is allowed for this particular combination
         # e.g. unit code can be blank only if paired with certain terms
-        v[c].eq(Arel::Nodes::Quoted.new(s[c])).or(v[c].eq(nil).and(s[c].eq(nil)))
+        table_v[column_name].eq(table_s[column_name]).or(table_v[column_name].eq(nil).and(table_s[column_name].eq(nil)))
       end
     end
-    valid_values = s.project(s[Arel.star]).join(v).on(arel_nodes.inject(&:and))
-    scoped_records_arel(s).except(valid_values)
+    valid_values = table_s.project(table_s[Arel.star]).join(table_v).on(arel_nodes.inject(&:and))
+    scoped_records_arel(table_s).except(valid_values)
   end
-
 end

From e841b6b8aa6a57fa6989685e65575c4583fa1604 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 17:06:33 +0000
Subject: [PATCH 057/241] rollback part of
 894a3e9bf49a4a7aa0e98954dbe12b4ea526c483

---
 app/models/trade/inclusion_validation_rule.rb             | 6 +++---
 .../trade/taxon_concept_appendix_year_validation_rule.rb  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/trade/inclusion_validation_rule.rb b/app/models/trade/inclusion_validation_rule.rb
index aaab9438b..10472969a 100644
--- a/app/models/trade/inclusion_validation_rule.rb
+++ b/app/models/trade/inclusion_validation_rule.rb
@@ -80,7 +80,7 @@ def validation_errors_for_shipment(shipment)
     return nil unless shipment_in_scope?(shipment)
     # if it is, check if it has a match in valid values view
     v = Arel::Table.new(valid_values_view)
-    arel_nodes = shipments_columns.map { |c| v[c].eq(Arel::Nodes::Quoted.new(shipment.send(c))) }
+    arel_nodes = shipments_columns.map { |c| v[c].eq(shipment.send(c)) }
     return nil if Trade::Shipment.find_by_sql(v.project(Arel.star).where(arel_nodes.inject(&:and))).any?
     error_message
   end
@@ -190,11 +190,11 @@ def scoped_records_arel(s)
     scope_nodes = sanitized_sandbox_scope.map do |scope_column, scope_def|
       tmp = []
       if scope_def['inclusion']
-        inclusion_nodes = scope_def['inclusion'].map { |value| s[scope_column].eq(Arel::Nodes::Quoted.new(value)) }
+        inclusion_nodes = scope_def['inclusion'].map { |value| s[scope_column].eq(value) }
         tmp << inclusion_nodes.inject(&:or)
       end
       if scope_def['exclusion']
-        exclusion_nodes = scope_def['exclusion'].map { |value| s[scope_column].not_eq(Arel::Nodes::Quoted.new(value)) }
+        exclusion_nodes = scope_def['exclusion'].map { |value| s[scope_column].not_eq(value) }
         tmp << exclusion_nodes.inject(&:or)
       end
       if scope_def['blank']
diff --git a/app/models/trade/taxon_concept_appendix_year_validation_rule.rb b/app/models/trade/taxon_concept_appendix_year_validation_rule.rb
index 13224e432..838972afa 100644
--- a/app/models/trade/taxon_concept_appendix_year_validation_rule.rb
+++ b/app/models/trade/taxon_concept_appendix_year_validation_rule.rb
@@ -21,11 +21,11 @@ def validation_errors_for_shipment(shipment)
     return nil unless shipment_in_scope?(shipment)
     # if it is, check if it has a match in valid values view
     v = Arel::Table.new(valid_values_view)
-    appendix_node = v['appendix'].eq(Arel::Nodes::Quoted.new(shipment.appendix))
+    appendix_node = v['appendix'].eq(shipment.appendix)
     effective_from = Arel::Nodes::NamedFunction.new "DATE_PART", [Arel::Nodes.build_quoted("year"), v['effective_from']]
     effective_to = Arel::Nodes::NamedFunction.new "DATE_PART", [Arel::Nodes.build_quoted("year"), v['effective_to']]
     year_node = effective_from.lteq(shipment.year).and(effective_to.gteq(shipment.year).or(effective_to.eq(nil)))
-    taxon_concept_node = v['taxon_concept_id'].eq(Arel::Nodes::Quoted.new(shipment.taxon_concept_id))
+    taxon_concept_node = v['taxon_concept_id'].eq(shipment.taxon_concept_id)
     conditions = appendix_node.and(year_node).and(taxon_concept_node)
     return nil if Trade::Shipment.find_by_sql(v.project(Arel.star).where(conditions)).any?
     error_message
@@ -41,11 +41,11 @@ def year_join_node(s, v)
   end
 
   def taxon_concept_join_node(s, v)
-    s['taxon_concept_id'].eq(Arel::Nodes::Quoted.new(v['taxon_concept_id']))
+    s['taxon_concept_id'].eq(v['taxon_concept_id'])
   end
 
   def appendix_join_node(s, v)
-    s['appendix'].eq(Arel::Nodes::Quoted.new(v['appendix']))
+    s['appendix'].eq(v['appendix'])
   end
 
   # Difference from superclass: rather than equality, check if appendix

From 33acfc5e143dd9c4a9fb26dce367c0bfed83782c Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 17:47:38 +0000
Subject: [PATCH 058/241] fix: strong params behaviour changed

---
 app/models/species/eu_decisions_export.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/species/eu_decisions_export.rb b/app/models/species/eu_decisions_export.rb
index 6f8c4a5ef..a67fa0f8e 100644
--- a/app/models/species/eu_decisions_export.rb
+++ b/app/models/species/eu_decisions_export.rb
@@ -97,8 +97,8 @@ def sql_columns
   # Produces list of excluded decision types.
   # e.g. SUSPENSIONS,SRG_REFERRAL
   def excluded_decision_types
-    @excluded_decision_types ||= @decision_types.map do |key, value|
+    @excluded_decision_types ||= @decision_types&.map do |key, value|
       value == 'false' ? key.singularize.underscore.upcase : nil
-    end.compact
+    end&.compact || []
   end
 end

From e6482a8df8cbb048a85db18bc0e840de606c875c Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 21:33:09 +0000
Subject: [PATCH 059/241] fix carrierwave strange behaviour for test

---
 spec/factories/documents.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/factories/documents.rb b/spec/factories/documents.rb
index 7ff3ff966..0911c13e1 100644
--- a/spec/factories/documents.rb
+++ b/spec/factories/documents.rb
@@ -17,6 +17,15 @@
     factory :commission_note, class: Document::CommissionNotes do
       type 'Document::CommissionNotes'
     end
+
+    # After upgrade to Rails 5 and Carrierwave 2, using factory syntax `filename { Rack::Test::UploadedFile.new(...) }`
+    # doesn't write the file to the correct location in the file system for unknown reason.
+    # This hacking callback copy the file to the correct location.
+    after :create do |document|
+      dummy_path = File.join(Rails.root, 'spec', 'support', 'annual_report_upload_exporter.csv')
+      FileUtils.mkdir_p(document.filename.store_dir)
+      FileUtils.cp(dummy_path, document.filename.store_dir)
+    end
   end
 
   factory :document_citation do

From b938396c7b19016ebafd7526fa5e62a2060bb5a7 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 19 Jan 2024 22:11:16 +0000
Subject: [PATCH 060/241] bugs fix

---
 app/models/trade/sandbox_template.rb                            | 2 +-
 .../admin/nomenclature_changes/lump_controller_spec.rb          | 2 +-
 .../admin/nomenclature_changes/split_controller_spec.rb         | 2 +-
 .../admin/nomenclature_changes/status_swap_controller_spec.rb   | 2 +-
 .../nomenclature_changes/status_to_accepted_controller_spec.rb  | 2 +-
 .../nomenclature_changes/status_to_synonym_controller_spec.rb   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/trade/sandbox_template.rb b/app/models/trade/sandbox_template.rb
index 8cf874b12..7222cf4e1 100644
--- a/app/models/trade/sandbox_template.rb
+++ b/app/models/trade/sandbox_template.rb
@@ -117,7 +117,7 @@ def self.update_batch(updates, validation_error, annual_report_upload)
           return unless updates
           updates[:updated_at] = Time.now
           records_for_batch_operation(validation_error, annual_report_upload).
-            update_all(updates)
+            update_all(updates.to_h)
           sanitize
         end
 
diff --git a/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
index 3a619f7c4..111cc6ec8 100644
--- a/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
@@ -112,7 +112,7 @@
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @lump.id, id: 'summary'
+          put :update, nomenclature_change_id: @lump.id, id: 'summary', nomenclature_change_lump: { dummy: 'test' }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
diff --git a/spec/controllers/admin/nomenclature_changes/split_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/split_controller_spec.rb
index f2bc0f750..597db0be6 100644
--- a/spec/controllers/admin/nomenclature_changes/split_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/split_controller_spec.rb
@@ -165,7 +165,7 @@
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @split.id, id: 'summary'
+          put :update, nomenclature_change_id: @split.id, id: 'summary', nomenclature_change_split: { dummy: 'test' }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
diff --git a/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
index 7fc49a850..46a37f0eb 100644
--- a/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
@@ -106,7 +106,7 @@
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary'
+          put :update, nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_swap: { dummy: 'test' }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
diff --git a/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
index 90416ae2b..3525dfa56 100644
--- a/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
@@ -79,7 +79,7 @@
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary'
+          put :update, nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_to_accepted: { dummy: 'test' }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
diff --git a/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
index 07370ae57..b6e59b4d7 100644
--- a/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
@@ -84,7 +84,7 @@
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary'
+          put :update, nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_to_synonym: { dummy: 'test' }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end

From 62dcc20a530572ed5ef02d259b17df2d50d7a9f9 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 09:32:44 +0000
Subject: [PATCH 061/241] matching_criteria is no longer a hash

---
 app/models/trade/inclusion_validation_rule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trade/inclusion_validation_rule.rb b/app/models/trade/inclusion_validation_rule.rb
index 10472969a..f7f25cc13 100644
--- a/app/models/trade/inclusion_validation_rule.rb
+++ b/app/models/trade/inclusion_validation_rule.rb
@@ -21,7 +21,7 @@ class Trade::InclusionValidationRule < Trade::ValidationRule
 
   def matching_records_for_aru_and_error(annual_report_upload, validation_error)
     @query = matching_records(annual_report_upload).where(
-      "#{Arel::Nodes.build_quoted(validation_error.matching_criteria.to_json).to_sql}::JSONB @> (#{jsonb_matching_criteria_for_comparison})::JSONB"
+      "#{Arel::Nodes.build_quoted(validation_error.matching_criteria).to_sql}::JSONB @> (#{jsonb_matching_criteria_for_comparison})::JSONB"
     )
   end
 

From 21dbbc7fe4027657e756b7212252059298c93fde Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 13:27:58 +0000
Subject: [PATCH 062/241] test status code of response instead of mock, and
 migrate away from DEPRECATION WARNING: `:nothing` option is deprecated and
 will be removed in Rails 5.1.

---
 app/controllers/api/v1/documents_controller.rb    | 6 ++----
 spec/controllers/api/documents_controller_spec.rb | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/v1/documents_controller.rb b/app/controllers/api/v1/documents_controller.rb
index 679022083..32fab4383 100644
--- a/app/controllers/api/v1/documents_controller.rb
+++ b/app/controllers/api/v1/documents_controller.rb
@@ -125,13 +125,11 @@ def access_denied?
   end
 
   def render_404
-    render file: "#{Rails.root}/public/404", layout: false, formats: [:html],
-    status: 404
+    head 404
   end
 
   def render_403
-    render file: "#{Rails.root}/public/403", layout: false, formats: [:html],
-    status: 403
+    head 403
   end
 
 end
diff --git a/spec/controllers/api/documents_controller_spec.rb b/spec/controllers/api/documents_controller_spec.rb
index 268ed686a..fcc7d00bb 100644
--- a/spec/controllers/api/documents_controller_spec.rb
+++ b/spec/controllers/api/documents_controller_spec.rb
@@ -83,8 +83,8 @@ def get_public_documents
   context "show action fails" do
     login_api_user
     it "should return 403 status when permission denied" do
-      expect(controller).to receive(:render_403) { controller.render nothing: true }
       get :show, id: @document2.id
+      expect(response.status).to eq(403)
     end
   end
 
@@ -99,8 +99,8 @@ def get_public_documents
     context "single document selected" do
       it "should return 404 if file is missing" do
         expect(File).to receive(:exists?).and_return(false)
-        expect(controller).to receive(:render_404) { controller.render nothing: true }
         get :download_zip, ids: @document2.id
+        expect(response.status).to eq(404)
       end
       it "should return zip file if file is found" do
         allow(controller).to receive(:render)
@@ -113,8 +113,8 @@ def get_public_documents
     context "multiple documents selected" do
       it "should return 404 if all files are missing" do
         expect(File).to receive(:exists?).and_return(false, false)
-        expect(controller).to receive(:render_404) { controller.render nothing: true }
         get :download_zip, ids: "#{@document.id},#{@document2.id}"
+        expect(response.status).to eq(404)
       end
 
       it "should return zip file if at least a file is found" do

From 9e0d0ce9cb93eeaadfaad1c52ad6c46c7d7a1ed6 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 22 Jan 2024 09:44:06 +0000
Subject: [PATCH 063/241] fix: two fixes for failing tests of
 NomenclatureChange::ReassignmentCopyProcessor

---
 app/models/distribution.rb                                 | 7 +++++++
 config/initializers/active_record_comparison_attributes.rb | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index b432395ff..8d2402dc4 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -55,4 +55,11 @@ def normalise_blank_values
       self[column].present? || self[column] = nil
     end
   end
+
+  # `ignored_attributes` is used by ComparisonAttributes when identifying
+  # duplicate records. Attributes in this list won't be considered when
+  # determining if the record is a duplicate.
+  def self.ignored_attributes
+    super() + [:tag_list]
+  end
 end
diff --git a/config/initializers/active_record_comparison_attributes.rb b/config/initializers/active_record_comparison_attributes.rb
index 4d447b50c..8904f31e7 100644
--- a/config/initializers/active_record_comparison_attributes.rb
+++ b/config/initializers/active_record_comparison_attributes.rb
@@ -59,3 +59,9 @@ def duplicates(comparison_attributes_override)
 end
 
 ApplicationRecord.send :include, ComparisonAttributes
+
+# Since Rails 5, our base class has changed and is no longer ActiveRecord::Base,
+# but is now ApplicationRecord. However ActsAsTaggableOn still has
+# ActiveRecord::Base as a base class, therefore it needs to be done separately.
+# It's possible that more ActsAsTaggableOn:: classes need this treatment.
+ActsAsTaggableOn::Tagging.send :include, ComparisonAttributes

From 3af52b411b3a579f93042147e51caef9b899c03e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 12:12:22 +0000
Subject: [PATCH 064/241] try to make in generic

---
 app/models/distribution.rb                               | 7 -------
 .../initializers/active_record_comparison_attributes.rb  | 9 ++++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index 8d2402dc4..b432395ff 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -55,11 +55,4 @@ def normalise_blank_values
       self[column].present? || self[column] = nil
     end
   end
-
-  # `ignored_attributes` is used by ComparisonAttributes when identifying
-  # duplicate records. Attributes in this list won't be considered when
-  # determining if the record is a duplicate.
-  def self.ignored_attributes
-    super() + [:tag_list]
-  end
 end
diff --git a/config/initializers/active_record_comparison_attributes.rb b/config/initializers/active_record_comparison_attributes.rb
index 8904f31e7..5d74a9270 100644
--- a/config/initializers/active_record_comparison_attributes.rb
+++ b/config/initializers/active_record_comparison_attributes.rb
@@ -6,7 +6,14 @@ def self.included(base)
 
   module ClassMethods
     def ignored_attributes
-      [:id, :created_at, :updated_at, :created_by_id, :updated_by_id, :original_id]
+      attr_to_ignore = [:id, :created_at, :updated_at, :created_by_id, :updated_by_id, :original_id]
+      # When upgrade `acts_as_taggable` gem from version 5 to 8.1, we found that
+      #  `attributes` now return `xxx_list` as well. Put them in ignore list.
+      # `ignored_attributes` is used by ComparisonAttributes when identifying
+      # duplicate records. Attributes in this list won't be considered when
+      # determining if the record is a duplicate.
+      attr_to_ignore += tag_types.map{|t| "#{t.to_s.singularize}_list" } if taggable?
+      attr_to_ignore
     end
 
     def text_attributes

From 2e904481307eef308bffdb81ea43b07bcb167918 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 22 Jan 2024 12:42:57 +0000
Subject: [PATCH 065/241] Revert "matching_criteria is no longer a hash"

This reverts commit 0becfe6f470a501b1d4e0f391a626890c3ca4a0e.

The issue was with the setup in the spec, not the code
---
 app/models/trade/inclusion_validation_rule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trade/inclusion_validation_rule.rb b/app/models/trade/inclusion_validation_rule.rb
index f7f25cc13..10472969a 100644
--- a/app/models/trade/inclusion_validation_rule.rb
+++ b/app/models/trade/inclusion_validation_rule.rb
@@ -21,7 +21,7 @@ class Trade::InclusionValidationRule < Trade::ValidationRule
 
   def matching_records_for_aru_and_error(annual_report_upload, validation_error)
     @query = matching_records(annual_report_upload).where(
-      "#{Arel::Nodes.build_quoted(validation_error.matching_criteria).to_sql}::JSONB @> (#{jsonb_matching_criteria_for_comparison})::JSONB"
+      "#{Arel::Nodes.build_quoted(validation_error.matching_criteria.to_json).to_sql}::JSONB @> (#{jsonb_matching_criteria_for_comparison})::JSONB"
     )
   end
 

From 708a6539b380c2af1432e7e054f9a5ed55d1026e Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 22 Jan 2024 12:12:12 +0000
Subject: [PATCH 066/241] fix: since Rails 5 this test was inserting a json
 string instead of a json object

---
 spec/models/trade/inclusion_validation_rule_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/trade/inclusion_validation_rule_spec.rb b/spec/models/trade/inclusion_validation_rule_spec.rb
index f7c4676a1..4d34c840a 100644
--- a/spec/models/trade/inclusion_validation_rule_spec.rb
+++ b/spec/models/trade/inclusion_validation_rule_spec.rb
@@ -53,7 +53,7 @@
         :validation_error,
         annual_report_upload_id: annual_report_upload.id,
         validation_rule_id: validation_rule.id,
-        matching_criteria: "{\"taxon_name\": \"Caniis lupus\"}",
+        matching_criteria: { "taxon_name": "Caniis lupus" },
         is_ignored: false,
         is_primary: true,
         error_message: "taxon_name Caniis lupus is invalid",
@@ -90,7 +90,7 @@
         :validation_error,
         annual_report_upload_id: annual_report_upload.id,
         validation_rule_id: validation_rule.id,
-        matching_criteria: "{\"taxon_name\": \"Caniis lupus\"}",
+        matching_criteria: { "taxon_name": "Caniis lupus" },
         is_ignored: false,
         is_primary: true,
         error_message: "taxon_name Caniis lupus is invalid",

From 815f91aa65edacac22bd841943edac0891f5216e Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 22 Jan 2024 12:23:36 +0000
Subject: [PATCH 067/241] fix: more instances of unnecessarily stringified JSON
 objects

---
 spec/controllers/trade/sandbox_shipments_controller_spec.rb | 2 +-
 spec/controllers/trade/validation_errors_controller_spec.rb | 2 +-
 spec/factories/trade.rb                                     | 2 +-
 spec/models/trade/sandbox_filter_spec.rb                    | 2 +-
 spec/models/trade/sandbox_template_spec.rb                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/controllers/trade/sandbox_shipments_controller_spec.rb b/spec/controllers/trade/sandbox_shipments_controller_spec.rb
index 50522a923..54f0fa32c 100644
--- a/spec/controllers/trade/sandbox_shipments_controller_spec.rb
+++ b/spec/controllers/trade/sandbox_shipments_controller_spec.rb
@@ -24,7 +24,7 @@
       :validation_error,
       annual_report_upload_id: annual_report_upload.id,
       validation_rule_id: create_taxon_concept_appendix_year_validation.id,
-      matching_criteria: "{\"taxon_concept_id\": #{@species.id}, \"appendix\": \"I\", \"year\": 2016}",
+      matching_criteria: { "taxon_concept_id": @species.id, "appendix": "I", "year": 2016 },
       is_ignored: false,
       is_primary: false,
       error_message: "taxon_name Acipenser baerii with appendix I with year 2016 is invalid",
diff --git a/spec/controllers/trade/validation_errors_controller_spec.rb b/spec/controllers/trade/validation_errors_controller_spec.rb
index 67446caeb..5a28659aa 100644
--- a/spec/controllers/trade/validation_errors_controller_spec.rb
+++ b/spec/controllers/trade/validation_errors_controller_spec.rb
@@ -22,7 +22,7 @@
       :validation_error,
       annual_report_upload_id: annual_report_upload.id,
       validation_rule_id: validation_rule.id,
-      matching_criteria: "{\"taxon_name\": \"Caniis lupus\"}",
+      matching_criteria: { "taxon_name": "Caniis lupus" },
       is_ignored: false,
       is_primary: true,
       error_message: "taxon_name Caniis lupus is invalid",
diff --git a/spec/factories/trade.rb b/spec/factories/trade.rb
index c78ecdbba..b80fe2a95 100644
--- a/spec/factories/trade.rb
+++ b/spec/factories/trade.rb
@@ -52,7 +52,7 @@
   factory :validation_error, :class => Trade::ValidationError do
     annual_report_upload
     validation_rule
-    matching_criteria '{}'
+    matching_criteria {}
     is_ignored false
   end
 
diff --git a/spec/models/trade/sandbox_filter_spec.rb b/spec/models/trade/sandbox_filter_spec.rb
index ddf98a9f7..3c3cb5bca 100644
--- a/spec/models/trade/sandbox_filter_spec.rb
+++ b/spec/models/trade/sandbox_filter_spec.rb
@@ -46,7 +46,7 @@
       :validation_error,
       annual_report_upload_id: annual_report_upload.id,
       validation_rule_id: validation_rule.id,
-      matching_criteria: "{\"taxon_concept_id\": #{canis_lupus.id}, \"appendix\": \"III\", \"year\": 2016}",
+      matching_criteria: { "taxon_concept_id": canis_lupus.id, "appendix": "III", "year": 2016 },
       is_ignored: false,
       is_primary: false,
       error_message: "taxon_name Canis lupus with appendix III with year 2016 is invalid",
diff --git a/spec/models/trade/sandbox_template_spec.rb b/spec/models/trade/sandbox_template_spec.rb
index dbfb09c2d..8fbc73953 100644
--- a/spec/models/trade/sandbox_template_spec.rb
+++ b/spec/models/trade/sandbox_template_spec.rb
@@ -68,7 +68,7 @@
         :validation_error,
         annual_report_upload_id: annual_report_upload.id,
         validation_rule_id: validation_rule.id,
-        matching_criteria: "{\"taxon_name\": \"Caniis lupus\"}",
+        matching_criteria: { "taxon_name": "Caniis lupus" },
         is_ignored: false,
         is_primary: true,
         error_message: "taxon_name Caniis lupus is invalid",

From c67a103193defafdcb109bc571c825fd408c16c7 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 19:12:55 +0000
Subject: [PATCH 068/241] DEPRECATION WARNING: Returning `false` in Active
 Record and Active Model callbacks will not implicitly halt a callback chain
 in Rails 5.1. To explicitly halt the callback chain, please use `throw
 :abort` instead.

---
 app/models/cites_tc.rb                            | 2 +-
 app/models/destroy_observer.rb                    | 2 +-
 app/models/trade/annual_report_upload_observer.rb | 3 ++-
 config/initializers/new_framework_defaults.rb     | 3 ---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/models/cites_tc.rb b/app/models/cites_tc.rb
index a946cdae1..de490f173 100644
--- a/app/models/cites_tc.rb
+++ b/app/models/cites_tc.rb
@@ -42,7 +42,7 @@ def self.elibrary_document_types
   def check_for_documents
     if documents.present?
       errors.add(:base, "failed. Please delete the associated documents before destroying this event.")
-      return false
+      throw :abort
     end
   end
 
diff --git a/app/models/destroy_observer.rb b/app/models/destroy_observer.rb
index 8777d4ae2..fbca07ebd 100644
--- a/app/models/destroy_observer.rb
+++ b/app/models/destroy_observer.rb
@@ -12,7 +12,7 @@ def before_destroy(model)
         msg << " (dependent objects present: #{model.dependent_objects.join(', ')})"
       end
       model.errors.add(:base, msg)
-      return false
+      throw :abort
     end
   end
 end
diff --git a/app/models/trade/annual_report_upload_observer.rb b/app/models/trade/annual_report_upload_observer.rb
index e52ca3794..adfa0b6a0 100644
--- a/app/models/trade/annual_report_upload_observer.rb
+++ b/app/models/trade/annual_report_upload_observer.rb
@@ -5,6 +5,7 @@ def after_create(annual_report_upload)
   end
 
   def before_destroy(annual_report_upload)
-    annual_report_upload.sandbox && annual_report_upload.sandbox.destroy
+    success = annual_report_upload.sandbox && annual_report_upload.sandbox.destroy
+    throw(:abort) unless success
   end
 end
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
index e8d3249f8..77ad2f1e0 100644
--- a/config/initializers/new_framework_defaults.rb
+++ b/config/initializers/new_framework_defaults.rb
@@ -16,6 +16,3 @@
 
 # Require `belongs_to` associations by default. Previous versions had false.
 Rails.application.config.active_record.belongs_to_required_by_default = false
-
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = true

From 08e793c4643552decd39c4f750460de232e0a81d Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 20:35:50 +0000
Subject: [PATCH 069/241] latest rubocop and auto fix rspec style

---
 .rubocop.yml                                  |  40 +++---
 Gemfile                                       |   4 +-
 Gemfile.lock                                  |  36 ++++--
 .../admin/change_types_controller_spec.rb     |   2 +-
 .../cites_suspensions_controller_spec.rb      |  25 ++--
 .../admin/designations_controller_spec.rb     |   2 +-
 .../admin/distributions_controller_spec.rb    |   4 +-
 .../admin/document_batches_controller_spec.rb |  24 ++--
 .../admin/documents_controller_spec.rb        |  54 ++++----
 .../admin/eu_opinions_controller_spec.rb      | 107 +++++----------
 .../admin/eu_suspensions_controller_spec.rb   |   7 +-
 .../admin/event_documents_controller_spec.rb  |   6 +-
 .../admin/events_controller_spec.rb           |   2 +-
 .../admin/exports_controller_spec.rb          |  24 ++--
 .../admin/geo_entities_controller_spec.rb     |   2 +-
 .../hybrid_relationships_controller_spec.rb   |   4 +-
 .../admin/instruments_controller_spec.rb      |   4 +-
 .../admin/languages_controller_spec.rb        |   2 +-
 .../admin/listing_changes_controller_spec.rb  |   9 +-
 .../lump_controller_spec.rb                   |  35 +++--
 .../split_controller_spec.rb                  |  63 +++++----
 .../status_swap_controller_spec.rb            |  23 ++--
 .../status_to_accepted_controller_spec.rb     |  17 ++-
 .../status_to_synonym_controller_spec.rb      |  19 ++-
 .../nomenclature_changes_controller_spec.rb   |   2 +-
 .../admin/ranks_controller_spec.rb            |   2 +-
 .../admin/references_controller_spec.rb       |   2 +-
 .../admin/species_listings_controller_spec.rb |   2 +-
 .../admin/srg_histories_controller_spec.rb    |  13 +-
 .../synonym_relationships_controller_spec.rb  |   4 +-
 .../controllers/admin/tags_controller_spec.rb |   2 +-
 ...taxon_cites_suspensions_controller_spec.rb |  41 +++---
 .../admin/taxon_commons_controller_spec.rb    |  11 +-
 .../taxon_concept_comments_controller_spec.rb |  11 +-
 ...axon_concept_references_controller_spec.rb |   4 +-
 .../admin/taxon_concepts_controller_spec.rb   |  20 ++-
 .../taxon_eu_suspensions_controller_spec.rb   |  66 ++++------
 .../taxon_listing_changes_controller_spec.rb  |  78 +++--------
 .../admin/taxon_quotas_controller_spec.rb     |  45 +++----
 .../taxon_relationships_controller_spec.rb    |  14 +-
 .../admin/taxonomies_controller_spec.rb       |   4 +-
 ...ade_names_relationships_controller_spec.rb |   4 +-
 .../admin/users_controller_spec.rb            |   2 +-
 ...complete_taxon_concepts_controller_spec.rb |   7 +-
 .../document_geo_entities_controller_spec.rb  |   4 +-
 .../api/documents_controller_spec.rb          |  20 +--
 .../api/geo_entities_controller_spec.rb       |   4 +-
 .../api/taxon_concepts_controller_spec.rb     |  14 +-
 .../checklist/geo_entities_controller_spec.rb |   4 +-
 .../cites_trade/exports_controller_spec.rb    |  10 +-
 .../cites_trade/shipments_controller_spec.rb  |  28 ++--
 .../registrations_controller_spec.rb          |  20 +--
 .../species/exports_controller_spec.rb        |  24 ++--
 .../annual_report_uploads_controller_spec.rb  |   4 +-
 .../trade/exports_controller_spec.rb          |   8 +-
 .../sandbox_shipments_controller_spec.rb      |  25 +---
 .../trade/shipments_controller_spec.rb        | 122 ++++++------------
 .../validation_errors_controller_spec.rb      |   8 +-
 spec/integration/login_spec.rb                |   8 +-
 59 files changed, 468 insertions(+), 684 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 791673bba..e3c5256a3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,13 @@
-inherit_from: .rubocop_todo.yml
+# inherit_from: .rubocop_todo.yml
+require:
+  - rubocop-rails
+  - rubocop-rspec
 
+Rails:
+  Enabled: true
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.5
+  TargetRailsVersion: 5.0
   Exclude:
     - 'lib/tasks/bbgem.rake'
     - 'db/schema.rb'
@@ -12,34 +18,24 @@ Style/StringLiterals:
 
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: outdent, indent
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: indent
 
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Style/IndentArray:
-  EnforcedStyle: consistent
-
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Style/IndentHash:
-  EnforcedStyle: consistent
-
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: normal, rails
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   EnforcedStyle: normal
   Exclude:
     - 'db/migrate/*'
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: symmetrical, new_line, same_line
-Style/MultilineArrayBraceLayout:
+Layout/MultilineArrayBraceLayout:
   EnforcedStyle: symmetrical
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: symmetrical, new_line, same_line
-Style/MultilineHashBraceLayout:
+Layout/MultilineHashBraceLayout:
   EnforcedStyle: symmetrical
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -52,33 +48,33 @@ Style/AndOr:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: leading, trailing
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
 
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Style/ExtraSpacing:
+Layout/ExtraSpacing:
   AllowForAlignment: true
   Exclude:
     - 'db/migrate/*'
 
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Style/FirstParameterIndentation:
+Layout/FirstParameterIndentation:
   Enabled: true
 
 # Configuration parameters: Width.
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Exclude:
     - 'db/migrate/*'
 
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
 # SupportedStyles: space, no_space
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: space
   EnforcedStyleForEmptyBraces: no_space
 
 # Configuration parameters: AllowForAlignment.
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   AllowForAlignment: true
 
 # Configuration parameters: AllowIfMethodIsEmpty.
diff --git a/Gemfile b/Gemfile
index 9cb554d05..deba4e57b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -108,7 +108,9 @@ group :development do
   gem 'brightbox', '2.3.9'
   gem 'rack-cors', '0.3.0' ,:require => 'rack/cors' # TODO: remove when upgrade Rails.
   gem 'jslint_on_rails', '1.1.1'
-  gem 'rubocop', '0.40.0', require: false
+  # gem 'rubocop', '0.40.0', require: false
+  gem 'rubocop-rails'
+  gem 'rubocop-rspec'
   gem 'rbnacl', '4.0.2'
   gem 'rbnacl-libsodium', '1.0.16'
   gem 'bcrypt_pbkdf', '1.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 59ec2e488..b78ac9356 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -315,8 +315,10 @@ GEM
     paper_trail (10.3.1)
       activerecord (>= 4.2)
       request_store (~> 1.1)
-    parser (2.7.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
     pdf-reader (1.4.1)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
@@ -330,7 +332,6 @@ GEM
       activerecord (>= 4.2)
       activesupport (>= 4.2)
     power_assert (2.0.3)
-    powerpack (0.1.3)
     prawn (0.13.2)
       pdf-reader (~> 1.2)
       ruby-rc4
@@ -376,8 +377,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
@@ -403,6 +403,7 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.10.0)
       redis (>= 4, < 6)
+    regexp_parser (2.9.0)
     request_store (1.4.1)
       rack (>= 1.4)
     responders (2.4.1)
@@ -412,6 +413,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -435,12 +437,23 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.12.1)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (1.28.2)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-rails (2.14.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.10.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby-vips (2.2.0)
@@ -521,7 +534,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.9.1)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.5.0)
     uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -616,7 +629,8 @@ DEPENDENCIES
   rest-client (= 1.8.0)
   rspec-collection_matchers (~> 1.2, >= 1.2.1)
   rspec-rails (= 4.1.1)
-  rubocop (= 0.40.0)
+  rubocop-rails
+  rubocop-rspec
   rubyzip (~> 2.3, >= 2.3.2)
   sass-rails (~> 5.0)
   sidekiq (= 5.2.10)
diff --git a/spec/controllers/admin/change_types_controller_spec.rb b/spec/controllers/admin/change_types_controller_spec.rb
index 1326a485c..f6b834c94 100644
--- a/spec/controllers/admin/change_types_controller_spec.rb
+++ b/spec/controllers/admin/change_types_controller_spec.rb
@@ -45,7 +45,7 @@
   describe "DELETE destroy" do
     let(:change_type) { create(:change_type) }
     it "redirects after delete" do
-      delete :destroy, :id => change_type.id
+      delete :destroy, params: { :id => change_type.id }
       expect(response).to redirect_to(admin_change_types_url)
     end
   end
diff --git a/spec/controllers/admin/cites_suspensions_controller_spec.rb b/spec/controllers/admin/cites_suspensions_controller_spec.rb
index 49e8c22e8..460775465 100644
--- a/spec/controllers/admin/cites_suspensions_controller_spec.rb
+++ b/spec/controllers/admin/cites_suspensions_controller_spec.rb
@@ -35,17 +35,16 @@
   describe "POST create" do
     context "when successful" do
       it "renders index" do
-        post :create,
-          :cites_suspension => {
+        post :create, params: { :cites_suspension => {
             :start_notification_id => create_cites_suspension_notification.id
-          }
+          } }
         expect(response).to redirect_to(
           admin_cites_suspensions_url
         )
       end
     end
     it "renders new when not successful" do
-      post :create, :cites_suspension => { dummy: 'test'}
+      post :create, params: { :cites_suspension => { dummy: 'test'} }
       expect(response).to render_template("new")
     end
   end
@@ -58,14 +57,14 @@
       )
     end
     it "renders the edit template" do
-      get :edit, :id => @cites_suspension.id
+      get :edit, params: { :id => @cites_suspension.id }
       expect(response).to render_template('edit')
     end
     it "assigns @geo_entities (country and territory) with two objects" do
       geo_entity_type_t = create(:geo_entity_type, :name => "TERRITORY")
       territory = create(:geo_entity, :geo_entity_type_id => geo_entity_type_t.id)
       country = create(:geo_entity)
-      get :new, :id => @cites_suspension.id
+      get :new, params: { :id => @cites_suspension.id }
       expect(assigns(:geo_entities).size).to eq(2)
     end
   end
@@ -80,11 +79,9 @@
 
     context "when successful" do
       it "redirects to taxon_concepts cites suspensions page" do
-        put :update,
-          :cites_suspension => {
+        put :update, params: { :cites_suspension => {
             :publication_date => 1.week.ago
-          },
-          :id => @cites_suspension.id
+          }, :id => @cites_suspension.id }
         expect(response).to redirect_to(
           admin_cites_suspensions_url
         )
@@ -92,11 +89,9 @@
     end
 
     it "renders edit when not successful" do
-      put :update,
-        :cites_suspension => {
+      put :update, params: { :cites_suspension => {
           :start_notification_id => nil
-        },
-        :id => @cites_suspension.id
+        }, :id => @cites_suspension.id }
       expect(response).to render_template('edit')
     end
   end
@@ -109,7 +104,7 @@
       )
     end
     it "redirects after delete" do
-      delete :destroy, :id => @cites_suspension.id
+      delete :destroy, params: { :id => @cites_suspension.id }
       expect(response).to redirect_to(
         admin_cites_suspensions_url
       )
diff --git a/spec/controllers/admin/designations_controller_spec.rb b/spec/controllers/admin/designations_controller_spec.rb
index 16d75c220..a263b967e 100644
--- a/spec/controllers/admin/designations_controller_spec.rb
+++ b/spec/controllers/admin/designations_controller_spec.rb
@@ -54,7 +54,7 @@
   describe "DELETE destroy" do
     let(:designation) { create(:designation) }
     it "redirects after delete" do
-      delete :destroy, :id => designation.id
+      delete :destroy, params: { :id => designation.id }
       expect(response).to redirect_to(admin_designations_url)
     end
   end
diff --git a/spec/controllers/admin/distributions_controller_spec.rb b/spec/controllers/admin/distributions_controller_spec.rb
index 08665f8e0..eea765708 100644
--- a/spec/controllers/admin/distributions_controller_spec.rb
+++ b/spec/controllers/admin/distributions_controller_spec.rb
@@ -94,9 +94,7 @@
   describe "DELETE destroy" do
     let(:distribution) { create(:distribution, :taxon_concept_id => @taxon_concept.id) }
     it "redirects after delete" do
-      delete :destroy,
-        :taxon_concept_id => @taxon_concept.id,
-        :id => distribution.id
+      delete :destroy, params: { :taxon_concept_id => @taxon_concept.id, :id => distribution.id }
       expect(response).to redirect_to(
         admin_taxon_concept_distributions_url(distribution.taxon_concept)
       )
diff --git a/spec/controllers/admin/document_batches_controller_spec.rb b/spec/controllers/admin/document_batches_controller_spec.rb
index 5fb0a73e7..b3838e393 100644
--- a/spec/controllers/admin/document_batches_controller_spec.rb
+++ b/spec/controllers/admin/document_batches_controller_spec.rb
@@ -35,31 +35,31 @@
 
       it "creates a new Document" do
         expect {
-          post :create, document_batch: {
+          post :create, params: { document_batch: {
             date: Date.today, documents_attributes: { "0" => document_attrs }, files: files
-          }
+          } }
         }.to change(Document, :count).by(1)
       end
 
       it "redirects to index when successful" do
-        post :create, document_batch: {
+        post :create, params: { document_batch: {
           date: Date.today, documents_attributes: { "0" => document_attrs }, files: files
-        }
+        } }
         expect(response).to redirect_to(admin_documents_url)
       end
 
       it "does not create a new Document" do
         expect {
-          post :create, document_batch: {
+          post :create, params: { document_batch: {
             date: nil, documents_attributes: { "0" => document_attrs }, files: files
-          }
+          } }
         }.to change(Document, :count).by(0)
       end
 
       it "renders new when not successful" do
-        post :create, document_batch: {
+        post :create, params: { document_batch: {
           date: nil, documents_attributes: { "0" => document_attrs }, files: files
-        }
+        } }
         expect(response).to render_template('new')
       end
     end
@@ -68,16 +68,16 @@
       let(:document) { create(:document, event_id: event.id) }
 
       it "redirects to index when successful" do
-        post :create, event_id: event.id, document_batch: {
+        post :create, params: { event_id: event.id, document_batch: {
           date: Date.today, documents_attributes: { "0" => document_attrs }, files: files
-        }
+        } }
         expect(response).to redirect_to(admin_event_documents_url(event))
       end
 
       it "renders new when not successful" do
-        post :create, event_id: event.id, document_batch: {
+        post :create, params: { event_id: event.id, document_batch: {
           date: nil, documents_attributes: { "0" => document_attrs }, files: files
-        }
+        } }
         expect(response).to render_template('new')
       end
     end
diff --git a/spec/controllers/admin/documents_controller_spec.rb b/spec/controllers/admin/documents_controller_spec.rb
index 2039145a4..5bd9d5f4e 100644
--- a/spec/controllers/admin/documents_controller_spec.rb
+++ b/spec/controllers/admin/documents_controller_spec.rb
@@ -33,35 +33,35 @@
 
       context "search" do
         it "runs a full text search on title" do
-          get :index, 'title_query' => 'good'
+          get :index, params: { 'title_query' => 'good' }
           expect(assigns(:documents)).to eq([@document2])
         end
         it "retrieves documents inclusive of the given start date" do
-          get :index, "document_date_start" => '25/12/2014'
+          get :index, params: { "document_date_start" => '25/12/2014' }
           expect(assigns(:documents)).to eq([@public_document, @document2, @document1])
         end
         it "retrieves documents inclusive of the given end date" do
-          get :index, "document_date_end" => '01/01/2014'
+          get :index, params: { "document_date_end" => '01/01/2014' }
           expect(assigns(:documents)).to eq([@document3])
         end
         it "retrieves documents after the given date" do
-          get :index, "document_date_start" => '10/01/2014'
+          get :index, params: { "document_date_start" => '10/01/2014' }
           expect(assigns(:documents)).to eq([@public_document, @document2, @document1])
         end
         it "retrieves documents before the given date" do
-          get :index, "document_date_end" => '10/01/2014'
+          get :index, params: { "document_date_end" => '10/01/2014' }
           expect(assigns(:documents)).to eq([@document3])
         end
         it "ignores invalid dates" do
-          get :index, "document_date_start" => '34/24/12', "document_date_end" => '34/24/12'
+          get :index, params: { "document_date_start" => '34/24/12', "document_date_end" => '34/24/12' }
           expect(assigns(:documents)).to eq([@document3, @public_document, @document2, @document1])
         end
         it "retrieves documents for taxon concept" do
-          get :index, "taxon_concepts_ids" => taxon_concept.id
+          get :index, params: { "taxon_concepts_ids" => taxon_concept.id }
           expect(assigns(:documents)).to eq([@public_document, @document1])
         end
         it "retrieves documents for geo entity" do
-          get :index, "geo_entities_ids" => [geo_entity.id]
+          get :index, params: { "geo_entities_ids" => [geo_entity.id] }
           expect(assigns(:documents)).to eq([@document2])
         end
         context 'by proposal outcome' do
@@ -71,7 +71,7 @@
             DocumentSearch.refresh_citations_and_documents
           end
           it "retrieves documents for tag" do
-            get :index, "document_tags_ids" => [proposal_outcome.id]
+            get :index, params: { "document_tags_ids" => [proposal_outcome.id] }
             expect(assigns(:documents).map(&:id)).to eq([@document3].map(&:id))
           end
         end
@@ -82,11 +82,11 @@
             DocumentSearch.refresh_citations_and_documents
           end
           it "retrieves documents for review_phase tag" do
-            get :index, "document_tags_ids" => [review_phase.id]
+            get :index, params: { "document_tags_ids" => [review_phase.id] }
             expect(assigns(:documents).map(&:id)).to eq([@document3].map(&:id))
           end
           it "retrieves documents for process_stage tag" do
-            get :index, "document_tags_ids" => [process_stage.id]
+            get :index, params: { "document_tags_ids" => [process_stage.id] }
             expect(assigns(:documents).map(&:id)).to eq([@document3].map(&:id))
           end
         end
@@ -101,13 +101,13 @@
 
       context "when event" do
         it "renders the event/documents/index template" do
-          get :index, events_ids: [event.id]
+          get :index, params: { events_ids: [event.id] }
           expect(response).to render_template('admin/event_documents/index')
         end
         it "assigns @documents for event, sorted by title" do
           @document3 = create(:document, title: 'CC hello world', event: event2)
           DocumentSearch.refresh_citations_and_documents
-          get :index, events_ids: [event.id, event2.id]
+          get :index, params: { events_ids: [event.id, event2.id] }
           expect(assigns(:documents)).to eq([@document3, @document2, @document1, @public_document])
         end
       end
@@ -127,7 +127,7 @@
     let(:document) { create(:document, tags: document_tags) }
 
     it "renders the edit template" do
-      get :edit, id: document.id
+      get :edit, params: { id: document.id }
       expect(response).to render_template('new')
     end
   end
@@ -137,12 +137,12 @@
     context "when no event" do
       let(:document) { create(:document) }
       it "redirects to index when successful" do
-        put :update, id: document.id, document: { date: Date.today }
+        put :update, params: { id: document.id, document: { date: Date.today } }
         expect(response).to redirect_to(admin_documents_url)
         expect(flash[:notice]).not_to be_nil
       end
       it "renders new when not successful" do
-        put :update, id: document.id, document: { date: nil }
+        put :update, params: { id: document.id, document: { date: nil } }
         expect(response).to render_template('new')
       end
     end
@@ -150,12 +150,12 @@
     context "when event" do
       let(:document) { create(:document, event_id: event.id) }
       it "redirects to index when successful" do
-        put :update, id: document.id, event_id: event.id, document: { date: Date.today }
+        put :update, params: { id: document.id, event_id: event.id, document: { date: Date.today } }
         expect(response).to redirect_to(admin_event_documents_url(event))
         expect(flash[:notice]).not_to be_nil
       end
       it "renders new when not successful" do
-        put :update, id: document.id, event_id: event.id, document: { date: nil }
+        put :update, params: { id: document.id, event_id: event.id, document: { date: nil } }
         expect(response).to render_template('new')
       end
     end
@@ -167,27 +167,27 @@
       let(:recommended_category) { "A wonderful category" }
 
       it "assign review phase to Review" do
-        put :update, id: document.id, document: {
+        put :update, params: { id: document.id, document: {
           date: Date.today, review_details_attributes: { review_phase_id: review_phase.id }
-        }
+        } }
         expect(response).to redirect_to(admin_documents_url)
 
         expect(document.reload.review_details.review_phase_id).to eq(review_phase.id)
       end
 
       it "assign process stage to Review" do
-        put :update, id: document.id, document: {
+        put :update, params: { id: document.id, document: {
           date: Date.today, review_details_attributes: { process_stage_id: process_stage.id }
-        }
+        } }
         expect(response).to redirect_to(admin_documents_url)
 
         expect(document.reload.review_details.process_stage_id).to eq(process_stage.id)
       end
 
       it "assign recommended category to Review" do
-        put :update, id: document.id, document: {
+        put :update, params: { id: document.id, document: {
           date: Date.today, review_details_attributes: { recommended_category: recommended_category }
-        }
+        } }
         expect(response).to redirect_to(admin_documents_url)
 
         expect(document.reload.review_details.recommended_category).to eq(recommended_category)
@@ -199,9 +199,9 @@
       let(:proposal_outcome) { create(:document_tag, type: 'DocumentTag::ProposalOutcome') }
 
       it "assign outcome to Proposal" do
-        put :update, id: document.id, document: {
+        put :update, params: { id: document.id, document: {
           date: Date.today, proposal_details_attributes: { proposal_outcome_id: proposal_outcome.id }
-        }
+        } }
         expect(response).to redirect_to(admin_documents_url)
 
         expect(document.reload.proposal_details.proposal_outcome_id).to eq(proposal_outcome.id)
@@ -224,7 +224,7 @@
       document
     }
     it "redirects after delete" do
-      delete :destroy, id: document.id
+      delete :destroy, params: { id: document.id }
       expect(response).to redirect_to(admin_documents_url)
     end
   end
diff --git a/spec/controllers/admin/eu_opinions_controller_spec.rb b/spec/controllers/admin/eu_opinions_controller_spec.rb
index ed1911c10..f089573c4 100644
--- a/spec/controllers/admin/eu_opinions_controller_spec.rb
+++ b/spec/controllers/admin/eu_opinions_controller_spec.rb
@@ -10,24 +10,24 @@
 
   describe "GET index" do
     it "renders the index template" do
-      get :index, taxon_concept_id: @taxon_concept.id
+      get :index, params: { taxon_concept_id: @taxon_concept.id }
       expect(response).to render_template("index")
     end
     it "renders the taxon_concepts_layout" do
-      get :index, taxon_concept_id: @taxon_concept.id
+      get :index, params: { taxon_concept_id: @taxon_concept.id }
       expect(response).to render_template('layouts/taxon_concepts')
     end
   end
 
   describe "GET new" do
     it "renders the new template" do
-      get :new, taxon_concept_id: @taxon_concept.id
+      get :new, params: { taxon_concept_id: @taxon_concept.id }
       expect(response).to render_template('new')
     end
     it "assigns @geo_entities (country and territory) with two objects" do
       create(:geo_entity, :geo_entity_type_id => territory_geo_entity_type.id)
       create(:geo_entity)
-      get :new, taxon_concept_id: @taxon_concept.id
+      get :new, params: { taxon_concept_id: @taxon_concept.id }
       expect(assigns(:geo_entities).size).to eq(2)
     end
   end
@@ -43,8 +43,7 @@
           @document = create(:commission_note)
         end
         it "redirects to the EU Opinions index" do
-          post :create,
-            eu_opinion: {
+          post :create, params: { eu_opinion: {
               eu_decision_type_id: @eu_decision_type.id,
               srg_history_id: @srg_history.id,
               start_date: Date.today,
@@ -52,15 +51,13 @@
               geo_entity_id: create(
                 :geo_entity, geo_entity_type_id: country_geo_entity_type.id
               )
-            },
-            taxon_concept_id: @taxon_concept.id
+            }, taxon_concept_id: @taxon_concept.id }
           expect(response).to redirect_to(admin_taxon_concept_eu_opinions_url(@taxon_concept))
         end
       end
       context "when event is present" do
         it "redirects to the EU Opinions index" do
-          post :create,
-            eu_opinion: {
+          post :create, params: { eu_opinion: {
               eu_decision_type_id: @eu_decision_type.id,
               srg_history_id: @srg_history.id,
               start_date: Date.today,
@@ -68,8 +65,7 @@
               geo_entity_id: create(
                 :geo_entity, geo_entity_type_id: country_geo_entity_type.id
               )
-            },
-            taxon_concept_id: @taxon_concept.id
+            }, taxon_concept_id: @taxon_concept.id }
           expect(response).to redirect_to(admin_taxon_concept_eu_opinions_url(@taxon_concept))
         end
       end
@@ -77,8 +73,7 @@
 
     context "when not successful" do
       it "renders new" do
-        post :create, eu_opinion: { dummy: 'test' },
-          taxon_concept_id: @taxon_concept.id
+        post :create, params: { eu_opinion: { dummy: 'test' }, taxon_concept_id: @taxon_concept.id }
         expect(response).to render_template("new")
       end
     end
@@ -93,12 +88,12 @@
       )
     end
     it "renders the edit template" do
-      get :edit, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id, start_event_id: @eu_regulation.id
+      get :edit, params: { id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id, start_event_id: @eu_regulation.id }
       expect(response).to render_template('edit')
     end
     it "assigns @geo_entities" do
       territory = create(:geo_entity, geo_entity_type_id: territory_geo_entity_type.id)
-      get :edit, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id, start_event_id: @eu_regulation.id
+      get :edit, params: { id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id, start_event_id: @eu_regulation.id }
       expect(assigns(:geo_entities)).to include(territory)
     end
   end
@@ -118,13 +113,10 @@
     context "when successful" do
       context "when eu decision type is present" do
         it "renders taxon_concepts EU Opinions page" do
-          put :update,
-            eu_opinion: {
+          put :update, params: { eu_opinion: {
               eu_decision_type_id: @eu_decision_type.id,
               start_event_id: @eu_regulation.id
-            },
-            id: @eu_opinion.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to redirect_to(
             admin_taxon_concept_eu_opinions_url(@taxon_concept)
           )
@@ -133,14 +125,11 @@
 
       context "when eu decision type is not present" do
         it "renders taxon_concepts EU Opinions page" do
-          put :update,
-          eu_opinion: {
+          put :update, params: { eu_opinion: {
             eu_decision_type_id: nil,
             srg_history_id: @srg_history.id,
             start_event_id: @eu_regulation.id
-          },
-          id: @eu_opinion.id,
-          taxon_concept_id: @taxon_concept.id
+          }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to redirect_to(
             admin_taxon_concept_eu_opinions_url(@taxon_concept)
           )
@@ -149,13 +138,10 @@
 
       context "when event is present" do
         it "renders taxon_concepts EU Opinions page" do
-          put :update,
-            eu_opinion: {
+          put :update, params: { eu_opinion: {
               eu_decision_type_id: @eu_decision_type.id,
               start_event_id: @eu_regulation.id
-            },
-            id: @eu_opinion.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to redirect_to(
             admin_taxon_concept_eu_opinions_url(@taxon_concept)
           )
@@ -164,14 +150,11 @@
 
       context "when event is not present" do
         it "renders taxon_concepts EU Opinions page" do
-          put :update,
-            eu_opinion: {
+          put :update, params: { eu_opinion: {
               eu_decision_type_id: @eu_decision_type.id,
               start_event_id: nil,
               document_id: @document.id
-            },
-            id: @eu_opinion.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to redirect_to(
             admin_taxon_concept_eu_opinions_url(@taxon_concept)
           )
@@ -182,29 +165,23 @@
     context "when not successful" do
       context "when eu decision type is present" do
         it "renders new" do
-          put :update,
-            eu_opinion: {
+          put :update, params: { eu_opinion: {
               eu_decision_type_id: @eu_decision_type.id,
               start_event_id: @eu_regulation.id,
               start_date: nil
-            },
-            id: @eu_opinion.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to render_template('new')
         end
       end
 
       context "when eu decision type is not present" do
         it "renders new" do
-          put :update,
-            eu_opinion: {
+          put :update, params: { eu_opinion: {
               eu_decision_type_id: nil,
               srg_history_id: @srg_history.id,
               start_event_id: @eu_regulation.id,
               start_date: nil
-            },
-            id: @eu_opinion.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to render_template('new')
         end
       end
@@ -212,73 +189,58 @@
 
     context "when both eu_decision_type and srg_history are empty" do
       it "renders new" do
-        put :update,
-          eu_opinion: {
+        put :update, params: { eu_opinion: {
             eu_decision_type_id: nil,
             srg_history_id: nil,
             start_date: nil
-          },
-          id: @eu_opinion.id,
-          taxon_concept_id: @taxon_concept.id
+          }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
         expect(response).to render_template('new')
       end
     end
 
     context "when event is present" do
       it "renders new" do
-        put :update,
-          eu_opinion: {
+        put :update, params: { eu_opinion: {
             eu_decision_type_id: @eu_decision_type.id,
             start_event_id: @eu_regulation.id,
             start_date: nil
-          },
-          id: @eu_opinion.id,
-          taxon_concept_id: @taxon_concept.id
+          }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
         expect(response).to render_template('new')
       end
     end
 
     context "when event is not present" do
       it "renders new" do
-        put :update,
-          eu_opinion: {
+        put :update, params: { eu_opinion: {
             eu_decision_type_id: @eu_decision_type.id,
             start_event_id: nil,
             document_id: @document.id,
             start_date: nil
-          },
-          id: @eu_opinion.id,
-          taxon_concept_id: @taxon_concept.id
+          }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
         expect(response).to render_template('new')
       end
     end
 
     context "when both event and intersessional doc are empty" do
       it "renders new" do
-        put :update,
-          eu_opinion: {
+        put :update, params: { eu_opinion: {
             eu_decision_type_id: @eu_decision_type.id,
             start_event_id: nil,
             document_id: nil,
             start_date: nil
-          },
-          id: @eu_opinion.id,
-          taxon_concept_id: @taxon_concept.id
+          }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
         expect(response).to render_template('new')
       end
     end
 
     context "when both event and intersessional doc are present" do
       it "renders new" do
-        put :update,
-          eu_opinion: {
+        put :update, params: { eu_opinion: {
             eu_decision_type_id: @eu_decision_type.id,
             start_event_id: @eu_regulation.id,
             document_id: @document.id,
             start_date: nil
-          },
-          id: @eu_opinion.id,
-          taxon_concept_id: @taxon_concept.id
+          }, id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id }
         expect(response).to render_template('new')
       end
     end
@@ -293,8 +255,7 @@
       )
     end
     it "redirects after delete" do
-      delete :destroy, id: @eu_opinion.id,
-        taxon_concept_id: @taxon_concept.id, start_event_id: @eu_regulation.id
+      delete :destroy, params: { id: @eu_opinion.id, taxon_concept_id: @taxon_concept.id, start_event_id: @eu_regulation.id }
       expect(response).to redirect_to(
         admin_taxon_concept_eu_opinions_url(@taxon_concept)
       )
diff --git a/spec/controllers/admin/eu_suspensions_controller_spec.rb b/spec/controllers/admin/eu_suspensions_controller_spec.rb
index 08b9bc48b..c8ad29cac 100644
--- a/spec/controllers/admin/eu_suspensions_controller_spec.rb
+++ b/spec/controllers/admin/eu_suspensions_controller_spec.rb
@@ -11,11 +11,11 @@
 
   describe "GET index" do
     it "renders the index template" do
-      get :index, :eu_suspension_regulation_id => @eu_suspension_regulation
+      get :index, params: { :eu_suspension_regulation_id => @eu_suspension_regulation }
       expect(response).to render_template("index")
     end
     it "renders the admin layout" do
-      get :index, :eu_suspension_regulation_id => @eu_suspension_regulation
+      get :index, params: { :eu_suspension_regulation_id => @eu_suspension_regulation }
       expect(response).to render_template('layouts/admin')
     end
   end
@@ -29,8 +29,7 @@
       )
     end
     it "redirects after delete" do
-      delete :destroy, :id => @eu_suspension.id,
-        :eu_suspension_regulation_id => @eu_suspension_regulation.id
+      delete :destroy, params: { :id => @eu_suspension.id, :eu_suspension_regulation_id => @eu_suspension_regulation.id }
       expect(response).to redirect_to(
         admin_eu_suspension_regulation_eu_suspensions_url(@eu_suspension_regulation)
       )
diff --git a/spec/controllers/admin/event_documents_controller_spec.rb b/spec/controllers/admin/event_documents_controller_spec.rb
index 6474d34ab..0f52d0565 100644
--- a/spec/controllers/admin/event_documents_controller_spec.rb
+++ b/spec/controllers/admin/event_documents_controller_spec.rb
@@ -13,17 +13,17 @@
 
     describe "GET show_order" do
       it "assigns @documents sorted by sort index" do
-        get :show_order, event_id: event.id
+        get :show_order, params: { event_id: event.id }
         expect(assigns(:documents)).to eq([@document2, @document1])
       end
     end
 
     describe "POST update_order" do
       it "updates sort index for collection of documents" do
-        post :update_order, event_id: event.id, documents: {
+        post :update_order, params: { event_id: event.id, documents: {
           "#{@document1.id}" => '1',
           "#{@document2.id}" => '2'
-        }
+        } }
         expect(@document1.reload.sort_index).to eq(1)
         expect(@document2.reload.sort_index).to eq(2)
       end
diff --git a/spec/controllers/admin/events_controller_spec.rb b/spec/controllers/admin/events_controller_spec.rb
index ac8b1ccb1..f7c020846 100644
--- a/spec/controllers/admin/events_controller_spec.rb
+++ b/spec/controllers/admin/events_controller_spec.rb
@@ -70,7 +70,7 @@
   describe "DELETE destroy" do
     let(:event) { create(:event) }
     it "redirects after delete" do
-      delete :destroy, :id => event.id
+      delete :destroy, params: { :id => event.id }
       expect(response).to redirect_to(admin_events_url)
     end
   end
diff --git a/spec/controllers/admin/exports_controller_spec.rb b/spec/controllers/admin/exports_controller_spec.rb
index b26720a5d..ee3225f0c 100644
--- a/spec/controllers/admin/exports_controller_spec.rb
+++ b/spec/controllers/admin/exports_controller_spec.rb
@@ -18,12 +18,12 @@
       it "returns taxon concepts names file" do
         create(:taxon_concept)
         allow_any_instance_of(Species::TaxonConceptsNamesExport).to receive(:public_file_name).and_return('taxon_concepts_names.csv')
-        get :download, :data_type => "Names"
+        get :download, params: { :data_type => "Names" }
         expect(response.content_type).to eq("text/csv")
         expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"")
       end
       it "redirects when no results" do
-        get :download, :data_type => "Names"
+        get :download, params: { :data_type => "Names" }
         expect(response).to redirect_to(admin_exports_path)
       end
     end
@@ -31,12 +31,12 @@
       it "returns CITES_EU taxon concepts names file" do
         create_cites_eu_species
         allow_any_instance_of(Species::TaxonConceptsNamesExport).to receive(:public_file_name).and_return('taxon_concepts_names.csv')
-        get :download, :data_type => "Names", :filters => { :taxonomy => 'CITES_EU' }
+        get :download, params: { :data_type => "Names", :filters => { :taxonomy => 'CITES_EU' } }
         expect(response.content_type).to eq("text/csv")
         expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"")
       end
       it "redirects when no results" do
-        get :download, :data_type => "Names", :filters => { :taxonomy => 'CITES_EU' }
+        get :download, params: { :data_type => "Names", :filters => { :taxonomy => 'CITES_EU' } }
         expect(response).to redirect_to(admin_exports_path)
       end
     end
@@ -44,12 +44,12 @@
       it "returns CMS taxon concepts names file" do
         create_cms_species
         allow_any_instance_of(Species::TaxonConceptsNamesExport).to receive(:public_file_name).and_return('taxon_concepts_names.csv')
-        get :download, :data_type => "Names", :filters => { :taxonomy => 'CMS' }
+        get :download, params: { :data_type => "Names", :filters => { :taxonomy => 'CMS' } }
         expect(response.content_type).to eq("text/csv")
         expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"")
       end
       it "redirects when no results" do
-        get :download, :data_type => "Names", :filters => { :taxonomy => 'CMS' }
+        get :download, params: { :data_type => "Names", :filters => { :taxonomy => 'CMS' } }
         expect(response).to redirect_to(admin_exports_path)
       end
     end
@@ -63,12 +63,12 @@
         tc = create(:taxon_concept)
         create(:distribution, :taxon_concept_id => tc.id)
         allow_any_instance_of(Species::TaxonConceptsDistributionsExport).to receive(:public_file_name).and_return('taxon_concepts_distributions.csv')
-        get :download, :data_type => "Distributions"
+        get :download, params: { :data_type => "Distributions" }
         expect(response.content_type).to eq("text/csv")
         expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"")
       end
       it "redirects when no results" do
-        get :download, :data_type => "Distributions"
+        get :download, params: { :data_type => "Distributions" }
         expect(response).to redirect_to(admin_exports_path)
       end
     end
@@ -77,12 +77,12 @@
         tc = create_cites_eu_species
         create(:distribution, :taxon_concept_id => tc.id)
         allow_any_instance_of(Species::TaxonConceptsDistributionsExport).to receive(:public_file_name).and_return('taxon_concepts_distributions.csv')
-        get :download, :data_type => "Distributions", :filters => { :taxonomy => 'CITES_EU' }
+        get :download, params: { :data_type => "Distributions", :filters => { :taxonomy => 'CITES_EU' } }
         expect(response.content_type).to eq("text/csv")
         expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"")
       end
       it "redirects when no results" do
-        get :download, :data_type => "Distributions", :filters => { :taxonomy => 'CITES_EU' }
+        get :download, params: { :data_type => "Distributions", :filters => { :taxonomy => 'CITES_EU' } }
         expect(response).to redirect_to(admin_exports_path)
       end
     end
@@ -91,12 +91,12 @@
         tc = create_cms_species
         create(:distribution, :taxon_concept_id => tc.id)
         allow_any_instance_of(Species::TaxonConceptsDistributionsExport).to receive(:public_file_name).and_return('taxon_concepts_distributions.csv')
-        get :download, :data_type => "Distributions", :filters => { :taxonomy => 'CMS' }
+        get :download, params: { :data_type => "Distributions", :filters => { :taxonomy => 'CMS' } }
         expect(response.content_type).to eq("text/csv")
         expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"")
       end
       it "redirects when no results" do
-        get :download, :data_type => "Distributions", :filters => { :taxonomy => 'CMS' }
+        get :download, params: { :data_type => "Distributions", :filters => { :taxonomy => 'CMS' } }
         expect(response).to redirect_to(admin_exports_path)
       end
     end
diff --git a/spec/controllers/admin/geo_entities_controller_spec.rb b/spec/controllers/admin/geo_entities_controller_spec.rb
index 12e244d20..98964ee5f 100644
--- a/spec/controllers/admin/geo_entities_controller_spec.rb
+++ b/spec/controllers/admin/geo_entities_controller_spec.rb
@@ -64,7 +64,7 @@
   describe "DELETE destroy" do
     let(:geo_entity) { create(:geo_entity) }
     it "redirects after delete" do
-      delete :destroy, id: geo_entity.id
+      delete :destroy, params: { id: geo_entity.id }
       expect(response).to redirect_to(admin_geo_entities_url)
     end
   end
diff --git a/spec/controllers/admin/hybrid_relationships_controller_spec.rb b/spec/controllers/admin/hybrid_relationships_controller_spec.rb
index 3b6e0337b..e2c8cd23a 100644
--- a/spec/controllers/admin/hybrid_relationships_controller_spec.rb
+++ b/spec/controllers/admin/hybrid_relationships_controller_spec.rb
@@ -79,9 +79,7 @@
 
   describe "DELETE destroy" do
     it "redirects after delete" do
-      delete :destroy,
-        :taxon_concept_id => taxon_concept.id,
-        :id => hybrid_relationship.id
+      delete :destroy, params: { :taxon_concept_id => taxon_concept.id, :id => hybrid_relationship.id }
       expect(response).to redirect_to(
         admin_taxon_concept_names_url(hybrid_relationship.taxon_concept)
       )
diff --git a/spec/controllers/admin/instruments_controller_spec.rb b/spec/controllers/admin/instruments_controller_spec.rb
index 8e9604117..6838baa51 100644
--- a/spec/controllers/admin/instruments_controller_spec.rb
+++ b/spec/controllers/admin/instruments_controller_spec.rb
@@ -54,7 +54,7 @@
   describe "DELETE destroy" do
     let(:instrument) { create(:instrument) }
     it "redirects after delete" do
-      delete :destroy, :id => instrument.id
+      delete :destroy, params: { :id => instrument.id }
       expect(flash[:notice]).not_to be_nil
       expect(flash[:alert]).to be_nil
       expect(response).to redirect_to(admin_instruments_url)
@@ -62,7 +62,7 @@
     let(:instrument2) { create(:instrument) }
     let!(:taxon_instrument) { create(:taxon_instrument, :instrument_id => instrument2.id) }
     it "fails to delete instrument because there are dependent objects" do
-      delete :destroy, :id => instrument2.id
+      delete :destroy, params: { :id => instrument2.id }
       expect(flash[:notice]).to be_nil
       expect(flash[:alert]).not_to be_nil
       expect(instrument2.reload).not_to be_nil
diff --git a/spec/controllers/admin/languages_controller_spec.rb b/spec/controllers/admin/languages_controller_spec.rb
index e6388d2f4..f4824ca0c 100644
--- a/spec/controllers/admin/languages_controller_spec.rb
+++ b/spec/controllers/admin/languages_controller_spec.rb
@@ -42,7 +42,7 @@
   describe "DELETE destroy" do
     let(:language) { create(:language) }
     it "redirects after delete" do
-      delete :destroy, :id => language.id
+      delete :destroy, params: { :id => language.id }
       expect(response).to redirect_to(admin_languages_url)
     end
   end
diff --git a/spec/controllers/admin/listing_changes_controller_spec.rb b/spec/controllers/admin/listing_changes_controller_spec.rb
index bbcc93854..3dc5daab0 100644
--- a/spec/controllers/admin/listing_changes_controller_spec.rb
+++ b/spec/controllers/admin/listing_changes_controller_spec.rb
@@ -42,16 +42,16 @@
         :event_id => @eu_regulation.id,
         :effective_at => 1.week.ago
       )
-      get :index, :eu_regulation_id => @eu_regulation.id
+      get :index, params: { :eu_regulation_id => @eu_regulation.id }
       expect(assigns(:listing_changes)).to eq([listing_change2, listing_change1])
       expect(assigns(:eu_regulation)).to eq @eu_regulation
     end
     it "renders the index template" do
-      get :index, :eu_regulation_id => @eu_regulation.id
+      get :index, params: { :eu_regulation_id => @eu_regulation.id }
       expect(response).to render_template("index")
     end
     it "renders the admin layout" do
-      get :index, :eu_regulation_id => @eu_regulation.id
+      get :index, params: { :eu_regulation_id => @eu_regulation.id }
       expect(response).to render_template('layouts/admin')
     end
   end
@@ -68,8 +68,7 @@
       )
     end
     it "redirects after delete" do
-      delete :destroy, :id => @listing_change.id,
-        :eu_regulation_id => @eu_regulation.id
+      delete :destroy, params: { :id => @listing_change.id, :eu_regulation_id => @eu_regulation.id }
       expect(response).to redirect_to(
         admin_eu_regulation_listing_changes_url(@eu_regulation)
       )
diff --git a/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
index 111cc6ec8..697e22b64 100644
--- a/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/lump_controller_spec.rb
@@ -9,7 +9,7 @@
         @lump = create(:nomenclature_change_lump)
       end
       it 'renders the inputs template' do
-        get :show, id: :inputs, nomenclature_change_id: @lump.id
+        get :show, params: { id: :inputs, nomenclature_change_id: @lump.id }
         expect(response).to render_template('inputs')
       end
     end
@@ -19,7 +19,7 @@
         create(:nomenclature_change_input, nomenclature_change: @lump)
       end
       it 'renders the outputs template' do
-        get :show, id: :outputs, nomenclature_change_id: @lump.id
+        get :show, params: { id: :outputs, nomenclature_change_id: @lump.id }
         expect(response).to render_template('outputs')
       end
     end
@@ -31,7 +31,7 @@
         create(:nomenclature_change_output, nomenclature_change: @lump)
       end
       it 'renders the notes template' do
-        get :show, id: :notes, nomenclature_change_id: @lump.id
+        get :show, params: { id: :notes, nomenclature_change_id: @lump.id }
         expect(response).to render_template('notes')
       end
       context "when legislation present" do
@@ -39,13 +39,13 @@
           create_cites_I_addition(taxon_concept: @input_species)
         end
         it 'renders the legislation template' do
-          get :show, id: :legislation, nomenclature_change_id: @lump.id
+          get :show, params: { id: :legislation, nomenclature_change_id: @lump.id }
           expect(response).to render_template('legislation')
         end
       end
       context "when no legislation" do
         it 'redirects to next step' do
-          get :show, id: :legislation, nomenclature_change_id: @lump.id
+          get :show, params: { id: :legislation, nomenclature_change_id: @lump.id }
           expect(response).to redirect_to(
             admin_nomenclature_change_lump_url(
               nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'summary'
@@ -54,7 +54,7 @@
         end
       end
       it 'renders the summary template' do
-        get :show, id: :summary, nomenclature_change_id: @lump.id
+        get :show, params: { id: :summary, nomenclature_change_id: @lump.id }
         expect(response).to render_template('summary')
       end
     end
@@ -62,7 +62,7 @@
 
   describe 'POST create' do
     it 'redirects to lump wizard' do
-      post :create, nomenclature_change_id: 'new'
+      post :create, params: { nomenclature_change_id: 'new' }
       expect(response).to redirect_to(
         admin_nomenclature_change_lump_url(
           nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'inputs'
@@ -77,12 +77,12 @@
     end
     context 'when successful' do
       it 'redirects to next step' do
-        put :update, nomenclature_change_lump: {
+        put :update, params: { nomenclature_change_lump: {
           inputs_attributes: {
             '0' => { taxon_concept_id: create_cites_eu_species.id },
             '1' => { taxon_concept_id: create_cites_eu_species.id }
           }
-        }, nomenclature_change_id: @lump.id, id: 'inputs'
+        }, nomenclature_change_id: @lump.id, id: 'inputs' }
         expect(response).to redirect_to(
           admin_nomenclature_change_lump_url(
             nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'outputs'
@@ -92,12 +92,11 @@
     end
     context 'when unsuccessful' do
       it 're-renders step' do
-        put :update,
-          nomenclature_change_lump: {
+        put :update, params: { nomenclature_change_lump: {
             inputs_attributes: {
               '0' => { taxon_concept_id: nil }
             }
-          }, nomenclature_change_id: @lump.id, id: 'inputs'
+          }, nomenclature_change_id: @lump.id, id: 'inputs' }
         expect(response).to render_template('inputs')
       end
     end
@@ -105,14 +104,14 @@
       context 'when user is secretariat' do
         login_secretariat_user
         it 'redirects to admin root path' do
-          put :update, nomenclature_change_id: @lump.id, id: 'summary'
+          put :update, params: { nomenclature_change_id: @lump.id, id: 'summary' }
           expect(response).to redirect_to admin_root_path
         end
       end
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @lump.id, id: 'summary', nomenclature_change_lump: { dummy: 'test' }
+          put :update, params: { nomenclature_change_id: @lump.id, id: 'summary', nomenclature_change_lump: { dummy: 'test' } }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
@@ -129,7 +128,7 @@
     end
     context 'when step is legislation' do
       it 'renders notes step' do
-        get :show, id: :notes, nomenclature_change_id: @lump.id, back: true
+        get :show, params: { id: :notes, nomenclature_change_id: @lump.id, back: true }
         expect(response).to render_template('notes')
       end
     end
@@ -139,15 +138,15 @@
           create_cites_I_addition(taxon_concept: @input_species)
         end
         it 'renders legislation step' do
-          get :show, id: :legislation, nomenclature_change_id: @lump.id, back: true
+          get :show, params: { id: :legislation, nomenclature_change_id: @lump.id, back: true }
           expect(response).to render_template('legislation')
         end
       end
       context 'when no legislation' do
         it 'redirects to notes step' do
-          get :show, id: :legislation, nomenclature_change_id: @lump.id, back: true
+          get :show, params: { id: :legislation, nomenclature_change_id: @lump.id, back: true }
           expect(response).to redirect_to action: :show, id: :notes
-          get :show, id: :notes, nomenclature_change_id: @lump.id
+          get :show, params: { id: :notes, nomenclature_change_id: @lump.id }
           expect(response).to redirect_to action: :show, id: :notes
         end
       end
diff --git a/spec/controllers/admin/nomenclature_changes/split_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/split_controller_spec.rb
index 597db0be6..f3aeece04 100644
--- a/spec/controllers/admin/nomenclature_changes/split_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/split_controller_spec.rb
@@ -10,7 +10,7 @@
         @split = create(:nomenclature_change_split)
       end
       it 'renders the inputs template' do
-        get :show, id: :inputs, nomenclature_change_id: @split.id
+        get :show, params: { id: :inputs, nomenclature_change_id: @split.id }
         expect(response).to render_template('inputs')
       end
     end
@@ -19,7 +19,7 @@
         @split = split_with_input
       end
       it 'renders the outputs template' do
-        get :show, id: :outputs, nomenclature_change_id: @split.id
+        get :show, params: { id: :outputs, nomenclature_change_id: @split.id }
         expect(response).to render_template('outputs')
       end
     end
@@ -28,7 +28,7 @@
         @split = split_with_input_and_output
       end
       it 'renders the notes template' do
-        get :show, id: :notes, nomenclature_change_id: @split.id
+        get :show, params: { id: :notes, nomenclature_change_id: @split.id }
         expect(response).to render_template('notes')
       end
       context "when children present" do
@@ -36,13 +36,13 @@
           create_cites_eu_subspecies(parent: input_species)
         end
         it 'renders the children template' do
-          get :show, id: :children, nomenclature_change_id: @split.id
+          get :show, params: { id: :children, nomenclature_change_id: @split.id }
           expect(response).to render_template('children')
         end
       end
       context "when no children" do
         it 'redirects to next step' do
-          get :show, id: :children, nomenclature_change_id: @split.id
+          get :show, params: { id: :children, nomenclature_change_id: @split.id }
           expect(response).to redirect_to(
             admin_nomenclature_change_split_url(
               nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'names'
@@ -59,13 +59,13 @@
           )
         end
         it 'renders the names template' do
-          get :show, id: :names, nomenclature_change_id: @split.id
+          get :show, params: { id: :names, nomenclature_change_id: @split.id }
           expect(response).to render_template('names')
         end
       end
       context "when no names" do
         it 'redirects to next step' do
-          get :show, id: :names, nomenclature_change_id: @split.id
+          get :show, params: { id: :names, nomenclature_change_id: @split.id }
           expect(response).to redirect_to(
             admin_nomenclature_change_split_url(
               nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'distribution'
@@ -78,13 +78,13 @@
           create(:distribution, taxon_concept: input_species)
         end
         it 'renders the distribution template' do
-          get :show, id: :distribution, nomenclature_change_id: @split.id
+          get :show, params: { id: :distribution, nomenclature_change_id: @split.id }
           expect(response).to render_template('distribution')
         end
       end
       context "when no distribution" do
         it 'redirects to next step' do
-          get :show, id: :distribution, nomenclature_change_id: @split.id
+          get :show, params: { id: :distribution, nomenclature_change_id: @split.id }
           expect(response).to redirect_to(
             admin_nomenclature_change_split_url(
               nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'legislation'
@@ -97,13 +97,13 @@
           create_cites_I_addition(taxon_concept: input_species)
         end
         it 'renders the legislation template' do
-          get :show, id: :legislation, nomenclature_change_id: @split.id
+          get :show, params: { id: :legislation, nomenclature_change_id: @split.id }
           expect(response).to render_template('legislation')
         end
       end
       context "when no legislation" do
         it 'redirects to next step' do
-          get :show, id: :legislation, nomenclature_change_id: @split.id
+          get :show, params: { id: :legislation, nomenclature_change_id: @split.id }
           expect(response).to redirect_to(
             admin_nomenclature_change_split_url(
               nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'summary'
@@ -112,7 +112,7 @@
         end
       end
       it 'renders the summary template' do
-        get :show, id: :summary, nomenclature_change_id: @split.id
+        get :show, params: { id: :summary, nomenclature_change_id: @split.id }
         expect(response).to render_template('summary')
       end
     end
@@ -120,7 +120,7 @@
 
   describe 'POST create' do
     it 'redirects to split wizard' do
-      post :create, nomenclature_change_id: 'new'
+      post :create, params: { nomenclature_change_id: 'new' }
       expect(response).to redirect_to(
         admin_nomenclature_change_split_url(
           nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'inputs'
@@ -135,9 +135,9 @@
     end
     context 'when successful' do
       it 'redirects to next step' do
-        put :update, nomenclature_change_split: {
+        put :update, params: { nomenclature_change_split: {
           input_attributes: { taxon_concept_id: create_cites_eu_species.id }
-        }, nomenclature_change_id: @split.id, id: 'inputs'
+        }, nomenclature_change_id: @split.id, id: 'inputs' }
         expect(response).to redirect_to(
           admin_nomenclature_change_split_url(
             nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'outputs'
@@ -147,10 +147,9 @@
     end
     context 'when unsuccessful' do
       it 're-renders step' do
-        put :update,
-          nomenclature_change_split: {
+        put :update, params: { nomenclature_change_split: {
             input_attributes: { taxon_concept_id: nil }
-          }, nomenclature_change_id: @split.id, id: 'inputs'
+          }, nomenclature_change_id: @split.id, id: 'inputs' }
         expect(response).to render_template('inputs')
       end
     end
@@ -158,14 +157,14 @@
       context 'when user is secretariat' do
         login_secretariat_user
         it 'redirects to admin root path' do
-          put :update, nomenclature_change_id: @split.id, id: 'summary'
+          put :update, params: { nomenclature_change_id: @split.id, id: 'summary' }
           expect(response).to redirect_to admin_root_path
         end
       end
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @split.id, id: 'summary', nomenclature_change_split: { dummy: 'test' }
+          put :update, params: { nomenclature_change_id: @split.id, id: 'summary', nomenclature_change_split: { dummy: 'test' } }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
@@ -183,15 +182,15 @@
           create_cites_eu_subspecies(parent: input_species)
         end
         it 'renders children template' do
-          get :show, id: :children, nomenclature_change_id: @split.id, back: true
+          get :show, params: { id: :children, nomenclature_change_id: @split.id, back: true }
           expect(response).to render_template('children')
         end
       end
       context 'when no children' do
         it 'redirects to notes step' do
-          get :show, id: :children, nomenclature_change_id: @split.id, back: true
+          get :show, params: { id: :children, nomenclature_change_id: @split.id, back: true }
           expect(response).to redirect_to action: :show, id: :notes
-          get :show, id: :notes, nomenclature_change_id: @split.id
+          get :show, params: { id: :notes, nomenclature_change_id: @split.id }
           expect(response).to redirect_to action: :show, id: :notes
         end
       end
@@ -206,15 +205,15 @@
           )
         end
         it 'renders names template' do
-          get :show, id: :names, nomenclature_change_id: @split.id, back: :true
+          get :show, params: { id: :names, nomenclature_change_id: @split.id, back: :true }
           expect(response).to render_template('names')
         end
       end
       context 'when no names and no children' do
         it 'redirects to notes step' do
-          get :show, id: :names, nomenclature_change_id: @split.id, back: true
+          get :show, params: { id: :names, nomenclature_change_id: @split.id, back: true }
           expect(response).to redirect_to action: :show, id: :children
-          get :show, id: :children, nomenclature_change_id: @split.id
+          get :show, params: { id: :children, nomenclature_change_id: @split.id }
           expect(response).to redirect_to action: :show, id: :notes
         end
       end
@@ -225,15 +224,15 @@
           create(:distribution, taxon_concept: input_species)
         end
         it 'renders distribution template' do
-          get :show, id: :distribution, nomenclature_change_id: @split.id, back: true
+          get :show, params: { id: :distribution, nomenclature_change_id: @split.id, back: true }
           expect(response).to render_template('distribution')
         end
       end
       context 'when no distribution and no names' do
         it 'redirects to children step' do
-          get :show, id: :distribution, nomenclature_change_id: @split.id, back: true
+          get :show, params: { id: :distribution, nomenclature_change_id: @split.id, back: true }
           expect(response).to redirect_to action: :show, id: :names
-          get :show, id: :names, nomenclature_change_id: @split.id
+          get :show, params: { id: :names, nomenclature_change_id: @split.id }
           expect(response).to redirect_to action: :show, id: :children
         end
       end
@@ -244,15 +243,15 @@
           create_cites_I_addition(taxon_concept: input_species)
         end
         it 'renders legislation template' do
-          get :show, id: :legislation, nomenclature_change_id: @split.id, back: true
+          get :show, params: { id: :legislation, nomenclature_change_id: @split.id, back: true }
           expect(response).to render_template('legislation')
         end
       end
       context 'when no legislation and no distribution' do
         it 'redirects to names step' do
-          get :show, id: :legislation, nomenclature_change_id: @split.id, back: true
+          get :show, params: { id: :legislation, nomenclature_change_id: @split.id, back: true }
           expect(response).to redirect_to action: :show, id: :distribution
-          get :show, id: :distribution, nomenclature_change_id: @split.id
+          get :show, params: { id: :distribution, nomenclature_change_id: @split.id }
           expect(response).to redirect_to action: :show, id: :names
         end
       end
diff --git a/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
index 46a37f0eb..31b297313 100644
--- a/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_swap_controller_spec.rb
@@ -10,7 +10,7 @@
         @status_change = create(:nomenclature_change_status_swap)
       end
       it 'renders the primary_output template' do
-        get :show, id: :primary_output, nomenclature_change_id: @status_change.id
+        get :show, params: { id: :primary_output, nomenclature_change_id: @status_change.id }
         expect(response).to render_template('primary_output')
       end
     end
@@ -19,7 +19,7 @@
         @status_change = a_to_s_with_swap
       end
       it 'renders the swap template' do
-        get :show, id: :secondary_output, nomenclature_change_id: @status_change.id
+        get :show, params: { id: :secondary_output, nomenclature_change_id: @status_change.id }
         expect(response).to render_template('secondary_output')
       end
     end
@@ -32,13 +32,13 @@
           create_cites_I_addition(taxon_concept: input_species)
         end
         it 'renders the legislation template' do
-          get :show, id: :legislation, nomenclature_change_id: @status_change.id
+          get :show, params: { id: :legislation, nomenclature_change_id: @status_change.id }
           expect(response).to render_template('legislation')
         end
       end
       context "when no legislation" do
         it 'redirects to next step' do
-          get :show, id: :legislation, nomenclature_change_id: @status_change.id
+          get :show, params: { id: :legislation, nomenclature_change_id: @status_change.id }
           expect(response).to redirect_to(
             admin_nomenclature_change_status_swap_url(
               nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'summary'
@@ -52,7 +52,7 @@
         @status_change = a_to_s_with_swap
       end
       it 'renders the summary template' do
-        get :show, id: :summary, nomenclature_change_id: @status_change.id
+        get :show, params: { id: :summary, nomenclature_change_id: @status_change.id }
         expect(response).to render_template('summary')
       end
     end
@@ -60,7 +60,7 @@
 
   describe 'POST create' do
     it 'redirects to status_change wizard' do
-      post :create, nomenclature_change_id: 'new'
+      post :create, params: { nomenclature_change_id: 'new' }
       expect(response).to redirect_to(
         admin_nomenclature_change_status_swap_url(
           nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'primary_output'
@@ -75,12 +75,12 @@
     end
     context 'when successful' do
       it 'redirects to next step' do
-        put :update, nomenclature_change_status_swap: {
+        put :update, params: { nomenclature_change_status_swap: {
           primary_output_attributes: {
             taxon_concept_id: create_cites_eu_species.id,
             new_name_status: 'S'
           }
-        }, nomenclature_change_id: @status_change.id, id: 'primary_output'
+        }, nomenclature_change_id: @status_change.id, id: 'primary_output' }
         expect(response).to redirect_to(
           admin_nomenclature_change_status_swap_url(
             nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'secondary_output'
@@ -90,8 +90,7 @@
     end
     context 'when unsuccessful' do
       it 're-renders step' do
-        put :update, nomenclature_change_status_swap: { dummy: 'test'},
-          nomenclature_change_id: @status_change.id, id: 'primary_output'
+        put :update, params: { nomenclature_change_status_swap: { dummy: 'test'}, nomenclature_change_id: @status_change.id, id: 'primary_output' }
         expect(response).to render_template('primary_output')
       end
     end
@@ -99,14 +98,14 @@
       context 'when user is secretariat' do
         login_secretariat_user
         it 'redirects to admin root path' do
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary'
+          put :update, params: { nomenclature_change_id: @status_change.id, id: 'summary' }
           expect(response).to redirect_to admin_root_path
         end
       end
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_swap: { dummy: 'test' }
+          put :update, params: { nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_swap: { dummy: 'test' } }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
diff --git a/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
index 3525dfa56..f62b4e78f 100644
--- a/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_to_accepted_controller_spec.rb
@@ -10,7 +10,7 @@
         @status_change = create(:nomenclature_change_status_to_accepted)
       end
       it 'renders the primary_output template' do
-        get :show, id: :primary_output, nomenclature_change_id: @status_change.id
+        get :show, params: { id: :primary_output, nomenclature_change_id: @status_change.id }
         expect(response).to render_template('primary_output')
       end
     end
@@ -19,7 +19,7 @@
         @status_change = t_to_a_with_input
       end
       it 'renders the summary template' do
-        get :show, id: :summary, nomenclature_change_id: @status_change.id
+        get :show, params: { id: :summary, nomenclature_change_id: @status_change.id }
         expect(response).to render_template('summary')
       end
     end
@@ -27,7 +27,7 @@
 
   describe 'POST create' do
     it 'redirects to status_change wizard' do
-      post :create, nomenclature_change_id: 'new'
+      post :create, params: { nomenclature_change_id: 'new' }
       expect(response).to redirect_to(
         admin_nomenclature_change_status_to_accepted_url(
           nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'primary_output'
@@ -42,7 +42,7 @@
     end
     context 'when successful' do
       it 'redirects to next step' do
-        put :update, nomenclature_change_status_to_accepted: {
+        put :update, params: { nomenclature_change_status_to_accepted: {
           primary_output_attributes: {
             taxon_concept_id: create_cites_eu_species(
               name_status: 'T',
@@ -53,7 +53,7 @@
             ).id,
             new_name_status: 'A'
           }
-        }, nomenclature_change_id: @status_change.id, id: 'primary_output'
+        }, nomenclature_change_id: @status_change.id, id: 'primary_output' }
         expect(response).to redirect_to(
           admin_nomenclature_change_status_to_accepted_url(
             nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'summary'
@@ -63,8 +63,7 @@
     end
     context 'when unsuccessful' do
       it 're-renders step' do
-        put :update, nomenclature_change_status_to_accepted: { dummy: 'test'},
-          nomenclature_change_id: @status_change.id, id: 'primary_output'
+        put :update, params: { nomenclature_change_status_to_accepted: { dummy: 'test'}, nomenclature_change_id: @status_change.id, id: 'primary_output' }
         expect(response).to render_template('primary_output')
       end
     end
@@ -72,14 +71,14 @@
       context 'when user is secretariat' do
         login_secretariat_user
         it 'redirects to admin root path' do
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary'
+          put :update, params: { nomenclature_change_id: @status_change.id, id: 'summary' }
           expect(response).to redirect_to admin_root_path
         end
       end
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_to_accepted: { dummy: 'test' }
+          put :update, params: { nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_to_accepted: { dummy: 'test' } }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
diff --git a/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb b/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
index b6e59b4d7..d86f296c5 100644
--- a/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes/status_to_synonym_controller_spec.rb
@@ -11,7 +11,7 @@
         @status_change = create(:nomenclature_change_status_to_synonym)
       end
       it 'renders the primary_output template' do
-        get :show, id: :primary_output, nomenclature_change_id: @status_change.id
+        get :show, params: { id: :primary_output, nomenclature_change_id: @status_change.id }
         expect(response).to render_template('primary_output')
       end
     end
@@ -20,7 +20,7 @@
         @status_change = n_to_s_with_primary_output
       end
       it 'renders the relay template' do
-        get :show, id: :relay, nomenclature_change_id: @status_change.id
+        get :show, params: { id: :relay, nomenclature_change_id: @status_change.id }
         expect(response).to render_template('relay')
       end
     end
@@ -30,7 +30,7 @@
         @status_change = n_to_s_with_input_and_secondary_output
       end
       it 'renders the summary template' do
-        get :show, id: :summary, nomenclature_change_id: @status_change.id
+        get :show, params: { id: :summary, nomenclature_change_id: @status_change.id }
         expect(response).to render_template('summary')
       end
     end
@@ -38,7 +38,7 @@
 
   describe 'POST create' do
     it 'redirects to status_change wizard' do
-      post :create, nomenclature_change_id: 'new'
+      post :create, params: { nomenclature_change_id: 'new' }
       expect(response).to redirect_to(
         admin_nomenclature_change_status_to_synonym_url(
           nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'primary_output'
@@ -53,12 +53,12 @@
     end
     context 'when successful' do
       it 'redirects to next step' do
-        put :update, nomenclature_change_status_to_synonym: {
+        put :update, params: { nomenclature_change_status_to_synonym: {
           primary_output_attributes: {
             taxon_concept_id: create_cites_eu_species(name_status: 'N').id,
             new_name_status: 'S'
           }
-        }, nomenclature_change_id: @status_change.id, id: 'primary_output'
+        }, nomenclature_change_id: @status_change.id, id: 'primary_output' }
         expect(response).to redirect_to(
           admin_nomenclature_change_status_to_synonym_url(
             nomenclature_change_id: assigns(:nomenclature_change).id, :id => 'relay'
@@ -68,8 +68,7 @@
     end
     context 'when unsuccessful' do
       it 're-renders step' do
-        put :update, nomenclature_change_status_to_synonym: { dummy: 'test'},
-          nomenclature_change_id: @status_change.id, id: 'primary_output'
+        put :update, params: { nomenclature_change_status_to_synonym: { dummy: 'test'}, nomenclature_change_id: @status_change.id, id: 'primary_output' }
         expect(response).to render_template('primary_output')
       end
     end
@@ -77,14 +76,14 @@
       context 'when user is secretariat' do
         login_secretariat_user
         it 'redirects to admin root path' do
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary'
+          put :update, params: { nomenclature_change_id: @status_change.id, id: 'summary' }
           expect(response).to redirect_to admin_root_path
         end
       end
       context 'when user is manager' do
         it 'redirects to nomenclature changes path' do
           pending("Strange render mismatch after upgrading to Rails 4")
-          put :update, nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_to_synonym: { dummy: 'test' }
+          put :update, params: { nomenclature_change_id: @status_change.id, id: 'summary', nomenclature_change_status_to_synonym: { dummy: 'test' } }
           expect(response).to be_successful
           expect(response).to render_template("nomenclature_changes")
         end
diff --git a/spec/controllers/admin/nomenclature_changes_controller_spec.rb b/spec/controllers/admin/nomenclature_changes_controller_spec.rb
index 672f29be5..5df3862f6 100644
--- a/spec/controllers/admin/nomenclature_changes_controller_spec.rb
+++ b/spec/controllers/admin/nomenclature_changes_controller_spec.rb
@@ -19,7 +19,7 @@
   describe "DELETE destroy" do
     let(:nomenclature_change) { create(:nomenclature_change) }
     it "redirects after delete" do
-      delete :destroy, :id => nomenclature_change.id
+      delete :destroy, params: { :id => nomenclature_change.id }
       expect(response).to redirect_to(admin_nomenclature_changes_url)
     end
   end
diff --git a/spec/controllers/admin/ranks_controller_spec.rb b/spec/controllers/admin/ranks_controller_spec.rb
index 82ebb203f..edc23c726 100644
--- a/spec/controllers/admin/ranks_controller_spec.rb
+++ b/spec/controllers/admin/ranks_controller_spec.rb
@@ -42,7 +42,7 @@
   describe "DELETE destroy" do
     let(:rank) { create(:rank) }
     it "redirects after delete" do
-      delete :destroy, :id => rank.id
+      delete :destroy, params: { :id => rank.id }
       expect(response).to redirect_to(admin_ranks_url)
     end
   end
diff --git a/spec/controllers/admin/references_controller_spec.rb b/spec/controllers/admin/references_controller_spec.rb
index c1bd708f6..8fbf0ce6b 100644
--- a/spec/controllers/admin/references_controller_spec.rb
+++ b/spec/controllers/admin/references_controller_spec.rb
@@ -54,7 +54,7 @@
   describe "DELETE destroy" do
     let(:reference) { create(:reference) }
     it "redirects after delete" do
-      delete :destroy, :id => reference.id
+      delete :destroy, params: { :id => reference.id }
       expect(response).to redirect_to(admin_references_url)
     end
   end
diff --git a/spec/controllers/admin/species_listings_controller_spec.rb b/spec/controllers/admin/species_listings_controller_spec.rb
index 870d1d096..33dd52b92 100644
--- a/spec/controllers/admin/species_listings_controller_spec.rb
+++ b/spec/controllers/admin/species_listings_controller_spec.rb
@@ -45,7 +45,7 @@
   describe "DELETE destroy" do
     let(:species_listing) { create(:species_listing) }
     it "redirects after delete" do
-      delete :destroy, :id => species_listing.id
+      delete :destroy, params: { :id => species_listing.id }
       expect(response).to redirect_to(admin_species_listings_url)
     end
   end
diff --git a/spec/controllers/admin/srg_histories_controller_spec.rb b/spec/controllers/admin/srg_histories_controller_spec.rb
index b0cd77095..03043ec74 100644
--- a/spec/controllers/admin/srg_histories_controller_spec.rb
+++ b/spec/controllers/admin/srg_histories_controller_spec.rb
@@ -17,7 +17,7 @@
       end
 
       it "renders the create js template" do
-        post :create, srg_history: { name: 'test' }, format: :js
+        post :create, params: { srg_history: { name: 'test' }, format: :js }
 
         expect(response).to render_template("create")
       end
@@ -25,7 +25,7 @@
 
     context "when not successful" do
       it "renders new" do
-        post :create, srg_history: { dummy: 'test' }, format: :js
+        post :create, params: { srg_history: { dummy: 'test' }, format: :js }
 
         expect(response).to render_template("new")
       end
@@ -39,7 +39,7 @@
 
     context "when successful" do
       it "renders the create js template" do
-        put :update, id: @srg_history.id, srg_history: { dummy: 'test' }, format: :js
+        put :update, params: { id: @srg_history.id, srg_history: { dummy: 'test' }, format: :js }
 
         expect(response).to render_template("create")
       end
@@ -47,10 +47,7 @@
 
     context "when not successful" do
       it "renders new" do
-        put :update,
-          srg_history: { name: nil },
-          id: @srg_history.id,
-          format: :js
+        put :update, params: { srg_history: { name: nil }, id: @srg_history.id, format: :js }
 
         expect(response).to render_template('new')
       end
@@ -63,7 +60,7 @@
     end
 
     it "redirects after delete" do
-      delete :destroy, id: @srg_history.id
+      delete :destroy, params: { id: @srg_history.id }
 
       expect(response).to redirect_to(admin_srg_histories_url)
     end
diff --git a/spec/controllers/admin/synonym_relationships_controller_spec.rb b/spec/controllers/admin/synonym_relationships_controller_spec.rb
index 1a1f7982e..07d2d5254 100644
--- a/spec/controllers/admin/synonym_relationships_controller_spec.rb
+++ b/spec/controllers/admin/synonym_relationships_controller_spec.rb
@@ -79,9 +79,7 @@
 
   describe "DELETE destroy" do
     it "redirects after delete" do
-      delete :destroy,
-        :taxon_concept_id => taxon_concept.id,
-        :id => synonym_relationship.id
+      delete :destroy, params: { :taxon_concept_id => taxon_concept.id, :id => synonym_relationship.id }
       expect(response).to redirect_to(
         admin_taxon_concept_names_url(synonym_relationship.taxon_concept)
       )
diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb
index 771c22a02..136b37a1a 100644
--- a/spec/controllers/admin/tags_controller_spec.rb
+++ b/spec/controllers/admin/tags_controller_spec.rb
@@ -42,7 +42,7 @@
   describe "DELETE destroy" do
     let(:preset_tag) { create(:preset_tag) }
     it "redirects after delete" do
-      delete :destroy, :id => preset_tag.id
+      delete :destroy, params: { :id => preset_tag.id }
       expect(response).to redirect_to(admin_tags_url)
     end
   end
diff --git a/spec/controllers/admin/taxon_cites_suspensions_controller_spec.rb b/spec/controllers/admin/taxon_cites_suspensions_controller_spec.rb
index 791677de2..b8b8efa4f 100644
--- a/spec/controllers/admin/taxon_cites_suspensions_controller_spec.rb
+++ b/spec/controllers/admin/taxon_cites_suspensions_controller_spec.rb
@@ -14,18 +14,18 @@
 
   describe "GET index" do
     it "renders the index template" do
-      get :index, :taxon_concept_id => @taxon_concept.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template("index")
     end
     it "renders the taxon_concepts_layout" do
-      get :index, :taxon_concept_id => @taxon_concept.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('layouts/taxon_concepts')
     end
   end
 
   describe "GET new" do
     it "renders the new template" do
-      get :new, :taxon_concept_id => @taxon_concept.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('new')
     end
   end
@@ -33,26 +33,23 @@
   describe "POST create" do
     context "when successful" do
       it "renders index" do
-        post :create,
-          :cites_suspension => {
+        post :create, params: { :cites_suspension => {
             :start_notification_id => create_cites_suspension_notification.id
-          },
-          :taxon_concept_id => @taxon_concept.id
+          }, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(
           admin_taxon_concept_cites_suspensions_url(@taxon_concept)
         )
       end
     end
     it "renders new when not successful" do
-      post :create, :cites_suspension => { dummy: 'test'},
-        :taxon_concept_id => @taxon_concept.id
+      post :create, params: { :cites_suspension => { dummy: 'test'}, :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('new')
     end
   end
 
   describe "GET edit" do
     it "renders the edit template" do
-      get :edit, :id => @cites_suspension.id, :taxon_concept_id => @taxon_concept.id
+      get :edit, params: { :id => @cites_suspension.id, :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('edit')
     end
   end
@@ -60,12 +57,9 @@
   describe "PUT update" do
     context "when successful" do
       it "renders taxon_concepts cites suspensions page" do
-        put :update,
-          :cites_suspension => {
+        put :update, params: { :cites_suspension => {
             :publication_date => 1.week.ago
-          },
-          :id => @cites_suspension.id,
-          :taxon_concept_id => @taxon_concept.id
+          }, :id => @cites_suspension.id, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(
           admin_taxon_concept_cites_suspensions_url(@taxon_concept)
         )
@@ -73,20 +67,16 @@
     end
 
     it "renders edit when not successful" do
-      put :update,
-        :cites_suspension => {
+      put :update, params: { :cites_suspension => {
           :start_notification_id => nil
-        },
-        :id => @cites_suspension.id,
-        :taxon_concept_id => @taxon_concept.id
+        }, :id => @cites_suspension.id, :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('edit')
     end
   end
 
   describe "DELETE destroy" do
     it "redirects after delete" do
-      delete :destroy, :id => @cites_suspension.id,
-        :taxon_concept_id => @taxon_concept.id
+      delete :destroy, params: { :id => @cites_suspension.id, :taxon_concept_id => @taxon_concept.id }
       expect(response).to redirect_to(
         admin_taxon_concept_cites_suspensions_url(@taxon_concept)
       )
@@ -98,19 +88,18 @@
 
     describe "GET index" do
       it "renders the index template" do
-        get :index, :taxon_concept_id => @taxon_concept.id
+        get :index, params: { :taxon_concept_id => @taxon_concept.id }
         expect(response).to render_template("index")
       end
       it "renders the taxon_concepts_layout" do
-        get :index, :taxon_concept_id => @taxon_concept.id
+        get :index, params: { :taxon_concept_id => @taxon_concept.id }
         expect(response).to render_template('layouts/taxon_concepts')
       end
     end
     describe "DELETE destroy" do
       it "fails to delete and redirects" do
         @request.env['HTTP_REFERER'] = admin_taxon_concept_cites_suspensions_url(@taxon_concept)
-        delete :destroy, :id => @cites_suspension.id,
-          :taxon_concept_id => @taxon_concept.id
+        delete :destroy, params: { :id => @cites_suspension.id, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(
           admin_taxon_concept_cites_suspensions_url(@taxon_concept)
         )
diff --git a/spec/controllers/admin/taxon_commons_controller_spec.rb b/spec/controllers/admin/taxon_commons_controller_spec.rb
index 783816ccf..6a2b71924 100644
--- a/spec/controllers/admin/taxon_commons_controller_spec.rb
+++ b/spec/controllers/admin/taxon_commons_controller_spec.rb
@@ -92,9 +92,7 @@
       )
     }
     it "redirects after delete" do
-      delete :destroy,
-        :taxon_concept_id => @taxon_concept.id,
-        :id => taxon_common.id
+      delete :destroy, params: { :taxon_concept_id => @taxon_concept.id, :id => taxon_common.id }
       expect(response).to redirect_to(
         admin_taxon_concept_names_url(@taxon_concept)
       )
@@ -143,9 +141,7 @@
       expect(@taxon_concept.reload.dependents_updated_at).not_to be_nil
       old_date = @taxon_concept.dependents_updated_at
 
-      delete :destroy,
-        :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_common.id
+      delete :destroy, params: { :taxon_concept_id => @taxon_concept.id, :id => @taxon_common.id }
 
       expect(@taxon_concept.reload.dependents_updated_at).not_to eq(old_date)
       expect(TaxonCommon.where(:id => @taxon_common.id).size).to eq(0)
@@ -164,8 +160,7 @@
     describe "DELETE destroy" do
       it "fails to delete and redirects" do
         @request.env['HTTP_REFERER'] = admin_taxon_concept_names_url(@taxon_concept)
-        delete :destroy, :id => taxon_common.id,
-          :taxon_concept_id => @taxon_concept.id
+        delete :destroy, params: { :id => taxon_common.id, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(
           admin_taxon_concept_names_url(@taxon_concept)
         )
diff --git a/spec/controllers/admin/taxon_concept_comments_controller_spec.rb b/spec/controllers/admin/taxon_concept_comments_controller_spec.rb
index 4e08a8634..17d61a543 100644
--- a/spec/controllers/admin/taxon_concept_comments_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concept_comments_controller_spec.rb
@@ -9,16 +9,14 @@
 
   describe 'GET index' do
     it 'renders the index template' do
-      get :index, taxon_concept_id: @taxon_concept.id
+      get :index, params: { taxon_concept_id: @taxon_concept.id }
       expect(response).to render_template('index')
     end
   end
 
   describe 'POST create' do
     it 'redirects to index with notice when success' do
-      post :create,
-        taxon_concept_id: @taxon_concept.id,
-        comment: { note: 'blah' }
+      post :create, params: { taxon_concept_id: @taxon_concept.id, comment: { note: 'blah' } }
       expect(response).to redirect_to(
         admin_taxon_concept_comments_url(@taxon_concept)
       )
@@ -29,10 +27,7 @@
   describe 'PUT update' do
     let(:comment) { @taxon_concept.comments.create({ note: 'bleh' }) }
     it 'redirects to index with notice when success' do
-      put :update,
-        id: comment.id,
-        taxon_concept_id: @taxon_concept.id,
-        comment: { note: 'blah' }
+      put :update, params: { id: comment.id, taxon_concept_id: @taxon_concept.id, comment: { note: 'blah' } }
       expect(response).to redirect_to(
         admin_taxon_concept_comments_url(@taxon_concept)
       )
diff --git a/spec/controllers/admin/taxon_concept_references_controller_spec.rb b/spec/controllers/admin/taxon_concept_references_controller_spec.rb
index 9e761bdc3..3d94c8105 100644
--- a/spec/controllers/admin/taxon_concept_references_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concept_references_controller_spec.rb
@@ -92,9 +92,7 @@
   describe "DELETE destroy" do
     let(:taxon_concept_reference) { create(:taxon_concept_reference, :taxon_concept_id => @taxon_concept.id, :reference_id => @reference.id) }
     it "redirects after delete" do
-      delete :destroy,
-        :taxon_concept_id => @taxon_concept.id,
-        :id => taxon_concept_reference.id
+      delete :destroy, params: { :taxon_concept_id => @taxon_concept.id, :id => taxon_concept_reference.id }
       expect(response).to redirect_to(
         admin_taxon_concept_taxon_concept_references_url(taxon_concept_reference.taxon_concept)
       )
diff --git a/spec/controllers/admin/taxon_concepts_controller_spec.rb b/spec/controllers/admin/taxon_concepts_controller_spec.rb
index dfd65188d..9e1e05867 100644
--- a/spec/controllers/admin/taxon_concepts_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concepts_controller_spec.rb
@@ -20,15 +20,15 @@
       expect(response).to render_template("layouts/admin")
     end
     it "redirects if 1 result" do
-      get :index, search_params: {
+      get :index, params: { search_params: {
         taxonomy: { id: cites_eu.id }, scientific_name: 'Foobarus i'
-      }
+      } }
       expect(response).to redirect_to(admin_taxon_concept_names_path(@taxon))
     end
     it "assigns taxa in taxonomic order" do
-      get :index, search_params: {
+      get :index, params: { search_params: {
         taxonomy: { id: cites_eu.id }, scientific_name: 'Foobarus'
-      }
+      } }
       expect(assigns(:taxon_concepts)).to eq([@taxon.parent, @taxon])
     end
   end
@@ -79,13 +79,11 @@
     end
     context "when HTML" do
       it "redirects to edit when successful" do
-        put :update, :id => taxon_concept.id,
-          :taxon_concept => { dummy: 'test' }
+        put :update, params: { :id => taxon_concept.id, :taxon_concept => { dummy: 'test' } }
         expect(response).to redirect_to(edit_admin_taxon_concept_url(taxon_concept))
       end
       it "renders edit when not successful" do
-        put :update, :id => taxon_concept.id,
-          :taxon_concept => { :taxonomy_id => nil }
+        put :update, params: { :id => taxon_concept.id, :taxon_concept => { :taxonomy_id => nil } }
         expect(response).to render_template("edit")
       end
     end
@@ -94,7 +92,7 @@
   describe "DELETE destroy" do
     let(:taxon_concept) { create(:taxon_concept) }
     it "redirects after delete" do
-      delete :destroy, :id => taxon_concept.id
+      delete :destroy, params: { :id => taxon_concept.id }
       expect(response).to redirect_to(admin_taxon_concepts_url)
     end
   end
@@ -104,7 +102,7 @@
     let(:taxon_concept) { create(:taxon_concept) }
 
     it "redirects to admin root path and doesn't delete" do
-      delete :destroy, :id => taxon_concept.id
+      delete :destroy, params: { :id => taxon_concept.id }
       expect(response).to redirect_to(admin_root_path)
       expect(TaxonConcept.where(:id => taxon_concept.id).size).to eq(1)
     end
@@ -120,7 +118,7 @@
     end
 
     it "redirects to root path and doesn't delete" do
-      delete :destroy, :id => taxon_concept.id
+      delete :destroy, params: { :id => taxon_concept.id }
       expect(response).to redirect_to(root_path)
       expect(TaxonConcept.where(:id => taxon_concept.id).size).to eq(1)
     end
diff --git a/spec/controllers/admin/taxon_eu_suspensions_controller_spec.rb b/spec/controllers/admin/taxon_eu_suspensions_controller_spec.rb
index 3834e5cc6..4bf8892ca 100644
--- a/spec/controllers/admin/taxon_eu_suspensions_controller_spec.rb
+++ b/spec/controllers/admin/taxon_eu_suspensions_controller_spec.rb
@@ -9,24 +9,24 @@
 
   describe "GET index" do
     it "renders the index template" do
-      get :index, :taxon_concept_id => @taxon_concept.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template("index")
     end
     it "renders the taxon_concepts_layout" do
-      get :index, :taxon_concept_id => @taxon_concept.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('layouts/taxon_concepts')
     end
   end
 
   describe "GET new" do
     it "renders the new template" do
-      get :new, :taxon_concept_id => @taxon_concept.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('new')
     end
     it "assigns @geo_entities (country and territory) with two objects" do
       territory = create(:geo_entity, :geo_entity_type_id => territory_geo_entity_type.id)
       country = create(:geo_entity)
-      get :new, :taxon_concept_id => @taxon_concept.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }
       expect(assigns(:geo_entities).size).to eq(2)
     end
   end
@@ -37,23 +37,20 @@
         @eu_decision_type = create(:eu_decision_type)
       end
       it "redirects to the EU suspensions index" do
-        post :create,
-          :eu_suspension => {
+        post :create, params: { :eu_suspension => {
             :eu_decision_type_id => @eu_decision_type.id,
             :start_date => Date.new(2013, 1, 1),
             :geo_entity_id => create(
               :geo_entity, :geo_entity_type_id => country_geo_entity_type.id
             )
-          },
-          :taxon_concept_id => @taxon_concept.id
+          }, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(admin_taxon_concept_eu_suspensions_url(@taxon_concept.id))
       end
     end
 
     context "when not successful" do
       it "renders new" do
-        post :create, :eu_suspension => { dummy: 'test' },
-          :taxon_concept_id => @taxon_concept.id
+        post :create, params: { :eu_suspension => { dummy: 'test' }, :taxon_concept_id => @taxon_concept.id }
         expect(response).to render_template("new")
       end
     end
@@ -67,12 +64,12 @@
       )
     end
     it "renders the edit template" do
-      get :edit, :id => @eu_suspension.id, :taxon_concept_id => @taxon_concept.id
+      get :edit, params: { :id => @eu_suspension.id, :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('edit')
     end
     it "assigns @geo_entities" do
       territory = create(:geo_entity, :geo_entity_type_id => territory_geo_entity_type.id)
-      get :edit, :id => @eu_suspension.id, :taxon_concept_id => @taxon_concept.id
+      get :edit, params: { :id => @eu_suspension.id, :taxon_concept_id => @taxon_concept.id }
       expect(assigns(:geo_entities)).to include(territory)
     end
   end
@@ -89,15 +86,12 @@
     context "when successful" do
       context "when eu_decision_type is present" do
         it "renders taxon_concepts EU suspensions page" do
-          put :update,
-            eu_suspension: {
+          put :update, params: { eu_suspension: {
               eu_decision_type_id: create(:eu_decision_type),
               geo_entity_id: create(
                 :geo_entity, :geo_entity_type_id => country_geo_entity_type.id
               )
-            },
-            id: @eu_suspension.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_suspension.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to redirect_to(
             admin_taxon_concept_eu_suspensions_url(@taxon_concept)
           )
@@ -105,16 +99,13 @@
       end
       context "when eu_decision_type is not present" do
         it "renders taxon_concepts EU suspensions page" do
-          put :update,
-            eu_suspension: {
+          put :update, params: { eu_suspension: {
               eu_decision_type_id: nil,
               srg_history_id: @srg_history.id,
               geo_entity_id: create(
                 :geo_entity, :geo_entity_type_id => country_geo_entity_type.id
               )
-            },
-            id: @eu_suspension.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_suspension.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to redirect_to(
             admin_taxon_concept_eu_suspensions_url(@taxon_concept)
           )
@@ -125,26 +116,20 @@
     context "when not successful" do
       context "when eu_decision_type is present" do
         it "renders new" do
-          put :update,
-            eu_suspension: {
+          put :update, params: { eu_suspension: {
               eu_decision_type_id: create(:eu_decision_type),
               geo_entity_id: nil
-            },
-            id: @eu_suspension.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_suspension.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to render_template('new')
         end
       end
       context "when eu_decision_type is not present" do
         it "renders new" do
-          put :update,
-            eu_suspension: {
+          put :update, params: { eu_suspension: {
               eu_decision_type_id: nil,
               srg_history_id: @srg_history.id,
               geo_entity_id: nil
-            },
-            id: @eu_suspension.id,
-            taxon_concept_id: @taxon_concept.id
+            }, id: @eu_suspension.id, taxon_concept_id: @taxon_concept.id }
           expect(response).to render_template('new')
         end
       end
@@ -152,14 +137,11 @@
 
     context "when both eu_decision_type and srg_history are empty" do
       it "renders new" do
-        put :update,
-          eu_suspension: {
+        put :update, params: { eu_suspension: {
             eu_decision_type_id: nil,
             srg_history_id: nil,
             start_date: nil
-          },
-          id: @eu_suspension.id,
-          taxon_concept_id: @taxon_concept.id
+          }, id: @eu_suspension.id, taxon_concept_id: @taxon_concept.id }
         expect(response).to render_template('new')
       end
     end
@@ -173,8 +155,7 @@
       )
     end
     it "redirects after delete" do
-      delete :destroy, :id => @eu_suspension.id,
-        :taxon_concept_id => @taxon_concept.id
+      delete :destroy, params: { :id => @eu_suspension.id, :taxon_concept_id => @taxon_concept.id }
       expect(response).to redirect_to(
         admin_taxon_concept_eu_suspensions_url(@taxon_concept)
       )
@@ -191,19 +172,18 @@
     }
     describe "GET index" do
       it "renders the index template" do
-        get :index, :taxon_concept_id => @taxon_concept.id
+        get :index, params: { :taxon_concept_id => @taxon_concept.id }
         expect(response).to render_template("index")
       end
       it "renders the taxon_concepts_layout" do
-        get :index, :taxon_concept_id => @taxon_concept.id
+        get :index, params: { :taxon_concept_id => @taxon_concept.id }
         expect(response).to render_template('layouts/taxon_concepts')
       end
     end
     describe "DELETE destroy" do
       it "fails to delete and redirects" do
         @request.env['HTTP_REFERER'] = admin_taxon_concept_eu_suspensions_url(@taxon_concept)
-        delete :destroy, :id => eu_suspension.id,
-          :taxon_concept_id => @taxon_concept.id
+        delete :destroy, params: { :id => eu_suspension.id, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(
           admin_taxon_concept_eu_suspensions_url(@taxon_concept)
         )
diff --git a/spec/controllers/admin/taxon_listing_changes_controller_spec.rb b/spec/controllers/admin/taxon_listing_changes_controller_spec.rb
index 35194fae4..de7b485a0 100644
--- a/spec/controllers/admin/taxon_listing_changes_controller_spec.rb
+++ b/spec/controllers/admin/taxon_listing_changes_controller_spec.rb
@@ -39,32 +39,27 @@
         :change_type_id => @addition.id,
         :effective_at => 1.week.ago
       )
-      get :index, :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(assigns(:listing_changes)).to eq([listing_change2, listing_change1])
       expect(assigns(:taxon_concept)).to eq @taxon_concept
     end
     it "renders the index template" do
-      get :index, :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(response).to render_template("index")
     end
     it "renders the taxon_concepts_layout" do
-      get :index, :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(response).to render_template('layouts/taxon_concepts')
     end
   end
 
   describe "GET new" do
     it "renders the new template" do
-      get :new, :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(response).to render_template('new')
     end
     it "assigns @listing_change" do
-      get :new, :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(assigns(:listing_change)).not_to be_nil
     end
   end
@@ -72,14 +67,11 @@
   describe "POST create" do
     context "when successful" do
       it "redirects to taxon_concept listing_changes page" do
-        post :create,
-          :listing_change => {
+        post :create, params: { :listing_change => {
             :change_type_id => @addition.id,
             :species_listing_id => @appendix.id,
             :effective_at => 1.week.ago
-          },
-          :taxon_concept_id => @taxon_concept.id,
-          :designation_id => @designation.id
+          }, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
         expect(response).to redirect_to(
           admin_taxon_concept_designation_listing_changes_url(@taxon_concept, @designation)
         )
@@ -87,9 +79,7 @@
     end
     it "renders new when not successful" do
       taxon_concept = create(:taxon_concept)
-      post :create, :listing_change => { dummy: 'test' },
-        :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      post :create, params: { :listing_change => { dummy: 'test' }, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(response).to render_template("new")
     end
   end
@@ -105,15 +95,11 @@
       )
     end
     it "renders the edit template" do
-      get :edit, :id => @listing_change.id,
-        :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      get :edit, params: { :id => @listing_change.id, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(response).to render_template('edit')
     end
     it "assigns the listing_change variable" do
-      get :edit, :id => @listing_change.id,
-        :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      get :edit, params: { :id => @listing_change.id, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(assigns(:listing_change)).not_to be_nil
     end
   end
@@ -132,15 +118,11 @@
     end
     context "when successful" do
       it "redirects to taxon_concept listing_changes page" do
-        put :update,
-          :listing_change => {
+        put :update, params: { :listing_change => {
             :change_type_id => @addition.id,
             :species_listing_id => @appendix.id,
             :effective_at => 1.week.ago
-          },
-          :id => @listing_change.id,
-          :taxon_concept_id => @taxon_concept.id,
-          :designation_id => @designation.id
+          }, :id => @listing_change.id, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
         expect(response).to redirect_to(
           admin_taxon_concept_designation_listing_changes_url(@taxon_concept, @designation)
         )
@@ -169,42 +151,30 @@
           :effective_at => 1.week.ago,
           :event_id => eu_regulation.id
         )
-        put :update,
-          :listing_change => {
+        put :update, params: { :listing_change => {
             :change_type_id => addition.id,
             :species_listing_id => annex.id,
             :effective_at => 1.week.ago
-          },
-          :id => listing_change2.id,
-         :taxon_concept_id => taxon_concept.id,
-          :designation_id => eu_designation.id,
-          :redirect_to_eu_reg => "1"
+          }, :id => listing_change2.id, :taxon_concept_id => taxon_concept.id, :designation_id => eu_designation.id, :redirect_to_eu_reg => "1" }
         expect(response).to redirect_to(
           admin_eu_regulation_listing_changes_url(eu_regulation)
         )
       end
     end
     it "renders edit when not successful" do
-      put :update, :listing_change => { :effective_at => nil },
-        :id => @listing_change.id,
-        :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      put :update, params: { :listing_change => { :effective_at => nil }, :id => @listing_change.id, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(response).to render_template('edit')
     end
 
     it "redirects to index page and removes annotation when fields cleared" do
-      put :update,
-        :id => @listing_change.id,
-        :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id,
-        :listing_change => {
+      put :update, params: { :id => @listing_change.id, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id, :listing_change => {
           :annotation_attributes => {
             "short_note_en" => "", "short_note_es" => "",
             "short_note_fr" => "", "full_note_en" => "",
             "full_note_es" => "", "full_note_fr" => "",
             "id" => @annotation.id
           }
-        }
+        } }
       expect(response).to redirect_to(
         admin_taxon_concept_designation_listing_changes_url(
           @taxon_concept, @designation)
@@ -224,9 +194,7 @@
       )
     end
     it "redirects after delete" do
-      delete :destroy, :id => @listing_change.id,
-        :taxon_concept_id => @taxon_concept.id,
-        :designation_id => @designation.id
+      delete :destroy, params: { :id => @listing_change.id, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
       expect(response).to redirect_to(
         admin_taxon_concept_designation_listing_changes_url(@taxon_concept, @designation)
       )
@@ -245,22 +213,18 @@
     }
     describe "GET index" do
       it "renders the index template" do
-        get :index, :taxon_concept_id => @taxon_concept.id,
-          :designation_id => @designation.id
+        get :index, params: { :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
         expect(response).to render_template("index")
       end
       it "renders the taxon_concepts_layout" do
-        get :index, :taxon_concept_id => @taxon_concept.id,
-          :designation_id => @designation.id
+        get :index, params: { :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
         expect(response).to render_template('layouts/taxon_concepts')
       end
     end
     describe "DELETE destroy" do
       it "fails to delete and redirects" do
         @request.env['HTTP_REFERER'] = admin_taxon_concept_designation_listing_changes_url(@taxon_concept, @designation)
-        delete :destroy, :id => listing_change.id,
-          :taxon_concept_id => @taxon_concept.id,
-          :designation_id => @designation.id
+        delete :destroy, params: { :id => listing_change.id, :taxon_concept_id => @taxon_concept.id, :designation_id => @designation.id }
         expect(response).to redirect_to(
           admin_taxon_concept_designation_listing_changes_url(@taxon_concept, @designation)
         )
diff --git a/spec/controllers/admin/taxon_quotas_controller_spec.rb b/spec/controllers/admin/taxon_quotas_controller_spec.rb
index 365660e60..0d0b44533 100644
--- a/spec/controllers/admin/taxon_quotas_controller_spec.rb
+++ b/spec/controllers/admin/taxon_quotas_controller_spec.rb
@@ -11,24 +11,24 @@
 
   describe "GET index" do
     it "renders the index template" do
-      get :index, :taxon_concept_id => @taxon_concept.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template("index")
     end
     it "renders the taxon_concepts_layout" do
-      get :index, :taxon_concept_id => @taxon_concept.id
+      get :index, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('layouts/taxon_concepts')
     end
   end
 
   describe "GET new" do
     it "renders the new template" do
-      get :new, :taxon_concept_id => @taxon_concept.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('new')
     end
     it "assigns @geo_entities (country and territory) with two objects" do
       geo_entity_type_t = create(:geo_entity_type, :name => "TERRITORY")
       territory = create(:geo_entity, :geo_entity_type_id => geo_entity_type_t.id)
-      get :new, :taxon_concept_id => @taxon_concept.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }
       expect(assigns(:geo_entities).size).to eq(2)
     end
   end
@@ -36,22 +36,19 @@
   describe "POST create" do
     context "when successful" do
       it "renders index" do
-        post :create,
-          :quota => {
+        post :create, params: { :quota => {
             :quota => 1,
             :unit_id => @unit.id,
             :publication_date => 1.week.ago,
             :geo_entity_id => @geo_entity.id
-          },
-          :taxon_concept_id => @taxon_concept.id
+          }, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(
           admin_taxon_concept_quotas_url(@taxon_concept)
         )
       end
     end
     it "renders new when not successful" do
-      post :create, :quota => { dummy: 'test' },
-        :taxon_concept_id => @taxon_concept.id
+      post :create, params: { :quota => { dummy: 'test' }, :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template("new")
     end
   end
@@ -66,13 +63,13 @@
       )
     end
     it "renders the edit template" do
-      get :edit, :id => @quota.id, :taxon_concept_id => @taxon_concept.id
+      get :edit, params: { :id => @quota.id, :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('edit')
     end
     it "assigns @geo_entities (country and territory) with two objects" do
       geo_entity_type_t = create(:geo_entity_type, :name => "TERRITORY")
       territory = create(:geo_entity, :geo_entity_type_id => geo_entity_type_t.id)
-      get :edit, :id => @quota.id, :taxon_concept_id => @taxon_concept.id
+      get :edit, params: { :id => @quota.id, :taxon_concept_id => @taxon_concept.id }
       expect(assigns(:geo_entities).size).to eq(2)
     end
   end
@@ -89,12 +86,9 @@
 
     context "when successful" do
       it "renders taxon_concepts quotas page" do
-        put :update,
-          :quota => {
+        put :update, params: { :quota => {
             :publication_date => 1.week.ago
-          },
-          :id => @quota.id,
-          :taxon_concept_id => @taxon_concept.id
+          }, :id => @quota.id, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(
           admin_taxon_concept_quotas_url(@taxon_concept)
         )
@@ -102,12 +96,9 @@
     end
 
     it "renders new when not successful" do
-      put :update,
-        :quota => {
+      put :update, params: { :quota => {
           :publication_date => nil
-        },
-        :id => @quota.id,
-        :taxon_concept_id => @taxon_concept.id
+        }, :id => @quota.id, :taxon_concept_id => @taxon_concept.id }
       expect(response).to render_template('new')
     end
   end
@@ -122,8 +113,7 @@
       )
     end
     it "redirects after delete" do
-      delete :destroy, :id => @quota.id,
-        :taxon_concept_id => @taxon_concept.id
+      delete :destroy, params: { :id => @quota.id, :taxon_concept_id => @taxon_concept.id }
       expect(response).to redirect_to(
         admin_taxon_concept_quotas_url(@taxon_concept)
       )
@@ -142,19 +132,18 @@
     }
     describe "GET index" do
       it "renders the index template" do
-        get :index, :taxon_concept_id => @taxon_concept.id
+        get :index, params: { :taxon_concept_id => @taxon_concept.id }
         expect(response).to render_template("index")
       end
       it "renders the taxon_concepts_layout" do
-        get :index, :taxon_concept_id => @taxon_concept.id
+        get :index, params: { :taxon_concept_id => @taxon_concept.id }
         expect(response).to render_template('layouts/taxon_concepts')
       end
     end
     describe "DELETE destroy" do
       it "fails to delete and redirects" do
         @request.env['HTTP_REFERER'] = admin_taxon_concept_quotas_url(@taxon_concept)
-        delete :destroy, :id => quota.id,
-          :taxon_concept_id => @taxon_concept.id
+        delete :destroy, params: { :id => quota.id, :taxon_concept_id => @taxon_concept.id }
         expect(response).to redirect_to(
           admin_taxon_concept_quotas_url(@taxon_concept)
         )
diff --git a/spec/controllers/admin/taxon_relationships_controller_spec.rb b/spec/controllers/admin/taxon_relationships_controller_spec.rb
index 131f7d725..f1c5604c4 100644
--- a/spec/controllers/admin/taxon_relationships_controller_spec.rb
+++ b/spec/controllers/admin/taxon_relationships_controller_spec.rb
@@ -10,16 +10,16 @@
       create(:taxon_relationship, :taxon_concept_id => taxon_concept.id)
     }
     it "assigns @taxon_relationships" do
-      get :index, :taxon_concept_id => taxon_concept.id, :type => taxon_relationship.taxon_relationship_type.name
+      get :index, params: { :taxon_concept_id => taxon_concept.id, :type => taxon_relationship.taxon_relationship_type.name }
       expect(assigns(:taxon_relationships)).to eq([taxon_relationship])
       assigns(:taxon_concept)
     end
     it "renders the index template" do
-      get :index, :taxon_concept_id => taxon_concept.id
+      get :index, params: { :taxon_concept_id => taxon_concept.id }
       expect(response).to render_template("index")
     end
     it "renders the taxon_concepts_layout" do
-      get :index, :taxon_concept_id => taxon_concept.id
+      get :index, params: { :taxon_concept_id => taxon_concept.id }
       expect(response).to render_template('layouts/taxon_concepts')
     end
   end
@@ -60,14 +60,14 @@
       context "destroys relationship for taxon concept" do
         specify {
           expect do
-            delete :destroy, taxon_concept_id: taxon_concept.id, id: rel.id
+            delete :destroy, params: { taxon_concept_id: taxon_concept.id, id: rel.id }
           end.to change(TaxonRelationship, :count).by(-2)
         }
       end
       context "destroys relationship for other taxon concept" do
         specify {
           expect do
-            delete :destroy, taxon_concept_id: other_taxon_concept.id, id: rel.id
+            delete :destroy, params: { taxon_concept_id: other_taxon_concept.id, id: rel.id }
           end.to change(TaxonRelationship, :count).by(-2)
         }
       end
@@ -89,14 +89,14 @@
       context "destroys relationship for taxon concept" do
         specify {
           expect do
-            delete :destroy, taxon_concept_id: taxon_concept.id, id: rel.id
+            delete :destroy, params: { taxon_concept_id: taxon_concept.id, id: rel.id }
           end.to change(TaxonRelationship, :count).by(-1)
         }
       end
       context "destroys relationship for other taxon concept" do
         specify {
           expect do
-            delete :destroy, taxon_concept_id: other_taxon_concept.id, id: rel.id
+            delete :destroy, params: { taxon_concept_id: other_taxon_concept.id, id: rel.id }
           end.to change(TaxonRelationship, :count).by(-1)
         }
       end
diff --git a/spec/controllers/admin/taxonomies_controller_spec.rb b/spec/controllers/admin/taxonomies_controller_spec.rb
index d6386851d..b37dfaba8 100644
--- a/spec/controllers/admin/taxonomies_controller_spec.rb
+++ b/spec/controllers/admin/taxonomies_controller_spec.rb
@@ -54,7 +54,7 @@
   describe "DELETE destroy" do
     let(:taxonomy) { create(:taxonomy) }
     it "redirects after delete" do
-      delete :destroy, :id => taxonomy.id
+      delete :destroy, params: { :id => taxonomy.id }
       expect(response).to redirect_to(admin_taxonomies_url)
     end
   end
@@ -70,7 +70,7 @@
     describe "DELETE destroy" do
       let(:taxonomy) { create(:taxonomy) }
       it "fails to delete and redirects to admin_root_path" do
-        delete :destroy, :id => taxonomy.id
+        delete :destroy, params: { :id => taxonomy.id }
         expect(response).to redirect_to(admin_root_path)
         expect(Taxonomy.find(taxonomy.id)).not_to be_nil
       end
diff --git a/spec/controllers/admin/trade_names_relationships_controller_spec.rb b/spec/controllers/admin/trade_names_relationships_controller_spec.rb
index c5aace692..221d37ac6 100644
--- a/spec/controllers/admin/trade_names_relationships_controller_spec.rb
+++ b/spec/controllers/admin/trade_names_relationships_controller_spec.rb
@@ -79,9 +79,7 @@
 
   describe "DELETE destroy" do
     it "redirects after delete" do
-      delete :destroy,
-        :taxon_concept_id => taxon_concept.id,
-        :id => trade_name_relationship.id
+      delete :destroy, params: { :taxon_concept_id => taxon_concept.id, :id => trade_name_relationship.id }
       expect(response).to redirect_to(
         admin_taxon_concept_names_url(trade_name_relationship.taxon_concept)
       )
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index bb66421e3..226f0f8c5 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -51,7 +51,7 @@
   describe "DELETE destroy" do
     let(:user) { create(:user) }
     it "redirects after delete" do
-      delete :destroy, :id => user.id
+      delete :destroy, params: { :id => user.id }
       expect(response).to redirect_to(admin_users_url)
     end
   end
diff --git a/spec/controllers/api/auto_complete_taxon_concepts_controller_spec.rb b/spec/controllers/api/auto_complete_taxon_concepts_controller_spec.rb
index 8cb20f57b..43dab8038 100644
--- a/spec/controllers/api/auto_complete_taxon_concepts_controller_spec.rb
+++ b/spec/controllers/api/auto_complete_taxon_concepts_controller_spec.rb
@@ -5,15 +5,12 @@
 
   describe "GET index" do
     it "returns 1 result when searching for species name and filtering for rank SPECIES" do
-      get :index, :taxonomy => "CITES",
-        :taxon_concept_query => "Boa", :ranks => ["SPECIES"],
-        :visibility => "trade"
+      get :index, params: { :taxonomy => "CITES", :taxon_concept_query => "Boa", :ranks => ["SPECIES"], :visibility => "trade" }
       expect(response.body).to have_json_size(1).
         at_path("auto_complete_taxon_concepts")
     end
     it "returns 3 results when searching for species name and not filtering by rank" do
-      get :index, :taxonomy => "CITES",
-        :taxon_concept_query => "Boa"
+      get :index, params: { :taxonomy => "CITES", :taxon_concept_query => "Boa" }
       expect(response.body).to have_json_size(3).
         at_path("auto_complete_taxon_concepts")
     end
diff --git a/spec/controllers/api/document_geo_entities_controller_spec.rb b/spec/controllers/api/document_geo_entities_controller_spec.rb
index 4a8abd36a..eac6f7b5a 100644
--- a/spec/controllers/api/document_geo_entities_controller_spec.rb
+++ b/spec/controllers/api/document_geo_entities_controller_spec.rb
@@ -24,12 +24,12 @@
     }
 
     it "returns Poland when searching by wolf" do
-      get :index, taxon_concept_query: 'Canis lu'
+      get :index, params: { taxon_concept_query: 'Canis lu' }
       expect(response.body).to have_json_size(1).at_path('document_geo_entities')
     end
 
     it "returns 0 geo entities when no match for taxon name" do
-      get :index, taxon_concept_query: 'Lynx'
+      get :index, params: { taxon_concept_query: 'Lynx' }
       expect(response.body).to have_json_size(0).at_path('document_geo_entities')
     end
 
diff --git a/spec/controllers/api/documents_controller_spec.rb b/spec/controllers/api/documents_controller_spec.rb
index fcc7d00bb..9344b9e52 100644
--- a/spec/controllers/api/documents_controller_spec.rb
+++ b/spec/controllers/api/documents_controller_spec.rb
@@ -27,7 +27,7 @@
 
   context "GET index returns all documents" do
     def get_all_documents
-      get :index, taxon_concept_id: @taxon_concept.id
+      get :index, params: { taxon_concept_id: @taxon_concept.id }
       expect(response.body).to have_json_size(4).at_path('documents')
     end
     context "GET index contributor" do
@@ -49,7 +49,7 @@ def get_all_documents
 
   context "GET index returns only public documents" do
     def get_public_documents
-      get :index, taxon_concept_id: @taxon_concept.id
+      get :index, params: { taxon_concept_id: @taxon_concept.id }
       expect(response.body).to have_json_size(3).at_path('documents')
     end
     context "GET index api user " do
@@ -68,7 +68,7 @@ def get_public_documents
 
   context "GET index returns only public documents for secretariat role" do
     def get_public_documents
-      get :index, taxon_concept_id: @taxon_concept.id
+      get :index, params: { taxon_concept_id: @taxon_concept.id }
       expect(response.body).to have_json_size(3).at_path('documents')
     end
     context "GET index api user " do
@@ -83,14 +83,14 @@ def get_public_documents
   context "show action fails" do
     login_api_user
     it "should return 403 status when permission denied" do
-      get :show, id: @document2.id
+      get :show, params: { id: @document2.id }
       expect(response.status).to eq(403)
     end
   end
 
   context "GET should retrieve documents with no event_type" do
     it "returns documents with no event_type" do
-      get :index, event_type: "Other"
+      get :index, params: { event_type: "Other" }
       expect(response.body).to have_json_size(1).at_path('documents')
     end
   end
@@ -99,13 +99,13 @@ def get_public_documents
     context "single document selected" do
       it "should return 404 if file is missing" do
         expect(File).to receive(:exists?).and_return(false)
-        get :download_zip, ids: @document2.id
+        get :download_zip, params: { ids: @document2.id }
         expect(response.status).to eq(404)
       end
       it "should return zip file if file is found" do
         allow(controller).to receive(:render)
         expect(File).to receive(:exists?).and_return(true)
-        get :download_zip, ids: @document2.id
+        get :download_zip, params: { ids: @document2.id }
         expect(response.headers['Content-Type']).to eq 'application/zip'
       end
     end
@@ -113,20 +113,20 @@ def get_public_documents
     context "multiple documents selected" do
       it "should return 404 if all files are missing" do
         expect(File).to receive(:exists?).and_return(false, false)
-        get :download_zip, ids: "#{@document.id},#{@document2.id}"
+        get :download_zip, params: { ids: "#{@document.id},#{@document2.id}" }
         expect(response.status).to eq(404)
       end
 
       it "should return zip file if at least a file is found" do
         expect(File).to receive(:exists?).and_return(false, true)
-        get :download_zip, ids: "#{@document.id},#{@document2.id}"
+        get :download_zip, params: { ids: "#{@document.id},#{@document2.id}" }
         expect(response.headers['Content-Type']).to eq 'application/zip'
       end
     end
 
     context "cascading documents logic" do
       it "should get subspecies documents" do
-        get :index, taxon_concepts_ids: [@taxon_concept.id]
+        get :index, params: { taxon_concepts_ids: [@taxon_concept.id] }
         expect(response.body).to have_json_size(3).at_path('documents')
       end
     end
diff --git a/spec/controllers/api/geo_entities_controller_spec.rb b/spec/controllers/api/geo_entities_controller_spec.rb
index 2ef04d6da..de9584822 100644
--- a/spec/controllers/api/geo_entities_controller_spec.rb
+++ b/spec/controllers/api/geo_entities_controller_spec.rb
@@ -36,11 +36,11 @@
   }
   describe "GET index" do
     it "returns regions" do
-      get :index, :geo_entity_types_set => "1"
+      get :index, params: { :geo_entity_types_set => "1" }
       expect(response.body).to have_json_size(1).at_path('geo_entities')
     end
     it "returns countries & territories" do
-      get :index, :geo_entity_types_set => "2"
+      get :index, params: { :geo_entity_types_set => "2" }
       expect(response.body).to have_json_size(3).at_path('geo_entities')
     end
   end
diff --git a/spec/controllers/api/taxon_concepts_controller_spec.rb b/spec/controllers/api/taxon_concepts_controller_spec.rb
index 5f60e875c..361a7832a 100644
--- a/spec/controllers/api/taxon_concepts_controller_spec.rb
+++ b/spec/controllers/api/taxon_concepts_controller_spec.rb
@@ -4,22 +4,12 @@
   context "GET index" do
     it " logs with Ahoy with different parameters" do
       expect {
-        get :index, {
-          :taxonomy => 'cites_eu',
-          :taxon_concept_query => 'stork',
-          :geo_entity_scope => 'cites',
-          :page => 1
-        }
+        get :index, params: { :taxonomy => 'cites_eu', :taxon_concept_query => 'stork', :geo_entity_scope => 'cites', :page => 1 }
       }.to change { Ahoy::Event.count }.by(1)
       expect(Ahoy::Event.last.visit_id).to_not be(nil)
 
       expect {
-        get :index, {
-          :taxonomy => 'cites_eu',
-          :taxon_concept_query => 'dolphin',
-          :geo_entity_scope => 'cites',
-          :page => 1
-        }
+        get :index, params: { :taxonomy => 'cites_eu', :taxon_concept_query => 'dolphin', :geo_entity_scope => 'cites', :page => 1 }
       }.to change { Ahoy::Event.count }.by(1)
       expect(@ahoy_event1).to eq(@ahoy_event2)
     end
diff --git a/spec/controllers/checklist/geo_entities_controller_spec.rb b/spec/controllers/checklist/geo_entities_controller_spec.rb
index 847c61208..33f95d891 100644
--- a/spec/controllers/checklist/geo_entities_controller_spec.rb
+++ b/spec/controllers/checklist/geo_entities_controller_spec.rb
@@ -36,11 +36,11 @@
   }
   describe "GET index" do
     it "returns regions" do
-      get :index, :geo_entity_types_set => "1"
+      get :index, params: { :geo_entity_types_set => "1" }
       expect(response.body).to have_json_size(1)
     end
     it "returns countries & territories" do
-      get :index, :geo_entity_types_set => "2"
+      get :index, params: { :geo_entity_types_set => "2" }
       expect(response.body).to have_json_size(3)
     end
   end
diff --git a/spec/controllers/cites_trade/exports_controller_spec.rb b/spec/controllers/cites_trade/exports_controller_spec.rb
index 2eef8d094..37338609c 100644
--- a/spec/controllers/cites_trade/exports_controller_spec.rb
+++ b/spec/controllers/cites_trade/exports_controller_spec.rb
@@ -6,7 +6,7 @@
     context "raw format" do
       it "returns count of shipments" do
         create(:shipment)
-        get :download, :filters => { :report_type => 'raw' }, :format => :json
+        get :download, params: { :filters => { :report_type => 'raw' }, :format => :json }
         expect(parse_json(response.body)['total']).to eq(1)
       end
     end
@@ -16,7 +16,7 @@
         allow_any_instance_of(Trade::ShipmentsExport).to receive(:public_file_name).and_return('shipments.csv')
         allow(Trade::TradeDataDownloadLogger).to receive(:city_country_from).and_return(["Cambridge", "United Kingdom"])
         allow(Trade::TradeDataDownloadLogger).to receive(:organization_from).and_return("UNEP-WCMC")
-        get :download, :filters => { :report_type => :comptab }
+        get :download, params: { :filters => { :report_type => :comptab } }
         expect(response.content_type).to eq("text/csv")
         expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"shipments.csv\"")
       end
@@ -26,12 +26,12 @@
         allow(Trade::TradeDataDownloadLogger).to receive(:city_country_from).and_return(["Cambridge", "United Kingdom"])
         allow(Trade::TradeDataDownloadLogger).to receive(:organization_from).and_return("UNEP-WCMC")
         expect do
-          get :download, :filters => {
+          get :download, params: { :filters => {
             :report_type => 'comptab',
             :exporters_ids => ['40'],
             :time_range_start => '1975',
             :time_range_end => '2000'
-          }
+          } }
         end.to change(Trade::TradeDataDownload, :count).by(1)
       end
     end
@@ -40,7 +40,7 @@
         allow_any_instance_of(Trade::ShipmentsExport).to receive(:export).and_return(false)
       end
       it "redirects to home page" do
-        get :download, :filters => { :report_type => :comptab }
+        get :download, params: { :filters => { :report_type => :comptab } }
         expect(response).to redirect_to(cites_trade_root_url)
       end
     end
diff --git a/spec/controllers/cites_trade/shipments_controller_spec.rb b/spec/controllers/cites_trade/shipments_controller_spec.rb
index b90e7e730..a8fe3fc39 100644
--- a/spec/controllers/cites_trade/shipments_controller_spec.rb
+++ b/spec/controllers/cites_trade/shipments_controller_spec.rb
@@ -7,21 +7,21 @@
     before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     context "serializer" do
       it "should return comptab export when report_type invalid" do
-        get :index, filters: {
+        get :index, params: { filters: {
           report_type: 'raw'
-        }, format: :json
+        }, format: :json }
         expect(response.body).to have_json_path('shipment_comptab_export')
       end
       it "should return comptab export when report_type = comptab" do
-        get :index, filters: {
+        get :index, params: { filters: {
           report_type: 'comptab'
-        }, format: :json
+        }, format: :json }
         expect(response.body).to have_json_path('shipment_comptab_export')
       end
       it "should return gross net export when report_type = gross_exports" do
-        get :index, filters: {
+        get :index, params: { filters: {
           report_type: 'gross_exports'
-        }, format: :json
+        }, format: :json }
         expect(response.body).to have_json_path('shipment_gross_net_export')
       end
     end
@@ -30,32 +30,32 @@
       expect(response.body).to have_json_size(7).at_path('shipment_comptab_export/rows')
     end
     it "should return all gross_exports shipments" do
-      get :index, filters: {
+      get :index, params: { filters: {
         report_type: 'gross_exports',
         time_range_start: 2012,
         time_range_end: 2014
-      }, format: :json
+      }, format: :json }
       expect(response.body).to have_json_size(5).at_path('shipment_gross_net_export/rows')
     end
     it "should return genus & species shipments when searching by genus" do
-      get :index, filters: {
+      get :index, params: { filters: {
         taxon_concepts_ids: [@animal_genus.id],
         selection_taxon: 'taxonomic_cascade'
-      }, format: :json
+      }, format: :json }
       expect(response.body).to have_json_size(2).at_path('shipment_comptab_export/rows')
     end
     it "should return family, genus & species shipments when searching by family" do
-      get :index, filters: {
+      get :index, params: { filters: {
         taxon_concepts_ids: [@animal_family.id],
         selection_taxon: 'taxonomic_cascade'
-      }, format: :json
+      }, format: :json }
       expect(response.body).to have_json_size(3).at_path('shipment_comptab_export/rows')
     end
     it "should return genus shipments when searching by taxon" do
-      get :index, filters: {
+      get :index, params: { filters: {
         taxon_concepts_ids: [@animal_genus.id],
         selection_taxon: 'taxon'
-      }, format: :json
+      }, format: :json }
       expect(response.body).to have_json_size(0).at_path('shipment_comptab_export/rows')
     end
   end
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index 1bf92dfab..84a59082b 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -12,27 +12,27 @@
   context "when editing own account" do
     it "should update name" do
       sign_in(@u1)
-      put :update, :id => @u1.id, :user => {
+      put :update, params: { :id => @u1.id, :user => {
         :email => @u1.email, :name => 'ZZ'
-      }
+      } }
       expect(response).to redirect_to(admin_root_url)
       expect(@u1.reload.name).to eq('ZZ')
     end
     it "should update password" do
       sign_in(@u1)
-      put :update, :id => @u1.id, :user => {
+      put :update, params: { :id => @u1.id, :user => {
         :email => @u1.email, :name => @u1.name,
         :password => '22222222', :password_confirmation => '22222222',
         :current_password => '11111111'
-      }
+      } }
       expect(response).to redirect_to(admin_root_url)
       expect(@u1.reload.valid_password?('22222222')).to eq(true)
     end
     it "should not update that account if not valid" do
       sign_in(@u1)
-      put :update, :id => @u1.id, :user => {
+      put :update, params: { :id => @u1.id, :user => {
         :email => 'another_email@example.com', :name => nil
-      }
+      } }
       expect(response).to render_template("edit")
       expect(@u1.reload.email).not_to eq('another_email@example.com')
     end
@@ -41,9 +41,9 @@
   context "when editing another user's account" do
     it "should not update that account" do
       sign_in(@u1)
-      put :update, :id => @u2.id, :user => {
+      put :update, params: { :id => @u2.id, :user => {
         :email => @u1.email, :name => 'ZZ'
-      }
+      } }
       expect(@u2.reload.name).not_to eq('ZZ')
     end
   end
@@ -51,10 +51,10 @@
   context "when signing up" do
     it "should create an account with the role set to api" do
       expect {
-        post :create, :user => {
+        post :create, params: { :user => {
           :email => @u3.email, :name => @u3.name, :organisation => 'WCMC',
           :password => '22222222', :password_confirmation => '22222222'
-        }
+        } }
       }.to change { User.count }.by(1)
       u = User.last
       expect(u.role).to eq 'api'
diff --git a/spec/controllers/species/exports_controller_spec.rb b/spec/controllers/species/exports_controller_spec.rb
index 022470e8a..bf97136cc 100644
--- a/spec/controllers/species/exports_controller_spec.rb
+++ b/spec/controllers/species/exports_controller_spec.rb
@@ -10,9 +10,9 @@
   context 'with ip address to csv separator conversion' do
     it 'sets separator to comma with local ip address' do
       allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("127.0.0.1")
-      get :download, data_type: 'EuDecisions', :filters => {
+      get :download, params: { data_type: 'EuDecisions', :filters => {
         'set' => 'current', 'decision_types' => {}, :csv_separator => ''
-      }
+      } }
 
       expect(response.cookies['speciesplus.csv_separator']).to_not be_nil
       expect(response.cookies['speciesplus.csv_separator']).to eq('comma')
@@ -22,9 +22,9 @@
     it 'sets separator to comma with UK ip address' do
       allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("194.59.188.126")
       allow_any_instance_of(Sapi::GeoIP).to receive(:country_and_city).and_return({ :country => "GB", :city => "Cambridge" })
-      get :download, data_type: 'EuDecisions', :filters => {
+      get :download, params: { data_type: 'EuDecisions', :filters => {
         'set' => 'current', 'decision_types' => {}, :csv_separator => ''
-      }
+      } }
       expect(response.cookies['speciesplus.csv_separator']).to_not be_nil
       expect(response.cookies['speciesplus.csv_separator']).to eq('comma')
       expect(assigns(:filters)[:csv_separator]).to eq(:comma)
@@ -33,9 +33,9 @@
     it 'sets separator to semicolon with AF ip address' do
       allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("175.106.59.78")
       allow_any_instance_of(Sapi::GeoIP).to receive(:country_and_city).and_return({ :country => "AF", :city => "Kabul" })
-      get :download, data_type: 'EuDecisions', :filters => {
+      get :download, params: { data_type: 'EuDecisions', :filters => {
         'set' => 'current', 'decision_types' => {}, :csv_separator => ''
-      }
+      } }
       expect(response.cookies['speciesplus.csv_separator']).to_not be_nil
       expect(response.cookies['speciesplus.csv_separator']).to eq('semicolon')
       expect(assigns(:filters)[:csv_separator]).to eq(:semicolon)
@@ -43,9 +43,9 @@
 
     it 'sets separator back to comma when a user overrides the encoded default' do
       allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("175.106.59.78")
-      get :download, data_type: 'EuDecisions', :filters => {
+      get :download, params: { data_type: 'EuDecisions', :filters => {
         'set' => 'current', 'decision_types' => {}, :csv_separator => 'comma'
-      }
+      } }
       expect(response.cookies['speciesplus.csv_separator']).to_not be_nil
       expect(response.cookies['speciesplus.csv_separator']).to eq('comma')
       expect(assigns(:filters)[:csv_separator]).to eq(:comma)
@@ -53,9 +53,9 @@
 
     it 'sets separator to comma when IP address is nil' do
       allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return(nil)
-      get :download, data_type: 'EuDecisions', :filters => {
+      get :download, params: { data_type: 'EuDecisions', :filters => {
         'set' => 'current', 'decision_types' => {}, :csv_separator => ''
-      }
+      } }
       expect(response.cookies['speciesplus.csv_separator']).to_not be_nil
       expect(response.cookies['speciesplus.csv_separator']).to eq('comma')
       expect(assigns(:filters)[:csv_separator]).to eq(:comma)
@@ -63,9 +63,9 @@
 
     it 'sets separator to comma when IP address is unknown' do
       allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return('unknown')
-      get :download, data_type: 'EuDecisions', :filters => {
+      get :download, params: { data_type: 'EuDecisions', :filters => {
         'set' => 'current', 'decision_types' => {}, :csv_separator => ''
-      }
+      } }
       expect(response.cookies['speciesplus.csv_separator']).to_not be_nil
       expect(response.cookies['speciesplus.csv_separator']).to eq('comma')
       expect(assigns(:filters)[:csv_separator]).to eq(:comma)
diff --git a/spec/controllers/trade/annual_report_uploads_controller_spec.rb b/spec/controllers/trade/annual_report_uploads_controller_spec.rb
index ac6896cb3..a5e8f793c 100644
--- a/spec/controllers/trade/annual_report_uploads_controller_spec.rb
+++ b/spec/controllers/trade/annual_report_uploads_controller_spec.rb
@@ -37,14 +37,14 @@ def exporter_csv
       expect(response.body).to have_json_size(2).at_path('annual_report_uploads')
     end
     it "should return annual report uploads in progress" do
-      get :index, is_done: 0, format: :json
+      get :index, params: { is_done: 0, format: :json }
       expect(response.body).to have_json_size(1).at_path('annual_report_uploads')
     end
   end
 
   describe "GET show" do
     it "should return success" do
-      get :show, id: annual_report_upload.id, format: :json
+      get :show, params: { id: annual_report_upload.id, format: :json }
       expect(response.body).to have_json_path('annual_report_upload')
     end
   end
diff --git a/spec/controllers/trade/exports_controller_spec.rb b/spec/controllers/trade/exports_controller_spec.rb
index 2298c49a9..7158f08e2 100644
--- a/spec/controllers/trade/exports_controller_spec.rb
+++ b/spec/controllers/trade/exports_controller_spec.rb
@@ -7,19 +7,19 @@
     context "raw format" do
       it "returns count of shipments" do
         create(:shipment)
-        get :download, :filters => { :report_type => 'raw' }, :format => :json
+        get :download, params: { :filters => { :report_type => 'raw' }, :format => :json }
         expect(parse_json(response.body)['total']).to eq(1)
       end
       it "does not log download information from the admin interface" do
         create(:shipment)
         allow_any_instance_of(Trade::ShipmentsExport).to receive(:public_file_name).and_return('shipments.csv')
         expect {
-          get :download, :filters => {
+          get :download, params: { :filters => {
             :report_type => :raw,
             :exporters_ids => ['40'],
             :time_range_start => '1975',
             :time_range_end => '2000'
-          }
+          } }
         }.not_to change(Trade::TradeDataDownload, :count)
       end
     end
@@ -28,7 +28,7 @@
         allow_any_instance_of(Trade::ShipmentsExport).to receive(:export).and_return(false)
       end
       it "redirects to home page" do
-        get :download, :filters => { :report_type => :comptab }
+        get :download, params: { :filters => { :report_type => :comptab } }
         expect(response).to redirect_to(trade_root_url)
       end
     end
diff --git a/spec/controllers/trade/sandbox_shipments_controller_spec.rb b/spec/controllers/trade/sandbox_shipments_controller_spec.rb
index 54f0fa32c..95205ff47 100644
--- a/spec/controllers/trade/sandbox_shipments_controller_spec.rb
+++ b/spec/controllers/trade/sandbox_shipments_controller_spec.rb
@@ -33,37 +33,25 @@
   end
   describe "PUT update" do
     it "should return success when taxon_name not set" do
-      put :update, :annual_report_upload_id => annual_report_upload.id,
-        :id => @shipment.id,
-        :sandbox_shipment => { :taxon_name => nil, :accepted_taxon_name => nil },
-        :format => :json
+      put :update, params: { :annual_report_upload_id => annual_report_upload.id, :id => @shipment.id, :sandbox_shipment => { :taxon_name => nil, :accepted_taxon_name => nil }, :format => :json }
       expect(response.body).to be_blank
     end
     it "should return success when taxon_name does not exist" do
-      put :update, :annual_report_upload_id => annual_report_upload.id,
-        :id => @shipment.id,
-        :sandbox_shipment => { :taxon_name => 'Acipenser foobarus' },
-        :format => :json
+      put :update, params: { :annual_report_upload_id => annual_report_upload.id, :id => @shipment.id, :sandbox_shipment => { :taxon_name => 'Acipenser foobarus' }, :format => :json }
       expect(response.body).to be_blank
     end
   end
 
   describe "DELETE destroy" do
     it "should return success" do
-      delete :destroy, :annual_report_upload_id => annual_report_upload.id,
-        :id => @shipment.id,
-        :format => :json
+      delete :destroy, params: { :annual_report_upload_id => annual_report_upload.id, :id => @shipment.id, :format => :json }
       expect(response.body).to be_blank
     end
   end
 
   describe "POST update_batch" do
     it "should return success" do
-      post :update_batch,
-        annual_report_upload_id: annual_report_upload.id,
-        validation_error_id: @validation_error.id,
-        updates: { appendix: 'II' },
-        format: :json
+      post :update_batch, params: { annual_report_upload_id: annual_report_upload.id, validation_error_id: @validation_error.id, updates: { appendix: 'II' }, format: :json }
       expect(response.body).to be_blank
       expect(sandbox_klass.where(taxon_name: @species.full_name, appendix: 'I').count(true)).to eq(0)
       expect(sandbox_klass.where(taxon_name: @species.full_name, appendix: 'II').count(true)).to eq(1)
@@ -72,10 +60,7 @@
 
   describe "POST destroy_batch" do
     it "should return success" do
-      post :destroy_batch,
-        annual_report_upload_id: annual_report_upload.id,
-        validation_error_id: @validation_error.id,
-        format: :json
+      post :destroy_batch, params: { annual_report_upload_id: annual_report_upload.id, validation_error_id: @validation_error.id, format: :json }
       expect(response.body).to be_blank
       expect(sandbox_klass.where(taxon_concept_id: @species.id).count(true)).to eq(0)
     end
diff --git a/spec/controllers/trade/shipments_controller_spec.rb b/spec/controllers/trade/shipments_controller_spec.rb
index dc4ac3080..258f2db61 100644
--- a/spec/controllers/trade/shipments_controller_spec.rb
+++ b/spec/controllers/trade/shipments_controller_spec.rb
@@ -12,13 +12,12 @@
       expect(response.body).to have_json_size(7).at_path('shipments')
     end
     it "should return genus & species shipments when searching by genus" do
-      get :index, taxon_concepts_ids: [@animal_genus.id], format: :json
+      get :index, params: { taxon_concepts_ids: [@animal_genus.id], format: :json }
       expect(response.body).to have_json_size(2).at_path('shipments')
     end
 
     it "should return 1 shipment when searching for reporter_type I" do
-      get :index, time_range_start: @shipment1.year, time_range_end: @shipment2.year,
-        reporter_type: "E", exporters_ids: [@portugal.id.to_s], format: :json
+      get :index, params: { time_range_start: @shipment1.year, time_range_end: @shipment2.year, reporter_type: "E", exporters_ids: [@portugal.id.to_s], format: :json }
       expect(response.body).to have_json_size(1).at_path('shipments')
     end
   end
@@ -26,25 +25,22 @@
   describe "PUT update" do
     before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should auto resolve accepted taxon when blank" do
-      put :update, id: @shipment1.id,
-        shipment: {
+      put :update, params: { id: @shipment1.id, shipment: {
           reported_taxon_concept_id: @synonym_subspecies.id
-        }
+        } }
       expect(@shipment1.reload.taxon_concept_id).to eq(@plant_species.id)
     end
     it "should not auto resolve accepted taxon when given" do
-      put :update, id: @shipment1.id,
-        shipment: {
+      put :update, params: { id: @shipment1.id, shipment: {
           reported_taxon_concept_id: @synonym_subspecies.id,
           taxon_concept_id: @animal_species.id
-        }
+        } }
       expect(@shipment1.reload.taxon_concept_id).to eq(@animal_species.id)
     end
     it "should delete orphaned permits" do
-      put :update, id: @shipment1.id,
-        shipment: {
+      put :update, params: { id: @shipment1.id, shipment: {
           import_permit_number: 'YYY'
-        }
+        } }
       expect(Trade::Permit.find_by_id(@import_permit.id)).to be_nil
     end
   end
@@ -52,103 +48,85 @@
   describe "POST update_batch" do
     before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should change reporter type from I to E" do
-      post :update_batch, {
-        filters: { # shipment2
+      post :update_batch, params: { filters: { # shipment2
           time_range_start: @shipment1.year,
           time_range_end: @shipment2.year,
           reporter_type: 'I',
           exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
           importers_ids: [@portugal.id.to_s, @argentina.id.to_s],
           taxon_concepts_ids: [@plant_species.id]
-        },
-        updates: {
+        }, updates: {
           reporter_type: 'E'
-        }
-      }
+        } }
       expect(@shipment1.reported_by_exporter).to be_truthy
       expect(@shipment2.reload.reported_by_exporter).to be_truthy
     end
     it "should change reporter type from E to I" do
-      post :update_batch, {
-        filters: { # shipment1
+      post :update_batch, params: { filters: { # shipment1
           time_range_start: @shipment1.year,
           time_range_end: @shipment2.year,
           reporter_type: 'E',
           exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
           importers_ids: [@portugal.id.to_s, @argentina.id.to_s]
-        },
-        updates: {
+        }, updates: {
           reporter_type: 'I'
-        }
-      }
+        } }
 
       expect(@shipment1.reload.reported_by_exporter).to be_falsey
       expect(@shipment2.reported_by_exporter).to be_falsey
     end
 
     it "should update year" do
-      post :update_batch, {
-        filters: { # shipment1
+      post :update_batch, params: { filters: { # shipment1
           time_range_start: @shipment1.year,
           time_range_end: @shipment2.year,
           year: 2013,
           exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
           importers_ids: [@portugal.id.to_s, @argentina.id.to_s]
-        },
-        updates: {
+        }, updates: {
           year: 2014
-        }
-      }
+        } }
       expect(Trade::Shipment.where(year: 2013).count).to eq(0)
       expect(Trade::Shipment.where(year: 2014).count).to be > 0
     end
 
     it "should auto resolve accepted taxon when blank" do
-      post :update_batch, {
-        filters: { # shipment1
+      post :update_batch, params: { filters: { # shipment1
           time_range_start: @shipment1.year,
           time_range_end: @shipment2.year,
           year: 2013,
           exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
           importers_ids: [@portugal.id.to_s, @argentina.id.to_s]
-        },
-        updates: {
+        }, updates: {
           reported_taxon_concept_id: @synonym_subspecies.id
-        }
-      }
+        } }
       expect(@shipment1.reload.taxon_concept_id).to eq(@plant_species.id)
     end
 
     it "should not auto resolve accepted taxon when given" do
-      post :update_batch, {
-        filters: { # shipment1
+      post :update_batch, params: { filters: { # shipment1
           time_range_start: @shipment1.year,
           time_range_end: @shipment2.year,
           year: 2013,
           exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
           importers_ids: [@portugal.id.to_s, @argentina.id.to_s]
-        },
-        updates: {
+        }, updates: {
           reported_taxon_concept_id: @synonym_subspecies.id,
           taxon_concept_id: @animal_species.id
-        }
-      }
+        } }
       expect(@shipment1.reload.taxon_concept_id).to eq(@animal_species.id)
     end
 
     it "should set permit number to blank and delete orphaned permits" do
-      post :update_batch, {
-        filters: { # shipment1
+      post :update_batch, params: { filters: { # shipment1
           time_range_start: @shipment1.year,
           time_range_end: @shipment2.year,
           year: 2013,
           exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
           importers_ids: [@portugal.id.to_s, @argentina.id.to_s]
-        },
-        updates: {
+        }, updates: {
           import_permit_number: nil
-        }
-      }
+        } }
       expect(@shipment1.reload.import_permits_ids).to be_blank
       expect(@shipment1.import_permit_number).to be_nil
       expect(Trade::Permit.find_by_id(@import_permit.id)).to be_nil
@@ -159,78 +137,56 @@
   describe "POST destroy_batch" do
     before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should delete 1 shipment" do
-      post :destroy_batch, {
-        time_range_start: @shipment1.year,
-        time_range_end: @shipment2.year,
-        reporter_type: 'E',
-        exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
-        importers_ids: [@portugal.id.to_s, @argentina.id.to_s],
-        taxon_concepts_ids: [@animal_species.id]
-      }
+      post :destroy_batch, params: { time_range_start: @shipment1.year, time_range_end: @shipment2.year, reporter_type: 'E', exporters_ids: [@portugal.id.to_s, @argentina.id.to_s], importers_ids: [@portugal.id.to_s, @argentina.id.to_s], taxon_concepts_ids: [@animal_species.id] }
       expect(Trade::Shipment.count).to eq(6)
     end
     it "should delete 5 shipment" do
-      post :destroy_batch, {
-        time_range_start: @shipment1.year,
-        time_range_end: @shipment2.year,
-        reporter_type: 'I',
-        exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
-        importers_ids: [@portugal.id.to_s, @argentina.id.to_s]
-      }
+      post :destroy_batch, params: { time_range_start: @shipment1.year, time_range_end: @shipment2.year, reporter_type: 'I', exporters_ids: [@portugal.id.to_s, @argentina.id.to_s], importers_ids: [@portugal.id.to_s, @argentina.id.to_s] }
       expect(Trade::Shipment.count).to eq(2)
     end
 
     it "should delete 2 shipments" do
-      post :destroy_batch, importers_ids: [@argentina.id.to_s]
+      post :destroy_batch, params: { importers_ids: [@argentina.id.to_s] }
       expect(Trade::Shipment.count).to eq(5)
     end
 
     it "should delete 1 shipments" do
-      post :destroy_batch, exporters_ids: [@portugal.id.to_s]
+      post :destroy_batch, params: { exporters_ids: [@portugal.id.to_s] }
       expect(Trade::Shipment.count).to eq(5)
     end
 
     it "should delete all shipments" do
-      post :destroy_batch, purposes_ids: [@purpose.id.to_s]
+      post :destroy_batch, params: { purposes_ids: [@purpose.id.to_s] }
       expect(Trade::Shipment.count).to eq(0)
     end
 
     it "shouldn't delete any shipments" do
-      post :destroy_batch, purpose_blank: "true"
+      post :destroy_batch, params: { purpose_blank: "true" }
       expect(Trade::Shipment.count).to eq(7)
     end
 
     it "should delete 1 shipment" do
-      post :destroy_batch, sources_ids: [@source.id.to_s]
+      post :destroy_batch, params: { sources_ids: [@source.id.to_s] }
       expect(Trade::Shipment.count).to eq(5)
     end
 
     it "should delete 3 shipment" do
-      post :destroy_batch, sources_ids: [@source_wild.id.to_s]
+      post :destroy_batch, params: { sources_ids: [@source_wild.id.to_s] }
       expect(Trade::Shipment.count).to eq(4)
     end
 
     it "should delete 0 shipments" do
-      post :destroy_batch, sources_ids: [@source_wild.id.to_s],
-        reporter_type: 'E'
+      post :destroy_batch, params: { sources_ids: [@source_wild.id.to_s], reporter_type: 'E' }
       expect(Trade::Shipment.count).to eq(7)
     end
 
     it "should delete 4 shipments" do
-      post :destroy_batch, sources_ids: [@source_wild.id.to_s],
-        reporter_type: 'I', source_blank: "true"
+      post :destroy_batch, params: { sources_ids: [@source_wild.id.to_s], reporter_type: 'I', source_blank: "true" }
       expect(Trade::Shipment.count).to eq(3)
     end
 
     it "should delete orphaned permits" do
-      post :destroy_batch, {
-        # shipment1
-        time_range_start: @shipment1.year,
-        time_range_end: @shipment2.year,
-        year: 2013,
-        exporters_ids: [@portugal.id.to_s, @argentina.id.to_s],
-        importers_ids: [@portugal.id.to_s, @argentina.id.to_s]
-      }
+      post :destroy_batch, params: { time_range_start: @shipment1.year, time_range_end: @shipment2.year, year: 2013, exporters_ids: [@portugal.id.to_s, @argentina.id.to_s], importers_ids: [@portugal.id.to_s, @argentina.id.to_s] }
       expect(Trade::Shipment.find_by_id(@shipment1.id)).to be_nil
       expect(Trade::Permit.find_by_id(@import_permit.id)).to be_nil
     end
@@ -239,11 +195,11 @@
   describe "DELETE destroy" do
     before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should delete 1 shipment" do
-      delete :destroy, id: @shipment1.id
+      delete :destroy, params: { id: @shipment1.id }
       expect(Trade::Shipment.where(id: @shipment1.id)).to be_empty
     end
     it "should delete orphaned permits" do
-      delete :destroy, id: @shipment1.id
+      delete :destroy, params: { id: @shipment1.id }
       expect(Trade::Permit.find_by_id(@import_permit.id)).to be_nil
     end
   end
diff --git a/spec/controllers/trade/validation_errors_controller_spec.rb b/spec/controllers/trade/validation_errors_controller_spec.rb
index 5a28659aa..c38f12297 100644
--- a/spec/controllers/trade/validation_errors_controller_spec.rb
+++ b/spec/controllers/trade/validation_errors_controller_spec.rb
@@ -32,18 +32,16 @@
 
   describe "PUT update" do
     it "should update is_ignored" do
-      put :update,
-        id: validation_error.id,
-        validation_error: {
+      put :update, params: { id: validation_error.id, validation_error: {
           is_ignored: true
-        }
+        } }
       expect(validation_error.reload.is_ignored).to be_truthy
     end
   end
 
   describe "GET show" do
     it "should return success" do
-      get :show, id: validation_error.id, format: :json
+      get :show, params: { id: validation_error.id, format: :json }
       expect(response.body).to have_json_path('validation_error')
     end
   end
diff --git a/spec/integration/login_spec.rb b/spec/integration/login_spec.rb
index 5b39af530..94c1eba97 100644
--- a/spec/integration/login_spec.rb
+++ b/spec/integration/login_spec.rb
@@ -3,22 +3,22 @@
 RSpec.describe "Home page", type: :request do
   it "redirects Data Manager to admin root path" do
     user = create(:user, role: User::MANAGER)
-    post "/users/sign_in", user: { email: user.email, password: user.password }
+    post "/users/sign_in", params: { user: { email: user.email, password: user.password } }
     assert_redirected_to admin_root_path
   end
   it "redirects Data Contributor to admin root path" do
     user = create(:user, role: User::CONTRIBUTOR)
-    post "/users/sign_in", user: { email: user.email, password: user.password }
+    post "/users/sign_in", params: { user: { email: user.email, password: user.password } }
     assert_redirected_to admin_root_path
   end
   it "redirects E-library Viewer to public root path" do
     user = create(:user, role: User::ELIBRARY_USER)
-    post "/users/sign_in", user: { email: user.email, password: user.password }
+    post "/users/sign_in", params: { user: { email: user.email, password: user.password } }
     assert_redirected_to root_path
   end
   it "redirects API User to public root path" do
     user = create(:user, role: User::API_USER)
-    post "/users/sign_in", user: { email: user.email, password: user.password }
+    post "/users/sign_in", params: { user: { email: user.email, password: user.password } }
     assert_redirected_to root_path
   end
 end

From 6357b312bea37a2af2684f710d1bb70fdd113f30 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 21:50:42 +0000
Subject: [PATCH 070/241] DEPRECATION WARNING: `xhr` and `xml_http_request` are
 deprecated and will be removed in Rails 5.1.

---
 .../admin/change_types_controller_spec.rb     |  8 +--
 .../admin/designations_controller_spec.rb     | 10 +--
 .../admin/distributions_controller_spec.rb    | 63 +++++++++--------
 .../admin/documents_controller_spec.rb        |  6 +-
 .../admin/eu_regulations_controller_spec.rb   |  2 +-
 ..._suspension_regulations_controller_spec.rb |  2 +-
 .../admin/events_controller_spec.rb           | 16 ++---
 .../admin/geo_entities_controller_spec.rb     | 22 +++---
 .../hybrid_relationships_controller_spec.rb   | 51 +++++++-------
 .../admin/instruments_controller_spec.rb      | 10 +--
 .../admin/languages_controller_spec.rb        |  8 +--
 .../admin/ranks_controller_spec.rb            |  8 +--
 .../admin/references_controller_spec.rb       | 10 +--
 .../admin/species_listings_controller_spec.rb |  8 +--
 .../synonym_relationships_controller_spec.rb  | 40 ++++++-----
 .../controllers/admin/tags_controller_spec.rb | 11 ++-
 .../admin/taxon_commons_controller_spec.rb    | 68 +++++++++++--------
 ...axon_concept_references_controller_spec.rb | 42 ++++++------
 .../admin/taxon_concepts_controller_spec.rb   | 36 +++++-----
 .../taxon_relationships_controller_spec.rb    |  8 +--
 .../admin/taxonomies_controller_spec.rb       | 10 +--
 ...ade_names_relationships_controller_spec.rb | 56 +++++++++------
 .../admin/users_controller_spec.rb            | 12 ++--
 .../taxon_concepts_controller_spec.rb         |  6 +-
 .../annual_report_uploads_controller_spec.rb  | 10 +--
 25 files changed, 280 insertions(+), 243 deletions(-)

diff --git a/spec/controllers/admin/change_types_controller_spec.rb b/spec/controllers/admin/change_types_controller_spec.rb
index f6b834c94..d655cb1cb 100644
--- a/spec/controllers/admin/change_types_controller_spec.rb
+++ b/spec/controllers/admin/change_types_controller_spec.rb
@@ -21,11 +21,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, change_type: build_attributes(:change_type)
+      post :create, params: { change_type: build_attributes(:change_type) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, change_type: { dummy: 'test' }
+      post :create, params: { change_type: { dummy: 'test' } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -33,11 +33,11 @@
   describe "XHR PUT update" do
     let(:change_type) { create(:change_type) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => change_type.id, :change_type => { :name => 'ZZ' }
+      put :update, :format => 'json', params: { :id => change_type.id, :change_type => { :name => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => change_type.id, :change_type => { :name => nil }
+      put :update, :format => 'json', params: { :id => change_type.id, :change_type => { :name => nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/designations_controller_spec.rb b/spec/controllers/admin/designations_controller_spec.rb
index a263b967e..d071ee99f 100644
--- a/spec/controllers/admin/designations_controller_spec.rb
+++ b/spec/controllers/admin/designations_controller_spec.rb
@@ -20,7 +20,7 @@
     end
     describe "XHR GET index JSON" do
       it "renders json for dropdown" do
-        xhr :get, :index, :format => 'json'
+        get :index, :format => 'json', xhr: true
         expect(response.body).to have_json_size(2)
         expect(parse_json(response.body, "0/text")).to eq('AA')
       end
@@ -30,11 +30,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, designation: build_attributes(:designation)
+      post :create, params: { designation: build_attributes(:designation) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, designation: { dummy: 'test'}
+      post :create, params: { designation: { dummy: 'test'} }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -42,11 +42,11 @@
   describe "XHR PUT update" do
     let(:designation) { create(:designation) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => designation.id, :designation => { :name => 'ZZ' }
+      put :update, :format => 'json', params: { :id => designation.id, :designation => { :name => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => designation.id, :designation => { :name => nil }
+      put :update, :format => 'json', params: { :id => designation.id, :designation => { :name => nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/distributions_controller_spec.rb b/spec/controllers/admin/distributions_controller_spec.rb
index eea765708..5b16f14fc 100644
--- a/spec/controllers/admin/distributions_controller_spec.rb
+++ b/spec/controllers/admin/distributions_controller_spec.rb
@@ -8,7 +8,7 @@
   end
   describe "XHR GET 'new'" do
     it "returns http success and renders the new template" do
-      xhr :get, :new, :taxon_concept_id => @taxon_concept.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }, xhr: true
       expect(response).to be_success
       expect(response).to render_template('new')
     end
@@ -16,11 +16,11 @@
       geo_entity_type_t = create(:geo_entity_type, :name => "TERRITORY")
       territory = create(:geo_entity, :geo_entity_type_id => geo_entity_type_t.id)
       country = create(:geo_entity)
-      xhr :get, :new, :taxon_concept_id => @taxon_concept.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }, xhr: true
       expect(assigns(:geo_entities).size).to eq(2)
     end
     it "assigns the distribution variable" do
-      xhr :get, :new, :taxon_concept_id => @taxon_concept.id
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }, xhr: true
       expect(assigns(:distribution)).not_to be_nil
       expect(assigns(:tags)).not_to be_nil
       expect(assigns(:geo_entities)).not_to be_nil
@@ -31,26 +31,30 @@
     let(:geo_entity) { create(:geo_entity) }
     let(:reference) { create(:reference) }
     it "renders create when successful and has an existing reference" do
-      xhr :post, :create,
-        :taxon_concept_id => @taxon_concept.id,
-        :distribution => {
-          :geo_entity_id => geo_entity.id
-        },
-        :reference => {
-          :reference_id => reference.id
+      post :create, xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :distribution => {
+            :geo_entity_id => geo_entity.id
+          },
+          :reference => {
+            :reference_id => reference.id
+          }
         }
       expect(response).to render_template("create")
     end
     it "renders create when successful and is creating a reference" do
-      xhr :post, :create,
-        :taxon_concept_id => @taxon_concept.id,
-        :distribution => {
-          :geo_entity_id => geo_entity.id
-        },
-        :reference => {
-          :title => reference.title,
-          :author => reference.author,
-          :year => reference.year
+      post :create, xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :distribution => {
+            :geo_entity_id => geo_entity.id
+          },
+          :reference => {
+            :title => reference.title,
+            :author => reference.author,
+            :year => reference.year
+          }
         }
       expect(response).to render_template("create")
     end
@@ -59,20 +63,17 @@
   describe "XHR GET edit" do
     let(:distribution) { create(:distribution, :taxon_concept_id => @taxon_concept.id) }
     it "renders the new template" do
-      xhr :get, :edit, :taxon_concept_id => @taxon_concept.id,
-        :id => distribution.id
+      get :edit, params: { :taxon_concept_id => @taxon_concept.id, :id => distribution.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the distribution variable" do
-      xhr :get, :edit, :taxon_concept_id => @taxon_concept.id,
-        :id => distribution.id
+      get :edit, params: { :taxon_concept_id => @taxon_concept.id, :id => distribution.id }, xhr: true
       expect(assigns(:distribution)).not_to be_nil
     end
     it "assigns @geo_entities (country and territory) with two objects" do
       geo_entity_type_t = create(:geo_entity_type, :name => "TERRITORY")
       territory = create(:geo_entity, :geo_entity_type_id => geo_entity_type_t.id)
-      xhr :get, :edit, :taxon_concept_id => @taxon_concept.id,
-        :id => distribution.id
+      get :edit, params: { :taxon_concept_id => @taxon_concept.id, :id => distribution.id }, xhr: true
       expect(assigns(:geo_entities).size).to eq(2)
     end
   end
@@ -81,11 +82,13 @@
     let(:distribution) { create(:distribution, :taxon_concept_id => @taxon_concept.id) }
     let(:geo_entity) { create(:geo_entity) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json',
-        :taxon_concept_id => @taxon_concept.id,
-        :id => distribution.id,
-        :distribution => {
-          :geo_entity_id => geo_entity.id
+      put :update, :format => 'json', xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :id => distribution.id,
+          :distribution => {
+            :geo_entity_id => geo_entity.id
+          }
         }
       expect(response).to be_success
     end
diff --git a/spec/controllers/admin/documents_controller_spec.rb b/spec/controllers/admin/documents_controller_spec.rb
index 5bd9d5f4e..e2520d6f8 100644
--- a/spec/controllers/admin/documents_controller_spec.rb
+++ b/spec/controllers/admin/documents_controller_spec.rb
@@ -241,8 +241,7 @@
 
     context "When no event specified" do
       it "returns properly formatted json" do
-        xhr :get, :autocomplete, :format => 'json',
-          :title => 'tit'
+        get :autocomplete, :format => 'json', params: { :title => 'tit' }, xhr: true
         expect(response.body).to have_json_size(2)
         expect(parse_json(response.body, "0/title")).to eq('Title')
         expect(parse_json(response.body, "1/title")).to eq('Title2')
@@ -251,8 +250,7 @@
 
     context "When an event is specified" do
       it "returns properly formatted json" do
-        xhr :get, :autocomplete, :format => 'json',
-          :title => 'tit', :event_id => event.id
+        get :autocomplete, :format => 'json', params: { :title => 'tit', :event_id => event.id }, xhr: true
         expect(response.body).to have_json_size(1)
         expect(parse_json(response.body, "0/title")).to eq('Title')
       end
diff --git a/spec/controllers/admin/eu_regulations_controller_spec.rb b/spec/controllers/admin/eu_regulations_controller_spec.rb
index ad9d05830..f967e33dd 100644
--- a/spec/controllers/admin/eu_regulations_controller_spec.rb
+++ b/spec/controllers/admin/eu_regulations_controller_spec.rb
@@ -24,7 +24,7 @@
   describe "XHR POST activate" do
     let(:eu_regulation) { create_eu_regulation }
     it "renders create when successful" do
-      xhr :post, :activate, :format => 'js', :id => eu_regulation.id
+      post :activate, :format => 'js', params: { :id => eu_regulation.id }, xhr: true
       expect(response).to render_template("create")
     end
   end
diff --git a/spec/controllers/admin/eu_suspension_regulations_controller_spec.rb b/spec/controllers/admin/eu_suspension_regulations_controller_spec.rb
index 758d36195..59093486e 100644
--- a/spec/controllers/admin/eu_suspension_regulations_controller_spec.rb
+++ b/spec/controllers/admin/eu_suspension_regulations_controller_spec.rb
@@ -24,7 +24,7 @@
   describe "XHR POST activate" do
     let(:eu_suspension_regulation) { create_eu_suspension_regulation(:is_current => true) }
     it "renders create when successful" do
-      xhr :post, :activate, :format => 'js', :id => eu_suspension_regulation.id
+      post :activate, :format => 'js', params: { :id => eu_suspension_regulation.id }, xhr: true
       expect(response).to render_template("create")
     end
   end
diff --git a/spec/controllers/admin/events_controller_spec.rb b/spec/controllers/admin/events_controller_spec.rb
index f7c020846..ce53b76fa 100644
--- a/spec/controllers/admin/events_controller_spec.rb
+++ b/spec/controllers/admin/events_controller_spec.rb
@@ -23,22 +23,22 @@
 
   describe "XHR GET new" do
     it "renders the new template" do
-      xhr :get, :new
+      get :new, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the event variable" do
-      xhr :get, :new
+      get :new, xhr: true
       expect(assigns(:event)).not_to be_nil
     end
   end
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, event: FactoryGirl.attributes_for(:event)
+      post :create, params: { event: FactoryGirl.attributes_for(:event) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, event: { :name => nil }
+      post :create, params: { event: { :name => nil } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -46,11 +46,11 @@
   describe "XHR GET edit" do
     let(:event) { create(:event) }
     it "renders the edit template" do
-      xhr :get, :edit, :id => event.id
+      get :edit, params: { :id => event.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the hybrid_relationship variable" do
-      xhr :get, :edit, :id => event.id
+      get :edit, params: { :id => event.id }, xhr: true
       expect(assigns(:event)).not_to be_nil
     end
   end
@@ -58,11 +58,11 @@
   describe "XHR PUT update JSON" do
     let(:event) { create(:event) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => event.id, :event => { :name => 'ZZ' }
+      put :update, :format => 'json', params: { :id => event.id, :event => { :name => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => event.id, :event => { :name => nil }
+      put :update, :format => 'json', params: { :id => event.id, :event => { :name => nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/geo_entities_controller_spec.rb b/spec/controllers/admin/geo_entities_controller_spec.rb
index 98964ee5f..abab4363c 100644
--- a/spec/controllers/admin/geo_entities_controller_spec.rb
+++ b/spec/controllers/admin/geo_entities_controller_spec.rb
@@ -33,17 +33,21 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, geo_entity: {
-        geo_entity_type_id: country_geo_entity_type.id,
-        name_en: 'CC',
-        iso_code2: 'CC'
+      post :create, xhr: true, params: {
+        geo_entity: {
+          geo_entity_type_id: country_geo_entity_type.id,
+          name_en: 'CC',
+          iso_code2: 'CC'
+        }
       }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, geo_entity: {
-        geo_entity_type_id: country_geo_entity_type.id,
-        iso_code2: nil
+      post :create, xhr: true, params: {
+        geo_entity: {
+          geo_entity_type_id: country_geo_entity_type.id,
+          iso_code2: nil
+        }
       }
       expect(response).to render_template("new")
     end
@@ -52,11 +56,11 @@
   describe "XHR PUT update JSON" do
     let(:geo_entity) { create(:geo_entity, geo_entity_type: country_geo_entity_type) }
     it "responds with 200 when successful" do
-      xhr :put, :update, format: 'json', id: geo_entity.id, geo_entity: { iso_code2: 'ZZ' }
+      put :update, format: 'json', params: { id: geo_entity.id, geo_entity: { iso_code2: 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, format: 'json', id: geo_entity.id, geo_entity: { iso_code2: nil }
+      put :update, format: 'json', params: { id: geo_entity.id, geo_entity: { iso_code2: nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/hybrid_relationships_controller_spec.rb b/spec/controllers/admin/hybrid_relationships_controller_spec.rb
index e2c8cd23a..73fc4a5e4 100644
--- a/spec/controllers/admin/hybrid_relationships_controller_spec.rb
+++ b/spec/controllers/admin/hybrid_relationships_controller_spec.rb
@@ -15,29 +15,32 @@
   }
   describe "XHR GET new" do
     it "renders the new template" do
-      xhr :get, :new, :taxon_concept_id => taxon_concept.id
+      get :new, params: { :taxon_concept_id => taxon_concept.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the hybrid_relationship variable" do
-      xhr :get, :new, :taxon_concept_id => taxon_concept.id
+      get :new, params: { :taxon_concept_id => taxon_concept.id }, xhr: true
       expect(assigns(:hybrid_relationship)).not_to be_nil
     end
   end
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create,
-        :taxon_concept_id => taxon_concept.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: hybrid.id
+      post :create, xhr: true,
+        params: {
+          :taxon_concept_id => taxon_concept.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: hybrid.id
+          }
         }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create,
-        :taxon_concept_id => taxon_concept.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: nil
+      post :create, xhr: true, params: {
+          :taxon_concept_id => taxon_concept.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: nil
+          }
         }
       expect(response).to render_template("new")
     end
@@ -45,33 +48,33 @@
 
   describe "XHR GET edit" do
     it "renders the edit template" do
-      xhr :get, :edit, :taxon_concept_id => taxon_concept.id,
-        :id => hybrid_relationship.id
+      get :edit, params: { :taxon_concept_id => taxon_concept.id, :id => hybrid_relationship.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the hybrid_relationship variable" do
-      xhr :get, :edit, :taxon_concept_id => taxon_concept.id,
-        :id => hybrid_relationship.id
+      get :edit, params: { :taxon_concept_id => taxon_concept.id, :id => hybrid_relationship.id }, xhr: true
       expect(assigns(:hybrid_relationship)).not_to be_nil
     end
   end
 
   describe "XHR PUT update" do
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => taxon_concept.id,
-        :id => hybrid_relationship.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: hybrid.id
+      put :update, :format => 'js', xhr: true, params: {
+          :taxon_concept_id => taxon_concept.id,
+          :id => hybrid_relationship.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: hybrid.id
+          }
         }
       expect(response).to render_template("create")
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => taxon_concept.id,
-        :id => hybrid_relationship.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: nil
+      put :update, :format => 'js', xhr: true, params: {
+          :taxon_concept_id => taxon_concept.id,
+          :id => hybrid_relationship.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: nil
+          }
         }
       expect(response).to render_template('new')
     end
diff --git a/spec/controllers/admin/instruments_controller_spec.rb b/spec/controllers/admin/instruments_controller_spec.rb
index 6838baa51..306b91d6c 100644
--- a/spec/controllers/admin/instruments_controller_spec.rb
+++ b/spec/controllers/admin/instruments_controller_spec.rb
@@ -20,7 +20,7 @@
     end
     describe "XHR GET index JSON" do
       it "renders json for dropdown" do
-        xhr :get, :index, :format => 'json'
+        get :index, :format => 'json', xhr: true
         expect(response.body).to have_json_size(2)
         expect(parse_json(response.body, "0/text")).to eq('AA')
       end
@@ -30,11 +30,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, instrument: build_attributes(:instrument)
+      post :create, params: { instrument: build_attributes(:instrument) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, instrument: { dummy: 'test' }
+      post :create, params: { instrument: { dummy: 'test' } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -42,11 +42,11 @@
   describe "XHR PUT update" do
     let(:instrument) { create(:instrument) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => instrument.id, :instrument => { :name => 'ZZ' }
+      put :update, :format => 'json', params: { :id => instrument.id, :instrument => { :name => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => instrument.id, :instrument => { :name => nil }
+      put :update, :format => 'json', params: { :id => instrument.id, :instrument => { :name => nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/languages_controller_spec.rb b/spec/controllers/admin/languages_controller_spec.rb
index f4824ca0c..8407af7a2 100644
--- a/spec/controllers/admin/languages_controller_spec.rb
+++ b/spec/controllers/admin/languages_controller_spec.rb
@@ -18,11 +18,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, language: FactoryGirl.attributes_for(:language)
+      post :create, params: { language: FactoryGirl.attributes_for(:language) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, language: { dummy: 'test' }
+      post :create, params: { language: { dummy: 'test' } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -30,11 +30,11 @@
   describe "XHR PUT update" do
     let(:language) { create(:language) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => language.id, :language => { :iso_code1 => 'ZZ' }
+      put :update, :format => 'json', params: { :id => language.id, :language => { :iso_code1 => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => language.id, :language => { :iso_code1 => 'zzz' }
+      put :update, :format => 'json', params: { :id => language.id, :language => { :iso_code1 => 'zzz' } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/ranks_controller_spec.rb b/spec/controllers/admin/ranks_controller_spec.rb
index edc23c726..80b933e37 100644
--- a/spec/controllers/admin/ranks_controller_spec.rb
+++ b/spec/controllers/admin/ranks_controller_spec.rb
@@ -18,11 +18,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, rank: build_attributes(:rank)
+      post :create, params: { rank: build_attributes(:rank) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, rank: { dummy: 'test'}
+      post :create, params: { rank: { dummy: 'test'} }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -30,11 +30,11 @@
   describe "XHR PUT update" do
     let(:rank) { create(:rank) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => rank.id, :rank => { :name => 'ZZ' }
+      put :update, :format => 'json', params: { :id => rank.id, :rank => { :name => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => rank.id, :rank => { :name => nil }
+      put :update, :format => 'json', params: { :id => rank.id, :rank => { :name => nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/references_controller_spec.rb b/spec/controllers/admin/references_controller_spec.rb
index 8fbf0ce6b..ce358bda9 100644
--- a/spec/controllers/admin/references_controller_spec.rb
+++ b/spec/controllers/admin/references_controller_spec.rb
@@ -21,7 +21,7 @@
     end
     describe "XHR GET index JSON" do
       it "renders json for dropdown" do
-        xhr :get, :index, :format => 'json'
+        get :index, :format => 'json', xhr: true
         expect(response.body).to have_json_size(2)
         expect(parse_json(response.body, "0/text")).to eq('AA')
       end
@@ -30,11 +30,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, reference: FactoryGirl.attributes_for(:reference)
+      post :create, params: { reference: FactoryGirl.attributes_for(:reference) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, reference: { :citation => nil }
+      post :create, params: { reference: { :citation => nil } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -42,11 +42,11 @@
   describe "XHR PUT update JSON" do
     let(:reference) { create(:reference) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => reference.id, :reference => { :citation => 'ZZ' }
+      put :update, :format => 'json', params: { :id => reference.id, :reference => { :citation => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => reference.id, :reference => { :citation => nil }
+      put :update, :format => 'json', params: { :id => reference.id, :reference => { :citation => nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/species_listings_controller_spec.rb b/spec/controllers/admin/species_listings_controller_spec.rb
index 33dd52b92..6d074ff5a 100644
--- a/spec/controllers/admin/species_listings_controller_spec.rb
+++ b/spec/controllers/admin/species_listings_controller_spec.rb
@@ -21,11 +21,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, species_listing: build_attributes(:species_listing)
+      post :create, params: { species_listing: build_attributes(:species_listing) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, species_listing: { dummy: 'test' }
+      post :create, params: { species_listing: { dummy: 'test' } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -33,11 +33,11 @@
   describe "XHR PUT update" do
     let(:species_listing) { create(:species_listing) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => species_listing.id, :species_listing => { :name => 'ZZ' }
+      put :update, :format => 'json', params: { :id => species_listing.id, :species_listing => { :name => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => species_listing.id, :species_listing => { :name => nil }
+      put :update, :format => 'json', params: { :id => species_listing.id, :species_listing => { :name => nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/synonym_relationships_controller_spec.rb b/spec/controllers/admin/synonym_relationships_controller_spec.rb
index 07d2d5254..ebecda0f6 100644
--- a/spec/controllers/admin/synonym_relationships_controller_spec.rb
+++ b/spec/controllers/admin/synonym_relationships_controller_spec.rb
@@ -15,63 +15,67 @@
   }
   describe "XHR GET new" do
     it "renders the new template" do
-      xhr :get, :new, :taxon_concept_id => taxon_concept.id
+      get :new, params: { :taxon_concept_id => taxon_concept.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the synonym_relationship variable" do
-      xhr :get, :new, :taxon_concept_id => taxon_concept.id
+      get :new, params: { :taxon_concept_id => taxon_concept.id }, xhr: true
       expect(assigns(:synonym_relationship)).not_to be_nil
     end
   end
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create,
+      post :create, params: {
         :taxon_concept_id => taxon_concept.id,
         :taxon_relationship => {
           other_taxon_concept_id: synonym.id
         }
+      }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create,
+      post :create, xhr: true, params: {
         :taxon_concept_id => taxon_concept.id,
         :taxon_relationship => {
           other_taxon_concept_id: nil
         }
+      }
       expect(response).to render_template("new")
     end
   end
 
   describe "XHR GET edit" do
     it "renders the edit template" do
-      xhr :get, :edit, :taxon_concept_id => taxon_concept.id,
-        :id => synonym_relationship.id
+      get :edit, params: { :taxon_concept_id => taxon_concept.id, :id => synonym_relationship.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the synonym_relationship variable" do
-      xhr :get, :edit, :taxon_concept_id => taxon_concept.id,
-        :id => synonym_relationship.id
+      get :edit, params: { :taxon_concept_id => taxon_concept.id, :id => synonym_relationship.id }, xhr: true
       expect(assigns(:synonym_relationship)).not_to be_nil
     end
   end
 
   describe "XHR PUT update" do
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => taxon_concept.id,
-        :id => synonym_relationship.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: synonym.id
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => taxon_concept.id,
+          :id => synonym_relationship.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: synonym.id
+          }
         }
       expect(response).to render_template('create')
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => taxon_concept.id,
-        :id => synonym_relationship.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: nil
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => taxon_concept.id,
+          :id => synonym_relationship.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: nil
+          }
         }
       expect(response).to render_template('new')
     end
diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb
index 136b37a1a..2946d0310 100644
--- a/spec/controllers/admin/tags_controller_spec.rb
+++ b/spec/controllers/admin/tags_controller_spec.rb
@@ -13,12 +13,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create,
-        tag: { name: "Test Tag", model: "TaxonConcept" }
+      post :create, params: { tag: { name: "Test Tag", model: "TaxonConcept" } }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, tag: { dummy: 'test' }
+      post :create, params: { tag: { dummy: 'test' } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -27,13 +26,11 @@
     let(:preset_tag) { create(:preset_tag) }
     context "when JSON" do
       it "responds with 200 when successful" do
-        xhr :put, :update, :format => 'json', :id => preset_tag.id,
-          :tag => { dummy: 'test' }
+        put :update, :format => 'json', params: { :id => preset_tag.id, :tag => { dummy: 'test' } }, xhr: true
         expect(response).to be_success
       end
       it "responds with json error when not successful" do
-        xhr :put, :update, :format => 'json', :id => preset_tag.id,
-          :tag => { :model => 'FakeCategory' }
+        put :update, :format => 'json', params: { :id => preset_tag.id, :tag => { :model => 'FakeCategory' } }, xhr: true
         expect(JSON.parse(response.body)).to include('errors')
       end
     end
diff --git a/spec/controllers/admin/taxon_commons_controller_spec.rb b/spec/controllers/admin/taxon_commons_controller_spec.rb
index 6a2b71924..9f82012a1 100644
--- a/spec/controllers/admin/taxon_commons_controller_spec.rb
+++ b/spec/controllers/admin/taxon_commons_controller_spec.rb
@@ -10,7 +10,7 @@
 
   describe "XHR GET 'new'" do
     it "returns http success and renders the new template" do
-      xhr :get, :new, { :taxon_concept_id => @taxon_concept.id, :format => 'js' }
+      get :new, params: { :taxon_concept_id => @taxon_concept.id, :format => 'js' }, xhr: true
       expect(response).to be_success
       expect(response).to render_template('new')
     end
@@ -18,18 +18,22 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create,
-        :taxon_concept_id => @taxon_concept.id,
-        :taxon_common => {
-          :name => @common_name.name,
-          :language_id => @common_name.language_id
+      post :create, xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :taxon_common => {
+            :name => @common_name.name,
+            :language_id => @common_name.language_id
+          }
         }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create,
-        :taxon_concept_id => @taxon_concept.id,
-        :taxon_common => { dummy: 'test' }
+      post :create, xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :taxon_common => { dummy: 'test' }
+        }
       expect(response).to render_template("new")
     end
   end
@@ -43,13 +47,11 @@
       )
     end
     it "renders the edit template" do
-      xhr :get, :edit, :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_common.id
+      get :edit, params: { :taxon_concept_id => @taxon_concept.id, :id => @taxon_common.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the  taxon common variable" do
-      xhr :get, :edit, :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_common.id
+      get :edit, params: { :taxon_concept_id => @taxon_concept.id, :id => @taxon_common.id }, xhr: true
       expect(assigns(:taxon_common)).not_to be_nil
     end
   end
@@ -63,21 +65,25 @@
       )
     end
     it "renders create when successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_common.id,
-        :taxon_common => {
-          :name => @common_name.name,
-          :language_id => @common_name.language_id
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :id => @taxon_common.id,
+          :taxon_common => {
+            :name => @common_name.name,
+            :language_id => @common_name.language_id
+          }
         }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_common.id,
-        :taxon_common => {
-          :common_name_id => nil
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :id => @taxon_common.id,
+          :taxon_common => {
+            :common_name_id => nil
+          }
         }
       expect(response).to render_template('new')
     end
@@ -120,12 +126,14 @@
       expect(@taxon_concept.reload.dependents_updated_at).not_to be_nil
       old_date = @taxon_concept.dependents_updated_at
 
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_common.id,
-        :taxon_common => {
-          :name => @common_name.name,
-          :language_id => @common_name.language_id
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :id => @taxon_common.id,
+          :taxon_common => {
+            :name => @common_name.name,
+            :language_id => @common_name.language_id
+          }
         }
 
       expect(@taxon_concept.reload.dependents_updated_at).not_to eq(old_date)
diff --git a/spec/controllers/admin/taxon_concept_references_controller_spec.rb b/spec/controllers/admin/taxon_concept_references_controller_spec.rb
index 3d94c8105..559d5e909 100644
--- a/spec/controllers/admin/taxon_concept_references_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concept_references_controller_spec.rb
@@ -10,22 +10,24 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create,
+      post :create, xhr: true, params: {
         :taxon_concept_id => @taxon_concept.id,
         :taxon_concept_reference => {
           :reference_attributes =>
             { :citation => "My nice literature" }
         }
+      }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create,
+      post :create, xhr: true, params: {
         :taxon_concept_id => @taxon_concept.id,
         :taxon_concept_reference => {
           :reference_attributes => {
             dummy: 'test'
           }
         }
+      }
       expect(response).to render_template("new")
     end
   end
@@ -39,13 +41,11 @@
       )
     end
     it "renders the edit template" do
-      xhr :get, :edit, :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_concept_reference.id
+      get :edit, params: { :taxon_concept_id => @taxon_concept.id, :id => @taxon_concept_reference.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the  taxon concept reference variable" do
-      xhr :get, :edit, :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_concept_reference.id
+      get :edit, params: { :taxon_concept_id => @taxon_concept.id, :id => @taxon_concept_reference.id }, xhr: true
       expect(assigns(:taxon_concept_reference)).not_to be_nil
     end
   end
@@ -59,22 +59,26 @@
       )
     end
     it "renders create when successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_concept_reference.id,
-        :taxon_concept_reference => {
-          :reference_attributes =>
-            { :citation => "My nice literature" }
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :id => @taxon_concept_reference.id,
+          :taxon_concept_reference => {
+            :reference_attributes =>
+              { :citation => "My nice literature" }
+          }
         }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => @taxon_concept.id,
-        :id => @taxon_concept_reference.id,
-        :taxon_concept_reference => {
-          :reference_attributes => {
-            dummy: 'test'
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => @taxon_concept.id,
+          :id => @taxon_concept_reference.id,
+          :taxon_concept_reference => {
+            :reference_attributes => {
+              dummy: 'test'
+            }
           }
         }
       expect(response).to render_template('new')
@@ -83,7 +87,7 @@
 
   describe "XHR GET 'new'" do
     it "returns http success and renders the new template" do
-      xhr :get, :new, { :taxon_concept_id => @taxon_concept.id, :format => 'js' }
+      get :new, params: { :taxon_concept_id => @taxon_concept.id }, xhr: true, :format => 'js'
       expect(response).to be_success
       expect(response).to render_template('new')
     end
diff --git a/spec/controllers/admin/taxon_concepts_controller_spec.rb b/spec/controllers/admin/taxon_concepts_controller_spec.rb
index 9e1e05867..0767f4562 100644
--- a/spec/controllers/admin/taxon_concepts_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concepts_controller_spec.rb
@@ -35,30 +35,32 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create,
-        taxon_concept: {
-          name_status: 'A',
-          taxonomy_id: cites_eu.id,
-          rank_id: create(:rank, name: Rank::GENUS),
-          scientific_name: 'Canis',
-          parent_id: create_cites_eu_family
+      post :create, xhr: true,
+        params: {
+          taxon_concept: {
+            name_status: 'A',
+            taxonomy_id: cites_eu.id,
+            rank_id: create(:rank, name: Rank::GENUS),
+            scientific_name: 'Canis',
+            parent_id: create_cites_eu_family
+          }
         }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, taxon_concept: { dummy: 'test'}
+      post :create, params: { taxon_concept: { dummy: 'test'} }, xhr: true
       expect(response).to render_template("new")
     end
     it "renders new_synonym when not successful S" do
-      xhr :post, :create, taxon_concept: { name_status: 'S' }
+      post :create, params: { taxon_concept: { name_status: 'S' } }, xhr: true
       expect(response).to render_template("new_synonym")
     end
     it "renders new_hybrid when not successful H" do
-      xhr :post, :create, taxon_concept: { name_status: 'H' }
+      post :create, params: { taxon_concept: { name_status: 'H' } }, xhr: true
       expect(response).to render_template("new_hybrid")
     end
     it "renders new_synonym when not successful N" do
-      xhr :post, :create, taxon_concept: { name_status: 'N' }
+      post :create, params: { taxon_concept: { name_status: 'N' } }, xhr: true
       expect(response).to render_template("new_n_name")
     end
   end
@@ -67,13 +69,13 @@
     let(:taxon_concept) { create(:taxon_concept) }
     context "when JSON" do
       it "responds with 200 when successful" do
-        xhr :put, :update, :format => 'json', :id => taxon_concept.id,
-          :taxon_concept => { dummy: 'test' }
+        put :update, :format => 'json', params: { :id => taxon_concept.id,
+          :taxon_concept => { dummy: 'test' } }, xhr: true
         expect(response).to be_success
       end
       it "responds with json error when not successful" do
-        xhr :put, :update, :format => 'json', :id => taxon_concept.id,
-          :taxon_concept => { :taxonomy_id => nil }
+        put :update, :format => 'json', params: { :id => taxon_concept.id,
+          :taxon_concept => { :taxonomy_id => nil } }, xhr: true
         expect(JSON.parse(response.body)).to include('errors')
       end
     end
@@ -131,8 +133,8 @@
       )
     }
     it "returns properly formatted json" do
-      xhr :get, :autocomplete, :format => 'json',
-        :search_params => { :scientific_name => 'AAA' }
+      get :autocomplete, :format => 'json',
+        params: { :search_params => { :scientific_name => 'AAA' } }, xhr: true
       expect(response.body).to have_json_size(1)
       expect(parse_json(response.body, "0/full_name")).to eq('Aaa')
     end
diff --git a/spec/controllers/admin/taxon_relationships_controller_spec.rb b/spec/controllers/admin/taxon_relationships_controller_spec.rb
index f1c5604c4..6d6de3fff 100644
--- a/spec/controllers/admin/taxon_relationships_controller_spec.rb
+++ b/spec/controllers/admin/taxon_relationships_controller_spec.rb
@@ -30,14 +30,14 @@
       allow(TaxonRelationshipType).to receive(:find).and_return(equal_relationship_type)
     end
     it "renders create when successful" do
-      xhr :post, :create, :taxon_relationship => taxon_relationship_attributes,
-        :taxon_concept_id => taxon_concept.id
+      post :create, params: { :taxon_relationship => taxon_relationship_attributes,
+        :taxon_concept_id => taxon_concept.id }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
       taxon_relationship = create(:taxon_relationship, taxon_relationship_attributes)
-      xhr :post, :create, taxon_relationship: taxon_relationship_attributes,
-        :taxon_concept_id => taxon_relationship.taxon_concept_id
+      post :create, params: { taxon_relationship: taxon_relationship_attributes,
+        :taxon_concept_id => taxon_relationship.taxon_concept_id }, xhr: true
       expect(response).to render_template("new")
     end
   end
diff --git a/spec/controllers/admin/taxonomies_controller_spec.rb b/spec/controllers/admin/taxonomies_controller_spec.rb
index b37dfaba8..dcabec548 100644
--- a/spec/controllers/admin/taxonomies_controller_spec.rb
+++ b/spec/controllers/admin/taxonomies_controller_spec.rb
@@ -21,7 +21,7 @@
     end
     describe "XHR GET index JSON" do
       it "renders json for dropdown" do
-        xhr :get, :index, :format => 'json'
+        get :index, :format => 'json', xhr: true
         expect(response.body).to have_json_size(2)
         expect(parse_json(response.body, "0/text")).to eq('AA')
       end
@@ -30,11 +30,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, taxonomy: FactoryGirl.attributes_for(:taxonomy)
+      post :create, params: { taxonomy: FactoryGirl.attributes_for(:taxonomy) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, taxonomy: { :name => nil }
+      post :create, params: { taxonomy: { :name => nil } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -42,11 +42,11 @@
   describe "XHR PUT update JSON" do
     let(:taxonomy) { create(:taxonomy) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'json', :id => taxonomy.id, :taxonomy => { :name => 'ZZ' }
+      put :update, :format => 'json', params: { :id => taxonomy.id, :taxonomy => { :name => 'ZZ' } }, xhr: true
       expect(response).to be_success
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'json', :id => taxonomy.id, :taxonomy => { :name => nil }
+      put :update, :format => 'json', params: { :id => taxonomy.id, :taxonomy => { :name => nil } }, xhr: true
       expect(JSON.parse(response.body)).to include('errors')
     end
   end
diff --git a/spec/controllers/admin/trade_names_relationships_controller_spec.rb b/spec/controllers/admin/trade_names_relationships_controller_spec.rb
index 221d37ac6..bb4999c18 100644
--- a/spec/controllers/admin/trade_names_relationships_controller_spec.rb
+++ b/spec/controllers/admin/trade_names_relationships_controller_spec.rb
@@ -15,29 +15,33 @@
   }
   describe "XHR GET new" do
     it "renders the new template" do
-      xhr :get, :new, :taxon_concept_id => taxon_concept.id
+      get :new, params: { :taxon_concept_id => taxon_concept.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the trade_name_relationship variable" do
-      xhr :get, :new, :taxon_concept_id => taxon_concept.id
+      get :new, params: { :taxon_concept_id => taxon_concept.id }, xhr: true
       expect(assigns(:trade_name_relationship)).not_to be_nil
     end
   end
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create,
-        :taxon_concept_id => taxon_concept.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: trade_name.id
+      post :create, xhr: true,
+        params: {
+          :taxon_concept_id => taxon_concept.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: trade_name.id
+          }
         }
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create,
-        :taxon_concept_id => taxon_concept.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: nil
+      post :create, xhr: true,
+        params: {
+          :taxon_concept_id => taxon_concept.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: nil
+          }
         }
       expect(response).to render_template("new")
     end
@@ -45,33 +49,41 @@
 
   describe "XHR GET edit" do
     it "renders the edit template" do
-      xhr :get, :edit, :taxon_concept_id => taxon_concept.id,
+      get :edit, params: {
+        :taxon_concept_id => taxon_concept.id,
         :id => trade_name_relationship.id
+      }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the trade_name_relationship variable" do
-      xhr :get, :edit, :taxon_concept_id => taxon_concept.id,
+      get :edit, params: {
+        :taxon_concept_id => taxon_concept.id,
         :id => trade_name_relationship.id
+      }, xhr: true
       expect(assigns(:trade_name_relationship)).not_to be_nil
     end
   end
 
   describe "XHR PUT update" do
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => taxon_concept.id,
-        :id => trade_name_relationship.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: trade_name.id
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => taxon_concept.id,
+          :id => trade_name_relationship.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: trade_name.id
+          }
         }
       expect(response).to render_template("create")
     end
     it "responds with json when not successful" do
-      xhr :put, :update, :format => 'js',
-        :taxon_concept_id => taxon_concept.id,
-        :id => trade_name_relationship.id,
-        :taxon_relationship => {
-          other_taxon_concept_id: nil
+      put :update, :format => 'js', xhr: true,
+        params: {
+          :taxon_concept_id => taxon_concept.id,
+          :id => trade_name_relationship.id,
+          :taxon_relationship => {
+            other_taxon_concept_id: nil
+          }
         }
       expect(response).to render_template('new')
     end
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 226f0f8c5..f94ddad5d 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -14,11 +14,11 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      xhr :post, :create, user: FactoryGirl.attributes_for(:user)
+      post :create, params: { user: FactoryGirl.attributes_for(:user) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
-      xhr :post, :create, user: { :name => nil }
+      post :create, params: { user: { :name => nil } }, xhr: true
       expect(response).to render_template("new")
     end
   end
@@ -26,11 +26,11 @@
   describe "XHR GET edit" do
     let(:user) { create(:user) }
     it "renders the edit template" do
-      xhr :get, :edit, :id => user.id
+      get :edit, params: { :id => user.id }, xhr: true
       expect(response).to render_template('new')
     end
     it "assigns the hybrid_relationship variable" do
-      xhr :get, :edit, :id => user.id
+      get :edit, params: { :id => user.id }, xhr: true
       expect(assigns(:user)).not_to be_nil
     end
   end
@@ -38,12 +38,12 @@
   describe "XHR PUT update JS" do
     let(:user) { create(:user) }
     it "responds with 200 when successful" do
-      xhr :put, :update, :format => 'js', :id => user.id, :user => { :name => 'ZZ' }
+      put :update, :format => 'js', params: { :id => user.id, :user => { :name => 'ZZ' } }, xhr: true
       expect(response).to be_success
       expect(response).to render_template('create')
     end
     it "responds with template new when not successful" do
-      xhr :put, :update, :format => 'js', :id => user.id, :user => { :name => nil }
+      put :update, :format => 'js', params: { :id => user.id, :user => { :name => nil } }, xhr: true
       expect(response).to render_template('new')
     end
   end
diff --git a/spec/controllers/checklist/taxon_concepts_controller_spec.rb b/spec/controllers/checklist/taxon_concepts_controller_spec.rb
index 0321ee49a..827fc1516 100644
--- a/spec/controllers/checklist/taxon_concepts_controller_spec.rb
+++ b/spec/controllers/checklist/taxon_concepts_controller_spec.rb
@@ -4,14 +4,14 @@
     include_context "Arctocephalus"
     context "when searching by accepted name" do
       it "returns 1 result" do
-        xhr :get, :autocomplete, :format => 'json',
-          :scientific_name => 'Arctocephalus townsendi'
+        get :autocomplete, :format => 'json', xhr: true,
+          params: { :scientific_name => 'Arctocephalus townsendi' }
         expect(response.body).to have_json_size(1)
       end
     end
     context "when query blank" do
       it "returns 0 results" do
-        xhr :get, :autocomplete, :format => 'json'
+        get :autocomplete, :format => 'json', xhr: true
         expect(response.body).to have_json_size(0)
       end
     end
diff --git a/spec/controllers/trade/annual_report_uploads_controller_spec.rb b/spec/controllers/trade/annual_report_uploads_controller_spec.rb
index a5e8f793c..60f0721ff 100644
--- a/spec/controllers/trade/annual_report_uploads_controller_spec.rb
+++ b/spec/controllers/trade/annual_report_uploads_controller_spec.rb
@@ -51,19 +51,21 @@ def exporter_csv
 
   describe "POST create" do
     it "should return success in jQuery File Upload way" do
-      xhr :post, :create,
+      post :create, params: {
         :annual_report_upload => {
           :point_of_view => 'E', :trading_country_id => france.id,
           :csv_source_file => exporter_csv
-        }, :format => 'json'
+        }
+      }, xhr: true, :format => 'json'
       expect(parse_json(response.body, "files/0")['id']).not_to be_blank
     end
     it "should return error in jQuery File Upload way" do
-      xhr :post, :create,
+      post :create, params: {
         :annual_report_upload => {
           :point_of_view => 'I', :trading_country_id => france.id,
           :csv_source_file => exporter_csv
-        }, :format => 'json'
+        }
+      }, :format => 'json', xhr: true
       expect(parse_json(response.body, "files/0")['id']).to be_blank
     end
   end

From 6cbffd9ac3f93766ef6843dc7314b117005f26cb Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 21:51:18 +0000
Subject: [PATCH 071/241] No idea why putting @aru there, but look like what it
 want to do is reload.

---
 spec/models/trade/scoped_inclusion_validation_rule_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/trade/scoped_inclusion_validation_rule_spec.rb b/spec/models/trade/scoped_inclusion_validation_rule_spec.rb
index f55cad3c8..d79f2d074 100644
--- a/spec/models/trade/scoped_inclusion_validation_rule_spec.rb
+++ b/spec/models/trade/scoped_inclusion_validation_rule_spec.rb
@@ -19,7 +19,7 @@
         create_taxon_concept_country_of_origin_validation
       }
       specify {
-        expect(subject.validation_errors(@aru).size).to eq(0)
+        expect(subject.validation_errors.reload.size).to eq(0)
       }
     end
 
@@ -46,7 +46,7 @@
         create_taxon_concept_country_of_origin_validation
       }
       specify {
-        expect(subject.validation_errors(@aru).size).to eq(0)
+        expect(subject.validation_errors.reload.size).to eq(0)
       }
     end
 

From f8e7faa96bc35717568800fda814a9e186d2fd2a Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 22:17:17 +0000
Subject: [PATCH 072/241] FactoryGril to FactoryBot

---
 Gemfile                                               |  2 +-
 Gemfile.lock                                          |  8 ++++----
 spec/controllers/admin/ahoy_events_controller_spec.rb |  4 ++--
 spec/controllers/admin/ahoy_visits_controller_spec.rb |  4 ++--
 spec/controllers/admin/events_controller_spec.rb      |  2 +-
 spec/controllers/admin/languages_controller_spec.rb   |  2 +-
 spec/controllers/admin/references_controller_spec.rb  |  2 +-
 spec/controllers/admin/taxonomies_controller_spec.rb  |  2 +-
 spec/controllers/admin/users_controller_spec.rb       |  2 +-
 spec/factories.rb                                     |  2 +-
 spec/factories/api_request.rb                         |  2 +-
 spec/factories/common_names.rb                        |  2 +-
 spec/factories/distributions.rb                       |  2 +-
 spec/factories/document_tag.rb                        |  2 +-
 spec/factories/documents.rb                           |  2 +-
 spec/factories/listings.rb                            |  2 +-
 spec/factories/nomenclature_changes.rb                |  2 +-
 spec/factories/ranks.rb                               |  2 +-
 spec/factories/srg_history.rb                         |  2 +-
 spec/factories/taxon_concepts.rb                      |  2 +-
 spec/factories/taxon_relationships.rb                 |  2 +-
 spec/factories/trade.rb                               |  2 +-
 spec/models/trade/annual_report_upload_spec.rb        |  2 +-
 spec/spec_helper.rb                                   |  4 ++--
 spec/support/controller_macros.rb                     | 10 +++++-----
 spec/workers/submission_worker_spec.rb                |  2 +-
 26 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Gemfile b/Gemfile
index deba4e57b..14e9b9665 100644
--- a/Gemfile
+++ b/Gemfile
@@ -131,7 +131,7 @@ end
 group :test do
   gem 'rails-controller-testing'
   gem "codeclimate-test-reporter", '0.1.1', require: nil # TODO, should be removed
-  gem "factory_girl_rails", '4.2.1'
+  gem 'factory_bot_rails', '4.11.1'
   gem 'simplecov', '0.22.0', :require => false # TODO: latest
   gem 'coveralls', '0.7.1', :require => false
   gem 'capybara', '2.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index b78ac9356..1adc77c5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,10 +196,10 @@ GEM
     errbase (0.2.2)
     erubis (2.7.0)
     execjs (2.9.1)
-    factory_girl (4.2.0)
+    factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_bot_rails (4.11.1)
+      factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
     ffi (1.16.3)
     geocoder (1.8.2)
@@ -593,7 +593,7 @@ DEPENDENCIES
   ember-data-source (= 1.13.0)
   ember-rails (~> 0.21.0)
   ember-source (= 1.8.0)
-  factory_girl_rails (= 4.2.1)
+  factory_bot_rails (= 4.11.1)
   geoip (= 1.3.5)
   gon (~> 6.4)
   groupdate (= 5.2.4)
diff --git a/spec/controllers/admin/ahoy_events_controller_spec.rb b/spec/controllers/admin/ahoy_events_controller_spec.rb
index 7dbfa2a01..3366221c0 100644
--- a/spec/controllers/admin/ahoy_events_controller_spec.rb
+++ b/spec/controllers/admin/ahoy_events_controller_spec.rb
@@ -7,10 +7,10 @@
   describe "index" do
 
     let!(:ahoy_event1) {
-      FactoryGirl.create(:ahoy_event, :name => "Search")
+      FactoryBot.create(:ahoy_event, :name => "Search")
     }
     let!(:ahoy_event2) {
-      FactoryGirl.create(:ahoy_event, :name => "Taxon Concept")
+      FactoryBot.create(:ahoy_event, :name => "Taxon Concept")
     }
 
     describe "GET index" do
diff --git a/spec/controllers/admin/ahoy_visits_controller_spec.rb b/spec/controllers/admin/ahoy_visits_controller_spec.rb
index 7b4d634b4..27350cd40 100644
--- a/spec/controllers/admin/ahoy_visits_controller_spec.rb
+++ b/spec/controllers/admin/ahoy_visits_controller_spec.rb
@@ -5,8 +5,8 @@
   login_admin
 
   describe "index" do
-    let!(:ahoy_visit1) { FactoryGirl.create(:ahoy_visit, :browser => "Safari", :device_type => "Desktop") }
-    let!(:ahoy_visit2) { FactoryGirl.create(:ahoy_visit, :browser => "Firefox", :device_type => "Desktop") }
+    let!(:ahoy_visit1) { FactoryBot.create(:ahoy_visit, :browser => "Safari", :device_type => "Desktop") }
+    let!(:ahoy_visit2) { FactoryBot.create(:ahoy_visit, :browser => "Firefox", :device_type => "Desktop") }
 
     describe "GET index" do
       it "assigns to @ahoy_events sorted by time DESC" do
diff --git a/spec/controllers/admin/events_controller_spec.rb b/spec/controllers/admin/events_controller_spec.rb
index ce53b76fa..40c6388ac 100644
--- a/spec/controllers/admin/events_controller_spec.rb
+++ b/spec/controllers/admin/events_controller_spec.rb
@@ -34,7 +34,7 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      post :create, params: { event: FactoryGirl.attributes_for(:event) }, xhr: true
+      post :create, params: { event: FactoryBot.attributes_for(:event) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
diff --git a/spec/controllers/admin/languages_controller_spec.rb b/spec/controllers/admin/languages_controller_spec.rb
index 8407af7a2..c3f0deff6 100644
--- a/spec/controllers/admin/languages_controller_spec.rb
+++ b/spec/controllers/admin/languages_controller_spec.rb
@@ -18,7 +18,7 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      post :create, params: { language: FactoryGirl.attributes_for(:language) }, xhr: true
+      post :create, params: { language: FactoryBot.attributes_for(:language) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
diff --git a/spec/controllers/admin/references_controller_spec.rb b/spec/controllers/admin/references_controller_spec.rb
index ce358bda9..0dd099223 100644
--- a/spec/controllers/admin/references_controller_spec.rb
+++ b/spec/controllers/admin/references_controller_spec.rb
@@ -30,7 +30,7 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      post :create, params: { reference: FactoryGirl.attributes_for(:reference) }, xhr: true
+      post :create, params: { reference: FactoryBot.attributes_for(:reference) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
diff --git a/spec/controllers/admin/taxonomies_controller_spec.rb b/spec/controllers/admin/taxonomies_controller_spec.rb
index dcabec548..192b6de76 100644
--- a/spec/controllers/admin/taxonomies_controller_spec.rb
+++ b/spec/controllers/admin/taxonomies_controller_spec.rb
@@ -30,7 +30,7 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      post :create, params: { taxonomy: FactoryGirl.attributes_for(:taxonomy) }, xhr: true
+      post :create, params: { taxonomy: FactoryBot.attributes_for(:taxonomy) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index f94ddad5d..27a50e530 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -14,7 +14,7 @@
 
   describe "XHR POST create" do
     it "renders create when successful" do
-      post :create, params: { user: FactoryGirl.attributes_for(:user) }, xhr: true
+      post :create, params: { user: FactoryBot.attributes_for(:user) }, xhr: true
       expect(response).to render_template("create")
     end
     it "renders new when not successful" do
diff --git a/spec/factories.rb b/spec/factories.rb
index b3b548419..605c4d10c 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :user do
     sequence(:name) { |n| "user#{n}" }
diff --git a/spec/factories/api_request.rb b/spec/factories/api_request.rb
index d89825c6f..92a4b7184 100644
--- a/spec/factories/api_request.rb
+++ b/spec/factories/api_request.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :api_request do
     user
diff --git a/spec/factories/common_names.rb b/spec/factories/common_names.rb
index 941047a2c..ed48a733e 100644
--- a/spec/factories/common_names.rb
+++ b/spec/factories/common_names.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :language do
     sequence(:name_en) { |n| "lng#{n}" }
diff --git a/spec/factories/distributions.rb b/spec/factories/distributions.rb
index a5fec6d81..5f4fd7d4c 100644
--- a/spec/factories/distributions.rb
+++ b/spec/factories/distributions.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :geo_relationship_type do
     sequence(:name) { |n| "CONTAINS#{n}" }
diff --git a/spec/factories/document_tag.rb b/spec/factories/document_tag.rb
index 0180c3255..ef81d722e 100644
--- a/spec/factories/document_tag.rb
+++ b/spec/factories/document_tag.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :document_tag do
     name 'You taaaag'
diff --git a/spec/factories/documents.rb b/spec/factories/documents.rb
index 0911c13e1..8313a06d4 100644
--- a/spec/factories/documents.rb
+++ b/spec/factories/documents.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :document do
     date { Date.today }
diff --git a/spec/factories/listings.rb b/spec/factories/listings.rb
index 68059637d..c778c8dc7 100644
--- a/spec/factories/listings.rb
+++ b/spec/factories/listings.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :species_listing do
     sequence(:name) { |n| "Appendix #{n}" }
diff --git a/spec/factories/nomenclature_changes.rb b/spec/factories/nomenclature_changes.rb
index 836822cbc..8f4b3f7cc 100644
--- a/spec/factories/nomenclature_changes.rb
+++ b/spec/factories/nomenclature_changes.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :nomenclature_change do
     event
diff --git a/spec/factories/ranks.rb b/spec/factories/ranks.rb
index 5a806b8ab..79f57db5c 100644
--- a/spec/factories/ranks.rb
+++ b/spec/factories/ranks.rb
@@ -42,7 +42,7 @@ def attributes_for_variety
   { name: Rank::VARIETY, taxonomic_position: '7.2', fixed_order: false }
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :rank do
     name {
       [
diff --git a/spec/factories/srg_history.rb b/spec/factories/srg_history.rb
index 2f87d6aae..d78df6c7c 100644
--- a/spec/factories/srg_history.rb
+++ b/spec/factories/srg_history.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :srg_history do
     sequence(:name) { |n| "srg_history#{n}" }
     tooltip 'asdfasdf'
diff --git a/spec/factories/taxon_concepts.rb b/spec/factories/taxon_concepts.rb
index c50f42db6..a6f1adc20 100644
--- a/spec/factories/taxon_concepts.rb
+++ b/spec/factories/taxon_concepts.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :taxon_concept, :aliases => [:other_taxon_concept] do
     taxonomy
     rank
diff --git a/spec/factories/taxon_relationships.rb b/spec/factories/taxon_relationships.rb
index 23cc19551..88896f9fc 100644
--- a/spec/factories/taxon_relationships.rb
+++ b/spec/factories/taxon_relationships.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :taxon_relationship_type do
     sequence(:name) { |n| "INCLUDES#{n}" }
diff --git a/spec/factories/trade.rb b/spec/factories/trade.rb
index b80fe2a95..12d534a73 100644
--- a/spec/factories/trade.rb
+++ b/spec/factories/trade.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :trade_code do
     factory :source, :class => Source do
diff --git a/spec/models/trade/annual_report_upload_spec.rb b/spec/models/trade/annual_report_upload_spec.rb
index 5009d6b86..a60c1b22d 100644
--- a/spec/models/trade/annual_report_upload_spec.rb
+++ b/spec/models/trade/annual_report_upload_spec.rb
@@ -153,7 +153,7 @@ def invalid_file
                          :name => 'Portugal',
                          :iso_code2 => 'PT'
                         )
-      @submitter = FactoryGirl.create(:user, role: User::MANAGER)
+      @submitter = FactoryBot.create(:user, role: User::MANAGER)
     end
     pending "it calls submission worker" do
       # This has been disabled due to some issues with asynchronous reports submission"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 899cd8398..07dfbdb75 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -50,7 +50,7 @@
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.extend ControllerMacros, :type => :controller
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include JsonSpec::Helpers
   config.include SapiSpec::Helpers
 
@@ -98,7 +98,7 @@
 end
 
 def build_attributes(*args)
-  FactoryGirl.build(*args).attributes.delete_if do |k, v|
+  FactoryBot.build(*args).attributes.delete_if do |k, v|
     ["id", "created_at", "updated_at", "touched_at"].member?(k)
   end
 end
diff --git a/spec/support/controller_macros.rb b/spec/support/controller_macros.rb
index d76c69979..9f6ade0a4 100644
--- a/spec/support/controller_macros.rb
+++ b/spec/support/controller_macros.rb
@@ -2,35 +2,35 @@ module ControllerMacros
   def login_admin
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      sign_in @user || FactoryGirl.create(:user, role: User::MANAGER)
+      sign_in @user || FactoryBot.create(:user, role: User::MANAGER)
     end
   end
 
   def login_contributor
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      sign_in FactoryGirl.create(:user, role: User::CONTRIBUTOR)
+      sign_in FactoryBot.create(:user, role: User::CONTRIBUTOR)
     end
   end
 
   def login_elibrary_viewer
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      sign_in FactoryGirl.create(:user, role: User::ELIBRARY_USER)
+      sign_in FactoryBot.create(:user, role: User::ELIBRARY_USER)
     end
   end
 
   def login_api_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      sign_in FactoryGirl.create(:user, role: User::API_USER)
+      sign_in FactoryBot.create(:user, role: User::API_USER)
     end
   end
 
   def login_secretariat_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      sign_in FactoryGirl.create(:user, role: User::SECRETARIAT)
+      sign_in FactoryBot.create(:user, role: User::SECRETARIAT)
     end
   end
 end
diff --git a/spec/workers/submission_worker_spec.rb b/spec/workers/submission_worker_spec.rb
index 583556c10..2bf6ead91 100644
--- a/spec/workers/submission_worker_spec.rb
+++ b/spec/workers/submission_worker_spec.rb
@@ -31,7 +31,7 @@ def deliver
                        :name => 'Portugal',
                        :iso_code2 => 'PT'
                       )
-    @submitter = FactoryGirl.create(:user, role: User::MANAGER)
+    @submitter = FactoryBot.create(:user, role: User::MANAGER)
     allow(Trade::ChangelogCsvGenerator).to receive(:call).and_return(Tempfile.new('changelog.csv'))
     allow_any_instance_of(SubmissionWorker).to receive(:upload_on_S3)
     allow_any_instance_of(NotificationMailer).to receive(:mail).and_return(EmailMessageStub.new())

From 57e91cbe97127ccaa27af3850f7179b6cbd2e863 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 22 Jan 2024 23:02:33 +0000
Subject: [PATCH 073/241] DEPRECATION WARNING: Static attributes will be
 removed in FactoryBot 5.0.

---
 spec/factories.rb                      | 30 ++++++++--------
 spec/factories/api_request.rb          | 10 +++---
 spec/factories/distributions.rb        |  6 ++--
 spec/factories/document_tag.rb         |  8 ++---
 spec/factories/documents.rb            | 10 +++---
 spec/factories/listings.rb             | 18 +++++-----
 spec/factories/nomenclature_changes.rb | 48 +++++++++++++-------------
 spec/factories/srg_history.rb          |  2 +-
 spec/factories/taxon_concepts.rb       |  4 +--
 spec/factories/taxon_relationships.rb  |  4 +--
 spec/factories/trade.rb                | 24 ++++++-------
 11 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/spec/factories.rb b/spec/factories.rb
index 605c4d10c..0060c9fff 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -3,11 +3,11 @@
   factory :user do
     sequence(:name) { |n| "user#{n}" }
     email { "#{name}@test.pl" }
-    password 'asdfasdf'
+    password { 'asdfasdf' }
     password_confirmation { password }
-    role User::MANAGER
-    is_cites_authority false
-    organisation 'WCMC'
+    role { User::MANAGER }
+    is_cites_authority { false }
+    organisation { 'WCMC' }
   end
 
   factory :taxonomy do
@@ -31,12 +31,12 @@
 
   factory :event do
     sequence(:name) { |n| "CoP#{n}" }
-    effective_at '2011-01-01'
-    published_at '2011-02-01'
+    effective_at { '2011-01-01' }
+    published_at { '2011-02-01' }
     designation
 
     factory :eu_regulation, :class => EuRegulation do
-      end_date '2012-01-01'
+      end_date { '2012-01-01' }
     end
     factory :eu_suspension_regulation, :class => EuSuspensionRegulation
     factory :eu_implementing_regulation, :class => EuImplementingRegulation
@@ -49,7 +49,7 @@
     factory :ec_srg, :class => EcSrg
     factory :cites_suspension_notification, :class => CitesSuspensionNotification,
       :aliases => [:start_notification] do
-      end_date '2012-01-01'
+      end_date { '2012-01-01' }
     end
   end
 
@@ -70,12 +70,12 @@
   factory :quota do
     taxon_concept
     unit
-    publication_date Date.new(2012, 12, 3)
-    quota '10'
+    publication_date { Date.new(2012, 12, 3) }
+    quota { '10' }
   end
 
   factory :reference do
-    citation 'Przygód kilka wróbla ćwirka'
+    citation { 'Przygód kilka wróbla ćwirka' }
   end
 
   factory :taxon_concept_reference do
@@ -84,8 +84,8 @@
   end
 
   factory :preset_tag do
-    name 'Extinct'
-    model 'TaxonConcept'
+    name { 'Extinct' }
+    model { 'TaxonConcept' }
   end
 
   factory :eu_decision do
@@ -94,7 +94,7 @@
     eu_decision_type
 
     factory :eu_opinion, class: EuOpinion do
-      start_date Date.new(2013, 1, 1)
+      start_date { Date.new(2013, 1, 1) }
     end
 
     factory :eu_suspension, class: EuSuspension
@@ -102,7 +102,7 @@
 
   factory :eu_decision_type do
     sequence(:name) { |n| "Opinion#{n}" }
-    decision_type "NO_OPINION"
+    decision_type { "NO_OPINION" }
   end
 
   factory :ahoy_event, :class => Ahoy::Event do
diff --git a/spec/factories/api_request.rb b/spec/factories/api_request.rb
index 92a4b7184..ecbd8c358 100644
--- a/spec/factories/api_request.rb
+++ b/spec/factories/api_request.rb
@@ -2,11 +2,11 @@
 
   factory :api_request do
     user
-    controller 'taxon_concepts'
-    action 'index'
-    format 'json'
-    ip '127.0.0.1'
-    response_status 200
+    controller { 'taxon_concepts' }
+    action { 'index' }
+    format { 'json' }
+    ip { '127.0.0.1' }
+    response_status { 200 }
   end
 
 end
diff --git a/spec/factories/distributions.rb b/spec/factories/distributions.rb
index 5f4fd7d4c..d35fa1b65 100644
--- a/spec/factories/distributions.rb
+++ b/spec/factories/distributions.rb
@@ -11,14 +11,14 @@
   end
 
   factory :geo_entity_type do
-    name 'COUNTRY'
+    name { 'COUNTRY' }
   end
 
   factory :geo_entity, :aliases => [:related_geo_entity, :trading_country, :importer, :exporter] do
     geo_entity_type
-    name_en 'Wonderland'
+    name_en { 'Wonderland' }
     sequence(:iso_code2) { |n| [n, n + 1].map { |i| (65 + i % 26).chr }.join }
-    is_current true
+    is_current { true }
   end
 
   factory :distribution do
diff --git a/spec/factories/document_tag.rb b/spec/factories/document_tag.rb
index ef81d722e..40ef7908e 100644
--- a/spec/factories/document_tag.rb
+++ b/spec/factories/document_tag.rb
@@ -1,15 +1,15 @@
 FactoryBot.define do
 
   factory :document_tag do
-    name 'You taaaag'
+    name { 'You taaaag' }
     factory :review_phase, class: DocumentTag::ReviewPhase do
-      type 'DocumentTag::ReviewPhase'
+      type { 'DocumentTag::ReviewPhase' }
     end
     factory :process_stage, class: DocumentTag::ProcessStage do
-      type 'DocumentTag::ProcessStage'
+      type { 'DocumentTag::ProcessStage' }
     end
     factory :proposal_outcome, class: DocumentTag::ProposalOutcome do
-      type 'DocumentTag::ProposalOutcome'
+      type { 'DocumentTag::ProposalOutcome' }
     end
   end
 
diff --git a/spec/factories/documents.rb b/spec/factories/documents.rb
index 8313a06d4..91831d343 100644
--- a/spec/factories/documents.rb
+++ b/spec/factories/documents.rb
@@ -5,17 +5,17 @@
     filename { Rack::Test::UploadedFile.new(File.join(Rails.root, 'spec', 'support', 'annual_report_upload_exporter.csv')) }
     designation
     event
-    type 'Document'
-    is_public false
+    type { 'Document' }
+    is_public { false }
 
     factory :review_of_significant_trade, class: Document::ReviewOfSignificantTrade do
-      type 'Document::ReviewOfSignificantTrade'
+      type { 'Document::ReviewOfSignificantTrade' }
     end
     factory :proposal, class: Document::Proposal do
-      type 'Document::Proposal'
+      type { 'Document::Proposal' }
     end
     factory :commission_note, class: Document::CommissionNotes do
-      type 'Document::CommissionNotes'
+      type { 'Document::CommissionNotes' }
     end
 
     # After upgrade to Rails 5 and Carrierwave 2, using factory syntax `filename { Rack::Test::UploadedFile.new(...) }`
diff --git a/spec/factories/listings.rb b/spec/factories/listings.rb
index c778c8dc7..dd0dfa260 100644
--- a/spec/factories/listings.rb
+++ b/spec/factories/listings.rb
@@ -16,22 +16,22 @@
     species_listing
     change_type
     taxon_concept
-    effective_at '2012-01-01'
-    parent_id nil
+    effective_at { '2012-01-01' }
+    parent_id { nil }
   end
 
   factory :listing_distribution do
     geo_entity
-    is_party true
+    is_party { true }
   end
 
   factory :annotation, :aliases => [:hash_annotation] do
-    symbol '#4'
-    parent_symbol 'CoP15'
-    short_note_en "I'm a short note"
-    full_note_en "I'm a long note"
-    display_in_index false
-    display_in_footnote false
+    symbol { '#4' }
+    parent_symbol { 'CoP15' }
+    short_note_en { "I'm a short note" }
+    full_note_en { "I'm a long note" }
+    display_in_index { false }
+    display_in_footnote { false }
   end
 
 end
diff --git a/spec/factories/nomenclature_changes.rb b/spec/factories/nomenclature_changes.rb
index 8f4b3f7cc..fa807c282 100644
--- a/spec/factories/nomenclature_changes.rb
+++ b/spec/factories/nomenclature_changes.rb
@@ -2,23 +2,23 @@
 
   factory :nomenclature_change do
     event
-    status 'new'
-    type 'NomenclatureChange'
+    status { 'new' }
+    type { 'NomenclatureChange' }
 
     factory :nomenclature_change_split, class: NomenclatureChange::Split do
-      type 'NomenclatureChange::Split'
+      type { 'NomenclatureChange::Split' }
     end
     factory :nomenclature_change_lump, class: NomenclatureChange::Lump do
-      type 'NomenclatureChange::Lump'
+      type { 'NomenclatureChange::Lump' }
     end
     factory :nomenclature_change_status_swap, class: NomenclatureChange::StatusSwap do
-      type 'NomenclatureChange::StatusSwap'
+      type { 'NomenclatureChange::StatusSwap' }
     end
     factory :nomenclature_change_status_to_accepted, class: NomenclatureChange::StatusToAccepted do
-      type 'NomenclatureChange::StatusToAccepted'
+      type { 'NomenclatureChange::StatusToAccepted' }
     end
     factory :nomenclature_change_status_to_synonym, class: NomenclatureChange::StatusToSynonym do
-      type 'NomenclatureChange::StatusToSynonym'
+      type { 'NomenclatureChange::StatusToSynonym' }
     end
   end
 
@@ -37,47 +37,47 @@
   factory :nomenclature_change_reassignment, class: NomenclatureChange::Reassignment,
     aliases: [:reassignment] do
     input
-    type 'NomenclatureChange::Reassignment'
-    reassignable_type 'TaxonConcept'
+    type { 'NomenclatureChange::Reassignment' }
+    reassignable_type { 'TaxonConcept' }
 
     factory :nomenclature_change_parent_reassignment do
-      type 'NomenclatureChange::ParentReassignment'
+      type { 'NomenclatureChange::ParentReassignment' }
     end
     factory :nomenclature_change_name_reassignment do
-      type 'NomenclatureChange::NameReassignment'
-      reassignable_type 'TaxonRelationship'
+      type { 'NomenclatureChange::NameReassignment' }
+      reassignable_type { 'TaxonRelationship' }
     end
     factory :nomenclature_change_distribution_reassignment do
-      type 'NomenclatureChange::DistributionReassignment'
-      reassignable_type 'Distribution'
+      type { 'NomenclatureChange::DistributionReassignment' }
+      reassignable_type { 'Distribution' }
     end
     factory :nomenclature_change_legislation_reassignment do
-      type 'NomenclatureChange::LegislationReassignment'
+      type { 'NomenclatureChange::LegislationReassignment' }
     end
     factory :nomenclature_change_document_citation_reassignment do
-      type 'NomenclatureChange::DocumentCitationReassignment'
+      type { 'NomenclatureChange::DocumentCitationReassignment' }
     end
   end
 
   factory :nomenclature_change_output_reassignment, class: NomenclatureChange::OutputReassignment,
     aliases: [:output_reassignment] do
     output
-    type 'NomenclatureChange::OutputReassignment'
-    reassignable_type 'TaxonConcept'
+    type { 'NomenclatureChange::OutputReassignment' }
+    reassignable_type { 'TaxonConcept' }
 
     factory :nomenclature_change_output_parent_reassignment do
-      type 'NomenclatureChange::OutputParentReassignment'
+      type { 'NomenclatureChange::OutputParentReassignment' }
     end
     factory :nomenclature_change_output_name_reassignment do
-      type 'NomenclatureChange::OutputNameReassignment'
-      reassignable_type 'TaxonRelationship'
+      type { 'NomenclatureChange::OutputNameReassignment' }
+      reassignable_type { 'TaxonRelationship' }
     end
     factory :nomenclature_change_output_distribution_reassignment do
-      type 'NomenclatureChange::OutputDistributionReassignment'
-      reassignable_type 'Distribution'
+      type { 'NomenclatureChange::OutputDistributionReassignment' }
+      reassignable_type { 'Distribution' }
     end
     factory :nomenclature_change_output_legislation_reassignment do
-      type 'NomenclatureChange::OutputLegislationReassignment'
+      type { 'NomenclatureChange::OutputLegislationReassignment' }
     end
   end
 
diff --git a/spec/factories/srg_history.rb b/spec/factories/srg_history.rb
index d78df6c7c..9156bbc00 100644
--- a/spec/factories/srg_history.rb
+++ b/spec/factories/srg_history.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :srg_history do
     sequence(:name) { |n| "srg_history#{n}" }
-    tooltip 'asdfasdf'
+    tooltip { 'asdfasdf' }
   end
 end
diff --git a/spec/factories/taxon_concepts.rb b/spec/factories/taxon_concepts.rb
index a6f1adc20..d99c0a853 100644
--- a/spec/factories/taxon_concepts.rb
+++ b/spec/factories/taxon_concepts.rb
@@ -3,8 +3,8 @@
     taxonomy
     rank
     taxon_name
-    taxonomic_position '1'
-    name_status 'A'
+    taxonomic_position { '1' }
+    name_status { 'A' }
     data {}
     listing {}
     before(:create) { |tc|
diff --git a/spec/factories/taxon_relationships.rb b/spec/factories/taxon_relationships.rb
index 88896f9fc..a54b032e8 100644
--- a/spec/factories/taxon_relationships.rb
+++ b/spec/factories/taxon_relationships.rb
@@ -2,8 +2,8 @@
 
   factory :taxon_relationship_type do
     sequence(:name) { |n| "INCLUDES#{n}" }
-    is_bidirectional false
-    is_intertaxonomic true
+    is_bidirectional { false }
+    is_intertaxonomic { true }
   end
 
   factory :taxon_relationship do
diff --git a/spec/factories/trade.rb b/spec/factories/trade.rb
index 12d534a73..faae18259 100644
--- a/spec/factories/trade.rb
+++ b/spec/factories/trade.rb
@@ -24,24 +24,24 @@
 
   factory :annual_report_upload, :class => Trade::AnnualReportUpload do
     trading_country
-    point_of_view 'E'
+    point_of_view { 'E' }
   end
 
   factory :validation_rule, :class => Trade::ValidationRule do
-    column_names ['taxon_name']
-    run_order 1
+    column_names { ['taxon_name'] }
+    run_order { 1 }
     factory :presence_validation_rule, :class => Trade::PresenceValidationRule
     factory :numericality_validation_rule, :class => Trade::NumericalityValidationRule
     factory :format_validation_rule, :class => Trade::FormatValidationRule do
-      format_re '^\w+$'
+      format_re { '^\w+$' }
     end
     factory :inclusion_validation_rule, :class => Trade::InclusionValidationRule do
-      valid_values_view 'valid_taxon_concept_view'
+      valid_values_view { 'valid_taxon_concept_view' }
     end
     factory :taxon_concept_appendix_year_validation_rule,
       :class => Trade::TaxonConceptAppendixYearValidationRule do
-      column_names ['taxon_concept_id', 'appendix', 'year']
-      valid_values_view 'valid_taxon_concept_appendix_year_mview'
+      column_names { ['taxon_concept_id', 'appendix', 'year'] }
+      valid_values_view { 'valid_taxon_concept_appendix_year_mview' }
     end
     factory :distinct_values_validation_rule,
       :class => Trade::DistinctValuesValidationRule
@@ -53,7 +53,7 @@
     annual_report_upload
     validation_rule
     matching_criteria {}
-    is_ignored false
+    is_ignored { false }
   end
 
   factory :trade_taxon_concept_term_pair, :class => Trade::TaxonConceptTermPair do
@@ -74,10 +74,10 @@
     source
     importer
     exporter
-    quantity 1
-    appendix 'I'
-    year 2013
-    ignore_warnings true
+    quantity { 1 }
+    appendix { 'I' }
+    year { 2013 }
+    ignore_warnings { true }
   end
 
   factory :permit, :class => Trade::Permit do

From 1922a774484000da2499c9bc98a77e015f848c64 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 23 Jan 2024 22:33:04 +0000
Subject: [PATCH 074/241] 2.19.1
 https://guides.rubyonrails.org/v5.0/upgrading_ruby_on_rails.html#new-framework-defaults

---
 app/models/ahoy/event.rb                           |  2 +-
 app/models/ahoy/visit.rb                           |  2 +-
 app/models/annotation.rb                           |  2 +-
 app/models/api_request.rb                          |  2 +-
 app/models/cites_process.rb                        |  4 ++--
 app/models/cites_suspension.rb                     |  4 ++--
 app/models/cms_mapping.rb                          |  4 ++--
 app/models/designation_geo_entity.rb               |  2 +-
 app/models/document.rb                             |  9 ++++-----
 app/models/eu_decision.rb                          | 14 +++++++-------
 app/models/eu_decision_confirmation.rb             |  2 +-
 app/models/eu_opinion.rb                           |  2 +-
 app/models/event.rb                                |  2 +-
 app/models/iucn_mapping.rb                         |  2 +-
 app/models/listing_change.rb                       | 10 +++++-----
 app/models/m_listing_change.rb                     | 12 ++++++------
 app/models/m_taxon_concept.rb                      |  2 +-
 app/models/nomenclature_change.rb                  |  2 +-
 app/models/nomenclature_change/output.rb           | 12 ++++++------
 .../nomenclature_change/reassignment_helpers.rb    |  3 +--
 app/models/taxon_concept.rb                        |  6 +++---
 app/models/term_trade_codes_pair.rb                |  2 +-
 app/models/trade/sandbox_template.rb               |  4 ++--
 app/models/trade/shipment.rb                       | 10 +++++-----
 app/models/trade_restriction.rb                    |  8 ++++----
 app/models/user.rb                                 |  2 +-
 config/initializers/new_framework_defaults.rb      |  3 ---
 27 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/app/models/ahoy/event.rb b/app/models/ahoy/event.rb
index b53e3c649..83e618063 100644
--- a/app/models/ahoy/event.rb
+++ b/app/models/ahoy/event.rb
@@ -15,7 +15,7 @@ class Event < ApplicationRecord
     self.table_name = 'ahoy_events'
 
     belongs_to :visit, class_name: 'Ahoy::Visit'
-    belongs_to :user
+    belongs_to :user, optional: true
     #should have been working with serialize :properties, JSON
     #like it works for other objects.
     #Won't probably work in this case because, in the database,
diff --git a/app/models/ahoy/visit.rb b/app/models/ahoy/visit.rb
index 4f5886cd8..437e484fd 100644
--- a/app/models/ahoy/visit.rb
+++ b/app/models/ahoy/visit.rb
@@ -30,7 +30,7 @@ class Visit < ApplicationRecord
     self.table_name = 'ahoy_visits'
 
     has_many :ahoy_events, class_name: 'Ahoy::Event'
-    belongs_to :user
+    belongs_to :user, optional: true
     serialize :properties, JSON
   end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index e665d77a4..6439e0205 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -35,7 +35,7 @@ class Annotation < ApplicationRecord
   has_many :hashed_listing_changes,
     :foreign_key => :hash_annotation_id, :class_name => "ListingChange"
 
-  belongs_to :event
+  belongs_to :event, optional: true
   translates :short_note, :full_note
 
   scope :for_cites, -> { joins(:event).where("events.type = 'CitesCop'").
diff --git a/app/models/api_request.rb b/app/models/api_request.rb
index 925dc2282..8a75501f2 100644
--- a/app/models/api_request.rb
+++ b/app/models/api_request.rb
@@ -18,7 +18,7 @@
 class ApiRequest < ApplicationRecord
   serialize :params, JSON
 
-  belongs_to :user
+  belongs_to :user, optional: true
 
   RECENT_DAYS = 90
   RECENT_MONTHS = 6
diff --git a/app/models/cites_process.rb b/app/models/cites_process.rb
index 7bb653101..7ea7d4a62 100644
--- a/app/models/cites_process.rb
+++ b/app/models/cites_process.rb
@@ -7,8 +7,8 @@ class CitesProcess < ApplicationRecord
 
   belongs_to :taxon_concept
   belongs_to :geo_entity
-  belongs_to :start_event, :class_name => 'Event'
-  belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id
+  belongs_to :start_event, :class_name => 'Event', optional: true
+  belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id, optional: true
 
   validates :taxon_concept, presence: true
   validates :geo_entity, presence: true
diff --git a/app/models/cites_suspension.rb b/app/models/cites_suspension.rb
index f7765a83e..1ffe156d8 100644
--- a/app/models/cites_suspension.rb
+++ b/app/models/cites_suspension.rb
@@ -35,9 +35,9 @@ class CitesSuspension < TradeRestriction
   # attr_accessible :start_notification_id, :end_notification_id,
   #   :cites_suspension_confirmations_attributes,
   #   :applies_to_import
-  belongs_to :taxon_concept
+  belongs_to :taxon_concept, optional: true
   belongs_to :start_notification, :class_name => 'CitesSuspensionNotification'
-  belongs_to :end_notification, :class_name => 'CitesSuspensionNotification'
+  belongs_to :end_notification, :class_name => 'CitesSuspensionNotification', optional: true
   has_many :cites_suspension_confirmations, :dependent => :destroy
   has_many :confirmation_notifications, :through => :cites_suspension_confirmations
   before_validation :handle_dates
diff --git a/app/models/cms_mapping.rb b/app/models/cms_mapping.rb
index 3e7e4cf56..58f2eb8e1 100644
--- a/app/models/cms_mapping.rb
+++ b/app/models/cms_mapping.rb
@@ -18,8 +18,8 @@ class CmsMapping < ApplicationRecord
   # attr_accessible :accepted_name_id, :cms_author, :cms_taxon_name, :cms_uuid, :details, :taxon_concept_id
 
   # serialize :details, ActiveRecord::Coders::Hstore
-  belongs_to :taxon_concept
-  belongs_to :accepted_name, :class_name => 'TaxonConcept'
+  belongs_to :taxon_concept, optional: true
+  belongs_to :accepted_name, :class_name => 'TaxonConcept', optional: true
 
   scope :filter, lambda { |option|
     case option
diff --git a/app/models/designation_geo_entity.rb b/app/models/designation_geo_entity.rb
index 1849c3a48..69c426c62 100644
--- a/app/models/designation_geo_entity.rb
+++ b/app/models/designation_geo_entity.rb
@@ -13,5 +13,5 @@ class DesignationGeoEntity < ApplicationRecord
   # Relationship table between Designation and GeoEntity.
   # attr_accessible :designation_id, :geo_entity_id
   belongs_to :designation
-  # TODO: missing `belongs_to :geo_entity`
+  belongs_to :geo_entity
 end
diff --git a/app/models/document.rb b/app/models/document.rb
index c8f3b2f0a..30f2f7754 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -39,12 +39,11 @@ class Document < ApplicationRecord
   #   :sort_index, :discussion_id, :discussion_sort_index,
   #   :primary_language_document_id,
   #   :designation_id
-
-  belongs_to :designation
-  belongs_to :event
-  belongs_to :language
+  belongs_to :designation, optional: true
+  belongs_to :event, optional: true
+  belongs_to :language, optional: true
   belongs_to :primary_language_document, class_name: 'Document',
-    foreign_key: 'primary_language_document_id'
+    foreign_key: 'primary_language_document_id', optional: true
   has_many :secondary_language_documents, class_name: 'Document',
     foreign_key: 'primary_language_document_id',
     dependent: :nullify
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index ee9b9c5c2..83c938b4b 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -39,14 +39,14 @@ class EuDecision < ApplicationRecord
   #   :created_by_id, :updated_by_id, :srg_history_id
 
   belongs_to :taxon_concept
-  belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id
+  belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id, optional: true
   belongs_to :geo_entity
-  belongs_to :eu_decision_type
-  belongs_to :srg_history
-  belongs_to :source, :class_name => 'TradeCode'
-  belongs_to :term, :class_name => 'TradeCode'
-  belongs_to :start_event, :class_name => 'Event'
-  belongs_to :end_event, :class_name => 'Event'
+  belongs_to :eu_decision_type, optional: true
+  belongs_to :srg_history, optional: true
+  belongs_to :source, :class_name => 'TradeCode', optional: true
+  belongs_to :term, :class_name => 'TradeCode', optional: true
+  belongs_to :start_event, :class_name => 'Event', optional: true
+  belongs_to :end_event, :class_name => 'Event', optional: true
   has_many :eu_decision_confirmations,
     :dependent => :destroy
 
diff --git a/app/models/eu_decision_confirmation.rb b/app/models/eu_decision_confirmation.rb
index 799dcce5d..641b1dc2c 100644
--- a/app/models/eu_decision_confirmation.rb
+++ b/app/models/eu_decision_confirmation.rb
@@ -14,5 +14,5 @@ class EuDecisionConfirmation < ApplicationRecord
   # attr_accessible :eu_decision_id, :event_id
 
   belongs_to :eu_decision
-  # TODO: missing `belongs_to :event`
+  belongs_to :event
 end
diff --git a/app/models/eu_opinion.rb b/app/models/eu_opinion.rb
index c74e0506b..9a7c4c269 100644
--- a/app/models/eu_opinion.rb
+++ b/app/models/eu_opinion.rb
@@ -30,7 +30,7 @@ class EuOpinion < EuDecision
   # Migrated to controller (Strong Parameters)
   # attr_accessible :document_id
 
-  belongs_to :document
+  belongs_to :document, optional: true
 
   validates :start_date, presence: true
   validate :event_or_document_presence
diff --git a/app/models/event.rb b/app/models/event.rb
index f77302568..1d4c5731e 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -33,7 +33,7 @@ class Event < ApplicationRecord
 
   attr_reader :effective_at_formatted
 
-  belongs_to :designation
+  belongs_to :designation, optional: true
   has_many :annotations, :dependent => :destroy
   has_many :documents
   has_many :cites_processes
diff --git a/app/models/iucn_mapping.rb b/app/models/iucn_mapping.rb
index f902e706e..3ac4595fa 100644
--- a/app/models/iucn_mapping.rb
+++ b/app/models/iucn_mapping.rb
@@ -21,7 +21,7 @@ class IucnMapping < ApplicationRecord
 
   # serialize :details, ActiveRecord::Coders::Hstore
   belongs_to :taxon_concept
-  belongs_to :accepted_name, :class_name => 'TaxonConcept'
+  belongs_to :accepted_name, :class_name => 'TaxonConcept', optional: true
 
   scope :filter, lambda { |option|
     case option
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index d46c2699b..3b33eca38 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -40,7 +40,7 @@ class ListingChange < ApplicationRecord
 
   attr_accessor :excluded_geo_entities_ids, :excluded_taxon_concepts_ids
 
-  belongs_to :event
+  belongs_to :event, optional: true
   has_many :listing_change_copies, :foreign_key => :original_id,
     :class_name => "ListingChange", :dependent => :nullify
   belongs_to :species_listing
@@ -52,10 +52,10 @@ class ListingChange < ApplicationRecord
   has_many :geo_entities, :through => :listing_distributions
   has_one :party_geo_entity, :class_name => 'GeoEntity',
     :through => :party_listing_distribution, :source => :geo_entity
-  belongs_to :annotation
-  belongs_to :hash_annotation, :class_name => 'Annotation'
-  belongs_to :parent, :class_name => 'ListingChange'
-  belongs_to :inclusion, :class_name => 'TaxonConcept', :foreign_key => 'inclusion_taxon_concept_id'
+  belongs_to :annotation, optional: true
+  belongs_to :hash_annotation, :class_name => 'Annotation', optional: true
+  belongs_to :parent, :class_name => 'ListingChange', optional: true
+  belongs_to :inclusion, :class_name => 'TaxonConcept', :foreign_key => 'inclusion_taxon_concept_id', optional: true
   has_many :exclusions, :class_name => 'ListingChange', :foreign_key => 'parent_id', :dependent => :destroy
   validates :change_type_id, :presence => true
   validates :effective_at, :presence => true
diff --git a/app/models/m_listing_change.rb b/app/models/m_listing_change.rb
index 321070239..53cfe3d3d 100644
--- a/app/models/m_listing_change.rb
+++ b/app/models/m_listing_change.rb
@@ -4,12 +4,12 @@ def self.included(base)
     base.class_eval do
       extend Mobility
 
-      belongs_to :designation
-      belongs_to :taxon_concept, :class_name => 'MTaxonConcept'
-      belongs_to :listing_change, :foreign_key => :id
-      belongs_to :event
-      translates :short_note, fallbacks: false
-      translates :full_note, fallbacks: false
+      belongs_to :designation, optional: true
+      belongs_to :taxon_concept, :class_name => 'MTaxonConcept', optional: true
+      belongs_to :listing_change, :foreign_key => :id, optional: true
+      belongs_to :event, optional: true
+      translates :short_note, fallback: false
+      translates :full_note, fallback: false
       translates :hash_full_note, :inherited_short_note, :inherited_full_note,
         :auto_note, :party_full_name
       translates :nomenclature_note, fallbacks: false
diff --git a/app/models/m_taxon_concept.rb b/app/models/m_taxon_concept.rb
index e2da848c0..8bffaaa53 100644
--- a/app/models/m_taxon_concept.rb
+++ b/app/models/m_taxon_concept.rb
@@ -109,7 +109,7 @@ class MTaxonConcept < ApplicationRecord
   self.table_name = :taxon_concepts_mview
   self.primary_key = :id
 
-  belongs_to :taxon_concept, :foreign_key => :id
+  belongs_to :taxon_concept, :foreign_key => :id, optional: true
   has_many :cites_listing_changes, :foreign_key => :taxon_concept_id, :class_name => MCitesListingChange
   has_many :historic_cites_listing_changes_for_downloads, -> { where(show_in_downloads: true).order(
     <<-SQL
diff --git a/app/models/nomenclature_change.rb b/app/models/nomenclature_change.rb
index 983305ce4..e61ecd79a 100644
--- a/app/models/nomenclature_change.rb
+++ b/app/models/nomenclature_change.rb
@@ -23,7 +23,7 @@ class NomenclatureChange < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :event_id, :status
 
-  belongs_to :event
+  belongs_to :event, optional: true
 
   validates :status, presence: true
   validate :cannot_update_when_locked
diff --git a/app/models/nomenclature_change/output.rb b/app/models/nomenclature_change/output.rb
index d3eaae19b..270074f71 100644
--- a/app/models/nomenclature_change/output.rb
+++ b/app/models/nomenclature_change/output.rb
@@ -45,10 +45,10 @@ class NomenclatureChange::Output < ApplicationRecord
   #   :output_type, :tag_list, :created_by_id, :updated_by_id
 
   belongs_to :nomenclature_change
-  belongs_to :taxon_concept
-  belongs_to :parent, :class_name => TaxonConcept, :foreign_key => :parent_id
-  belongs_to :rank
-  belongs_to :new_taxon_concept, :class_name => TaxonConcept, :foreign_key => :new_taxon_concept_id
+  belongs_to :taxon_concept, optional: true
+  belongs_to :parent, :class_name => TaxonConcept, :foreign_key => :parent_id, optional: true
+  belongs_to :rank, optional: true
+  belongs_to :new_taxon_concept, :class_name => TaxonConcept, :foreign_key => :new_taxon_concept_id, optional: true
   has_many :reassignments, :inverse_of => :output,
     :class_name => NomenclatureChange::OutputReassignment,
     :foreign_key => :nomenclature_change_output_id, :dependent => :destroy,
@@ -72,8 +72,8 @@ class NomenclatureChange::Output < ApplicationRecord
   has_many :reassignment_targets, :inverse_of => :output,
     :class_name => NomenclatureChange::ReassignmentTarget,
     :foreign_key => :nomenclature_change_output_id, :dependent => :destroy
-  belongs_to :new_parent, :class_name => TaxonConcept, :foreign_key => :new_parent_id
-  belongs_to :new_rank, :class_name => Rank, :foreign_key => :new_rank_id
+  belongs_to :new_parent, :class_name => TaxonConcept, :foreign_key => :new_parent_id, optional: true
+  belongs_to :new_rank, :class_name => Rank, :foreign_key => :new_rank_id, optional: true
 
   validates :nomenclature_change, :presence => true
   validates :new_scientific_name, :presence => true,
diff --git a/app/models/nomenclature_change/reassignment_helpers.rb b/app/models/nomenclature_change/reassignment_helpers.rb
index d1ab11a4b..6995d19d4 100644
--- a/app/models/nomenclature_change/reassignment_helpers.rb
+++ b/app/models/nomenclature_change/reassignment_helpers.rb
@@ -8,8 +8,7 @@ def self.included(base)
       # attr_accessible :type, :reassignable_id, :reassignable_type,
       #   :nomenclature_change_input_id, :nomenclature_change_output_id,
       #   :note_en, :note_es, :note_fr, :internal_note, :output_ids
-
-      belongs_to :reassignable, :polymorphic => true
+      belongs_to :reassignable, :polymorphic => true, optional: true
       has_many :reassignment_targets,
         inverse_of: :reassignment,
         class_name: 'NomenclatureChange::ReassignmentTarget',
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index 916cf0516..477fe6332 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -63,13 +63,13 @@ class TaxonConcept < ApplicationRecord
 
   has_one :m_taxon_concept, :foreign_key => :id
 
-  belongs_to :dependents_updater, foreign_key: :dependents_updated_by_id, class_name: User
-  belongs_to :parent, :class_name => 'TaxonConcept'
+  belongs_to :dependents_updater, foreign_key: :dependents_updated_by_id, class_name: User, optional: true
+  belongs_to :parent, :class_name => 'TaxonConcept', optional: true
   has_many :children, -> { where(name_status: ['A', 'N']) }, class_name: 'TaxonConcept', foreign_key: :parent_id # conditions: { name_status: ['A', 'N'] }
   belongs_to :rank
   belongs_to :taxonomy
   has_many :designations, :through => :taxonomy
-  belongs_to :taxon_name
+  belongs_to :taxon_name, optional: true
   has_many :taxon_relationships, :dependent => :destroy
   has_many :inverse_taxon_relationships, :class_name => 'TaxonRelationship',
     :foreign_key => :other_taxon_concept_id, :dependent => :destroy
diff --git a/app/models/term_trade_codes_pair.rb b/app/models/term_trade_codes_pair.rb
index 370b5a67a..d683623b5 100644
--- a/app/models/term_trade_codes_pair.rb
+++ b/app/models/term_trade_codes_pair.rb
@@ -15,7 +15,7 @@ class TermTradeCodesPair < ApplicationRecord
   # attr_accessible :trade_code_id, :trade_code_type, :term_id
 
   belongs_to :term, :class_name => "TradeCode"
-  belongs_to :trade_code
+  belongs_to :trade_code, optional: true
 
   validates :term_id, :presence => true, :uniqueness => { :scope => :trade_code_id }
 
diff --git a/app/models/trade/sandbox_template.rb b/app/models/trade/sandbox_template.rb
index 7222cf4e1..19a131d3a 100644
--- a/app/models/trade/sandbox_template.rb
+++ b/app/models/trade/sandbox_template.rb
@@ -60,8 +60,8 @@ def self.ar_klass(table_name)
         #   :purpose_code,
         #   :source_code,
         #   :year
-        belongs_to :taxon_concept
-        belongs_to :reported_taxon_concept, :class_name => TaxonConcept
+        belongs_to :taxon_concept, optional: true
+        belongs_to :reported_taxon_concept, :class_name => TaxonConcept, optional: true
 
         def sanitize
           self.class.sanitize(self.id)
diff --git a/app/models/trade/shipment.rb b/app/models/trade/shipment.rb
index 8dc02a8fe..549b2e7c7 100644
--- a/app/models/trade/shipment.rb
+++ b/app/models/trade/shipment.rb
@@ -65,13 +65,13 @@ class Trade::Shipment < ApplicationRecord
   validates_with Trade::ShipmentSecondaryErrorsValidator
 
   belongs_to :taxon_concept
-  belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id
+  belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id, optional: true
   belongs_to :reported_taxon_concept, :class_name => 'TaxonConcept'
-  belongs_to :purpose, :class_name => "TradeCode"
-  belongs_to :source, :class_name => "TradeCode"
+  belongs_to :purpose, :class_name => "TradeCode", optional: true
+  belongs_to :source, :class_name => "TradeCode", optional: true
   belongs_to :term, :class_name => "TradeCode"
-  belongs_to :unit, :class_name => "TradeCode"
-  belongs_to :country_of_origin, :class_name => "GeoEntity"
+  belongs_to :unit, :class_name => "TradeCode", optional: true
+  belongs_to :country_of_origin, :class_name => "GeoEntity", optional: true
   belongs_to :exporter, :class_name => "GeoEntity"
   belongs_to :importer, :class_name => "GeoEntity"
 
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index 9641ecef4..babe0c3bf 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -43,9 +43,9 @@ class TradeRestriction < ApplicationRecord
   #   :created_by_id, :updated_by_id, :url,
   #   :taxon_concept_id
 
-  belongs_to :taxon_concept
-  belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id
-  belongs_to :unit, :class_name => 'TradeCode'
+  belongs_to :taxon_concept, optional: true
+  belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id, optional: true
+  belongs_to :unit, :class_name => 'TradeCode', optional: true
   has_many :trade_restriction_terms, :dependent => :destroy
   has_many :terms, :through => :trade_restriction_terms
   has_many :trade_restriction_sources, :dependent => :destroy
@@ -53,7 +53,7 @@ class TradeRestriction < ApplicationRecord
   has_many :trade_restriction_purposes, :dependent => :destroy
   has_many :purposes, :through => :trade_restriction_purposes
 
-  belongs_to :geo_entity
+  belongs_to :geo_entity, optional: true
 
   validates :publication_date, :presence => true
   validate :valid_dates
diff --git a/app/models/user.rb b/app/models/user.rb
index 5fbeba390..7516df4f9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -49,7 +49,7 @@ class User < ApplicationRecord
   has_many :ahoy_visits, dependent: :nullify, class_name: 'Ahoy::Visit'
   has_many :ahoy_events, dependent: :nullify, class_name: 'Ahoy::Event'
   has_many :api_requests
-  belongs_to :geo_entity
+  belongs_to :geo_entity, optional: true
 
   validates :email, :uniqueness => true, :presence => true
   validates :name, :presence => true
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
index 77ad2f1e0..208456c7a 100644
--- a/config/initializers/new_framework_defaults.rb
+++ b/config/initializers/new_framework_defaults.rb
@@ -13,6 +13,3 @@
 
 # Enable origin-checking CSRF mitigation. Previous versions had false.
 Rails.application.config.action_controller.forgery_protection_origin_check = false
-
-# Require `belongs_to` associations by default. Previous versions had false.
-Rails.application.config.active_record.belongs_to_required_by_default = false

From 268046a9759e7aee56ab0953add4fe2ed96fa841 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 23 Jan 2024 22:44:41 +0000
Subject: [PATCH 075/241] remove new framework file

---
 config/initializers/new_framework_defaults.rb | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 config/initializers/new_framework_defaults.rb

diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
deleted file mode 100644
index 208456c7a..000000000
--- a/config/initializers/new_framework_defaults.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 5.0 upgrade.
-#
-# Once upgraded flip defaults one by one to migrate to the new default.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-
-Rails.application.config.action_controller.raise_on_unfiltered_parameters = true
-
-# Enable per-form CSRF tokens. Previous versions had false.
-Rails.application.config.action_controller.per_form_csrf_tokens = false
-
-# Enable origin-checking CSRF mitigation. Previous versions had false.
-Rails.application.config.action_controller.forgery_protection_origin_check = false

From 73aeac49f582d81705160c7dcb0894f8ad997f3e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 17:47:57 +0000
Subject: [PATCH 076/241] fix new default belongs_to loading issue

---
 Gemfile.lock                                  |  2 +-
 app/models/application_record.rb              |  3 +++
 .../models/concerns/comparison_attributes.rb  |  5 ++--
 .../models/concerns/protected_deletion.rb     |  3 +--
 app/models/m_listing_change.rb                |  4 +--
 .../initializers/0_new_framework_defaults.rb  | 26 +++++++++++++++++++
 config/initializers/acts_as_taggable_on.rb    |  2 ++
 7 files changed, 38 insertions(+), 7 deletions(-)
 rename config/initializers/active_record_comparison_attributes.rb => app/models/concerns/comparison_attributes.rb (94%)
 rename config/initializers/active_record_protected_deletion.rb => app/models/concerns/protected_deletion.rb (91%)
 create mode 100644 config/initializers/0_new_framework_defaults.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index 1adc77c5b..93e47fef9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -604,8 +604,8 @@ DEPENDENCIES
   json_spec (= 1.1.5)
   kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
-  mobility (~> 1.2, >= 1.2.9)
   listen (~> 3.0.5)
+  mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
   nokogiri (= 1.12.5)
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 10a4cba84..9eb6f356f 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,3 +1,6 @@
 class ApplicationRecord < ActiveRecord::Base
+  include ProtectedDeletion
+  include ComparisonAttributes
+
   self.abstract_class = true
 end
diff --git a/config/initializers/active_record_comparison_attributes.rb b/app/models/concerns/comparison_attributes.rb
similarity index 94%
rename from config/initializers/active_record_comparison_attributes.rb
rename to app/models/concerns/comparison_attributes.rb
index 5d74a9270..5ae610c75 100644
--- a/config/initializers/active_record_comparison_attributes.rb
+++ b/app/models/concerns/comparison_attributes.rb
@@ -1,4 +1,5 @@
 module ComparisonAttributes
+  extend ActiveSupport::Concern
 
   def self.included(base)
     base.extend ClassMethods
@@ -65,10 +66,10 @@ def duplicates(comparison_attributes_override)
 
 end
 
-ApplicationRecord.send :include, ComparisonAttributes
+# ApplicationRecord.send :include, ComparisonAttributes
 
 # Since Rails 5, our base class has changed and is no longer ActiveRecord::Base,
 # but is now ApplicationRecord. However ActsAsTaggableOn still has
 # ActiveRecord::Base as a base class, therefore it needs to be done separately.
 # It's possible that more ActsAsTaggableOn:: classes need this treatment.
-ActsAsTaggableOn::Tagging.send :include, ComparisonAttributes
+# ActsAsTaggableOn::Tagging.send :include, ComparisonAttributes
diff --git a/config/initializers/active_record_protected_deletion.rb b/app/models/concerns/protected_deletion.rb
similarity index 91%
rename from config/initializers/active_record_protected_deletion.rb
rename to app/models/concerns/protected_deletion.rb
index 3eb94290f..e7073df93 100644
--- a/config/initializers/active_record_protected_deletion.rb
+++ b/app/models/concerns/protected_deletion.rb
@@ -1,4 +1,5 @@
 module ProtectedDeletion
+  extend ActiveSupport::Concern
 
   # ideally override this
   def can_be_deleted?
@@ -21,6 +22,4 @@ def dependent_objects
   def dependent_objects_map
     {}
   end
-
 end
-ApplicationRecord.send :include, ProtectedDeletion
diff --git a/app/models/m_listing_change.rb b/app/models/m_listing_change.rb
index 53cfe3d3d..b9e504fb1 100644
--- a/app/models/m_listing_change.rb
+++ b/app/models/m_listing_change.rb
@@ -8,8 +8,8 @@ def self.included(base)
       belongs_to :taxon_concept, :class_name => 'MTaxonConcept', optional: true
       belongs_to :listing_change, :foreign_key => :id, optional: true
       belongs_to :event, optional: true
-      translates :short_note, fallback: false
-      translates :full_note, fallback: false
+      translates :short_note, fallbacks: false
+      translates :full_note, fallbacks: false
       translates :hash_full_note, :inherited_short_note, :inherited_full_note,
         :auto_note, :party_full_name
       translates :nomenclature_note, fallbacks: false
diff --git a/config/initializers/0_new_framework_defaults.rb b/config/initializers/0_new_framework_defaults.rb
new file mode 100644
index 000000000..dd236b5fe
--- /dev/null
+++ b/config/initializers/0_new_framework_defaults.rb
@@ -0,0 +1,26 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.0 upgrade.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+Rails.application.config.action_controller.raise_on_unfiltered_parameters = true
+
+# Enable per-form CSRF tokens. Previous versions had false.
+Rails.application.config.action_controller.per_form_csrf_tokens = true
+
+# Enable origin-checking CSRF mitigation. Previous versions had false.
+Rails.application.config.action_controller.forgery_protection_origin_check = true
+
+# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
+# Previous versions had false.
+ActiveSupport.to_time_preserves_timezone = true
+
+# Require `belongs_to` associations by default. Previous versions had false.
+Rails.application.config.active_record.belongs_to_required_by_default = true
+
+# Do not halt callback chains when a callback returns false. Previous versions had true.
+ActiveSupport.halt_callback_chains_on_return_false = false
+
+# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
+Rails.application.config.ssl_options = { hsts: { subdomains: true } }
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index 78e8d0b79..bd6585dcd 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -6,3 +6,5 @@
 # ActsAsTaggableOn::Tagging.class_eval do
 #   attr_accessible :tag_id, :context, :taggable, :taggable_id, :taggable_type, :tagger_id, :tagger_type
 # end
+
+ActsAsTaggableOn::Tagging.send :include, ComparisonAttributes

From 255b86d8737614b0be189125a03d985fbcb37c16 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 18:04:17 +0000
Subject: [PATCH 077/241] remove redundant validation (now come with
 belongs_to)

---
 app/models/cites_process.rb                           | 2 --
 app/models/cites_suspension.rb                        | 1 -
 app/models/concerns/track_who_does_it.rb              | 4 ++--
 app/models/eu_country_date.rb                         | 2 +-
 app/models/eu_decision.rb                             | 2 --
 app/models/geo_entity.rb                              | 1 -
 app/models/listing_change.rb                          | 1 -
 app/models/nomenclature_change/input.rb               | 2 --
 app/models/nomenclature_change/output.rb              | 1 -
 app/models/nomenclature_change/output_reassignment.rb | 2 --
 app/models/nomenclature_change/reassignment.rb        | 2 --
 app/models/nomenclature_change/reassignment_target.rb | 3 ---
 app/models/taxon_common.rb                            | 2 --
 app/models/taxon_concept.rb                           | 2 --
 app/models/taxon_relationship.rb                      | 1 -
 app/models/term_trade_codes_pair.rb                   | 2 +-
 app/models/trade/shipment.rb                          | 4 ----
 app/models/trade/taxon_concept_term_pair.rb           | 2 --
 18 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/app/models/cites_process.rb b/app/models/cites_process.rb
index 7ea7d4a62..2af493472 100644
--- a/app/models/cites_process.rb
+++ b/app/models/cites_process.rb
@@ -10,8 +10,6 @@ class CitesProcess < ApplicationRecord
   belongs_to :start_event, :class_name => 'Event', optional: true
   belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id, optional: true
 
-  validates :taxon_concept, presence: true
-  validates :geo_entity, presence: true
   validates :resolution, presence: true
   validates :start_date, presence: true
 
diff --git a/app/models/cites_suspension.rb b/app/models/cites_suspension.rb
index 1ffe156d8..37cb68900 100644
--- a/app/models/cites_suspension.rb
+++ b/app/models/cites_suspension.rb
@@ -42,7 +42,6 @@ class CitesSuspension < TradeRestriction
   has_many :confirmation_notifications, :through => :cites_suspension_confirmations
   before_validation :handle_dates
   before_save :handle_current_flag
-  validates :start_notification_id, :presence => true
   accepts_nested_attributes_for :cites_suspension_confirmations
 
   def handle_dates
diff --git a/app/models/concerns/track_who_does_it.rb b/app/models/concerns/track_who_does_it.rb
index ddb46b772..e42fca7b9 100644
--- a/app/models/concerns/track_who_does_it.rb
+++ b/app/models/concerns/track_who_does_it.rb
@@ -4,8 +4,8 @@ module TrackWhoDoesIt
   included do
     before_create :track_who_does_it_create_callback
     before_update :track_who_does_it_update_callback
-    belongs_to :creator, class_name: 'User', foreign_key: 'created_by_id'#, optional: true # TODO, enable that for Rails 5
-    belongs_to :updater, class_name: 'User', foreign_key: 'updated_by_id'#, optional: true # TODO, enable that for Rails 5
+    belongs_to :creator, class_name: 'User', foreign_key: 'created_by_id', optional: true
+    belongs_to :updater, class_name: 'User', foreign_key: 'updated_by_id', optional: true
   end
 
   private
diff --git a/app/models/eu_country_date.rb b/app/models/eu_country_date.rb
index c113d1877..86d5dbb86 100644
--- a/app/models/eu_country_date.rb
+++ b/app/models/eu_country_date.rb
@@ -3,7 +3,7 @@ class EuCountryDate < ApplicationRecord
   # attr_accessible :eu_accession_year, :eu_exit_year, :geo_entity
 
   belongs_to :geo_entity
-  validates :geo_entity, :eu_accession_year, :presence => true
+  validates :eu_accession_year, :presence => true
   validate :is_country
 
   private
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index 83c938b4b..59f2741af 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -50,8 +50,6 @@ class EuDecision < ApplicationRecord
   has_many :eu_decision_confirmations,
     :dependent => :destroy
 
-  validates :taxon_concept, presence: true
-  validates :geo_entity, presence: true
   validate :eu_decision_type_and_or_srg_history
 
   translates :nomenclature_note
diff --git a/app/models/geo_entity.rb b/app/models/geo_entity.rb
index 33a28233c..d7039f0e4 100644
--- a/app/models/geo_entity.rb
+++ b/app/models/geo_entity.rb
@@ -42,7 +42,6 @@ class GeoEntity < ApplicationRecord
   has_many :users
   has_many :cites_processes
   has_many :eu_country_dates
-  validates :geo_entity_type_id, :presence => true
   validates :iso_code2, :uniqueness => true, :allow_blank => true
   validates :iso_code2, :presence => true, :length => { :is => 2 },
     :if => :is_country?
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 3b33eca38..15c33a614 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -57,7 +57,6 @@ class ListingChange < ApplicationRecord
   belongs_to :parent, :class_name => 'ListingChange', optional: true
   belongs_to :inclusion, :class_name => 'TaxonConcept', :foreign_key => 'inclusion_taxon_concept_id', optional: true
   has_many :exclusions, :class_name => 'ListingChange', :foreign_key => 'parent_id', :dependent => :destroy
-  validates :change_type_id, :presence => true
   validates :effective_at, :presence => true
   validate :inclusion_at_higher_rank
   validate :species_listing_designation_mismatch
diff --git a/app/models/nomenclature_change/input.rb b/app/models/nomenclature_change/input.rb
index ebbcfb4b5..057cf9527 100644
--- a/app/models/nomenclature_change/input.rb
+++ b/app/models/nomenclature_change/input.rb
@@ -65,8 +65,6 @@ class NomenclatureChange::Input < ApplicationRecord
     foreign_key: :nomenclature_change_input_id,
     dependent: :destroy,
     autosave: true
-  validates :nomenclature_change, :presence => true
-  validates :taxon_concept, :presence => true
   accepts_nested_attributes_for :parent_reassignments, :allow_destroy => true
   accepts_nested_attributes_for :name_reassignments, :allow_destroy => true
   accepts_nested_attributes_for :distribution_reassignments, :allow_destroy => true
diff --git a/app/models/nomenclature_change/output.rb b/app/models/nomenclature_change/output.rb
index 270074f71..63651d2de 100644
--- a/app/models/nomenclature_change/output.rb
+++ b/app/models/nomenclature_change/output.rb
@@ -75,7 +75,6 @@ class NomenclatureChange::Output < ApplicationRecord
   belongs_to :new_parent, :class_name => TaxonConcept, :foreign_key => :new_parent_id, optional: true
   belongs_to :new_rank, :class_name => Rank, :foreign_key => :new_rank_id, optional: true
 
-  validates :nomenclature_change, :presence => true
   validates :new_scientific_name, :presence => true,
     :if => Proc.new { |c| c.taxon_concept_id.blank? }
   validates :new_parent_id, :presence => true,
diff --git a/app/models/nomenclature_change/output_reassignment.rb b/app/models/nomenclature_change/output_reassignment.rb
index 03ef2fd03..a1f6093fc 100644
--- a/app/models/nomenclature_change/output_reassignment.rb
+++ b/app/models/nomenclature_change/output_reassignment.rb
@@ -33,6 +33,4 @@ class NomenclatureChange::OutputReassignment < ApplicationRecord
   belongs_to :output, :class_name => NomenclatureChange::Output,
     :foreign_key => :nomenclature_change_output_id
 
-  validates :output, :presence => true
-
 end
diff --git a/app/models/nomenclature_change/reassignment.rb b/app/models/nomenclature_change/reassignment.rb
index 38be0841e..00819bae7 100644
--- a/app/models/nomenclature_change/reassignment.rb
+++ b/app/models/nomenclature_change/reassignment.rb
@@ -32,6 +32,4 @@ class NomenclatureChange::Reassignment < ApplicationRecord
 
   belongs_to :input, :class_name => NomenclatureChange::Input,
     :foreign_key => :nomenclature_change_input_id
-
-  validates :input, :presence => true
 end
diff --git a/app/models/nomenclature_change/reassignment_target.rb b/app/models/nomenclature_change/reassignment_target.rb
index c3c81b767..a63b49eda 100644
--- a/app/models/nomenclature_change/reassignment_target.rb
+++ b/app/models/nomenclature_change/reassignment_target.rb
@@ -22,7 +22,4 @@ class NomenclatureChange::ReassignmentTarget < ApplicationRecord
   belongs_to :reassignment,
     class_name: 'NomenclatureChange::Reassignment',
     foreign_key: :nomenclature_change_reassignment_id
-
-  validates :reassignment, :presence => true
-  validates :output, :presence => true
 end
diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index 79a65e0dd..d74d8ef81 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -21,8 +21,6 @@ class TaxonCommon < ApplicationRecord
   belongs_to :common_name
   belongs_to :taxon_concept
 
-  validates :common_name_id, :presence => true
-
   before_validation do
     cname = CommonName.find_or_create_by(
       name: self.name, language_id: self.language_id)
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index 477fe6332..1350afb25 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -151,8 +151,6 @@ class TaxonConcept < ApplicationRecord
   has_many :cites_processes
   has_many :cites_captivity_processes
 
-  validates :taxonomy_id, :presence => true
-  validates :rank_id, :presence => true
   validates :name_status, :presence => true
   validates :parent_id, presence: true,
     if: lambda { |tc| ['A', 'N'].include?(tc.name_status) && tc.rank.try(:name) != 'KINGDOM' }
diff --git a/app/models/taxon_relationship.rb b/app/models/taxon_relationship.rb
index 91db3a8b6..7656c5a31 100644
--- a/app/models/taxon_relationship.rb
+++ b/app/models/taxon_relationship.rb
@@ -36,7 +36,6 @@ class TaxonRelationship < ApplicationRecord
     scope: [:taxon_relationship_type_id, :other_taxon_concept_id],
     message: 'This relationship already exists, choose another taxon.'
   }
-  validates :other_taxon_concept_id, presence: true
   validate :intertaxonomic_relationship_uniqueness, :if => "taxon_relationship_type.is_intertaxonomic?"
 
   scope :hybrids, -> { where(
diff --git a/app/models/term_trade_codes_pair.rb b/app/models/term_trade_codes_pair.rb
index d683623b5..7451b2400 100644
--- a/app/models/term_trade_codes_pair.rb
+++ b/app/models/term_trade_codes_pair.rb
@@ -17,7 +17,7 @@ class TermTradeCodesPair < ApplicationRecord
   belongs_to :term, :class_name => "TradeCode"
   belongs_to :trade_code, optional: true
 
-  validates :term_id, :presence => true, :uniqueness => { :scope => :trade_code_id }
+  validates :term_id, :uniqueness => { :scope => :trade_code_id }
 
   def self.search(query)
     if query.present?
diff --git a/app/models/trade/shipment.rb b/app/models/trade/shipment.rb
index 549b2e7c7..da1f459df 100644
--- a/app/models/trade/shipment.rb
+++ b/app/models/trade/shipment.rb
@@ -55,10 +55,6 @@ class Trade::Shipment < ApplicationRecord
     :only_integer => true, :greater_than_or_equal_to => 1975, :less_than => 3000,
     :message => 'should be a 4 digit year'
   }
-  validates :taxon_concept_id, :presence => true
-  validates :term_id, :presence => true
-  validates :exporter_id, :presence => true
-  validates :importer_id, :presence => true
   validates :reporter_type, :presence => true, :inclusion => {
     :in => ['E', 'I'], :message => 'should be one of E, I'
   }
diff --git a/app/models/trade/taxon_concept_term_pair.rb b/app/models/trade/taxon_concept_term_pair.rb
index ba6c8d161..1627b9cc0 100644
--- a/app/models/trade/taxon_concept_term_pair.rb
+++ b/app/models/trade/taxon_concept_term_pair.rb
@@ -12,8 +12,6 @@
 class Trade::TaxonConceptTermPair < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :term_id
-  validates :taxon_concept_id, :presence => true
-  validates :term_id, :presence => true
   validates_uniqueness_of :taxon_concept_id, scope: :term_id
 
   belongs_to :taxon_concept

From e9da15eace9bc190e8149421c1b992e9308d17bb Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 21:49:26 +0000
Subject: [PATCH 078/241] bugs fix

---
 app/models/ahoy/event.rb     | 2 +-
 app/models/taxon_common.rb   | 4 ++--
 app/models/trade/shipment.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/ahoy/event.rb b/app/models/ahoy/event.rb
index 83e618063..5439bb471 100644
--- a/app/models/ahoy/event.rb
+++ b/app/models/ahoy/event.rb
@@ -14,7 +14,7 @@ module Ahoy
   class Event < ApplicationRecord
     self.table_name = 'ahoy_events'
 
-    belongs_to :visit, class_name: 'Ahoy::Visit'
+    belongs_to :visit, class_name: 'Ahoy::Visit', optional: true
     belongs_to :user, optional: true
     #should have been working with serialize :properties, JSON
     #like it works for other objects.
diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index d74d8ef81..7cd9d88cd 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -18,8 +18,8 @@ class TaxonCommon < ApplicationRecord
   #   :updated_by_id, :name, :language_id
 
   attr_accessor :name, :language_id
-  belongs_to :common_name
-  belongs_to :taxon_concept
+  belongs_to :common_name, optional: true
+  belongs_to :taxon_concept, optional: true
 
   before_validation do
     cname = CommonName.find_or_create_by(
diff --git a/app/models/trade/shipment.rb b/app/models/trade/shipment.rb
index da1f459df..fd530d727 100644
--- a/app/models/trade/shipment.rb
+++ b/app/models/trade/shipment.rb
@@ -62,7 +62,7 @@ class Trade::Shipment < ApplicationRecord
 
   belongs_to :taxon_concept
   belongs_to :m_taxon_concept, :foreign_key => :taxon_concept_id, optional: true
-  belongs_to :reported_taxon_concept, :class_name => 'TaxonConcept'
+  belongs_to :reported_taxon_concept, :class_name => 'TaxonConcept', optional: true
   belongs_to :purpose, :class_name => "TradeCode", optional: true
   belongs_to :source, :class_name => "TradeCode", optional: true
   belongs_to :term, :class_name => "TradeCode"

From b2357cfe2d3c78bf820e9dfaee95dc2109280f90 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 23:12:26 +0000
Subject: [PATCH 079/241] ActiveRecord TaxonConcept `validates :rank_id,
 :presence => true` was removed due to redundant to new `belongs_to :rank`
 build-in validation.

---
 app/models/nomenclature_change/output.rb       | 2 +-
 spec/models/nomenclature_change/output_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/nomenclature_change/output.rb b/app/models/nomenclature_change/output.rb
index 63651d2de..0a52a83f2 100644
--- a/app/models/nomenclature_change/output.rb
+++ b/app/models/nomenclature_change/output.rb
@@ -186,7 +186,7 @@ def validate_tmp_taxon_concept
 
     return true if @tmp_taxon_concept.valid?
     @tmp_taxon_concept.errors.each do |attribute, message|
-      if [:parent_id, :rank_id, :name_status, :author_year, :full_name].
+      if [:parent_id, :rank, :name_status, :author_year, :full_name].
         include?(attribute)
         errors.add(:"new_#{attribute}", message)
       else
diff --git a/spec/models/nomenclature_change/output_spec.rb b/spec/models/nomenclature_change/output_spec.rb
index ebb6de305..77c153890 100644
--- a/spec/models/nomenclature_change/output_spec.rb
+++ b/spec/models/nomenclature_change/output_spec.rb
@@ -52,7 +52,7 @@
       }
       specify { expect(output).to have(1).errors_on(:new_scientific_name) }
       specify { expect(output).to have(1).errors_on(:new_parent_id) }
-      specify { expect(output).to have(1).errors_on(:new_rank_id) }
+      specify { expect(output).to have(1).errors_on(:new_rank) }
       specify { expect(output).to have(1).errors_on(:new_name_status) }
       specify { expect(output).to have(1).errors_on(:new_taxon_concept) }
     end

From be43b9d4a11377ec7ca37d49bdf3d47fc5332ae8 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 23:17:21 +0000
Subject: [PATCH 080/241] add comments

---
 app/models/taxon_common.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index 7cd9d88cd..f681562b8 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -18,9 +18,15 @@ class TaxonCommon < ApplicationRecord
   #   :updated_by_id, :name, :language_id
 
   attr_accessor :name, :language_id
+
+  # Rspec file such as `spec/shared/agave.rb`, which assign taxon_concept.common_names = [array of common_name] broken
+  # if we remove `optional: true`, although it should be false.
   belongs_to :common_name, optional: true
   belongs_to :taxon_concept, optional: true
 
+  # rspec ./spec/controllers/admin/taxon_commons_controller_spec.rb borken if we remove the following validates.
+  validates :common_name_id, :presence => true
+
   before_validation do
     cname = CommonName.find_or_create_by(
       name: self.name, language_id: self.language_id)

From 9f551f354f410b99240057a663b2159352e81923 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 23:31:13 +0000
Subject: [PATCH 081/241] changed to use belongs_to build-in validation

---
 spec/models/cites_suspension_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/cites_suspension_spec.rb b/spec/models/cites_suspension_spec.rb
index 15c877da2..7e012f2c7 100644
--- a/spec/models/cites_suspension_spec.rb
+++ b/spec/models/cites_suspension_spec.rb
@@ -208,7 +208,7 @@
         }
 
         specify { expect(cites_suspension).to be_invalid }
-        specify { expect(cites_suspension.error_on(:start_notification_id).size).to eq(1) }
+        specify { expect(cites_suspension.error_on(:start_notification).size).to eq(1) }
       end
 
       context "when start date greater than end date" do

From 4df93ae3a0c95e804f20b755e373a5add78040f7 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 17:16:39 +0000
Subject: [PATCH 082/241] Update database_cleaner to fix the time travel issue
 in rspec. Also fixing gemfile lock issue due to git rebase.

---
 Gemfile      |  2 +-
 Gemfile.lock | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 14e9b9665..5e4d8bc85 100644
--- a/Gemfile
+++ b/Gemfile
@@ -122,7 +122,7 @@ group :test, :development do
   gem "rspec-rails", '4.1.1' # TODO: should upgrade once to rails 5.2
   gem 'rspec-collection_matchers', '~> 1.2', '>= 1.2.1'
   gem "json_spec", '1.1.5'
-  gem "database_cleaner", "1.2.0" # TODO, should remove after upgrade to Rails 5.1. (https://stackoverflow.com/questions/49246124/is-databasecleaner-still-necessary-with-rails-system-specs)
+  gem 'database_cleaner', '~> 2.0', '>= 2.0.2' # TODO, should remove after upgrade to Rails 5.1. (https://stackoverflow.com/questions/49246124/is-databasecleaner-still-necessary-with-rails-system-specs)
   gem "launchy", '2.4.3'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
diff --git a/Gemfile.lock b/Gemfile.lock
index 93e47fef9..b61b173af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -155,7 +155,12 @@ GEM
       thor
     crass (1.0.6)
     dalli (2.7.10)
-    database_cleaner (1.2.0)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     device_detector (1.0.7)
     devise (4.4.3)
       bcrypt (~> 3.0)
@@ -404,7 +409,7 @@ GEM
     redis-store (1.10.0)
       redis (>= 4, < 6)
     regexp_parser (2.9.0)
-    request_store (1.4.1)
+    request_store (1.5.1)
       rack (>= 1.4)
     responders (2.4.1)
       actionpack (>= 4.2.0, < 6.0)
@@ -468,9 +473,9 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sidekiq (4.2.10)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+    sidekiq (5.2.10)
+      connection_pool (~> 2.2, >= 2.2.2)
+      rack (~> 2.0)
       rack-protection (>= 1.5.0)
       redis (~> 4.5, < 4.6.0)
     sidekiq-status (2.1.3)
@@ -512,7 +517,7 @@ GEM
     ssrf_filter (1.0.8)
     strong_migrations (0.7.9)
       activerecord (>= 5)
-    strscan (3.0.8)
+    strscan (3.0.9)
     susy (2.2.14)
       sass (>= 3.3.0, < 3.5)
     sync (0.5.0)
@@ -586,7 +591,7 @@ DEPENDENCIES
   coffee-rails (~> 4.2)
   coveralls (= 0.7.1)
   dalli (= 2.7.10)
-  database_cleaner (= 1.2.0)
+  database_cleaner (~> 2.0, >= 2.0.2)
   devise (= 4.4.3)
   dotenv-rails (= 2.0.1)
   ed25519 (= 1.2.4)

From 8c79fdc4f970888ddb9ddd696340bb41b600d101 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 23:38:04 +0000
Subject: [PATCH 083/241] Upgrade Ruby to 2.6.10

---
 .rubocop.yml     | 2 +-
 .ruby-version    | 2 +-
 .travis.yml      | 2 +-
 Dockerfile       | 2 +-
 Gemfile          | 2 +-
 Gemfile.lock     | 2 +-
 config/deploy.rb | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index e3c5256a3..f0d916514 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,7 +6,7 @@ require:
 Rails:
   Enabled: true
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   TargetRailsVersion: 5.0
   Exclude:
     - 'lib/tasks/bbgem.rake'
diff --git a/.ruby-version b/.ruby-version
index 30f69e8cc..a04abec91 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5.9
+2.6.10
diff --git a/.travis.yml b/.travis.yml
index 6d30521b7..eef2cd5f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ cache: bundler
 bundler_args: --without development production staging
 sudo: false
 rvm:
-  - 2.5.9
+  - 2.6.10
 addons:
   postgresql: 9.4
   code_climate:
diff --git a/Dockerfile b/Dockerfile
index 217c4a965..00fe5b167 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile
-FROM ruby:2.5.9
+FROM ruby:2.6.10
 
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
 # runtime, so attempt to get these from apt, where possible
diff --git a/Gemfile b/Gemfile
index 5e4d8bc85..d4e506b72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-ruby '2.5.9'
+ruby '2.6.10'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.0.7', '>= 5.0.7.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index b61b173af..7f39531c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -657,7 +657,7 @@ DEPENDENCIES
   wkhtmltopdf-binary (~> 0.12.6.6)
 
 RUBY VERSION
-   ruby 2.5.9p229
+   ruby 2.6.10p229
 
 BUNDLED WITH
    1.17.3
diff --git a/config/deploy.rb b/config/deploy.rb
index c3386c389..46fd4af41 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -20,7 +20,7 @@
 # set :format, :pretty
 
 set :rvm_type, :user
-set :rvm_ruby_version, '2.5.9'
+set :rvm_ruby_version, '2.6.10'
 
 # Default value for :log_level is :debug
 # set :log_level, :debug

From cd29bb62db9c50b34812a82a69da1181c2dccdc8 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 10:15:28 +0000
Subject: [PATCH 084/241] fix Gemfile.lock broken due to rebase

---
 Gemfile.lock | 62 ++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7f39531c4..29f73ecef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,6 +83,7 @@ GEM
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
+    base64 (0.2.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.0)
     bindex (0.8.1)
@@ -161,6 +162,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    date (3.3.4)
     device_detector (1.0.7)
     devise (4.4.3)
       bcrypt (~> 3.0)
@@ -169,7 +171,6 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.0)
-    digest (3.1.1)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -238,7 +239,6 @@ GEM
       has_scope (~> 0.6)
       railties (>= 4.2, < 5.3)
       responders
-    io-wait (0.3.1)
     jmespath (1.6.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
@@ -278,9 +278,9 @@ GEM
     method_source (1.0.0)
     mime-types (2.99.3)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     mini_portile2 (2.6.1)
-    minitest (5.15.0)
+    minitest (5.21.2)
     mobility (1.2.9)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
@@ -291,24 +291,20 @@ GEM
       activerecord
       activesupport
     nested_form (0.3.2)
-    net-imap (0.2.2)
-      digest
+    net-imap (0.3.7)
+      date
       net-protocol
-      strscan
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.2.2)
       timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-smtp (0.3.0)
-      digest
+    net-smtp (0.4.0.1)
       net-protocol
-      timeout
-    net-ssh (6.1.0)
+    net-ssh (7.2.1)
     netrc (0.11.0)
     nio4r (2.7.0)
     nokogiri (1.12.5)
@@ -341,13 +337,14 @@ GEM
       pdf-reader (~> 1.2)
       ruby-rc4
       ttfunk (~> 1.0.3)
-    public_suffix (4.0.7)
+    public_suffix (5.0.4)
     puma (3.12.6)
     racc (1.7.3)
     rack (2.2.8)
     rack-cors (0.3.0)
-    rack-protection (2.2.4)
-      rack
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-session (1.0.2)
       rack (< 3)
     rack-test (0.6.3)
@@ -442,23 +439,27 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.12.1)
-    rubocop (1.28.2)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
-    rubocop-rails (2.14.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-rails (2.19.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.10.0)
-      rubocop (~> 1.19)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.20.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby-vips (2.2.0)
@@ -514,10 +515,9 @@ GEM
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    ssrf_filter (1.0.8)
+    ssrf_filter (1.1.2)
     strong_migrations (0.7.9)
       activerecord (>= 5)
-    strscan (3.0.9)
     susy (2.2.14)
       sass (>= 3.3.0, < 3.5)
     sync (0.5.0)
@@ -525,10 +525,10 @@ GEM
       tins (~> 1.0)
     test-unit (3.1.5)
       power_assert
-    thor (1.2.2)
+    thor (1.3.0)
     thread_safe (0.3.6)
     tilt (2.3.0)
-    timeout (0.4.0)
+    timeout (0.4.1)
     tins (1.32.1)
       sync
     ttfunk (1.0.3)

From 3269dcad0ebb30574babdc4ff193f8eb521388ed Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 23:41:27 +0000
Subject: [PATCH 085/241] Rails 5.1.7; Remove DBCleaner; Update
 application.secrets
 (https://guides.rubyonrails.org/v5.1/upgrading_ruby_on_rails.html#application-secrets-now-loaded-with-all-keys-as-symbols)

---
 .rubocop.yml                                  |  2 +-
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 82 +++++++++----------
 .../api/v1/shipments_controller.rb            |  2 +-
 .../cites_trade/home_controller.rb            |  2 +-
 app/mailers/application_mailer.rb             |  1 +
 .../changes_history_generator_worker.rb       |  2 +-
 app/workers/submission_worker.rb              |  2 +-
 config/environments/development.rb            |  5 +-
 config/environments/production.rb             | 11 ++-
 config/environments/staging.rb                | 11 ++-
 config/environments/test.rb                   |  3 +-
 config/initializers/aws.rb                    |  4 +-
 config/initializers/sidekiq.rb                |  4 +-
 spec/spec_helper.rb                           |  7 +-
 15 files changed, 66 insertions(+), 74 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index f0d916514..c7689fb2b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -7,7 +7,7 @@ Rails:
   Enabled: true
 AllCops:
   TargetRubyVersion: 2.6
-  TargetRailsVersion: 5.0
+  TargetRailsVersion: 5.1
   Exclude:
     - 'lib/tasks/bbgem.rake'
     - 'db/schema.rb'
diff --git a/Gemfile b/Gemfile
index d4e506b72..46a019eeb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ end
 ruby '2.6.10'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.0.7', '>= 5.0.7.2'
+gem 'rails', '5.1.7'
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3'
 # Use Puma as the app server
diff --git a/Gemfile.lock b/Gemfile.lock
index 29f73ecef..7d823f620 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,47 +2,47 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
+      nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.7.2)
-      actionview (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actionview (5.0.7.2)
-      activesupport (= 5.0.7.2)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active-model-adapter-source (2.1.1)
       ember-data-source (>= 1.13, < 3.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (5.0.7.2)
-      activesupport (= 5.0.7.2)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
       globalid (>= 0.3.6)
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      arel (~> 7.0)
-    activesupport (5.0.7.2)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
+      arel (~> 8.0)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -64,7 +64,7 @@ GEM
     appsignal (1.3.3)
       rack
       thread_safe
-    arel (7.1.4)
+    arel (8.0.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
     aws-sdk (2.11.632)
@@ -200,7 +200,7 @@ GEM
     ember-source (1.8.0)
       handlebars-source (~> 1.0)
     errbase (0.2.2)
-    erubis (2.7.0)
+    erubi (1.12.0)
     execjs (2.9.1)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
@@ -347,19 +347,19 @@ GEM
       rack (~> 2.2, >= 2.2.4)
     rack-session (1.0.2)
       rack (< 3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.7.2)
-      actioncable (= 5.0.7.2)
-      actionmailer (= 5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activerecord (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
       bundler (>= 1.3.0)
-      railties (= 5.0.7.2)
+      railties (= 5.1.7)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -373,9 +373,9 @@ GEM
       loofah (~> 2.19, >= 2.19.1)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -623,7 +623,7 @@ DEPENDENCIES
   prawn (= 0.13.2)
   puma (~> 3.0)
   rack-cors (= 0.3.0)
-  rails (~> 5.0.7, >= 5.0.7.2)
+  rails (= 5.1.7)
   rails-controller-testing
   rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)
diff --git a/app/controllers/api/v1/shipments_controller.rb b/app/controllers/api/v1/shipments_controller.rb
index 25abe42be..5a316c139 100644
--- a/app/controllers/api/v1/shipments_controller.rb
+++ b/app/controllers/api/v1/shipments_controller.rb
@@ -165,7 +165,7 @@ def sanitized_attributes
 
   def authenticate
     token = request.headers['X-Authentication-Token']
-    unless token == Rails.application.secrets["shipments_api_token"]
+    unless token == Rails.application.secrets[:shipments_api_token]
       head status: :unauthorized
       return false
     end
diff --git a/app/controllers/cites_trade/home_controller.rb b/app/controllers/cites_trade/home_controller.rb
index b0e0023cd..8931c0636 100644
--- a/app/controllers/cites_trade/home_controller.rb
+++ b/app/controllers/cites_trade/home_controller.rb
@@ -15,7 +15,7 @@ def view_results
   end
 
   def download_db
-    full_download_path = Rails.application.secrets['cites_trade_full_download']
+    full_download_path = Rails.application.secrets[:cites_trade_full_download]
     send_file(
       "#{Rails.root}/#{full_download_path}",
       filename: full_download_path.split("/").last,
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index af30b5fda..8087e9719 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,4 +1,5 @@
 class ApplicationMailer < ActionMailer::Base
+  default from: Rails.application.secrets.mailer[:from]
   layout 'mailer'
 end
 
diff --git a/app/workers/changes_history_generator_worker.rb b/app/workers/changes_history_generator_worker.rb
index 426bd039f..d14540d45 100644
--- a/app/workers/changes_history_generator_worker.rb
+++ b/app/workers/changes_history_generator_worker.rb
@@ -19,7 +19,7 @@ def perform(aru_id, user_id)
     begin
       s3 = Aws::S3::Resource.new
       filename = "#{Rails.env}/trade/annual_report_upload/#{aru.id}/changelog.csv"
-      bucket_name = Rails.application.secrets.aws['bucket_name']
+      bucket_name = Rails.application.secrets.aws[:bucket_name]
       obj = s3.bucket(bucket_name).object(filename)
       obj.upload_file(tempfile.path)
 
diff --git a/app/workers/submission_worker.rb b/app/workers/submission_worker.rb
index e1503d0d4..4078e8651 100644
--- a/app/workers/submission_worker.rb
+++ b/app/workers/submission_worker.rb
@@ -58,7 +58,7 @@ def upload_on_S3(aru, tempfile)
     begin
       s3 = Aws::S3::Resource.new
       filename = "#{Rails.env}/trade/annual_report_upload/#{aru.id}/changelog.csv"
-      bucket_name = Rails.application.secrets.aws['bucket_name']
+      bucket_name = Rails.application.secrets.aws[:bucket_name]
       obj = s3.bucket(bucket_name).object(filename)
       obj.upload_file(tempfile.path)
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bd94090f8..38fe99157 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -57,11 +57,10 @@
 
   # Custom email settings
   config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = { address: Rails.application.secrets.mailer['address'], port: 1025 }
+  config.action_mailer.smtp_settings = { address: Rails.application.secrets.mailer[:address], port: 1025 }
   config.action_mailer.default_url_options = {
-    host: Rails.application.secrets.mailer['host'] || 'http://localhost:3000'
+    host: Rails.application.secrets.mailer[:host] || 'http://localhost:3000'
   }
-  ActionMailer::Base.default from: Rails.application.secrets.mailer['from']
 
   # CORS settings
   # TODO: Rails 5 should build-in, need change this part when upgrade.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 805c63bda..b08307187 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -90,16 +90,15 @@
 
   # Custom email settings
   config.action_mailer.smtp_settings = {
-    domain: Rails.application.secrets.mailer['domain'],
-    address: Rails.application.secrets.mailer['address'],
+    domain: Rails.application.secrets.mailer[:domain],
+    address: Rails.application.secrets.mailer[:address],
     port: 587,
     authentication: :login,
     enable_starttls_auto: true,
-    user_name: Rails.application.secrets.mailer['username'],
-    password: Rails.application.secrets.mailer['password']
+    user_name: Rails.application.secrets.mailer[:username],
+    password: Rails.application.secrets.mailer[:password]
   }
   config.action_mailer.default_url_options = {
-    host: Rails.application.secrets.mailer['host']
+    host: Rails.application.secrets.mailer[:host]
   }
-  ActionMailer::Base.default from: Rails.application.secrets.mailer['from']
 end
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index a01773eb7..7840d1345 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -83,16 +83,15 @@
 
   # Custom email settings
   config.action_mailer.smtp_settings = {
-    domain: Rails.application.secrets.mailer['domain'],
-    address: Rails.application.secrets.mailer['address'],
+    domain: Rails.application.secrets.mailer[:domain],
+    address: Rails.application.secrets.mailer[:address],
     port: 587,
     authentication: :login,
     enable_starttls_auto: true,
-    user_name: Rails.application.secrets.mailer['username'],
-    password: Rails.application.secrets.mailer['password']
+    user_name: Rails.application.secrets.mailer[:username],
+    password: Rails.application.secrets.mailer[:password]
   }
   config.action_mailer.default_url_options = {
-    host: Rails.application.secrets.mailer['host']
+    host: Rails.application.secrets.mailer[:host]
   }
-  ActionMailer::Base.default from: Rails.application.secrets.mailer['from']
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index d0706ab7b..861784143 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -49,7 +49,6 @@
 
   # Custom email settings
   config.action_mailer.default_url_options = {
-    host: Rails.application.secrets.mailer['host']
+    host: Rails.application.secrets.mailer[:host]
   }
-  ActionMailer::Base.default from: Rails.application.secrets.mailer['from']
 end
diff --git a/config/initializers/aws.rb b/config/initializers/aws.rb
index 1169c4591..5db4a0400 100644
--- a/config/initializers/aws.rb
+++ b/config/initializers/aws.rb
@@ -1,7 +1,7 @@
 Aws.eager_autoload!(services: %w(S3 EC2))
 
-access_key_id = Rails.application.secrets.aws['access_key_id']
-secret_access_key = Rails.application.secrets.aws['secret_access_key']
+access_key_id = Rails.application.secrets.aws[:access_key_id]
+secret_access_key = Rails.application.secrets.aws[:secret_access_key]
 
 
 Aws.config.update({
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index f16373caf..f62ab9ee2 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -8,7 +8,7 @@
     chain.add SidekiqUniqueJobs::Middleware::Client
   end
   config.redis = {
-    url: Rails.application.secrets.redis['url']
+    url: Rails.application.secrets.redis[:url]
   }
 end
 
@@ -22,7 +22,7 @@
     chain.add SidekiqUniqueJobs::Middleware::Client
   end
   config.redis = {
-    url: Rails.application.secrets.redis['url']
+    url: Rails.application.secrets.redis[:url]
   }
 
   SidekiqUniqueJobs::Server.configure(config)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 07dfbdb75..1d18d2a97 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -38,7 +38,7 @@
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of
@@ -55,26 +55,21 @@
   config.include SapiSpec::Helpers
 
   config.before(:all) do
-    DatabaseCleaner.clean_with(:deletion, { :cache_tables => false })
     @user = create(:user)
     RequestStore.store[:track_who_does_it_current_user] = @user
   end
 
   config.before(:each) do
-    DatabaseCleaner.strategy = :transaction
   end
 
   config.before(:each, :drops_tables => true) do
-    DatabaseCleaner.strategy = :deletion, { :cache_tables => false }
     ApplicationRecord.connection.execute('SELECT * FROM drop_trade_sandboxes()')
   end
 
   config.before(:each) do
-    DatabaseCleaner.start
   end
 
   config.after(:each) do
-    DatabaseCleaner.clean
     # this is duplicated here because of the :drops_tables specs
     @user = create(:user)
     RequestStore.store[:track_who_does_it_current_user] = @user

From 34f3733b4c61829ed658473beeaef77b24d0fcf0 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 23 Jan 2024 13:33:33 +0000
Subject: [PATCH 086/241] remove "old_cap"

---
 old_cap/Capfile              |   5 -
 old_cap/deploy.rb            | 396 -----------------------------------
 old_cap/deploy/production.rb |  91 --------
 old_cap/deploy/staging.rb    |  66 ------
 4 files changed, 558 deletions(-)
 delete mode 100644 old_cap/Capfile
 delete mode 100644 old_cap/deploy.rb
 delete mode 100644 old_cap/deploy/production.rb
 delete mode 100644 old_cap/deploy/staging.rb

diff --git a/old_cap/Capfile b/old_cap/Capfile
deleted file mode 100644
index a2ab1f74b..000000000
--- a/old_cap/Capfile
+++ /dev/null
@@ -1,5 +0,0 @@
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-# Generated with 'brightbox' on 2013-06-27 08:45:55 +0100
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-#load 'deploy/assets'
-load 'config/deploy'
diff --git a/old_cap/deploy.rb b/old_cap/deploy.rb
deleted file mode 100644
index c2ad25c9f..000000000
--- a/old_cap/deploy.rb
+++ /dev/null
@@ -1,396 +0,0 @@
-set :default_stage, 'staging'
-
-require 'capistrano/ext/multistage'
-## Generated with 'brightbox' on 2013-06-27 08:45:55 +0100
-gem 'brightbox', '>=2.3.9'
-require 'brightbox/recipes'
-require 'brightbox/passenger'
-require 'capistrano/sidekiq'
-
-require 'capistrano/slack'
-
-#required
-require 'yaml'
-set :secrets, YAML.load(File.open('config/secrets.yml'))
-
-set :slack_token, secrets["development"]["capistrano_slack"] # comes from inbound webhook integration
-set :api_token, secrets["development"]["api_token"]
-set :slack_room, "#speciesplus" # the room to send the message to
-set :slack_subdomain, "wcmc" # if your subdomain is example.slack.com
-
-# optional
-set :slack_application, "SAPI" # override Capistrano `application`
-deployment_animals = [
-  ["Loxodonta deployana", ":elephant:"],
-  ["Canis deployus", ":wolf:"],
-  ["Panthera capistranis", ":tiger:"],
-  ["Bison deployon", ":ox:"],
-  ["Ursus capistranus", ":bear:"],
-  ["Crotalus rattledeploy", ":snake:"],
-  ["Caiman assetocompilatus", ":crocodile:"]
-]
-
-set :shuffle_deployer, deployment_animals.shuffle.first
-
-set :slack_username, shuffle_deployer[0] # displayed as name of message sender
-set :slack_emoji, shuffle_deployer[1] # will be used as the avatar for the message
-
-set :generate_webserver_config, false
-
-require 'rvm/capistrano'
-set :rvm_ruby_string, '2.1.6'
-
-ssh_options[:forward_agent] = true
-
-# The name of your application.  Used for deployment directory and filenames
-# and Apache configs. Should be unique on the Brightbox
-set :application, "sapi"
-
-# got sick of "gem X not found in any of the sources" when using the default whenever recipe
-# probable source of issue:
-# https://github.com/javan/whenever/commit/7ae1009c31deb03c5db4a68f5fc99ea099ce5655
-namespace :deploy do
-
-  task :default do
-    update
-    assets.precompile
-    restart
-    cleanup
-    # etc
-  end
-
-  desc "Restarting mod_rails with restart.txt"
-  task :restart, :roles => :app, :except => { :no_release => true } do
-    run "touch #{current_path}/tmp/restart.txt"
-  end
-
-end
-
-namespace :assets do
-  desc "Precompile assets locally and then rsync to app servers"
-    task :precompile, :only => { :primary => true } do
-    run_locally "bundle exec rake RAILS_ENV=#{rails_env} assets:precompile;"
-    servers = find_servers :roles => [:app], :except => { :no_release => true }
-    servers.each do |server|
-    run_locally "rsync -av ./public/assets/ rails@#{domain}:#{deploy_to}/shared/assets;"
-    end
-    run_locally "rm -rf public/assets"
-    run "ln -nfs #{deploy_to}/shared/assets #{deploy_to}/current/public/assets"
-  end
-end
-
-# Target directory for the application on the web and app servers.
-set(:deploy_to) { File.join("", "home", user, application) }
-
-# URL of your source repository. By default this will just upload
-# the local directory.  You should probably change this if you use
-# another repository, like git or subversion.
-
-set :repository,  "git@github.com:unepwcmc/SAPI.git"
-set :scm, :git
-set :scm_username, "unepwcmc-read"
-set :deploy_via, :remote_cache
-set :copy_exclude, [ '.git' ]
-
-### Other options you can set ##
-# Comma separated list of additional domains for Apache
-# set :domain_aliases, "www.example.com,dev.example.com"
-
-## Dependencies
-# Set the commands and gems that your application requires. e.g.
-# depend :remote, :gem, "will_paginate", ">=2.2.2"
-# depend :remote, :command, "brightbox"
-#
-# If you're using Bundler, then you don't need to specify your
-# gems here as well as there (and the bundler gem is installed for
-# you automatically)
-#
-# Gem with a source (such as github)
-# depend :remote, :gem, "tmm1-amqp", ">=0.6.0", :source => "http://gems.github.com"
-#
-# Specify your specific Rails version if it is not vendored
-# depend :remote, :gem, "rails", "=2.2.2"
-#
-# Set the apt packages your application or gems require. e.g.
-# depend :remote, :apt, "libxml2-dev"
-
-## Local Shared Area
-# These are the list of files and directories that you want
-# to share between the releases of your application on a particular
-# server. It uses the same shared area as the log files.
-#
-# NOTE: local areas trump global areas, allowing you to have some
-# servers using local assets if required.
-#
-# So if you have an 'upload' directory in public, add 'public/upload'
-# to the :local_shared_dirs array.
-# If you want to share the database.yml add 'config/database.yml'
-# to the :local_shared_files array.
-#
-# The shared area is prepared with 'deploy:setup' and all the shared
-# items are symlinked in when the code is updated.
-set :local_shared_files, %w(config/database.yml config/mailer_config.yml
-                           config/secrets.yml)
-set :local_shared_dirs, %w(tmp/pids public/downloads public/uploads
-  public/cites_trade_guidelines)
-
-## Global Shared Area
-# These are the list of files and directories that you want
-# to share between all releases of your application across all servers.
-# For it to work you need a directory on a network file server shared
-# between all your servers. Specify the path to the root of that area
-# in :global_shared_path. Defaults to the same value as :shared_path.
-# set :global_shared_path, "/srv/share/myapp"
-#
-# NOTE: local areas trump global areas, allowing you to have some
-# servers using local assets if required.
-#
-# Beyond that it is the same as the local shared area.
-# So if you have an 'upload' directory in public, add 'public/upload'
-# to the :global_shared_dirs array.
-# If you want to share the database.yml add 'config/database.yml'
-# to the :global_shared_files array.
-#
-# The shared area is prepared with 'deploy:setup' and all the shared
-# items are symlinked in when the code is updated.
-# set :global_shared_dirs, %w(public/upload)
-# set :global_shared_files, %w(config/database.yml)
-
-# SSL Certificates. If you specify an SSL certificate name then
-# the gem will create an 'https' configuration for this application
-# TODO: Upload and install the keys on the server
-# set :ssl_certificate, "/path/to/certificate/for/my_app.crt"
-# set :ssl_key, "/path/to/key/for/my_app.key
-# or
-# set :ssl_certificate, "name_of_installed_certificate"
-
-## Static asset caching.
-# By default static assets served directly by the web server are
-# cached by the client web browser for 10 years, and cache invalidation
-# of static assets is handled by the Rails helpers using asset
-# timestamping.
-# You may need to adjust this value if you have hard coded static
-# assets, or other special cache requirements. The value is in seconds.
-# set :max_age, 315360000
-
-# SSH options. The forward agent option is used so that loopback logins
-# with keys work properly
-# ssh_options[:forward_agent] = true
-
-# Forces a Pty so that svn+ssh repository access will work. You
-# don't need this if you are using a different SCM system. Note that
-# ptys stop shell startup scripts from running.
-default_run_options[:pty] = true
-
-## Logrotation
-# Where the logs are stored. Defaults to <shared_path>/log
-# set :log_dir, "central/log/path"
-# The size at which to rotate a log. e.g 1G, 100M, 5M. Defaults to 100M
-# set :log_max_size, "100M"
-# How many old compressed logs to keep. Defaults to 10
-# set :log_keep, "10"
-
-## Version Control System
-# Which version control system. Defaults to subversion if there is
-# no 'set :scm' command.
-# set :scm, :git
-# set :scm_username, "rails"
-# set :scm_password, "mysecret"
-# or be explicit
-# set :scm, :subversion
-
-## Deployment settings
-# The brightbox gem deploys as the user 'rails' by default and
-# into the 'production' environment. You can change these as required.
-# set :user, "rails"
-# set :rails_env, :production
-
-## Command running settings
-# use_sudo is switched off by default so that commands are run
-# directly as 'user' by the run command. If you switch on sudo
-# make sure you set the :runner variable - which is the user the
-# capistrano default tasks use to execute commands.
-# NB. This just affects the default recipes unless you use the
-# 'try_sudo' command to run your commands.
-# set :use_sudo, false
-# set :runner, user## Passenger Configuration
-# Set the method of restarting passenger
-# Defaults to :hard which is used to instantly free up database connections
-# :soft uses the standard touch tmp/restart.txt which leaves database connections
-# lingering until the workers time out
-# set :passenger_restart_strategy, :hard
-
-task :setup_production_database_configuration do
-  the_host = Capistrano::CLI.ui.ask("Database IP address: ")
-  database_name = Capistrano::CLI.ui.ask("Database name: ")
-  database_user = Capistrano::CLI.ui.ask("Database username: ")
-  pg_password = Capistrano::CLI.password_prompt("Database user password: ")
-
-  require 'yaml'
-
-  spec = {
-    "#{rails_env}" => {
-      "adapter" => "postgresql",
-      "database" => database_name,
-      "username" => database_user,
-      "host" => the_host,
-      "password" => pg_password
-    }
-  }
-
-  run "mkdir -p #{shared_path}/config"
-  put(spec.to_yaml, "#{shared_path}/config/database.yml")
-end
-
-namespace :mailer do
-  task :setup do
-    smtp_user = Capistrano::CLI.ui.ask("SMTP username: ")
-    smtp_password = Capistrano::CLI.password_prompt("SMTP password: ")
-
-    require 'yaml'
-
-    spec = {
-      "#{rails_env}" => {
-        :default_url_options => {
-          :host => "#{domain}"
-        },
-        :smtp_settings => {
-          :enable_starttls_auto => true,
-          :address => 'pod51017.outlook.com',
-          :port => 587,
-          :domain => 'unep-wcmc.org',
-          :authentication => 'login',
-          :user_name => smtp_user,
-          :password => smtp_password
-        }
-      }
-    }
-
-    run "mkdir -p #{shared_path}/config"
-    put(spec.to_yaml, "#{shared_path}/config/mailer_config.yml")
-  end
-end
-
-after "deploy:setup", :setup_production_database_configuration
-after "deploy:setup", 'mailer:setup'
-
-namespace :seeds do
-  desc 'plants seeds, defined inside db/seeds.rb file'
-  task :plant, :roles => [:db] do
-    run "cd #{current_path} && RAILS_ENV=#{rails_env} rake db:seed"
-  end
-end
-
-namespace :import do
-
-  namespace :cleaned do
-    task :species, :roles => [:db] do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake import:cleaned:species"
-    end
-    task :distributions, :roles => [:db] do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake import:cleaned:distributions"
-    end
-    task :common_names, :roles => [:db] do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake import:cleaned:common_names"
-    end
-    task :references, :roles => [:db] do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake import:cleaned:references"
-    end
-    desc "Run full import"
-    task :all, :roles => [:db] do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake import:cleaned"
-    end
-  end
-
-  desc "Redo full import (drop / create db, seeds, full import)"
-  task :redo, :roles => [:db] do
-    run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake import:redo"
-  end
-end
-
-namespace :downloads do
-  namespace :cache do
-    desc "Clear cache"
-    task :clear, :roles => [:web, :app] do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake downloads:cache:clear"
-    end
-
-    desc "Populate cache"
-    task :populate, :roles => [:web, :app] do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake downloads:cache:update_species_downloads"
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake downloads:cache:update_checklist_downloads"
-    end
-
-    desc "Rotate cache"
-    task :rotate, :roles => [:web, :app] do
-      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake downloads:cache:rotate"
-    end
-  end
-end
-
-namespace :deploy do
-  desc 'Rebuild database mviews'
-  task :rebuild, :roles => [:db] do
-    run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake db:migrate:rebuild"
-  end
-end
-after "deploy:rebuild", "downloads:cache:clear"
-
-task :smoke_test do
-
-  message = ""
-
-  urls = [
-    "http://www.speciesplus.net", "http://trade.cites.org",
-    "http://www.speciesplus.net/trade", "http://www.speciesplus.net/admin",
-    "http://api.speciesplus.net/api/v1/taxon_concepts?name=Canis%20lupus",
-    "http://api.speciesplus.net/api/v1/taxon_concepts/9644/references",
-    "http://api.speciesplus.net/api/v1/taxon_concepts/9644/eu_legislation",
-    "http://api.speciesplus.net/api/v1/taxon_concepts/9644/distributions",
-    "http://api.speciesplus.net/api/v1/taxon_concepts/9644/cites_legislation"
-  ]
-
-  urls.each do |url|
-    if /api/.match(url)
-      curl_result = `curl -i -s -w "%{http_code}" #{url} -H "X-Authentication-Token:#{api_token}" -o /dev/null`
-    else
-      curl_result = `curl -s -w "%{http_code}" #{url} -o /dev/null`
-    end
-
-    if curl_result == "200"
-      message << "#{url} passed the smoke test\n"
-    elsif curl_result == "302"
-      message << "#{url} passed the smoke test with a redirection\n"
-    else
-      message << "#{url} failed the smoke test\n"
-    end
-  end
-
-  slack_smoke_notification message
-end
-
-def slack_smoke_notification(message)
-  uri = URI.parse("https://hooks.slack.com/services/T028F7AGY/B036GEF7T/#{slack_token}")
-
-  payload = {
-    channel: slack_room,
-    username: slack_username,
-    text: message,
-    icon_emoji: slack_emoji
-  }
-
-  response = nil
-
-  request = Net::HTTP::Post.new(uri.request_uri)
-  request.set_form_data({ :payload => JSON.generate( payload ) })
-
-  http = Net::HTTP.new(uri.host, uri.port)
-  http.use_ssl = true
-  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-  http.start do |h|
-    response = h.request(request)
-  end
-end
-
-after "deploy", "smoke_test"
diff --git a/old_cap/deploy/production.rb b/old_cap/deploy/production.rb
deleted file mode 100644
index fa92d904e..000000000
--- a/old_cap/deploy/production.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-set :rails_env, "production"
-
-# Primary domain name of your application. Used in the Apache configs
-set :domain, "unepwcmc-013.vm.brightbox.net"
-
-## List of servers
-server "unepwcmc-013.vm.brightbox.net", :app, :web, :db, :primary => true
-
-set :application, "sapi"
-set :server_name, "sapi.unepwcmc-013.vm.brightbox.net"
-set :sudo_user, "rails"
-set :app_port, "80"
-
-set :branch, :master
-
-set :whenever_environment, defer { stage }
-require 'whenever/capistrano'
-
-desc "Configure VHost"
-task :config_vhost do
-  vhost_config = <<-EOF
-    server {
-      listen 80;
-      client_max_body_size 4G;
-      server_name #{application}.unepwcmc-013.vm.brightbox.net;
-      keepalive_timeout 5;
-      root #{deploy_to}/current/public;
-      passenger_enabled on;
-      rails_env production;
-
-      add_header 'Access-Control-Allow-Origin' *;
-      add_header 'Access-Control-Allow-Methods' "GET, POST, PUT, DELETE, OPTIONS";
-      add_header 'Access-Control-Allow-Headers' "X-Requested-With, X-Prototype-Version";
-      add_header 'Access-Control-Max-Age' 1728000;
-
-      # Enable serving files through nginx
-      passenger_set_cgi_param HTTP_X_ACCEL_MAPPING /home/rails/sapi/shared/public/downloads/=/downloads/;
-      passenger_pass_header X-Accel-Redirect;
-
-      location ~ ^/downloads/(.*)$ {
-        alias /home/rails/sapi/shared/public/downloads/$1;
-        internal;
-      }
-
-      gzip on;
-      location ^~ /assets/ {
-        expires max;
-        add_header Cache-Control public;
-      }
-
-      if (-f $document_root/system/maintenance.html) {
-        return 503;
-      }
-
-      error_page 500 502 504 /500.html;
-      location = /500.html {
-        root #{deploy_to}/public;
-      }
-
-      error_page 503 @maintenance;
-      location @maintenance {
-        rewrite  ^(.*)$  /system/maintenance.html break;
-      }
-    }
-  EOF
-  put vhost_config, "/tmp/vhost_config"
-  sudo "mv /tmp/vhost_config /etc/nginx/sites-available/#{application}"
-  sudo "ln -s /etc/nginx/sites-available/#{application} /etc/nginx/sites-enabled/#{application}"
-end
-
-after "deploy:setup", :config_vhost
-
-endpoints = [
-  {
-    name: "Species+",
-    url: "http://www.speciesplus.net"
-  },
-  {
-    name: "Public Trade",
-    url: "http://trade.cites.org"
-  },
-  {
-    name: "Private Trade",
-    url: "http://www.speciesplus.net/trade"
-  },
-  {
-    name: "Admin",
-    url: "http://www.speciesplus.net/admin"
-  }
-]
-set :urls_to_test, endpoints
diff --git a/old_cap/deploy/staging.rb b/old_cap/deploy/staging.rb
deleted file mode 100644
index f77710593..000000000
--- a/old_cap/deploy/staging.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-set :rails_env, "staging"
-# Primary domain name of your application. Used in the Apache configs
-set :domain, "unepwcmc-012.vm.brightbox.net"
-## List of servers
-server "unepwcmc-012.vm.brightbox.net", :app, :web, :db, :primary => true
-
-set :application, "sapi"
-set :server_name, "sapi.unepwcmc-012.vm.brightbox.net"
-set :sudo_user, "rails"
-set :app_port, "80"
-
-set :branch, :develop
-
-desc "Configure VHost"
-task :config_vhost do
-  vhost_config = <<-EOF
-    server {
-      listen 80;
-      client_max_body_size 4G;
-      server_name #{application}.unepwcmc-012.vm.brightbox.net #{application}.sw02.matx.info;
-      keepalive_timeout 5;
-      root #{deploy_to}/current/public;
-      passenger_enabled on;
-      rails_env staging;
-
-      add_header 'Access-Control-Allow-Origin' *;
-      add_header 'Access-Control-Allow-Methods' "GET, POST, PUT, DELETE, OPTIONS";
-      add_header 'Access-Control-Allow-Headers' "X-Requested-With, X-Prototype-Version";
-      add_header 'Access-Control-Max-Age' 1728000;
-
-      # Enable serving files through nginx
-      passenger_set_cgi_param HTTP_X_ACCEL_MAPPING /home/rails/sapi/shared/public/downloads/=/downloads/;
-      passenger_pass_header X-Accel-Redirect;
-
-      location ~ ^/downloads/(.*)$ {
-        alias /home/rails/sapi/shared/public/downloads/$1;
-        internal;
-      }
-
-      gzip on;
-      location ^~ /assets/ {
-        expires max;
-        add_header Cache-Control public;
-      }
-
-      if (-f $document_root/system/maintenance.html) {
-        return 503;
-      }
-
-      error_page 500 502 504 /500.html;
-      location = /500.html {
-        root #{deploy_to}/public;
-      }
-
-      error_page 503 @maintenance;
-      location @maintenance {
-        rewrite  ^(.*)$  /system/maintenance.html break;
-      }
-    }
-  EOF
-  put vhost_config, "/tmp/vhost_config"
-  sudo "mv /tmp/vhost_config /etc/nginx/sites-available/#{application}"
-  sudo "ln -s /etc/nginx/sites-available/#{application} /etc/nginx/sites-enabled/#{application}"
-end
-
-after "deploy:setup", :config_vhost

From f3ccce1c3c1a853bfc784474e8196e625f389ec8 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 23 Jan 2024 13:55:55 +0000
Subject: [PATCH 087/241] rails app:update

---
 bin/setup                                     |  4 +++
 bin/yarn                                      | 11 ++++++++
 config/application.rb                         |  3 +++
 config/cable.yml                              |  1 +
 config/environments/development.rb            |  4 +--
 config/environments/production.rb             |  7 +++++-
 config/environments/test.rb                   |  2 +-
 config/initializers/assets.rb                 |  9 ++++---
 .../new_framework_defaults_5_1.rb             | 14 +++++++++++
 config/puma.rb                                | 25 +++++++++++++------
 10 files changed, 65 insertions(+), 15 deletions(-)
 create mode 100755 bin/yarn
 create mode 100644 config/initializers/new_framework_defaults_5_1.rb

diff --git a/bin/setup b/bin/setup
index e620b4dad..78c4e861d 100755
--- a/bin/setup
+++ b/bin/setup
@@ -18,6 +18,10 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'
diff --git a/bin/yarn b/bin/yarn
new file mode 100755
index 000000000..c2bacef83
--- /dev/null
+++ b/bin/yarn
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end
diff --git a/config/application.rb b/config/application.rb
index 5c3977435..580b313d5 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,6 +9,9 @@
 
 module SAPI
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
diff --git a/config/cable.yml b/config/cable.yml
index 0bbde6f74..66e1517de 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -7,3 +7,4 @@ test:
 production:
   adapter: redis
   url: redis://localhost:6379/1
+  channel_prefix: sapi_production
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 38fe99157..94234b3d7 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -18,7 +18,7 @@
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => 'public, max-age=172800'
+      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -50,7 +50,7 @@
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
-  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
   # Custom ember settings
   config.ember.variant = :development
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b08307187..eab50c954 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,6 +14,11 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
+  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
+  # `config/secrets.yml.key`.
+  config.read_encrypted_secrets = false # TODO upgrade Rails 5.1
+
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
@@ -79,7 +84,7 @@
   if ENV["RAILS_LOG_TO_STDOUT"].present?
     logger           = ActiveSupport::Logger.new(STDOUT)
     logger.formatter = config.log_formatter
-    config.logger = ActiveSupport::TaggedLogging.new(logger)
+    config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end
 
   # Do not dump schema after migrations.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 861784143..7405f96af 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -16,7 +16,7 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => 'public, max-age=3600'
+    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
   }
 
   # Show full error reports and disable caching.
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 818c63a1c..4e9aa09fe 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -3,14 +3,17 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
-# Add additional assets to the asset load path
+# Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
+# Add Yarn node_modules folder to the asset load path.
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
 Rails.application.config.assets.precompile += %w( vendor/* admin.js admin.css trade.js trade.css species.js species.css
                                 pages.css pages.js cites_trade.js cites_trade.css
                                 activities.css activities.js mobile.css)
 
-#  select2-rails 3.5.10 https://rubygems.org/gems/select2-rails/versions/3.5.10
+# select2-rails 3.5.10 https://rubygems.org/gems/select2-rails/versions/3.5.10
 Rails.application.config.assets.precompile += %w(select2.png select2-spinner.gif select2x2.png)
diff --git a/config/initializers/new_framework_defaults_5_1.rb b/config/initializers/new_framework_defaults_5_1.rb
new file mode 100644
index 000000000..9010abd5c
--- /dev/null
+++ b/config/initializers/new_framework_defaults_5_1.rb
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.1 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Make `form_with` generate non-remote forms.
+Rails.application.config.action_view.form_with_generates_remote_forms = false
+
+# Unknown asset fallback will return the path passed in when the given
+# asset is not present in the asset pipeline.
+# Rails.application.config.assets.unknown_asset_fallback = false
diff --git a/config/puma.rb b/config/puma.rb
index d2b0e4089..1e19380dc 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,13 +1,13 @@
 # Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers a minimum and maximum.
+# The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum, this matches the default thread size of Active Record.
+# and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
 threads threads_count, threads_count
 
-# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
 port        ENV.fetch("PORT") { 3000 }
 
@@ -32,16 +32,25 @@
 #
 # preload_app!
 
+# If you are preloading your application and using Active Record, it's
+# recommended that you close any connections to the database before workers
+# are forked to prevent connection leakage.
+#
+# before_fork do
+#   ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
+# end
+
 # The code in the `on_worker_boot` will be called if you are using
 # clustered mode by specifying a number of `workers`. After each worker
-# process is booted this block will be run, if you are using `preload_app!`
-# option you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, Ruby
+# process is booted, this block will be run. If you are using the `preload_app!`
+# option, you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, as Ruby
 # cannot share connections between processes.
 #
 # on_worker_boot do
-#   ApplicationRecord.establish_connection if defined?(ActiveRecord)
+#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
 # end
+#
 
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart

From ff2f88737bc3ea5d85c71126c54e6ffa15d15ec6 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 23 Jan 2024 16:16:04 +0000
Subject: [PATCH 088/241] rails-diff

---
 .gitignore                              |   4 +-
 Gemfile                                 |   9 +-
 Gemfile.lock                            |  35 +-
 app/assets/javascripts/admin.js         |   2 +-
 app/assets/javascripts/application.js   |   6 +-
 app/assets/javascripts/cable.js         |   2 +-
 app/assets/javascripts/cites_trade.js   |   2 +-
 app/assets/javascripts/pages.js         |   2 +-
 app/assets/javascripts/species.js       |   2 +-
 app/assets/javascripts/trade.js         |   2 +-
 app/assets/stylesheets/application.css  |   4 +-
 vendor/assets/javascripts/jquery_ujs.js | 429 ------------------------
 12 files changed, 43 insertions(+), 456 deletions(-)
 delete mode 100644 vendor/assets/javascripts/jquery_ujs.js

diff --git a/.gitignore b/.gitignore
index 19dd992c1..23bee559d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,9 @@
 !/log/.keep
 !/tmp/.keep
 
-# Ignore Byebug command history file.
+/node_modules
+/yarn-error.log
+
 .byebug_history
 
 /coverage
diff --git a/Gemfile b/Gemfile
index 46a019eeb..45483c687 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '5.1.7'
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3'
 # Use Puma as the app server
-gem 'puma', '~> 3.0'
+gem 'puma', '~> 3.7'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
@@ -58,7 +58,6 @@ gem 'redis-rails', '5.0.2' # TODO: latest, may remove this Gem when upgrade to R
 gem 'whenever', '0.11.0', :require => false # TODO: latest version 1.0 @ 2019. Should migrate to sidekiq-cron.
 gem 'httparty', '~> 0.21.0'
 
-# gem 'sprockets', '2.12.5' # upgrading to 3 breaks handlebars/tilt
 gem 'kaminari', '~> 1.2', '>= 1.2.2' # TODO: Suggest migrate to pagy gem.
 
 gem 'acts-as-taggable-on', '8.1.0' # TODO: latest v10 @ 2023. Can upgrade after upgrade to Rails 6.
@@ -88,7 +87,7 @@ gem 'rest-client', '1.8.0', require: false # TODO, should upgrade for better com
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '~> 3.0.5'
+  gem 'listen', '>= 3.0.5', '< 3.2'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 	gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -126,6 +125,9 @@ group :test, :development do
   gem "launchy", '2.4.3'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', '>= 2.15'
+  gem 'selenium-webdriver'
 end
 
 group :test do
@@ -134,7 +136,6 @@ group :test do
   gem 'factory_bot_rails', '4.11.1'
   gem 'simplecov', '0.22.0', :require => false # TODO: latest
   gem 'coveralls', '0.7.1', :require => false
-  gem 'capybara', '2.2.1'
 end
 
 gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest version is 1.6.4 @ 2018
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d823f620..b963e05d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,12 +119,15 @@ GEM
     capistrano-sidekiq (1.0.2)
       capistrano (>= 3.9.0)
       sidekiq (>= 3.4)
-    capybara (2.2.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+    capybara (3.36.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
     carrierwave (2.2.5)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -134,6 +137,7 @@ GEM
       mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     chartkick (2.3.5)
+    childprocess (4.1.0)
     chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
@@ -275,6 +279,7 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
     mime-types (2.99.3)
     mini_magick (4.12.0)
@@ -474,6 +479,13 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2)
+    sentient_user_request_store (1.0.0)
+      railties (>= 3.1)
+      request_store (= 1.4.1)
     sidekiq (5.2.10)
       connection_pool (~> 2.2, >= 2.2.2)
       rack (~> 2.0)
@@ -556,8 +568,8 @@ GEM
     wicked (1.3.4)
       railties (>= 3.0.7)
     wkhtmltopdf-binary (0.12.6.6)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -584,7 +596,7 @@ DEPENDENCIES
   capistrano-rails (= 1.4.0)
   capistrano-rvm (= 0.1.2)
   capistrano-sidekiq (= 1.0.2)
-  capybara (= 2.2.1)
+  capybara (>= 2.15)
   carrierwave (= 2.2.5)
   chartkick (= 2.3.5)
   codeclimate-test-reporter (= 0.1.1)
@@ -609,7 +621,7 @@ DEPENDENCIES
   json_spec (= 1.1.5)
   kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
-  listen (~> 3.0.5)
+  listen (>= 3.0.5, < 3.2)
   mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
@@ -621,7 +633,7 @@ DEPENDENCIES
   pg_array_parser (~> 0.0.9)
   pg_search (= 2.3.0)
   prawn (= 0.13.2)
-  puma (~> 3.0)
+  puma (~> 3.7)
   rack-cors (= 0.3.0)
   rails (= 5.1.7)
   rails-controller-testing
@@ -638,6 +650,7 @@ DEPENDENCIES
   rubocop-rspec
   rubyzip (~> 2.3, >= 2.3.2)
   sass-rails (~> 5.0)
+  selenium-webdriver
   sidekiq (= 5.2.10)
   sidekiq-status (= 2.1.3)
   sidekiq-unique-jobs (= 7.1.31)
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index 9bb036bc4..db8f2da3d 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -11,7 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require bootstrap
 //= require bootstrap-editable
 //= require bootstrap-datepicker
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 031aefca7..e211b36c9 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,8 +1,8 @@
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // compiled file. JavaScript code in this file should be added after the last require_* statement.
@@ -11,7 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require jquery.chained
 //= require bootstrap-dropdown
 //= require bootstrap-button
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
index 10657b665..78743d891 100644
--- a/app/assets/javascripts/cable.js
+++ b/app/assets/javascripts/cable.js
@@ -1,5 +1,5 @@
 // Action Cable provides the framework to deal with WebSockets in Rails.
-// You can generate new channels where WebSocket features live using the rails generate channel command.
+// You can generate new channels where WebSocket features live using the `rails generate channel` command.
 //
 //= require action_cable
 //= require_self
diff --git a/app/assets/javascripts/cites_trade.js b/app/assets/javascripts/cites_trade.js
index b14f0e769..48471efe4 100644
--- a/app/assets/javascripts/cites_trade.js
+++ b/app/assets/javascripts/cites_trade.js
@@ -1,6 +1,6 @@
 //= require underscore
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require cites_trade/jquery-ui-1.10.4.custom
 //= require jquery-deparam
 //= require js.cookie
diff --git a/app/assets/javascripts/pages.js b/app/assets/javascripts/pages.js
index a71c20657..e42d23518 100644
--- a/app/assets/javascripts/pages.js
+++ b/app/assets/javascripts/pages.js
@@ -12,7 +12,7 @@
 //
 //= require underscore
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require_self
 //= require_tree ./pages
 //= require ./shared/login
diff --git a/app/assets/javascripts/species.js b/app/assets/javascripts/species.js
index 0d6f0b3e8..b24a23296 100644
--- a/app/assets/javascripts/species.js
+++ b/app/assets/javascripts/species.js
@@ -12,7 +12,7 @@
 //
 //= require underscore
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require jquery-deparam
 //= require js.cookie
 //= require bootstrap-scrollspy
diff --git a/app/assets/javascripts/trade.js b/app/assets/javascripts/trade.js
index f9f50dd78..cee949934 100644
--- a/app/assets/javascripts/trade.js
+++ b/app/assets/javascripts/trade.js
@@ -11,7 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require jquery-deparam
 //= require jquery-ui
 //= require jquery.mousewheel
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 5d5b89282..8cf472e16 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -2,8 +2,8 @@
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
+ * vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
diff --git a/vendor/assets/javascripts/jquery_ujs.js b/vendor/assets/javascripts/jquery_ujs.js
deleted file mode 100644
index df9dc862b..000000000
--- a/vendor/assets/javascripts/jquery_ujs.js
+++ /dev/null
@@ -1,429 +0,0 @@
-(function($, undefined) {
-
-/**
- * Unobtrusive scripting adapter for jQuery
- *
- * Requires jQuery 1.6.0 or later.
- * https://github.com/rails/jquery-ujs
-
- * Uploading file using rails.js
- * =============================
- *
- * By default, browsers do not allow files to be uploaded via AJAX. As a result, if there are any non-blank file fields
- * in the remote form, this adapter aborts the AJAX submission and allows the form to submit through standard means.
- *
- * The `ajax:aborted:file` event allows you to bind your own handler to process the form submission however you wish.
- *
- * Ex:
- *     $('form').live('ajax:aborted:file', function(event, elements){
- *       // Implement own remote file-transfer handler here for non-blank file inputs passed in `elements`.
- *       // Returning false in this handler tells rails.js to disallow standard form submission
- *       return false;
- *     });
- *
- * The `ajax:aborted:file` event is fired when a file-type input is detected with a non-blank value.
- *
- * Third-party tools can use this hook to detect when an AJAX file upload is attempted, and then use
- * techniques like the iframe method to upload the file instead.
- *
- * Required fields in rails.js
- * ===========================
- *
- * If any blank required inputs (required="required") are detected in the remote form, the whole form submission
- * is canceled. Note that this is unlike file inputs, which still allow standard (non-AJAX) form submission.
- *
- * The `ajax:aborted:required` event allows you to bind your own handler to inform the user of blank required inputs.
- *
- * !! Note that Opera does not fire the form's submit event if there are blank required inputs, so this event may never
- *    get fired in Opera. This event is what causes other browsers to exhibit the same submit-aborting behavior.
- *
- * Ex:
- *     $('form').live('ajax:aborted:required', function(event, elements){
- *       // Returning false in this handler tells rails.js to submit the form anyway.
- *       // The blank required inputs are passed to this function in `elements`.
- *       return ! confirm("Would you like to submit the form with missing info?");
- *     });
- */
-
-  // Cut down on the number if issues from people inadvertently including jquery_ujs twice
-  // by detecting and raising an error when it happens.
-  var alreadyInitialized = function() {
-    var events = $._data(document, 'events');
-    return events && events.click && $.grep(events.click, function(e) { return e.namespace === 'rails'; }).length;
-  }
-
-  if ( alreadyInitialized() ) {
-    $.error('jquery-ujs has already been loaded!');
-  }
-
-  // Shorthand to make it a little easier to call public rails functions from within rails.js
-  var rails;
-
-  $.rails = rails = {
-    // Link elements bound by jquery-ujs
-    linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with]',
-
-    // Select elements bound by jquery-ujs
-    inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
-
-    // Form elements bound by jquery-ujs
-    formSubmitSelector: 'form',
-
-    // Form input elements bound by jquery-ujs
-    formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type])',
-
-    // Form input elements disabled during form submission
-    disableSelector: 'input[data-disable-with], button[data-disable-with], textarea[data-disable-with]',
-
-    // Form input elements re-enabled after form submission
-    enableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled',
-
-    // Form required input elements
-    requiredInputSelector: 'input[name][required]:not([disabled]),textarea[name][required]:not([disabled])',
-
-    // Form file input elements
-    fileInputSelector: 'input:file',
-
-    // Link onClick disable selector with possible reenable after remote submission
-    linkDisableSelector: 'a[data-disable-with]',
-
-    // Make sure that every Ajax request sends the CSRF token
-    CSRFProtection: function(xhr) {
-      var token = $('meta[name="csrf-token"]').attr('content');
-      if (token) xhr.setRequestHeader('X-CSRF-Token', token);
-    },
-
-    // Triggers an event on an element and returns false if the event result is false
-    fire: function(obj, name, data) {
-      var event = $.Event(name);
-      obj.trigger(event, data);
-      return event.result !== false;
-    },
-
-    // Default confirm dialog, may be overridden with custom confirm dialog in $.rails.confirm
-    confirm: function(message) {
-      return confirm(message);
-    },
-
-    // Default ajax function, may be overridden with custom function in $.rails.ajax
-    ajax: function(options) {
-      return $.ajax(options);
-    },
-
-    // Default way to get an element's href. May be overridden at $.rails.href.
-    href: function(element) {
-      return element.attr('href');
-    },
-
-    // Submits "remote" forms and links with ajax
-    handleRemote: function(element) {
-      var method, url, data, elCrossDomain, crossDomain, withCredentials, dataType, options;
-
-      if (rails.fire(element, 'ajax:before')) {
-        elCrossDomain = element.data('cross-domain');
-        crossDomain = elCrossDomain === undefined ? null : elCrossDomain;
-        withCredentials = element.data('with-credentials') || null;
-        dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
-
-        if (element.is('form')) {
-          method = element.attr('method');
-          url = element.attr('action');
-          data = element.serializeArray();
-          // memoized value from clicked submit button
-          var button = element.data('ujs:submit-button');
-          if (button) {
-            data.push(button);
-            element.data('ujs:submit-button', null);
-          }
-        } else if (element.is(rails.inputChangeSelector)) {
-          method = element.data('method');
-          url = element.data('url');
-          data = element.serialize();
-          if (element.data('params')) data = data + "&" + element.data('params');
-        } else {
-          method = element.data('method');
-          url = rails.href(element);
-          data = element.data('params') || null;
-        }
-
-        options = {
-          type: method || 'GET', data: data, dataType: dataType,
-          // stopping the "ajax:beforeSend" event will cancel the ajax request
-          beforeSend: function(xhr, settings) {
-            if (settings.dataType === undefined) {
-              xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
-            }
-            return rails.fire(element, 'ajax:beforeSend', [xhr, settings]);
-          },
-          success: function(data, status, xhr) {
-            element.trigger('ajax:success', [data, status, xhr]);
-          },
-          complete: function(xhr, status) {
-            element.trigger('ajax:complete', [xhr, status]);
-          },
-          error: function(xhr, status, error) {
-            element.trigger('ajax:error', [xhr, status, error]);
-          },
-          xhrFields: {
-            withCredentials: withCredentials
-          },
-          crossDomain: crossDomain
-        };
-        // Only pass url to `ajax` options if not blank
-        if (url) { options.url = url; }
-
-        var jqxhr = rails.ajax(options);
-        element.trigger('ajax:send', jqxhr);
-        return jqxhr;
-      } else {
-        return false;
-      }
-    },
-
-    // Handles "data-method" on links such as:
-    // <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
-    handleMethod: function(link) {
-      var href = rails.href(link),
-        method = link.data('method'),
-        target = link.attr('target'),
-        csrf_token = $('meta[name=csrf-token]').attr('content'),
-        csrf_param = $('meta[name=csrf-param]').attr('content'),
-        form = $('<form method="post" action="' + href + '"></form>'),
-        metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
-
-      if (csrf_param !== undefined && csrf_token !== undefined) {
-        metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
-      }
-
-      if (target) { form.attr('target', target); }
-
-      form.hide().append(metadata_input).appendTo('body');
-      form.submit();
-    },
-
-    /* Disables form elements:
-      - Caches element value in 'ujs:enable-with' data store
-      - Replaces element text with value of 'data-disable-with' attribute
-      - Sets disabled property to true
-    */
-    disableFormElements: function(form) {
-      form.find(rails.disableSelector).each(function() {
-        var element = $(this), method = element.is('button') ? 'html' : 'val';
-        element.data('ujs:enable-with', element[method]());
-        element[method](element.data('disable-with'));
-        element.prop('disabled', true);
-      });
-    },
-
-    /* Re-enables disabled form elements:
-      - Replaces element text with cached value from 'ujs:enable-with' data store (created in `disableFormElements`)
-      - Sets disabled property to false
-    */
-    enableFormElements: function(form) {
-      form.find(rails.enableSelector).each(function() {
-        var element = $(this), method = element.is('button') ? 'html' : 'val';
-        if (element.data('ujs:enable-with')) element[method](element.data('ujs:enable-with'));
-        element.prop('disabled', false);
-      });
-    },
-
-   /* For 'data-confirm' attribute:
-      - Fires `confirm` event
-      - Shows the confirmation dialog
-      - Fires the `confirm:complete` event
-
-      Returns `true` if no function stops the chain and user chose yes; `false` otherwise.
-      Attaching a handler to the element's `confirm` event that returns a `falsy` value cancels the confirmation dialog.
-      Attaching a handler to the element's `confirm:complete` event that returns a `falsy` value makes this function
-      return false. The `confirm:complete` event is fired whether or not the user answered true or false to the dialog.
-   */
-    allowAction: function(element) {
-      var message = element.data('confirm'),
-          answer = false, callback;
-      if (!message) { return true; }
-
-      if (rails.fire(element, 'confirm')) {
-        answer = rails.confirm(message);
-        callback = rails.fire(element, 'confirm:complete', [answer]);
-      }
-      return answer && callback;
-    },
-
-    // Helper function which checks for blank inputs in a form that match the specified CSS selector
-    blankInputs: function(form, specifiedSelector, nonBlank) {
-      var inputs = $(), input, valueToCheck,
-          selector = specifiedSelector || 'input,textarea',
-          allInputs = form.find(selector);
-
-      allInputs.each(function() {
-        input = $(this);
-        valueToCheck = input.is(':checkbox,:radio') ? input.is(':checked') : input.val();
-        // If nonBlank and valueToCheck are both truthy, or nonBlank and valueToCheck are both falsey
-        if (!valueToCheck === !nonBlank) {
-
-          // Don't count unchecked required radio if other radio with same name is checked
-          if (input.is(':radio') && allInputs.filter('input:radio:checked[name="' + input.attr('name') + '"]').length) {
-            return true; // Skip to next input
-          }
-
-          inputs = inputs.add(input);
-        }
-      });
-      return inputs.length ? inputs : false;
-    },
-
-    // Helper function which checks for non-blank inputs in a form that match the specified CSS selector
-    nonBlankInputs: function(form, specifiedSelector) {
-      return rails.blankInputs(form, specifiedSelector, true); // true specifies nonBlank
-    },
-
-    // Helper function, needed to provide consistent behavior in IE
-    stopEverything: function(e) {
-      $(e.target).trigger('ujs:everythingStopped');
-      e.stopImmediatePropagation();
-      return false;
-    },
-
-    // find all the submit events directly bound to the form and
-    // manually invoke them. If anyone returns false then stop the loop
-    callFormSubmitBindings: function(form, event) {
-      var events = form.data('events'), continuePropagation = true;
-      if (events !== undefined && events['submit'] !== undefined) {
-        $.each(events['submit'], function(i, obj){
-          if (typeof obj.handler === 'function') return continuePropagation = obj.handler(event);
-        });
-      }
-      return continuePropagation;
-    },
-
-    //  replace element's html with the 'data-disable-with' after storing original html
-    //  and prevent clicking on it
-    disableElement: function(element) {
-      element.data('ujs:enable-with', element.html()); // store enabled state
-      element.html(element.data('disable-with')); // set to disabled state
-      element.bind('click.railsDisable', function(e) { // prevent further clicking
-        return rails.stopEverything(e);
-      });
-    },
-
-    // restore element to its original state which was disabled by 'disableElement' above
-    enableElement: function(element) {
-      if (element.data('ujs:enable-with') !== undefined) {
-        element.html(element.data('ujs:enable-with')); // set to old enabled state
-        // this should be element.removeData('ujs:enable-with')
-        // but, there is currently a bug in jquery which makes hyphenated data attributes not get removed
-        element.data('ujs:enable-with', false); // clean up cache
-      }
-      element.unbind('click.railsDisable'); // enable element
-    }
-
-  };
-
-  if (rails.fire($(document), 'rails:attachBindings')) {
-
-    $.ajaxPrefilter(function(options, originalOptions, xhr){ if ( !options.crossDomain ) { rails.CSRFProtection(xhr); }});
-
-    $(document).delegate(rails.linkDisableSelector, 'ajax:complete', function() {
-        rails.enableElement($(this));
-    });
-
-    $(document).delegate(rails.linkClickSelector, 'click.rails', function(e) {
-      var link = $(this), method = link.data('method'), data = link.data('params');
-      if (!rails.allowAction(link)) return rails.stopEverything(e);
-
-      if (link.is(rails.linkDisableSelector)) rails.disableElement(link);
-
-      if (link.data('remote') !== undefined) {
-        if ( (e.metaKey || e.ctrlKey) && (!method || method === 'GET') && !data ) { return true; }
-
-        var handleRemote = rails.handleRemote(link);
-        // response from rails.handleRemote() will either be false or a deferred object promise.
-        if (handleRemote === false) {
-          rails.enableElement(link);
-        } else {
-          handleRemote.error( function() { rails.enableElement(link); } );
-        }
-        return false;
-
-      } else if (link.data('method')) {
-        rails.handleMethod(link);
-        return false;
-      }
-    });
-
-    $(document).delegate(rails.inputChangeSelector, 'change.rails', function(e) {
-      var link = $(this);
-      if (!rails.allowAction(link)) return rails.stopEverything(e);
-
-      rails.handleRemote(link);
-      return false;
-    });
-
-    $(document).delegate(rails.formSubmitSelector, 'submit.rails', function(e) {
-      var form = $(this),
-        remote = form.data('remote') !== undefined,
-        blankRequiredInputs = rails.blankInputs(form, rails.requiredInputSelector),
-        nonBlankFileInputs = rails.nonBlankInputs(form, rails.fileInputSelector);
-
-      if (!rails.allowAction(form)) return rails.stopEverything(e);
-
-      // skip other logic when required values are missing or file upload is present
-      if (blankRequiredInputs && form.attr("novalidate") == undefined && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) {
-        return rails.stopEverything(e);
-      }
-
-      if (remote) {
-        if (nonBlankFileInputs) {
-          // slight timeout so that the submit button gets properly serialized
-          // (make it easy for event handler to serialize form without disabled values)
-          setTimeout(function(){ rails.disableFormElements(form); }, 13);
-          var aborted = rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
-
-          // re-enable form elements if event bindings return false (canceling normal form submission)
-          if (!aborted) { setTimeout(function(){ rails.enableFormElements(form); }, 13); }
-
-          return aborted;
-        }
-
-        // If browser does not support submit bubbling, then this live-binding will be called before direct
-        // bindings. Therefore, we should directly call any direct bindings before remotely submitting form.
-        if (!$.support.submitBubbles && $().jquery < '1.7' && rails.callFormSubmitBindings(form, e) === false) return rails.stopEverything(e);
-
-        rails.handleRemote(form);
-        return false;
-
-      } else {
-        // slight timeout so that the submit button gets properly serialized
-        setTimeout(function(){ rails.disableFormElements(form); }, 13);
-      }
-    });
-
-    $(document).delegate(rails.formInputClickSelector, 'click.rails', function(event) {
-      var button = $(this);
-
-      if (!rails.allowAction(button)) return rails.stopEverything(event);
-
-      // register the pressed submit button
-      var name = button.attr('name'),
-        data = name ? {name:name, value:button.val()} : null;
-
-      button.closest('form').data('ujs:submit-button', data);
-    });
-
-    $(document).delegate(rails.formSubmitSelector, 'ajax:beforeSend.rails', function(event) {
-      if (this == event.target) rails.disableFormElements($(this));
-    });
-
-    $(document).delegate(rails.formSubmitSelector, 'ajax:complete.rails', function(event) {
-      if (this == event.target) rails.enableFormElements($(this));
-    });
-
-    $(function(){
-      // making sure that all forms have actual up-to-date token(cached forms contain old one)
-      csrf_token = $('meta[name=csrf-token]').attr('content');
-      csrf_param = $('meta[name=csrf-param]').attr('content');
-      $('form input[name="' + csrf_param + '"]').val(csrf_token);
-    });
-  }
-
-})( jQuery );

From 1272f0cfe3881ddb28cb84d1cb0588f9233838ee Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 23 Jan 2024 16:35:46 +0000
Subject: [PATCH 089/241] DEPRECATION WARNING: Passing a class to the
 `class_name` is deprecated and will raise an ArgumentError in Rails 5.2.

---
 app/models/eu_suspension_regulation.rb        |  2 +-
 app/models/m_taxon_concept.rb                 |  8 ++++----
 .../distribution_reassignment.rb              |  2 +-
 .../document_citation_reassignment.rb         |  2 +-
 .../legislation_reassignment.rb               |  2 +-
 app/models/nomenclature_change/lump.rb        |  4 ++--
 .../nomenclature_change/name_reassignment.rb  |  2 +-
 app/models/nomenclature_change/output.rb      | 20 +++++++++----------
 .../output_reassignment.rb                    |  2 +-
 .../parent_reassignment.rb                    |  4 ++--
 .../nomenclature_change/reassignment.rb       |  2 +-
 .../reassignment_target.rb                    |  3 +--
 app/models/nomenclature_change/split.rb       |  4 ++--
 .../status_change_helpers.rb                  |  6 +++---
 app/models/taxon_concept.rb                   |  2 +-
 app/models/trade/annual_report_upload.rb      |  2 +-
 app/models/trade/sandbox_template.rb          |  2 +-
 app/models/trade/validation_error.rb          |  4 ++--
 app/models/trade/validation_rule.rb           |  2 +-
 19 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/app/models/eu_suspension_regulation.rb b/app/models/eu_suspension_regulation.rb
index 63cdfbfe8..136c94ae1 100644
--- a/app/models/eu_suspension_regulation.rb
+++ b/app/models/eu_suspension_regulation.rb
@@ -30,7 +30,7 @@ class EuSuspensionRegulation < Event
 
   has_many :eu_suspensions, :foreign_key => :start_event_id,
     :dependent => :destroy
-  has_many :ended_eu_suspensions, class_name: EuSuspension,
+  has_many :ended_eu_suspensions, class_name: 'EuSuspension',
     foreign_key: :end_event_id, dependent: :nullify
 
   validate :designation_is_eu
diff --git a/app/models/m_taxon_concept.rb b/app/models/m_taxon_concept.rb
index 8bffaaa53..56b8035f4 100644
--- a/app/models/m_taxon_concept.rb
+++ b/app/models/m_taxon_concept.rb
@@ -110,7 +110,7 @@ class MTaxonConcept < ApplicationRecord
   self.primary_key = :id
 
   belongs_to :taxon_concept, :foreign_key => :id, optional: true
-  has_many :cites_listing_changes, :foreign_key => :taxon_concept_id, :class_name => MCitesListingChange
+  has_many :cites_listing_changes, :foreign_key => :taxon_concept_id, :class_name => 'MCitesListingChange'
   has_many :historic_cites_listing_changes_for_downloads, -> { where(show_in_downloads: true).order(
     <<-SQL
       effective_at,
@@ -122,13 +122,13 @@ class MTaxonConcept < ApplicationRecord
       END
     SQL
     ) }, :foreign_key => :taxon_concept_id,
-    :class_name => MCitesListingChange
+    :class_name => 'MCitesListingChange'
   has_many :current_cites_additions, -> { where(is_current: true, change_type_name: ChangeType::ADDITION).order('effective_at DESC, species_listing_name ASC') },
     :foreign_key => :taxon_concept_id,
-    :class_name => MCitesListingChange
+    :class_name => 'MCitesListingChange'
   has_many :current_cms_additions, -> { where(is_current: true, change_type_name: ChangeType::ADDITION).order('effective_at DESC, species_listing_name ASC') },
     :foreign_key => :taxon_concept_id,
-    :class_name => MCmsListingChange
+    :class_name => 'MCmsListingChange'
   has_many :cites_processes
   scope :by_cites_eu_taxonomy, -> { where(:taxonomy_is_cites_eu => true) }
   scope :by_cms_taxonomy, -> { where(:taxonomy_is_cites_eu => false) }
diff --git a/app/models/nomenclature_change/distribution_reassignment.rb b/app/models/nomenclature_change/distribution_reassignment.rb
index 734e02269..7061854d3 100644
--- a/app/models/nomenclature_change/distribution_reassignment.rb
+++ b/app/models/nomenclature_change/distribution_reassignment.rb
@@ -19,7 +19,7 @@
 
 # Reassignable is a distribution that is assigned to a new taxon concept
 class NomenclatureChange::DistributionReassignment < NomenclatureChange::Reassignment
-  belongs_to :input, class_name: NomenclatureChange::Input,
+  belongs_to :input, class_name: 'NomenclatureChange::Input',
     inverse_of: :distribution_reassignments,
     foreign_key: :nomenclature_change_input_id
 end
diff --git a/app/models/nomenclature_change/document_citation_reassignment.rb b/app/models/nomenclature_change/document_citation_reassignment.rb
index 869a4af40..1fe4b4610 100644
--- a/app/models/nomenclature_change/document_citation_reassignment.rb
+++ b/app/models/nomenclature_change/document_citation_reassignment.rb
@@ -18,7 +18,7 @@
 #
 
 class NomenclatureChange::DocumentCitationReassignment < NomenclatureChange::Reassignment
-  belongs_to :input, class_name: NomenclatureChange::Input,
+  belongs_to :input, class_name: 'NomenclatureChange::Input',
     inverse_of: :document_citation_reassignments,
     foreign_key: :nomenclature_change_input_id
 end
diff --git a/app/models/nomenclature_change/legislation_reassignment.rb b/app/models/nomenclature_change/legislation_reassignment.rb
index 4aa71b049..72ddd1d09 100644
--- a/app/models/nomenclature_change/legislation_reassignment.rb
+++ b/app/models/nomenclature_change/legislation_reassignment.rb
@@ -19,7 +19,7 @@
 
 # Reassignable is legislation that is assigned to a new taxon concept
 class NomenclatureChange::LegislationReassignment < NomenclatureChange::Reassignment
-  belongs_to :input, class_name: NomenclatureChange::Input,
+  belongs_to :input, class_name: 'NomenclatureChange::Input',
     inverse_of: :legislation_reassignments,
     foreign_key: :nomenclature_change_input_id
 end
diff --git a/app/models/nomenclature_change/lump.rb b/app/models/nomenclature_change/lump.rb
index bfcd7fc5b..d356c0f1e 100644
--- a/app/models/nomenclature_change/lump.rb
+++ b/app/models/nomenclature_change/lump.rb
@@ -17,11 +17,11 @@ class NomenclatureChange::Lump < NomenclatureChange
   # Migrated to controller (Strong Parameters)
   # attr_accessible :inputs_attributes, :output_attributes
   has_many :inputs, :inverse_of => :nomenclature_change,
-    :class_name => NomenclatureChange::Input,
+    :class_name => 'NomenclatureChange::Input',
     :foreign_key => :nomenclature_change_id,
     :dependent => :destroy
   has_one :output, :inverse_of => :nomenclature_change,
-    :class_name => NomenclatureChange::Output,
+    :class_name => 'NomenclatureChange::Output',
     :foreign_key => :nomenclature_change_id,
     :dependent => :destroy
   accepts_nested_attributes_for :inputs, :allow_destroy => true
diff --git a/app/models/nomenclature_change/name_reassignment.rb b/app/models/nomenclature_change/name_reassignment.rb
index 1eea7e8a5..7a5c5ca2f 100644
--- a/app/models/nomenclature_change/name_reassignment.rb
+++ b/app/models/nomenclature_change/name_reassignment.rb
@@ -19,7 +19,7 @@
 
 # Reassignable is a taxon relationship that is assigned to a new taxon concept
 class NomenclatureChange::NameReassignment < NomenclatureChange::Reassignment
-  belongs_to :input, class_name: NomenclatureChange::Input,
+  belongs_to :input, class_name: 'NomenclatureChange::Input',
     inverse_of: :name_reassignments,
     foreign_key: :nomenclature_change_input_id
 end
diff --git a/app/models/nomenclature_change/output.rb b/app/models/nomenclature_change/output.rb
index 0a52a83f2..0bbd1ef49 100644
--- a/app/models/nomenclature_change/output.rb
+++ b/app/models/nomenclature_change/output.rb
@@ -46,34 +46,34 @@ class NomenclatureChange::Output < ApplicationRecord
 
   belongs_to :nomenclature_change
   belongs_to :taxon_concept, optional: true
-  belongs_to :parent, :class_name => TaxonConcept, :foreign_key => :parent_id, optional: true
+  belongs_to :parent, :class_name => 'TaxonConcept', :foreign_key => :parent_id, optional: true
   belongs_to :rank, optional: true
-  belongs_to :new_taxon_concept, :class_name => TaxonConcept, :foreign_key => :new_taxon_concept_id, optional: true
+  belongs_to :new_taxon_concept, :class_name => 'TaxonConcept', :foreign_key => :new_taxon_concept_id, optional: true
   has_many :reassignments, :inverse_of => :output,
-    :class_name => NomenclatureChange::OutputReassignment,
+    :class_name => 'NomenclatureChange::OutputReassignment',
     :foreign_key => :nomenclature_change_output_id, :dependent => :destroy,
     :autosave => true
   has_many :parent_reassignments, :inverse_of => :output,
-    :class_name => NomenclatureChange::OutputParentReassignment,
+    :class_name => 'NomenclatureChange::OutputParentReassignment',
     :foreign_key => :nomenclature_change_output_id, :dependent => :destroy,
     :autosave => true
   has_many :name_reassignments, :inverse_of => :output,
-    :class_name => NomenclatureChange::OutputNameReassignment,
+    :class_name => 'NomenclatureChange::OutputNameReassignment',
     :foreign_key => :nomenclature_change_output_id, :dependent => :destroy,
     :autosave => true
   has_many :distribution_reassignments, :inverse_of => :output,
-    :class_name => NomenclatureChange::OutputDistributionReassignment,
+    :class_name => 'NomenclatureChange::OutputDistributionReassignment',
     :foreign_key => :nomenclature_change_output_id, :dependent => :destroy,
     :autosave => true
   has_many :legislation_reassignments, :inverse_of => :output,
-    :class_name => NomenclatureChange::OutputLegislationReassignment,
+    :class_name => 'NomenclatureChange::OutputLegislationReassignment',
     :foreign_key => :nomenclature_change_output_id, :dependent => :destroy,
     :autosave => true
   has_many :reassignment_targets, :inverse_of => :output,
-    :class_name => NomenclatureChange::ReassignmentTarget,
+    :class_name => 'NomenclatureChange::ReassignmentTarget',
     :foreign_key => :nomenclature_change_output_id, :dependent => :destroy
-  belongs_to :new_parent, :class_name => TaxonConcept, :foreign_key => :new_parent_id, optional: true
-  belongs_to :new_rank, :class_name => Rank, :foreign_key => :new_rank_id, optional: true
+  belongs_to :new_parent, :class_name => 'TaxonConcept', :foreign_key => :new_parent_id, optional: true
+  belongs_to :new_rank, :class_name => 'Rank', :foreign_key => :new_rank_id, optional: true
 
   validates :new_scientific_name, :presence => true,
     :if => Proc.new { |c| c.taxon_concept_id.blank? }
diff --git a/app/models/nomenclature_change/output_reassignment.rb b/app/models/nomenclature_change/output_reassignment.rb
index a1f6093fc..85e4ff50e 100644
--- a/app/models/nomenclature_change/output_reassignment.rb
+++ b/app/models/nomenclature_change/output_reassignment.rb
@@ -30,7 +30,7 @@
 class NomenclatureChange::OutputReassignment < ApplicationRecord
   include NomenclatureChange::ReassignmentHelpers
 
-  belongs_to :output, :class_name => NomenclatureChange::Output,
+  belongs_to :output, :class_name => 'NomenclatureChange::Output',
     :foreign_key => :nomenclature_change_output_id
 
 end
diff --git a/app/models/nomenclature_change/parent_reassignment.rb b/app/models/nomenclature_change/parent_reassignment.rb
index 94c61b3ce..63cecae74 100644
--- a/app/models/nomenclature_change/parent_reassignment.rb
+++ b/app/models/nomenclature_change/parent_reassignment.rb
@@ -22,9 +22,9 @@ class NomenclatureChange::ParentReassignment < NomenclatureChange::Reassignment
   # Migrated to controller (Strong Parameters)
   # attr_accessible :reassignment_target_attributes
   has_one :reassignment_target, :inverse_of => :reassignment,
-    :class_name => NomenclatureChange::ReassignmentTarget,
+    :class_name => 'NomenclatureChange::ReassignmentTarget',
     :foreign_key => :nomenclature_change_reassignment_id
-  belongs_to :input, class_name: NomenclatureChange::Input,
+  belongs_to :input, class_name: 'NomenclatureChange::Input',
     inverse_of: :parent_reassignments,
     foreign_key: :nomenclature_change_input_id
   accepts_nested_attributes_for :reassignment_target, :allow_destroy => true
diff --git a/app/models/nomenclature_change/reassignment.rb b/app/models/nomenclature_change/reassignment.rb
index 00819bae7..05f20118c 100644
--- a/app/models/nomenclature_change/reassignment.rb
+++ b/app/models/nomenclature_change/reassignment.rb
@@ -30,6 +30,6 @@
 class NomenclatureChange::Reassignment < ApplicationRecord
   include NomenclatureChange::ReassignmentHelpers
 
-  belongs_to :input, :class_name => NomenclatureChange::Input,
+  belongs_to :input, :class_name => 'NomenclatureChange::Input',
     :foreign_key => :nomenclature_change_input_id
 end
diff --git a/app/models/nomenclature_change/reassignment_target.rb b/app/models/nomenclature_change/reassignment_target.rb
index a63b49eda..a7ec2d605 100644
--- a/app/models/nomenclature_change/reassignment_target.rb
+++ b/app/models/nomenclature_change/reassignment_target.rb
@@ -16,8 +16,7 @@ class NomenclatureChange::ReassignmentTarget < ApplicationRecord
   # Relationship table
   # attr_accessible :nomenclature_change_output_id,
   #   :nomenclature_change_reassignment_id, :note
-
-  belongs_to :output, :class_name => NomenclatureChange::Output,
+  belongs_to :output, :class_name => 'NomenclatureChange::Output',
     :foreign_key => :nomenclature_change_output_id
   belongs_to :reassignment,
     class_name: 'NomenclatureChange::Reassignment',
diff --git a/app/models/nomenclature_change/split.rb b/app/models/nomenclature_change/split.rb
index e51cb4d7c..82e194367 100644
--- a/app/models/nomenclature_change/split.rb
+++ b/app/models/nomenclature_change/split.rb
@@ -18,11 +18,11 @@ class NomenclatureChange::Split < NomenclatureChange
   # Migrated to controller (Strong Parameters)
   # attr_accessible :input_attributes, :outputs_attributes
   has_one :input, :inverse_of => :nomenclature_change,
-    :class_name => NomenclatureChange::Input,
+    :class_name => 'NomenclatureChange::Input',
     :foreign_key => :nomenclature_change_id,
     :dependent => :destroy, :autosave => true
   has_many :outputs, :inverse_of => :nomenclature_change,
-    :class_name => NomenclatureChange::Output,
+    :class_name => 'NomenclatureChange::Output',
     :foreign_key => :nomenclature_change_id,
     :dependent => :destroy, :autosave => true
   accepts_nested_attributes_for :input, :allow_destroy => true
diff --git a/app/models/nomenclature_change/status_change_helpers.rb b/app/models/nomenclature_change/status_change_helpers.rb
index 77f80bf85..8d66b60f1 100644
--- a/app/models/nomenclature_change/status_change_helpers.rb
+++ b/app/models/nomenclature_change/status_change_helpers.rb
@@ -6,17 +6,17 @@ def self.included(base)
       # attr_accessible :primary_output_attributes, :secondary_output_attributes,
       #   :input_attributes
       has_one :input, :inverse_of => :nomenclature_change,
-        :class_name => NomenclatureChange::Input,
+        :class_name => 'NomenclatureChange::Input',
         :foreign_key => :nomenclature_change_id,
         :dependent => :destroy, autosave: true
       has_one :primary_output, -> { where is_primary_output: true },
         :inverse_of => :nomenclature_change,
-        :class_name => NomenclatureChange::Output,
+        :class_name => 'NomenclatureChange::Output',
         :foreign_key => :nomenclature_change_id,
         :dependent => :destroy, autosave: true
       has_one :secondary_output, -> { where is_primary_output: false },
         :inverse_of => :nomenclature_change,
-        :class_name => NomenclatureChange::Output,
+        :class_name => 'NomenclatureChange::Output',
         :foreign_key => :nomenclature_change_id,
         :dependent => :destroy, autosave: true
 
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index 1350afb25..c44c8ced4 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -63,7 +63,7 @@ class TaxonConcept < ApplicationRecord
 
   has_one :m_taxon_concept, :foreign_key => :id
 
-  belongs_to :dependents_updater, foreign_key: :dependents_updated_by_id, class_name: User, optional: true
+  belongs_to :dependents_updater, foreign_key: :dependents_updated_by_id, class_name: 'User', optional: true
   belongs_to :parent, :class_name => 'TaxonConcept', optional: true
   has_many :children, -> { where(name_status: ['A', 'N']) }, class_name: 'TaxonConcept', foreign_key: :parent_id # conditions: { name_status: ['A', 'N'] }
   belongs_to :rank
diff --git a/app/models/trade/annual_report_upload.rb b/app/models/trade/annual_report_upload.rb
index 427123e17..20ab731d7 100644
--- a/app/models/trade/annual_report_upload.rb
+++ b/app/models/trade/annual_report_upload.rb
@@ -28,7 +28,7 @@ class Trade::AnnualReportUpload < ApplicationRecord
   #                 :number_of_records_submitted, :aws_storage_path
 
   mount_uploader :csv_source_file, Trade::CsvSourceFileUploader
-  belongs_to :trading_country, :class_name => GeoEntity, :foreign_key => :trading_country_id
+  belongs_to :trading_country, :class_name => 'GeoEntity', :foreign_key => :trading_country_id
   validates :csv_source_file, :csv_column_headers => true, :on => :create
 
   scope :created_by_sapi, -> {
diff --git a/app/models/trade/sandbox_template.rb b/app/models/trade/sandbox_template.rb
index 19a131d3a..e58c7f2ba 100644
--- a/app/models/trade/sandbox_template.rb
+++ b/app/models/trade/sandbox_template.rb
@@ -61,7 +61,7 @@ def self.ar_klass(table_name)
         #   :source_code,
         #   :year
         belongs_to :taxon_concept, optional: true
-        belongs_to :reported_taxon_concept, :class_name => TaxonConcept, optional: true
+        belongs_to :reported_taxon_concept, :class_name => 'TaxonConcept', optional: true
 
         def sanitize
           self.class.sanitize(self.id)
diff --git a/app/models/trade/validation_error.rb b/app/models/trade/validation_error.rb
index 5d956016d..125744e55 100644
--- a/app/models/trade/validation_error.rb
+++ b/app/models/trade/validation_error.rb
@@ -1,6 +1,6 @@
 class Trade::ValidationError < ApplicationRecord
-  belongs_to :annual_report_upload, class_name: Trade::AnnualReportUpload
-  belongs_to :validation_rule, class_name: Trade::ValidationRule
+  belongs_to :annual_report_upload, class_name: 'Trade::AnnualReportUpload'
+  belongs_to :validation_rule, class_name: 'Trade::ValidationRule'
 
   # Used by app/models/trade/validation_rule.rb
   # attr_accessible :annual_report_upload_id,
diff --git a/app/models/trade/validation_rule.rb b/app/models/trade/validation_rule.rb
index f14615d83..9ead03ef6 100644
--- a/app/models/trade/validation_rule.rb
+++ b/app/models/trade/validation_rule.rb
@@ -19,7 +19,7 @@ class Trade::ValidationRule < ApplicationRecord
   # Used by seed.
   # attr_accessible :column_names, :run_order, :is_primary, :scope, :is_strict
   serialize :scope, ActiveRecord::Coders::NestedHstore
-  has_many :validation_errors, class_name: Trade::ValidationError
+  has_many :validation_errors, class_name: 'Trade::ValidationError'
 
   def matching_records_for_aru_and_error(annual_report_upload, validation_error)
     table_name = annual_report_upload.sandbox.table_name

From 3f9b91097da6ccd8477b0429ec7fd3717f9c54bd Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 24 Jan 2024 23:51:09 +0000
Subject: [PATCH 090/241] migrate to 5.1 default

---
 .../initializers/0_new_framework_defaults.rb  | 26 -------------------
 ...5_1.rb => 0_new_framework_defaults_5_1.rb} |  4 +--
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 config/initializers/0_new_framework_defaults.rb
 rename config/initializers/{new_framework_defaults_5_1.rb => 0_new_framework_defaults_5_1.rb} (86%)

diff --git a/config/initializers/0_new_framework_defaults.rb b/config/initializers/0_new_framework_defaults.rb
deleted file mode 100644
index dd236b5fe..000000000
--- a/config/initializers/0_new_framework_defaults.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 5.0 upgrade.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-
-Rails.application.config.action_controller.raise_on_unfiltered_parameters = true
-
-# Enable per-form CSRF tokens. Previous versions had false.
-Rails.application.config.action_controller.per_form_csrf_tokens = true
-
-# Enable origin-checking CSRF mitigation. Previous versions had false.
-Rails.application.config.action_controller.forgery_protection_origin_check = true
-
-# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
-# Previous versions had false.
-ActiveSupport.to_time_preserves_timezone = true
-
-# Require `belongs_to` associations by default. Previous versions had false.
-Rails.application.config.active_record.belongs_to_required_by_default = true
-
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = false
-
-# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
-Rails.application.config.ssl_options = { hsts: { subdomains: true } }
diff --git a/config/initializers/new_framework_defaults_5_1.rb b/config/initializers/0_new_framework_defaults_5_1.rb
similarity index 86%
rename from config/initializers/new_framework_defaults_5_1.rb
rename to config/initializers/0_new_framework_defaults_5_1.rb
index 9010abd5c..4657f5ee4 100644
--- a/config/initializers/new_framework_defaults_5_1.rb
+++ b/config/initializers/0_new_framework_defaults_5_1.rb
@@ -7,8 +7,8 @@
 # Read the Guide for Upgrading Ruby on Rails for more info on each option.
 
 # Make `form_with` generate non-remote forms.
-Rails.application.config.action_view.form_with_generates_remote_forms = false
+Rails.application.config.action_view.form_with_generates_remote_forms = true
 
 # Unknown asset fallback will return the path passed in when the given
 # asset is not present in the asset pipeline.
-# Rails.application.config.assets.unknown_asset_fallback = false
+Rails.application.config.assets.unknown_asset_fallback = false

From e5f2c41950869f3f2a0daab8f0d152544f37ce95 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 14:32:34 +0000
Subject: [PATCH 091/241] Bring back Database Cleaner for now

---
 Gemfile.lock        | 3 ---
 spec/spec_helper.rb | 7 ++++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b963e05d7..5500daf5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -483,9 +483,6 @@ GEM
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
-    sentient_user_request_store (1.0.0)
-      railties (>= 3.1)
-      request_store (= 1.4.1)
     sidekiq (5.2.10)
       connection_pool (~> 2.2, >= 2.2.2)
       rack (~> 2.0)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1d18d2a97..07dfbdb75 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -38,7 +38,7 @@
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of
@@ -55,21 +55,26 @@
   config.include SapiSpec::Helpers
 
   config.before(:all) do
+    DatabaseCleaner.clean_with(:deletion, { :cache_tables => false })
     @user = create(:user)
     RequestStore.store[:track_who_does_it_current_user] = @user
   end
 
   config.before(:each) do
+    DatabaseCleaner.strategy = :transaction
   end
 
   config.before(:each, :drops_tables => true) do
+    DatabaseCleaner.strategy = :deletion, { :cache_tables => false }
     ApplicationRecord.connection.execute('SELECT * FROM drop_trade_sandboxes()')
   end
 
   config.before(:each) do
+    DatabaseCleaner.start
   end
 
   config.after(:each) do
+    DatabaseCleaner.clean
     # this is duplicated here because of the :drops_tables specs
     @user = create(:user)
     RequestStore.store[:track_who_does_it_current_user] = @user

From 8b5489878a8c4341a41b933d1897d195860f6de8 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 14:51:00 +0000
Subject: [PATCH 092/241] Upgrade 'pg' and 'database_cleaner' to latest version

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 45483c687..4d7f2a9c4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem 'actionpack-action_caching', '~> 1.2', '>= 1.2.2' # A feature that removed f
 gem 'actionpack-page_caching', '~> 1.2', '>= 1.2.4' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
 gem 'active_model_serializers', '0.8.4' # Deprecated
 gem 'dalli', '2.7.10' # TODO: latest is 3.2.6. I believe should be fine to upgrade but we have no way to test.
-gem 'pg', '0.21.0' # TODO: latest 1.5.4, need Rails 5 to upgrade to 1.0.0
+gem 'pg', '~> 1.5', '>= 1.5.4'
 gem 'pg_array_parser', '~> 0.0.9'
 gem 'nested-hstore', '~> 0.1.2'
 gem 'pg_search', '2.3.0' # TODO: can upgrade to newer version after Rails 5
diff --git a/Gemfile.lock b/Gemfile.lock
index 5500daf5d..8d74f69ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -332,7 +332,7 @@ GEM
       ruby-rc4
       ttfunk
     pdfkit (0.8.7.3)
-    pg (0.21.0)
+    pg (1.5.4)
     pg_array_parser (0.0.9)
     pg_search (2.3.0)
       activerecord (>= 4.2)
@@ -626,7 +626,7 @@ DEPENDENCIES
   oj (= 3.14.2)
   paper_trail (= 10.3.1)
   pdfkit (~> 0.8.7.3)
-  pg (= 0.21.0)
+  pg (~> 1.5, >= 1.5.4)
   pg_array_parser (~> 0.0.9)
   pg_search (= 2.3.0)
   prawn (= 0.13.2)

From 247d4d495a484084b61c878575124bccae5979d9 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 16:20:03 +0000
Subject: [PATCH 093/241] Fix ActiveModel::Dirty DEPRECATION WARNING

---
 app/models/change_observer.rb            | 28 ++++++++++++++++--
 app/models/document_observer.rb          | 18 +++++++++++-
 app/models/taxon_concept_observer.rb     | 27 +++++++++++++++---
 app/models/trade_restriction_observer.rb | 36 ++++++++++++++++++++++--
 config/initializers/mobility.rb          |  2 +-
 5 files changed, 100 insertions(+), 11 deletions(-)

diff --git a/app/models/change_observer.rb b/app/models/change_observer.rb
index fe348ff6f..5ed249762 100644
--- a/app/models/change_observer.rb
+++ b/app/models/change_observer.rb
@@ -23,9 +23,31 @@ def after_save(model)
     if model.taxon_concept
       bump_dependents_timestamp(model.taxon_concept, model.updated_by_id)
     end
-    if model.taxon_concept.nil? && model.taxon_concept_id_was ||
-      model.taxon_concept && model.taxon_concept_id_was && model.taxon_concept_id != model.taxon_concept_id_was
-      previous_taxon_concept = TaxonConcept.find_by_id(model.taxon_concept_id_was)
+    # Rails 5.1 to 5.2
+    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `attribute_before_last_save` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+    #
+    # == Original code ==
+    # if model.taxon_concept.nil? && model.taxon_concept_id_was ||
+    #   model.taxon_concept && model.taxon_concept_id_was && model.taxon_concept_id != model.taxon_concept_id_was
+    #   previous_taxon_concept = TaxonConcept.find_by_id(model.taxon_concept_id_was)
+    #   if previous_taxon_concept
+    #     bump_dependents_timestamp(previous_taxon_concept, model.updated_by_id)
+    #   end
+    # end
+    # == Changed to fix deprecation warnings ==
+    if model.taxon_concept.nil? && model.taxon_concept_id_before_last_save ||
+      model.taxon_concept && model.taxon_concept_id_before_last_save && model.taxon_concept_id != model.taxon_concept_id_before_last_save
+      previous_taxon_concept = TaxonConcept.find_by_id(model.taxon_concept_id_before_last_save)
       if previous_taxon_concept
         bump_dependents_timestamp(previous_taxon_concept, model.updated_by_id)
       end
diff --git a/app/models/document_observer.rb b/app/models/document_observer.rb
index 923f37b42..f2b27f293 100644
--- a/app/models/document_observer.rb
+++ b/app/models/document_observer.rb
@@ -12,7 +12,23 @@ def after_destroy(document)
   private
 
   def sync_sort_index(document)
-    if document.sort_index_changed?
+    # Rails 5.1 to 5.2
+    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `attribute_before_last_save` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+    #
+    # == Original code ==
+    # if document.sort_index_changed?
+    # == Changed to fix deprecation warnings ==
+    if document.saved_change_to_sort_index?
       if document.primary_language_document &&
         document.primary_language_document_id != document.id
         document.primary_language_document.update_attribute(
diff --git a/app/models/taxon_concept_observer.rb b/app/models/taxon_concept_observer.rb
index 0ad151b99..6dfbcf2f2 100644
--- a/app/models/taxon_concept_observer.rb
+++ b/app/models/taxon_concept_observer.rb
@@ -45,10 +45,29 @@ def after_destroy(taxon_concept)
 
   def after_update(taxon_concept)
     ensure_species_touched(taxon_concept)
-    if taxon_concept.rank_id_changed? ||
-      taxon_concept.taxon_name_id_changed? ||
-      taxon_concept.parent_id_changed? ||
-      taxon_concept.name_status_changed?
+    # Rails 5.1 to 5.2
+    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `attribute_before_last_save` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+    #
+    # == Original code ==
+    # if taxon_concept.rank_id_changed? ||
+    #   taxon_concept.taxon_name_id_changed? ||
+    #   taxon_concept.parent_id_changed? ||
+    #   taxon_concept.name_status_changed?
+    # == Changed to fix deprecation warnings ==
+    if taxon_concept.saved_change_to_rank_id? ||
+       taxon_concept.saved_change_to_taxon_name_id? ||
+       taxon_concept.saved_change_to_parent_id? ||
+       taxon_concept.saved_change_to_name_status?
       Species::Search.increment_cache_iterator
       Species::TaxonConceptPrefixMatcher.increment_cache_iterator
       Checklist::Checklist.increment_cache_iterator
diff --git a/app/models/trade_restriction_observer.rb b/app/models/trade_restriction_observer.rb
index 3a5892548..d15b226da 100644
--- a/app/models/trade_restriction_observer.rb
+++ b/app/models/trade_restriction_observer.rb
@@ -27,7 +27,23 @@ def touch_taxa_with_applicable_distribution(trade_restriction)
       AND distributions.geo_entity_id IN (:geo_entity_id)",
       :updated_by_id => trade_restriction.updated_by_id,
       :geo_entity_id => [
-        trade_restriction.geo_entity_id, trade_restriction.geo_entity_id_was
+        # Rails 5.1 to 5.2
+        # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `attribute_before_last_save` instead.
+        #
+        # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+        #
+        # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+        #
+        # == Original code ==
+        # trade_restriction.geo_entity_id, trade_restriction.geo_entity_id_was
+        # == Changed to fix deprecation warnings ==
+        trade_restriction.geo_entity_id, trade_restriction.geo_entity_id_before_last_save
       ].compact.uniq
     ])
     TaxonConcept.connection.execute update_stmt
@@ -47,7 +63,23 @@ def touch_descendants(trade_restriction)
       ] && ARRAY[:taxon_concept_id] ",
       :updated_by_id => trade_restriction.updated_by_id,
       :taxon_concept_id => [
-        trade_restriction.taxon_concept_id, trade_restriction.taxon_concept_id_was
+        # Rails 5.1 to 5.2
+        # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `attribute_before_last_save` instead.
+        #
+        # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+        #
+        # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+        #
+        # == Original code ==
+        # trade_restriction.taxon_concept_id, trade_restriction.taxon_concept_id_was
+        # == Changed to fix deprecation warnings ==
+        trade_restriction.taxon_concept_id, trade_restriction.taxon_concept_id_before_last_save
       ].compact.uniq
     ])
     TaxonConcept.connection.execute update_stmt
diff --git a/config/initializers/mobility.rb b/config/initializers/mobility.rb
index f4442f0ab..5acb4b560 100644
--- a/config/initializers/mobility.rb
+++ b/config/initializers/mobility.rb
@@ -53,7 +53,7 @@
     # Dirty
     #
     # Uncomment this line to include and enable globally:
-    # dirty # Doesn't work in Rails 4.2
+    dirty
     #
     # Or uncomment this line to include but disable by default, and only enable
     # per model by passing +dirty: true+ to +translates+.

From 06e223fe66ac2cf0ff3577055091f7cf4b58940b Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 16:28:54 +0000
Subject: [PATCH 094/241] DEPRECATION WARNING: Passing string to be evaluated
 in :if and :unless conditional options is deprecated and will be removed in
 Rails 5.2 without replacement. Pass a symbol for an instance method, or a
 lambda, proc or block, instead.

---
 app/models/taxon_relationship.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/taxon_relationship.rb b/app/models/taxon_relationship.rb
index 7656c5a31..087e71d02 100644
--- a/app/models/taxon_relationship.rb
+++ b/app/models/taxon_relationship.rb
@@ -36,7 +36,7 @@ class TaxonRelationship < ApplicationRecord
     scope: [:taxon_relationship_type_id, :other_taxon_concept_id],
     message: 'This relationship already exists, choose another taxon.'
   }
-  validate :intertaxonomic_relationship_uniqueness, :if => "taxon_relationship_type.is_intertaxonomic?"
+  validate :intertaxonomic_relationship_uniqueness, if: -> { taxon_relationship_type.is_intertaxonomic? }
 
   scope :hybrids, -> { where(
       "taxon_relationship_type_id IN

From 2bd7eebb3ffb7fb7c2c62b45dfc0a70e11c35545 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 18:10:00 +0000
Subject: [PATCH 095/241] add comment

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index eab50c954..d6c9591f9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -17,7 +17,7 @@
   # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
   # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
   # `config/secrets.yml.key`.
-  config.read_encrypted_secrets = false # TODO upgrade Rails 5.1
+  config.read_encrypted_secrets = false # Rails 5.1 introduce feature, but going to deprecate in Rails 5.2 and replaced by credentials.
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.

From d8bced2eb6b1120ed8c0a2b5343b6bc27775bea0 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 18:12:01 +0000
Subject: [PATCH 096/241] update comments

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4d7f2a9c4..596f97633 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'dalli', '2.7.10' # TODO: latest is 3.2.6. I believe should be fine to upgra
 gem 'pg', '~> 1.5', '>= 1.5.4'
 gem 'pg_array_parser', '~> 0.0.9'
 gem 'nested-hstore', '~> 0.1.2'
-gem 'pg_search', '2.3.0' # TODO: can upgrade to newer version after Rails 5
+gem 'pg_search', '2.3.0' # TODO: can upgrade to newer version after Rails 5.2
 gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
 gem 'inherited_resources', '1.9.0' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
@@ -121,7 +121,7 @@ group :test, :development do
   gem "rspec-rails", '4.1.1' # TODO: should upgrade once to rails 5.2
   gem 'rspec-collection_matchers', '~> 1.2', '>= 1.2.1'
   gem "json_spec", '1.1.5'
-  gem 'database_cleaner', '~> 2.0', '>= 2.0.2' # TODO, should remove after upgrade to Rails 5.1. (https://stackoverflow.com/questions/49246124/is-databasecleaner-still-necessary-with-rails-system-specs)
+  gem 'database_cleaner', '~> 2.0', '>= 2.0.2'
   gem "launchy", '2.4.3'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'

From e3feb3dffc60466ae8125c3580d1e3c7499385ab Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 18:38:43 +0000
Subject: [PATCH 097/241] Upgrade Rails gem to 5.2.8.1

---
 Gemfile      |   2 +-
 Gemfile.lock | 103 +++++++++++++++++++++++++++------------------------
 2 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/Gemfile b/Gemfile
index 596f97633..93d507a78 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ end
 ruby '2.6.10'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '5.1.7'
+gem 'rails', '5.2.8.1'
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3'
 # Use Puma as the app server
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d74f69ee..38fa49ec9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,20 +2,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (5.1.7)
-      actionpack (= 5.1.7)
+    actioncable (5.2.8.1)
+      actionpack (= 5.2.8.1)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      actionview (= 5.2.8.1)
+      activejob (= 5.2.8.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
-      rack (~> 2.0)
+    actionpack (5.2.8.1)
+      actionview (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
@@ -23,8 +23,8 @@ GEM
       actionpack (>= 4.0.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
+    actionview (5.2.8.1)
+      activesupport (= 5.2.8.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -33,16 +33,20 @@ GEM
       ember-data-source (>= 1.13, < 3.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (5.1.7)
-      activesupport (= 5.1.7)
+    activejob (5.2.8.1)
+      activesupport (= 5.2.8.1)
       globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
+    activemodel (5.2.8.1)
+      activesupport (= 5.2.8.1)
+    activerecord (5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      arel (>= 9.0)
+    activestorage (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activerecord (= 5.2.8.1)
+      marcel (~> 1.0.0)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -64,7 +68,7 @@ GEM
     appsignal (1.3.3)
       rack
       thread_safe
-    arel (8.0.0)
+    arel (9.0.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
     aws-sdk (2.11.632)
@@ -224,9 +228,9 @@ GEM
     groupdate (5.2.4)
       activesupport (>= 5)
     handlebars-source (1.0.12)
-    has_scope (0.7.2)
-      actionpack (>= 4.1)
-      activesupport (>= 4.1)
+    has_scope (0.8.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
     hashery (2.1.2)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
@@ -267,9 +271,10 @@ GEM
     kaminari-core (1.2.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (3.0.8)
+    listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -354,17 +359,18 @@ GEM
       rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (5.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (= 5.1.7)
+    rails (5.2.8.1)
+      actioncable (= 5.2.8.1)
+      actionmailer (= 5.2.8.1)
+      actionpack (= 5.2.8.1)
+      actionview (= 5.2.8.1)
+      activejob (= 5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activerecord (= 5.2.8.1)
+      activestorage (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       bundler (>= 1.3.0)
-      railties (= 5.1.7)
+      railties (= 5.2.8.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -378,12 +384,12 @@ GEM
       loofah (~> 2.19, >= 2.19.1)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (5.1.7)
-      actionpack (= 5.1.7)
-      activesupport (= 5.1.7)
+    railties (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
@@ -469,12 +475,13 @@ GEM
     ruby-rc4 (0.1.5)
     ruby-vips (2.2.0)
       ffi (~> 1.12)
+    ruby_dep (1.5.0)
     rubyzip (2.3.2)
     safely_block (0.3.0)
       errbase (>= 0.1.1)
     sass (3.4.25)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
+    sass-rails (5.1.0)
+      railties (>= 5.2.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
@@ -515,9 +522,9 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sshkit (1.22.0)
       mutex_m
@@ -557,7 +564,7 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     whenever (0.11.0)
@@ -632,7 +639,7 @@ DEPENDENCIES
   prawn (= 0.13.2)
   puma (~> 3.7)
   rack-cors (= 0.3.0)
-  rails (= 5.1.7)
+  rails (= 5.2.8.1)
   rails-controller-testing
   rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)

From 195f5706a97be0ce56d3236567e8afda161a2403 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 18:39:41 +0000
Subject: [PATCH 098/241] ActiveRecord::Relation already defined an instance
 method named "filter".

---
 .../admin/cms_mappings_controller.rb           |  6 +++---
 .../admin/iucn_mappings_controller.rb          | 18 +++++++++---------
 app/models/cms_mapping.rb                      |  2 +-
 app/models/iucn_mapping.rb                     |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/controllers/admin/cms_mappings_controller.rb b/app/controllers/admin/cms_mappings_controller.rb
index 4eac7c018..2ad8410dd 100644
--- a/app/controllers/admin/cms_mappings_controller.rb
+++ b/app/controllers/admin/cms_mappings_controller.rb
@@ -6,8 +6,8 @@ def index
         where(:taxonomies => { :name => Taxonomy::CMS }).
         where(:name_status => 'A').count,
       :cms_mapped => CmsMapping.all.count,
-      :matches => CmsMapping.filter('MATCHES').count,
-      :missing_species_plus => CmsMapping.filter('MISSING_SPECIES_PLUS').count
+      :matches => CmsMapping.index_filter('MATCHES').count,
+      :missing_species_plus => CmsMapping.index_filter('MISSING_SPECIES_PLUS').count
     }
   end
 
@@ -17,6 +17,6 @@ def collection
     @cms_mappings ||= end_of_association_chain.
       order("taxon_concepts.data->'class_name'").
       page(params[:page]).includes(:taxon_concept).
-      includes(:accepted_name).filter(params[:show])
+      includes(:accepted_name).index_filter(params[:show])
   end
 end
diff --git a/app/controllers/admin/iucn_mappings_controller.rb b/app/controllers/admin/iucn_mappings_controller.rb
index 8d6f41d4f..b37ce4e5a 100644
--- a/app/controllers/admin/iucn_mappings_controller.rb
+++ b/app/controllers/admin/iucn_mappings_controller.rb
@@ -2,14 +2,14 @@ class Admin::IucnMappingsController < Admin::SimpleCrudController
 
   def index
     @totals = {
-      :matching => IucnMapping.filter("MATCHING").count,
-      :full_match => IucnMapping.filter("FULL_MATCH").count,
-      :name_match => IucnMapping.filter("NAME_MATCH").count,
-      :full_synonym_match => IucnMapping.filter("FULL_SYNONYM_MATCH").count,
-      :synonym_match => IucnMapping.filter("SYNONYM_NAME_MATCH").count,
-      :non_matching => IucnMapping.filter("NON_MATCHING").count,
-      :synonyms => IucnMapping.filter('SYNONYMS').count,
-      :accepted => IucnMapping.filter('ACCEPTED').count,
+      :matching => IucnMapping.index_filter("MATCHING").count,
+      :full_match => IucnMapping.index_filter("FULL_MATCH").count,
+      :name_match => IucnMapping.index_filter("NAME_MATCH").count,
+      :full_synonym_match => IucnMapping.index_filter("FULL_SYNONYM_MATCH").count,
+      :synonym_match => IucnMapping.index_filter("SYNONYM_NAME_MATCH").count,
+      :non_matching => IucnMapping.index_filter("NON_MATCHING").count,
+      :synonyms => IucnMapping.index_filter('SYNONYMS').count,
+      :accepted => IucnMapping.index_filter('ACCEPTED').count,
       :all => IucnMapping.count
 
     }
@@ -19,7 +19,7 @@ def index
 
   def collection
     @iucn_mappings ||= end_of_association_chain.order(:taxon_concept_id).
-      page(params[:page]).filter(params[:show] || "ALL").includes(:taxon_concept).
+      page(params[:page]).index_filter(params[:show] || "ALL").includes(:taxon_concept).
       includes(:accepted_name)
   end
 end
diff --git a/app/models/cms_mapping.rb b/app/models/cms_mapping.rb
index 58f2eb8e1..ec4734a18 100644
--- a/app/models/cms_mapping.rb
+++ b/app/models/cms_mapping.rb
@@ -21,7 +21,7 @@ class CmsMapping < ApplicationRecord
   belongs_to :taxon_concept, optional: true
   belongs_to :accepted_name, :class_name => 'TaxonConcept', optional: true
 
-  scope :filter, lambda { |option|
+  scope :index_filter, lambda { |option|
     case option
     when "MATCHES"
       where('taxon_concept_id IS NOT NULL')
diff --git a/app/models/iucn_mapping.rb b/app/models/iucn_mapping.rb
index 3ac4595fa..40f90da06 100644
--- a/app/models/iucn_mapping.rb
+++ b/app/models/iucn_mapping.rb
@@ -23,7 +23,7 @@ class IucnMapping < ApplicationRecord
   belongs_to :taxon_concept
   belongs_to :accepted_name, :class_name => 'TaxonConcept', optional: true
 
-  scope :filter, lambda { |option|
+  scope :index_filter, lambda { |option|
     case option
     when "ALL"
       all

From 29f6ac9b205e2c17c609a996340cc41e159da820 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 20:19:38 +0000
Subject: [PATCH 099/241] rails app:update

---
 bin/bundle                                    |  2 +-
 bin/setup                                     |  4 +-
 bin/update                                    |  6 ++-
 bin/yarn                                      |  6 +--
 config/application.rb                         |  5 ++-
 config/boot.rb                                |  1 +
 config/cable.yml                              |  2 +-
 config/environments/development.rb            | 11 +++++-
 config/environments/production.rb             | 10 +++--
 config/environments/test.rb                   |  6 ++-
 .../0_new_framework_defaults_5_1.rb           | 14 -------
 .../0_new_framework_defaults_5_2.rb           | 38 +++++++++++++++++++
 .../initializers/content_security_policy.rb   | 25 ++++++++++++
 config/puma.rb                                | 27 ++-----------
 config/spring.rb                              |  4 +-
 config/storage.yml                            | 34 +++++++++++++++++
 16 files changed, 137 insertions(+), 58 deletions(-)
 delete mode 100644 config/initializers/0_new_framework_defaults_5_1.rb
 create mode 100644 config/initializers/0_new_framework_defaults_5_2.rb
 create mode 100644 config/initializers/content_security_policy.rb
 create mode 100644 config/storage.yml

diff --git a/bin/bundle b/bin/bundle
index 66e9889e8..f19acf5b5 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/setup b/bin/setup
index 78c4e861d..94fd4d797 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -21,7 +20,6 @@ chdir APP_ROOT do
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
-
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'
diff --git a/bin/update b/bin/update
index a8e4462f2..58bfaed51 100755
--- a/bin/update
+++ b/bin/update
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
 
diff --git a/bin/yarn b/bin/yarn
index c2bacef83..460dd565b 100755
--- a/bin/yarn
+++ b/bin/yarn
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
   begin
-    exec "yarnpkg #{ARGV.join(" ")}"
+    exec "yarnpkg", *ARGV
   rescue Errno::ENOENT
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
diff --git a/config/application.rb b/config/application.rb
index 580b313d5..aef27351d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,8 +13,9 @@ class Application < Rails::Application
     config.load_defaults 5.1
 
     # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
 
     # @see https://gist.github.com/maxivak/381f1e964923f1d469c8d39da8e2522f
     # TODO: Rails 7.1 https://stackoverflow.com/a/77198784/556780
diff --git a/config/boot.rb b/config/boot.rb
index 30f5120df..b9e460cef 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/cable.yml b/config/cable.yml
index 66e1517de..c1fe5018d 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -6,5 +6,5 @@ test:
 
 production:
   adapter: redis
-  url: redis://localhost:6379/1
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
   channel_prefix: sapi_production
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 94234b3d7..27fbdd214 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -13,12 +13,13 @@
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
-  if Rails.root.join('tmp/caching-dev.txt').exist?
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -26,6 +27,9 @@
     config.cache_store = :null_store
   end
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
@@ -37,6 +41,9 @@
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index d6c9591f9..4fb295e5b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,10 +14,9 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
-  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
-  # `config/secrets.yml.key`.
-  config.read_encrypted_secrets = false # Rails 5.1 introduce feature, but going to deprecate in Rails 5.2 and replaced by credentials.
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
@@ -39,6 +38,9 @@
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 7405f96af..5164afd1d 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -16,7 +16,7 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.
@@ -28,6 +28,10 @@
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
+
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
diff --git a/config/initializers/0_new_framework_defaults_5_1.rb b/config/initializers/0_new_framework_defaults_5_1.rb
deleted file mode 100644
index 4657f5ee4..000000000
--- a/config/initializers/0_new_framework_defaults_5_1.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 5.1 upgrade.
-#
-# Once upgraded flip defaults one by one to migrate to the new default.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-
-# Make `form_with` generate non-remote forms.
-Rails.application.config.action_view.form_with_generates_remote_forms = true
-
-# Unknown asset fallback will return the path passed in when the given
-# asset is not present in the asset pipeline.
-Rails.application.config.assets.unknown_asset_fallback = false
diff --git a/config/initializers/0_new_framework_defaults_5_2.rb b/config/initializers/0_new_framework_defaults_5_2.rb
new file mode 100644
index 000000000..c383d072b
--- /dev/null
+++ b/config/initializers/0_new_framework_defaults_5_2.rb
@@ -0,0 +1,38 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.2 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Make Active Record use stable #cache_key alongside new #cache_version method.
+# This is needed for recyclable cache keys.
+# Rails.application.config.active_record.cache_versioning = true
+
+# Use AES-256-GCM authenticated encryption for encrypted cookies.
+# Also, embed cookie expiry in signed or encrypted cookies for increased security.
+#
+# This option is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 5.2.
+#
+# Existing cookies will be converted on read then written with the new scheme.
+# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
+
+# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
+# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
+# Rails.application.config.active_support.use_authenticated_message_encryption = true
+
+# Add default protection from forgery to ActionController::Base instead of in
+# ApplicationController.
+# Rails.application.config.action_controller.default_protect_from_forgery = true
+
+# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
+# 'f' after migrating old data.
+# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+
+# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
+# Rails.application.config.active_support.use_sha1_digests = true
+
+# Make `form_with` generate id attributes for any generated HTML tags.
+# Rails.application.config.action_view.form_with_generates_ids = true
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
new file mode 100644
index 000000000..d3bcaa5ec
--- /dev/null
+++ b/config/initializers/content_security_policy.rb
@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.config.content_security_policy do |policy|
+#   policy.default_src :self, :https
+#   policy.font_src    :self, :https, :data
+#   policy.img_src     :self, :https, :data
+#   policy.object_src  :none
+#   policy.script_src  :self, :https
+#   policy.style_src   :self, :https
+
+#   # Specify URI for violation reports
+#   # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true
diff --git a/config/puma.rb b/config/puma.rb
index 1e19380dc..b2102072b 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -15,6 +15,9 @@
 #
 environment ENV.fetch("RAILS_ENV") { "development" }
 
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked webserver processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.
@@ -26,31 +29,9 @@
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code
 # before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory. If you use this option
-# you need to make sure to reconnect any threads in the `on_worker_boot`
-# block.
+# process behavior so workers use less memory.
 #
 # preload_app!
 
-# If you are preloading your application and using Active Record, it's
-# recommended that you close any connections to the database before workers
-# are forked to prevent connection leakage.
-#
-# before_fork do
-#   ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
-# end
-
-# The code in the `on_worker_boot` will be called if you are using
-# clustered mode by specifying a number of `workers`. After each worker
-# process is booted, this block will be run. If you are using the `preload_app!`
-# option, you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, as Ruby
-# cannot share connections between processes.
-#
-# on_worker_boot do
-#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-# end
-#
-
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart
diff --git a/config/spring.rb b/config/spring.rb
index c9119b40c..9fa7863f9 100644
--- a/config/spring.rb
+++ b/config/spring.rb
@@ -1,6 +1,6 @@
-%w(
+%w[
   .ruby-version
   .rbenv-vars
   tmp/restart.txt
   tmp/caching-dev.txt
-).each { |path| Spring.watch(path) }
+].each { |path| Spring.watch(path) }
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 000000000..d32f76e8f
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]

From 2883b38a5362ebd7fcbd360ddc99c504a3c0fc24 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 20:41:47 +0000
Subject: [PATCH 100/241] rails diff

---
 .gitignore                                |  8 ++++
 Gemfile                                   | 25 +++++++-----
 Gemfile.lock                              | 13 +++++-
 app/controllers/application_controller.rb |  1 -
 app/views/layouts/admin.html.erb          |  1 +
 app/views/layouts/application.html.erb    |  1 +
 app/views/layouts/mobile.html.erb         |  1 +
 app/views/layouts/pages.html.erb          |  1 +
 app/views/layouts/species.html.erb        |  1 +
 app/views/layouts/taxon_concepts.html.erb |  1 +
 app/views/layouts/trade.html.erb          |  1 +
 config/application.rb                     |  2 +-
 config/environments/production.rb         |  2 +-
 config/environments/staging.rb            | 48 +++++++++++++++--------
 14 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23bee559d..0004f2107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,11 +13,19 @@
 !/log/.keep
 !/tmp/.keep
 
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
+
 /node_modules
 /yarn-error.log
 
+/public/assets
 .byebug_history
 
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
 /coverage
 /rdoc
 /private
diff --git a/Gemfile b/Gemfile
index 93d507a78..c1289d0c8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,5 @@
 source 'https://rubygems.org'
-
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '2.6.10'
 
@@ -12,7 +8,7 @@ gem 'rails', '5.2.8.1'
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3'
 # Use Puma as the app server
-gem 'puma', '~> 3.7'
+gem 'puma', '~> 3.11'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
@@ -20,7 +16,7 @@ gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 4.2'
 # See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
+# gem 'mini_racer', platforms: :ruby
 
 gem 'actionpack-action_caching', '~> 1.2', '>= 1.2.2' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
 gem 'actionpack-page_caching', '~> 1.2', '>= 1.2.4' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
@@ -79,13 +75,19 @@ gem 'strong_migrations', '0.7.9' # TODO: should upgrade when we upgrade to rails
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
+# Use ActiveStorage variant
+# gem 'mini_magick', '~> 4.8'
+
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
+
 # To use Jbuilder templates for JSON
 # gem 'jbuilder', '~> 2.5'
 
 gem 'rest-client', '1.8.0', require: false # TODO, should upgrade for better compatibility with newer Ruby but breaking change. Seems not many place using it, worth a try.
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
@@ -125,12 +127,15 @@ group :test, :development do
   gem "launchy", '2.4.3'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
+end
+
+group :test do
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '>= 2.15'
   gem 'selenium-webdriver'
-end
+  # Easy installation and use of chromedriver to run system tests with Chrome
+  gem 'chromedriver-helper'
 
-group :test do
   gem 'rails-controller-testing'
   gem "codeclimate-test-reporter", '0.1.1', require: nil # TODO, should be removed
   gem 'factory_bot_rails', '4.11.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 38fa49ec9..e7126532b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,6 +68,8 @@ GEM
     appsignal (1.3.3)
       rack
       thread_safe
+    archive-zip (0.12.0)
+      io-like (~> 0.3.0)
     arel (9.0.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
@@ -91,6 +93,8 @@ GEM
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.0)
     bindex (0.8.1)
+    bootsnap (1.17.1)
+      msgpack (~> 1.2)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     brightbox (2.3.9)
@@ -142,6 +146,9 @@ GEM
       ssrf_filter (~> 1.0)
     chartkick (2.3.5)
     childprocess (4.1.0)
+    chromedriver-helper (2.1.1)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
     chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
@@ -247,6 +254,7 @@ GEM
       has_scope (~> 0.6)
       railties (>= 4.2, < 5.3)
       responders
+    io-like (0.3.1)
     jmespath (1.6.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
@@ -294,6 +302,7 @@ GEM
     mobility (1.2.9)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mutex_m (0.2.0)
@@ -588,6 +597,7 @@ DEPENDENCIES
   appsignal (= 1.3.3)
   aws-sdk (~> 2)
   bcrypt_pbkdf (= 1.1.0)
+  bootsnap (>= 1.1.0)
   bootstrap-sass (= 2.3.2.2)
   brightbox (= 2.3.9)
   byebug
@@ -603,6 +613,7 @@ DEPENDENCIES
   capybara (>= 2.15)
   carrierwave (= 2.2.5)
   chartkick (= 2.3.5)
+  chromedriver-helper
   codeclimate-test-reporter (= 0.1.1)
   coffee-rails (~> 4.2)
   coveralls (= 0.7.1)
@@ -637,7 +648,7 @@ DEPENDENCIES
   pg_array_parser (~> 0.0.9)
   pg_search (= 2.3.0)
   prawn (= 0.13.2)
-  puma (~> 3.7)
+  puma (~> 3.11)
   rack-cors (= 0.3.0)
   rails (= 5.2.8.1)
   rails-controller-testing
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0bb9daabb..49d061b89 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,4 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery
   before_action :track_who_does_it_current_user
   before_action :set_locale
   before_action :configure_permitted_parameters, if: :devise_controller?
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 08dddf134..aed63e7a7 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -15,6 +15,7 @@
   <%= stylesheet_link_tag    "admin" %>
   <%= javascript_include_tag "admin" %>
   <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
   <% if controller_name == 'api_usage' %>
     <%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %>
   <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 40758ce8a..f86bfade3 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -15,6 +15,7 @@
   <%= stylesheet_link_tag "admin" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
 </head>
 <body>
   <div class="navbar navbar-fixed-top">
diff --git a/app/views/layouts/mobile.html.erb b/app/views/layouts/mobile.html.erb
index 179206efc..f37c2e414 100644
--- a/app/views/layouts/mobile.html.erb
+++ b/app/views/layouts/mobile.html.erb
@@ -10,6 +10,7 @@
   <%= stylesheet_link_tag "mobile" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
 </head>
 <body>
   <div class="mobile">
diff --git a/app/views/layouts/pages.html.erb b/app/views/layouts/pages.html.erb
index 8e4b108d8..a72bccfa2 100644
--- a/app/views/layouts/pages.html.erb
+++ b/app/views/layouts/pages.html.erb
@@ -11,6 +11,7 @@
   <%= javascript_include_tag "pages" %>
 
   <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
 
   <% if Rails.env.production? %>
     <!-- Google Analytics ga.js -->
diff --git a/app/views/layouts/species.html.erb b/app/views/layouts/species.html.erb
index c78b690c8..582e4f1c2 100644
--- a/app/views/layouts/species.html.erb
+++ b/app/views/layouts/species.html.erb
@@ -19,6 +19,7 @@
     </script>
     <%= javascript_include_tag "species" %>
     <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
 
     <% if Rails.env.production? %>
       <script>
diff --git a/app/views/layouts/taxon_concepts.html.erb b/app/views/layouts/taxon_concepts.html.erb
index 36ee18509..d44127724 100644
--- a/app/views/layouts/taxon_concepts.html.erb
+++ b/app/views/layouts/taxon_concepts.html.erb
@@ -15,6 +15,7 @@
     <%= stylesheet_link_tag    "admin" %>
     <%= javascript_include_tag "admin" %>
     <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
     <script type="text/javascript">
       window.editorClass = '<%= controller.controller_name %>'
     </script>
diff --git a/app/views/layouts/trade.html.erb b/app/views/layouts/trade.html.erb
index 75ca1b49f..fa289b9bc 100644
--- a/app/views/layouts/trade.html.erb
+++ b/app/views/layouts/trade.html.erb
@@ -18,6 +18,7 @@
   </script>
   <%= javascript_include_tag "trade" %>
   <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
 </head>
 <body>
   <%= yield %>
diff --git a/config/application.rb b/config/application.rb
index aef27351d..65c891a7c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -10,7 +10,7 @@
 module SAPI
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 5.2
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4fb295e5b..23defb097 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -51,7 +51,7 @@
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
-  config.log_level = :debug
+  config.log_level = :warn # @see https://github.com/heartcombo/devise#password-reset-tokens-and-rails-logs
 
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 7840d1345..435915493 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -14,15 +14,13 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like
-  # NGINX, varnish or squid.
-  # config.action_dispatch.rack_cache = true
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -31,16 +29,23 @@
   # Don't fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
@@ -49,16 +54,15 @@
   config.log_level = :warn # @see https://github.com/heartcombo/devise#password-reset-tokens-and-rails-logs
 
   # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  config.log_tags = [ :request_id ]
 
   # Use a different cache store in staging.
   config.cache_store = :memory_store, { size: 64.megabytes }
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "sapi_#{Rails.env}"
+  config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -75,6 +79,16 @@
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger    = ActiveSupport::TaggedLogging.new(logger)
+  end
+
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 

From c5d44f46591a91c1002313872443550802ed22a4 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 21:04:15 +0000
Subject: [PATCH 101/241] upgrade rspec gem

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index c1289d0c8..42d7e08e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -120,7 +120,7 @@ group :development do
 end
 
 group :test, :development do
-  gem "rspec-rails", '4.1.1' # TODO: should upgrade once to rails 5.2
+  gem "rspec-rails", '5.1.2' # TODO: should upgrade once to rails 6.1
   gem 'rspec-collection_matchers', '~> 1.2', '>= 1.2.1'
   gem "json_spec", '1.1.5'
   gem 'database_cleaner', '~> 2.0', '>= 2.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index e7126532b..72ee65f18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -450,10 +450,10 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (4.1.1)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
       rspec-core (~> 3.10)
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
@@ -660,7 +660,7 @@ DEPENDENCIES
   responders (~> 2.0)
   rest-client (= 1.8.0)
   rspec-collection_matchers (~> 1.2, >= 1.2.1)
-  rspec-rails (= 4.1.1)
+  rspec-rails (= 5.1.2)
   rubocop-rails
   rubocop-rspec
   rubyzip (~> 2.3, >= 2.3.2)

From 5f9d79610cf68c57e28dfae07756163e19468911 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 21:44:15 +0000
Subject: [PATCH 102/241] upgrade pg_search and strong_migration

---
 Gemfile      |  4 ++--
 Gemfile.lock | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 42d7e08e4..4ab0b79d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,7 @@ gem 'dalli', '2.7.10' # TODO: latest is 3.2.6. I believe should be fine to upgra
 gem 'pg', '~> 1.5', '>= 1.5.4'
 gem 'pg_array_parser', '~> 0.0.9'
 gem 'nested-hstore', '~> 0.1.2'
-gem 'pg_search', '2.3.0' # TODO: can upgrade to newer version after Rails 5.2
+gem 'pg_search', '~> 2.3', '>= 2.3.6'
 gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
 gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
 gem 'inherited_resources', '1.9.0' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
@@ -70,7 +70,7 @@ gem 'rails-observers', '~> 0.1.5' # A feature that removed from core in Rails 4.
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', :platforms => :ruby
 
-gem 'strong_migrations', '0.7.9' # TODO: should upgrade when we upgrade to rails 5.2
+gem 'strong_migrations', '~> 1.7'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 72ee65f18..f84eca85c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -348,9 +348,9 @@ GEM
     pdfkit (0.8.7.3)
     pg (1.5.4)
     pg_array_parser (0.0.9)
-    pg_search (2.3.0)
-      activerecord (>= 4.2)
-      activesupport (>= 4.2)
+    pg_search (2.3.6)
+      activerecord (>= 5.2)
+      activesupport (>= 5.2)
     power_assert (2.0.3)
     prawn (0.13.2)
       pdf-reader (~> 1.2)
@@ -541,8 +541,8 @@ GEM
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
     ssrf_filter (1.1.2)
-    strong_migrations (0.7.9)
-      activerecord (>= 5)
+    strong_migrations (1.7.0)
+      activerecord (>= 5.2)
     susy (2.2.14)
       sass (>= 3.3.0, < 3.5)
     sync (0.5.0)
@@ -646,7 +646,7 @@ DEPENDENCIES
   pdfkit (~> 0.8.7.3)
   pg (~> 1.5, >= 1.5.4)
   pg_array_parser (~> 0.0.9)
-  pg_search (= 2.3.0)
+  pg_search (~> 2.3, >= 2.3.6)
   prawn (= 0.13.2)
   puma (~> 3.11)
   rack-cors (= 0.3.0)
@@ -674,7 +674,7 @@ DEPENDENCIES
   slackistrano (= 0.1.9)
   spring
   spring-watcher-listen (~> 2.0.0)
-  strong_migrations (= 0.7.9)
+  strong_migrations (~> 1.7)
   susy (~> 2.2, >= 2.2.14)
   test-unit (= 3.1.5)
   uglifier (>= 1.3.0)

From 691fc42ef4cb1da7485a2d2a43155f9c265b07e9 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 25 Jan 2024 22:30:21 +0000
Subject: [PATCH 103/241] upgrade paper trail

---
 Gemfile                            |  8 ++++----
 Gemfile.lock                       | 30 +++++++++++++++---------------
 config/initializers/paper_trail.rb |  5 -----
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4ab0b79d7..4afb5629e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,8 +27,8 @@ gem 'pg_array_parser', '~> 0.0.9'
 gem 'nested-hstore', '~> 0.1.2'
 gem 'pg_search', '~> 2.3', '>= 2.3.6'
 gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
-gem 'nokogiri', '1.12.5' # TODO: 1.12.5 is the last version support 2.5. New version need Ruby 2.6+
-gem 'inherited_resources', '1.9.0' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
+gem 'nokogiri', '1.13.10' # TODO: 1.13.10 is the last version support 2.6. New version need Ruby 2.7+
+gem 'inherited_resources', '1.13.1' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
 gem 'mobility', '~> 1.2', '>= 1.2.9'
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
 gem 'cancancan', '2.3.0' # TODO, can upgrade to 3.0 after Rails 6
@@ -40,7 +40,7 @@ gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.
 #   rspec ./spec/controllers/admin/nomenclature_changes/split_controller_spec.rb:191
 gem 'wicked', '1.3.4'
 
-gem 'groupdate', '5.2.4' # TODO: can upgrade after rails 5.2 and newer ruby 2.6
+gem 'groupdate', '6.2.1' # TODO: can upgrade after rails 6.1 and newer ruby 3
 
 gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
@@ -146,7 +146,7 @@ end
 gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest version is 1.6.4 @ 2018
 
 gem 'request_store', '~> 1.5', '>= 1.5.1'
-gem 'paper_trail', '10.3.1' # TODO: latest is 15.1.0. Can upgrade to newer version when we at Rails 5.2
+gem 'paper_trail', '13.0.0' # TODO: latest is 15.1.0. Can upgrade to newer version when we at Rails 6
 
 gem 'dotenv-rails', '2.0.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f84eca85c..0d7d06fe0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -232,8 +232,8 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    groupdate (5.2.4)
-      activesupport (>= 5)
+    groupdate (6.2.1)
+      activesupport (>= 5.2)
     handlebars-source (1.0.12)
     has_scope (0.8.2)
       actionpack (>= 5.2)
@@ -249,11 +249,11 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    inherited_resources (1.9.0)
-      actionpack (>= 4.2, < 5.3)
+    inherited_resources (1.13.1)
+      actionpack (>= 5.2, < 7.1)
       has_scope (~> 0.6)
-      railties (>= 4.2, < 5.3)
-      responders
+      railties (>= 5.2, < 7.1)
+      responders (>= 2, < 4)
     io-like (0.3.1)
     jmespath (1.6.2)
     jquery-rails (4.6.0)
@@ -297,7 +297,7 @@ GEM
     mime-types (2.99.3)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.5)
     minitest (5.21.2)
     mobility (1.2.9)
       i18n (>= 0.6.10, < 2)
@@ -326,14 +326,14 @@ GEM
     net-ssh (7.2.1)
     netrc (0.11.0)
     nio4r (2.7.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     numerizer (0.1.1)
     oj (3.14.2)
     orm_adapter (0.5.0)
-    paper_trail (10.3.1)
-      activerecord (>= 4.2)
+    paper_trail (13.0.0)
+      activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.24.0)
     parser (3.3.0.5)
@@ -628,10 +628,10 @@ DEPENDENCIES
   factory_bot_rails (= 4.11.1)
   geoip (= 1.3.5)
   gon (~> 6.4)
-  groupdate (= 5.2.4)
+  groupdate (= 6.2.1)
   handlebars-source (= 1.0.12)
   httparty (~> 0.21.0)
-  inherited_resources (= 1.9.0)
+  inherited_resources (= 1.13.1)
   jslint_on_rails (= 1.1.1)
   json_spec (= 1.1.5)
   kaminari (~> 1.2, >= 1.2.2)
@@ -640,9 +640,9 @@ DEPENDENCIES
   mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
-  nokogiri (= 1.12.5)
+  nokogiri (= 1.13.10)
   oj (= 3.14.2)
-  paper_trail (= 10.3.1)
+  paper_trail (= 13.0.0)
   pdfkit (~> 0.8.7.3)
   pg (~> 1.5, >= 1.5.4)
   pg_array_parser (~> 0.0.9)
diff --git a/config/initializers/paper_trail.rb b/config/initializers/paper_trail.rb
index 9cfcb752e..ee89a658f 100644
--- a/config/initializers/paper_trail.rb
+++ b/config/initializers/paper_trail.rb
@@ -1,10 +1,5 @@
 # config/initializers/paper_trail.rb
 
-PaperTrail.config.track_associations = false
-
-# the following line is required for PaperTrail >= 4.0.0 and < 12.0.0 with Rails
-PaperTrail::Rails::Engine.eager_load!
-
 class TaxonConceptVersion < PaperTrail::Version
   # Migrated to Strong Parameters
   # attr_accessible :taxon_concept_id,

From 6ee39ec7df52a3bc155091fb8a5b809d1f9fc1db Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 00:12:23 +0000
Subject: [PATCH 104/241] upgrade factory bot, with
 `FactoryBot.use_parent_strategy = false` to keep the same behaviour.

---
 Gemfile             |  2 +-
 Gemfile.lock        | 12 ++++++------
 spec/spec_helper.rb |  4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4afb5629e..6c62454b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -138,7 +138,7 @@ group :test do
 
   gem 'rails-controller-testing'
   gem "codeclimate-test-reporter", '0.1.1', require: nil # TODO, should be removed
-  gem 'factory_bot_rails', '4.11.1'
+  gem 'factory_bot_rails', '5.2.0'
   gem 'simplecov', '0.22.0', :require => false # TODO: latest
   gem 'coveralls', '0.7.1', :require => false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d7d06fe0..6eb644deb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -217,11 +217,11 @@ GEM
     errbase (0.2.2)
     erubi (1.12.0)
     execjs (2.9.1)
-    factory_bot (4.11.1)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.11.1)
-      factory_bot (~> 4.11.1)
-      railties (>= 3.0.0)
+    factory_bot (5.2.0)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.2.0)
+      factory_bot (~> 5.2.0)
+      railties (>= 4.2.0)
     ffi (1.16.3)
     geocoder (1.8.2)
     geoip (1.3.5)
@@ -625,7 +625,7 @@ DEPENDENCIES
   ember-data-source (= 1.13.0)
   ember-rails (~> 0.21.0)
   ember-source (= 1.8.0)
-  factory_bot_rails (= 4.11.1)
+  factory_bot_rails (= 5.2.0)
   geoip (= 1.3.5)
   gon (~> 6.4)
   groupdate (= 6.2.1)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 07dfbdb75..56a0d9f0f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -55,6 +55,10 @@
   config.include SapiSpec::Helpers
 
   config.before(:all) do
+    # https://github.com/thoughtbot/factory_bot/issues/1255
+    # https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#build-strategies-1
+    FactoryBot.use_parent_strategy = false
+
     DatabaseCleaner.clean_with(:deletion, { :cache_tables => false })
     @user = create(:user)
     RequestStore.store[:track_who_does_it_current_user] = @user

From 91e0b3ea483e879ce5a02d873e1b7a3ecb70bd39 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 14:37:20 +0000
Subject: [PATCH 105/241] Upgrade Ahoy, and update GDPR related config.

---
 Gemfile                     |  2 +-
 Gemfile.lock                |  8 +++-----
 config/initializers/ahoy.rb | 13 +++++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6c62454b8..46c456ef6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem 'inherited_resources', '1.13.1' # Deprecated (https://github.com/activeadmin
 gem 'mobility', '~> 1.2', '>= 1.2.9'
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
 gem 'cancancan', '2.3.0' # TODO, can upgrade to 3.0 after Rails 6
-gem 'ahoy_matey', '3.3.0' # TODO: latest 5.0.2. Can't upgrade to 4.0 until upgrade to Rails 5.2
+gem 'ahoy_matey', '4.2.1' # TODO: latest 5.0.2. Can't upgrade to 5.0 until upgrade to Rails 6
 gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
 
 # TODO: starting from v1.4, it break our test due to redirection changes:
diff --git a/Gemfile.lock b/Gemfile.lock
index 6eb644deb..ab5877e3a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,10 +56,9 @@ GEM
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
-    ahoy_matey (3.3.0)
-      activesupport (>= 5)
+    ahoy_matey (4.2.1)
+      activesupport (>= 5.2)
       device_detector
-      geocoder (>= 1.4.5)
       safely_block (>= 0.2.1)
     airbrussh (1.5.1)
       sshkit (>= 1.6.1, != 1.7.0)
@@ -223,7 +222,6 @@ GEM
       factory_bot (~> 5.2.0)
       railties (>= 4.2.0)
     ffi (1.16.3)
-    geocoder (1.8.2)
     geoip (1.3.5)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -592,7 +590,7 @@ DEPENDENCIES
   actionpack-page_caching (~> 1.2, >= 1.2.4)
   active_model_serializers (= 0.8.4)
   acts-as-taggable-on (= 8.1.0)
-  ahoy_matey (= 3.3.0)
+  ahoy_matey (= 4.2.1)
   annotate (= 2.5.0)
   appsignal (= 1.3.3)
   aws-sdk (~> 2)
diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb
index 168640987..41e76e86d 100644
--- a/config/initializers/ahoy.rb
+++ b/config/initializers/ahoy.rb
@@ -1,11 +1,20 @@
 require 'sapi/geoip'
+
 class Ahoy::Store < Ahoy::DatabaseStore
   UUID_NAMESPACE = UUIDTools::UUID.parse("dcd74c26-8fc9-453a-a9c2-afc445c3258d")
 
+  def authenticate(data)
+    # disables automatic linking of visits and users
+  end
+
   def visit_model
     Ahoy::Visit
   end
 
+  def event_model
+    Ahoy::Event
+  end
+
   def visit
     @visit ||= visit_model.find_by(id: ensure_uuid(ahoy.visit_token)) if ahoy.visit_token
   end
@@ -33,12 +42,16 @@ def ensure_uuid(id)
     UUIDTools::UUID.sha1_create(UUID_NAMESPACE, id).to_s
   end
 end
+
 Ahoy.quiet = false
 Ahoy.api = true
 Ahoy.server_side_visits = :when_needed
 Ahoy.user_agent_parser = :device_detector
 Ahoy.bot_detection_version = 2
 Ahoy.track_bots = Rails.env.test?
+Ahoy.geocode = false # we use our own geocoder (Sapi::GeoIP)
+Ahoy.mask_ips = true
+Ahoy.cookies = false # TODO: when upgrade to Ahoy v5, change value to :none
 
 # https://github.com/ankane/ahoy/tree/v2.2.1#exceptions
 Safely.report_exception_method = ->(e) { Appsignal.add_exception(exception) if defined? Appsignal }

From e84d5e55da6ad434d283b5e5291f60d81ba04e55 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 15:07:52 +0000
Subject: [PATCH 106/241] DEPRECATION WARNING: Dangerous query method (method
 whose arguments are used as raw SQL) called with non-attribute argument(s)

---
 app/controllers/admin/tags_controller.rb           |  2 +-
 .../checklist/pdf/history_annotations_key.rb       |  2 +-
 app/models/checklist/pdf/index_annotations_key.rb  |  4 ++--
 app/models/eu_decision_type.rb                     |  4 ++--
 app/models/trade_restriction.rb                    | 14 ++++++++------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index ab2eb2b47..96e5ed672 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -7,7 +7,7 @@ class Admin::TagsController < Admin::SimpleCrudController
 
   def collection
     @tags ||= end_of_association_chain.page(params[:page]).
-      order('UPPER(name) ASC, model ASC').
+      order(Arel.sql('UPPER(name) ASC'), :model).
       search(params[:query])
   end
 
diff --git a/app/models/checklist/pdf/history_annotations_key.rb b/app/models/checklist/pdf/history_annotations_key.rb
index 3ad05b19a..403117225 100644
--- a/app/models/checklist/pdf/history_annotations_key.rb
+++ b/app/models/checklist/pdf/history_annotations_key.rb
@@ -14,7 +14,7 @@ def hash_annotations_key
     tex = "\\hashAnnotationsHistoryInfo" + "\n\n"
     cops = CitesCop.order('effective_at')
     cops.each do |cop|
-      annotations = cop.hash_annotations.order('SUBSTRING(symbol FROM 2)::INT')
+      annotations = cop.hash_annotations.order(Arel.sql('SUBSTRING(symbol FROM 2)::INT'))
       if annotations.empty?
         tex << "No hash annotations found.\n\n"
       end
diff --git a/app/models/checklist/pdf/index_annotations_key.rb b/app/models/checklist/pdf/index_annotations_key.rb
index db1211f7e..38a27bda3 100644
--- a/app/models/checklist/pdf/index_annotations_key.rb
+++ b/app/models/checklist/pdf/index_annotations_key.rb
@@ -26,7 +26,7 @@ def hash_annotations_key
     tex << "\\section*{\\hashAnnotations}\n"
     tex << "\\hashAnnotationsIndexInfo" + "\n\n"
     cop = CitesCop.find_by_is_current(true)
-    annotations = cop && cop.hash_annotations.order('SUBSTRING(symbol FROM 2)::INT')
+    annotations = cop && cop.hash_annotations.order(Arel.sql('SUBSTRING(symbol FROM 2)::INT'))
     unless annotations && !annotations.empty?
       tex << "No current hash annotations found.\n\n"
       return tex
@@ -53,7 +53,7 @@ def non_hash_annotations
       ).
       where('taxon_concept_id = original_taxon_concept_id').
       where('cites_listing_changes_mview.ann_symbol IS NOT NULL').
-      order("cites_listing_changes_mview.ann_symbol::INT").map do |lc|
+      order(Arel.sql('cites_listing_changes_mview.ann_symbol::INT')).map do |lc|
         {
           :taxon_concept => lc.taxon_concept,
           :symbol => lc.ann_symbol,
diff --git a/app/models/eu_decision_type.rb b/app/models/eu_decision_type.rb
index b0391f24a..1ba1942f6 100644
--- a/app/models/eu_decision_type.rb
+++ b/app/models/eu_decision_type.rb
@@ -18,9 +18,9 @@ class EuDecisionType < ApplicationRecord
     :suspension, :srg_referral
 
   scope :opinions, -> { where('decision_type <> ?', EuDecisionType::SUSPENSION).
-    order('UPPER(name) ASC') }
+    order(Arel.sql('UPPER(name) ASC')) }
   scope :suspensions, -> { where(:decision_type => EuDecisionType::SUSPENSION).
-    order('UPPER(name) ASC') }
+    order(Arel.sql('UPPER(name) ASC')) }
 
   validates :name, presence: true, uniqueness: true
   validates :decision_type, presence: true
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index babe0c3bf..06a4cb3f3 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -114,12 +114,14 @@ def self.export_query(filters)
       filter_geo_entities(filters).
       filter_years(filters).
       filter_taxon_concepts(filters).
-      where(:public_display => true).
-      order('
-        taxon_concepts.name_status ASC,
-        taxon_concepts_mview.taxonomic_position ASC,
-        trade_restrictions.start_date DESC, geo_entities.name_en ASC,
-        trade_restrictions.notes ASC')
+      where(public_display: true).
+      order(
+        'taxon_concepts.name_status': :asc,
+        'taxon_concepts_mview.taxonomic_position': :asc,
+        start_date: :desc,
+        'geo_entities.name_en': :asc,
+        notes: :asc
+      )
   end
 
   # Gets the display text for each CSV_COLUMNS

From 3ca18d55fcd1ba75879cf1b464c1cbd9a1dd05ff Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 15:39:28 +0000
Subject: [PATCH 107/241] fix cache not able to cache ActiveRecordRelation
 https://stackoverflow.com/questions/19288142/cant-dump-anonymous-class-module-error-on-caching-in-rails-3

---
 app/controllers/admin/documents_controller.rb | 5 ++++-
 lib/modules/search_cache.rb                   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/documents_controller.rb b/app/controllers/admin/documents_controller.rb
index 658ce0e4a..7c49a0d4a 100644
--- a/app/controllers/admin/documents_controller.rb
+++ b/app/controllers/admin/documents_controller.rb
@@ -88,7 +88,10 @@ def collection
     # TO DO: figure out if the cascading feature has been completed, and if so move the
     # pagination back into the search class and out of the controllers.
     @documents = Kaminari::PaginatableArray.new(
-      @search.cached_results.limit(@search.per_page).offset(@search.offset).to_a,
+      # @search.cached_results.limit(@search.per_page).offset(@search.offset).to_a,
+      # Leonardo: rollback https://github.com/unepwcmc/SAPI/commit/52f6439bdd05ce8bbf4e5121c2a8af427668b079
+      # cached_results return array, not ActiveRecord Relation, cannot chain to use .limit(), etc.
+      @search.cached_results,
       limit: @search.per_page,
       offset: @search.offset,
       total_count: @search.cached_total_cnt
diff --git a/lib/modules/search_cache.rb b/lib/modules/search_cache.rb
index 0764501d9..6ed015edc 100644
--- a/lib/modules/search_cache.rb
+++ b/lib/modules/search_cache.rb
@@ -12,7 +12,7 @@ module SearchCache
 
   def cached_results
     Rails.cache.fetch(results_cache_key, :expires_in => 24.hours) do
-      results
+      results.to_a
     end
   end
 

From e0432e350d615b0ef0af895f2398287d38d82dd3 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 16:14:49 +0000
Subject: [PATCH 108/241] enable all rails 5.2 default

---
 config/application.rb                               |  5 -----
 config/initializers/0_new_framework_defaults_5_2.rb | 12 ++++++------
 config/initializers/locale.rb                       |  4 ++++
 3 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 config/initializers/locale.rb

diff --git a/config/application.rb b/config/application.rb
index 65c891a7c..db33b9d59 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -34,10 +34,5 @@ class Application < Rails::Application
       :"trade/shipment_observer", :"trade/trade_data_download_observer",
       :change_observer, :document_observer, :nomenclature_change_observer,
       :geo_entity_observer
-
-    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
-
-    config.i18n.available_locales = %i[en es fr]
-    config.i18n.default_locale = :en
   end
 end
diff --git a/config/initializers/0_new_framework_defaults_5_2.rb b/config/initializers/0_new_framework_defaults_5_2.rb
index c383d072b..4c3a4be4c 100644
--- a/config/initializers/0_new_framework_defaults_5_2.rb
+++ b/config/initializers/0_new_framework_defaults_5_2.rb
@@ -8,7 +8,7 @@
 
 # Make Active Record use stable #cache_key alongside new #cache_version method.
 # This is needed for recyclable cache keys.
-# Rails.application.config.active_record.cache_versioning = true
+Rails.application.config.active_record.cache_versioning = true
 
 # Use AES-256-GCM authenticated encryption for encrypted cookies.
 # Also, embed cookie expiry in signed or encrypted cookies for increased security.
@@ -17,22 +17,22 @@
 # It's best enabled when your entire app is migrated and stable on 5.2.
 #
 # Existing cookies will be converted on read then written with the new scheme.
-# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
+Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
 
 # Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
 # instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
-# Rails.application.config.active_support.use_authenticated_message_encryption = true
+Rails.application.config.active_support.use_authenticated_message_encryption = true
 
 # Add default protection from forgery to ActionController::Base instead of in
 # ApplicationController.
-# Rails.application.config.action_controller.default_protect_from_forgery = true
+Rails.application.config.action_controller.default_protect_from_forgery = true
 
 # Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
 # 'f' after migrating old data.
 # Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
 
 # Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
-# Rails.application.config.active_support.use_sha1_digests = true
+Rails.application.config.active_support.use_sha1_digests = true
 
 # Make `form_with` generate id attributes for any generated HTML tags.
-# Rails.application.config.action_view.form_with_generates_ids = true
+Rails.application.config.action_view.form_with_generates_ids = true
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
new file mode 100644
index 000000000..cfce29824
--- /dev/null
+++ b/config/initializers/locale.rb
@@ -0,0 +1,4 @@
+I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
+
+I18n.available_locales = %i[en es fr]
+I18n.default_locale = :en

From 3b0ab0d087887d285f4ce9b62647d4e69b5d4b55 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 16:51:13 +0000
Subject: [PATCH 109/241] Upgrade and reconfig chartkick gem

---
 Gemfile                          | 2 +-
 Gemfile.lock                     | 4 ++--
 app/assets/javascripts/admin.js  | 1 +
 app/views/layouts/admin.html.erb | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 46c456ef6..0c2942512 100644
--- a/Gemfile
+++ b/Gemfile
@@ -173,7 +173,7 @@ gem 'test-unit', '3.1.5' # annoyingly, rails console won't start without it in s
 
 gem 'susy', '~> 2.2', '>= 2.2.14' # TODO: Deprecated. (https://github.com/oddbird/susy#power-tools-for-the-web-deprecated)
 gem 'gon', '~> 6.4'
-gem "chartkick", '2.3.5' # TODO: latest 5.0.5 @ 2023. Should upgrade to v4 once we upgrade to Rails 5.2+ and Ruby 2.6+
+gem "chartkick", '4.2.1' # TODO: latest 5.0.5 @ 2023. Should upgrade to v4 once we upgrade to Rails 6 and Ruby 2.7
 gem 'nested_form', '~> 0.3.2' # TODO: Deprecated. (https://github.com/ryanb/nested_form#unmaintained)
 gem 'bootstrap-sass', '2.3.2.2' # TODO: latest 3.4.1 @ 2019. Can't upgrade unless we sure bootstrap v3 backward compatible with boostrap v2
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ab5877e3a..943c5a727 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,7 @@ GEM
       marcel (~> 1.0.0)
       mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
-    chartkick (2.3.5)
+    chartkick (4.2.1)
     childprocess (4.1.0)
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
@@ -610,7 +610,7 @@ DEPENDENCIES
   capistrano-sidekiq (= 1.0.2)
   capybara (>= 2.15)
   carrierwave (= 2.2.5)
-  chartkick (= 2.3.5)
+  chartkick (= 4.2.1)
   chromedriver-helper
   codeclimate-test-reporter (= 0.1.1)
   coffee-rails (~> 4.2)
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index db8f2da3d..e5cdde110 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -20,4 +20,5 @@
 //= require jquery.chained
 //= require html.sortable
 //= require underscore
+//= require chartkick
 //= require_tree ./admin
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index aed63e7a7..c3ce4f439 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -12,13 +12,13 @@
     <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->
 
+  <% if controller_name == 'api_usage' %>
+    <%= javascript_include_tag "https://www.gstatic.com/charts/loader.js" %>
+  <% end %>
   <%= stylesheet_link_tag    "admin" %>
   <%= javascript_include_tag "admin" %>
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
-  <% if controller_name == 'api_usage' %>
-    <%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %>
-  <% end %>
   <script type="text/javascript">
     window.editorClass = '<%= controller.controller_name %>'
   </script>

From ddb64289f1656effdc547efaff42b9ba763f6acc Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 18:43:08 +0000
Subject: [PATCH 110/241] Use Sidekiq to send Devise's emails

---
 app/models/user.rb    | 4 ++++
 config/application.rb | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index 7516df4f9..dbaf670f1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -120,4 +120,8 @@ def set_default_role
     self.role ||= 'api'
   end
 
+  # https://github.com/heartcombo/devise/tree/v4.4.3#active-job-integration
+  def send_devise_notification(notification, *args)
+    devise_mailer.send(notification, self, *args).deliver_later
+  end
 end
diff --git a/config/application.rb b/config/application.rb
index db33b9d59..1437b1d05 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -34,5 +34,9 @@ class Application < Rails::Application
       :"trade/shipment_observer", :"trade/trade_data_download_observer",
       :change_observer, :document_observer, :nomenclature_change_observer,
       :geo_entity_observer
+
+    # Active Job
+    config.active_job.queue_adapter = :sidekiq
+    config.action_mailer.deliver_later_queue_name = 'default'
   end
 end

From 9f0fdf573d7d21ab1d6ccf960fe50473abcd3ac1 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 18:55:10 +0000
Subject: [PATCH 111/241] Rails 5.2 build-in redis store
 (https://github.com/redis-store/redis-rails/tree/master#a-quick-note-about-rails-52)

---
 Gemfile      |  3 +--
 Gemfile.lock | 19 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0c2942512..12f9a38a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,10 +46,9 @@ gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
 
 # TODO: need Sidekiq 6 and Rails 6, before we can migrate worker to job, due to sidekiq_options (https://github.com/sidekiq/sidekiq/issues/4281)
-gem 'sidekiq', '5.2.10' # TODO, Ruby 2.7 need version 6.0.5 sidekiq
+gem 'sidekiq', '5.2.10' # TODO, when upgrade to Ruby 2.7, need to upgrade Sidekiq to v6.0.5
 gem 'sidekiq-status', '2.1.3' # TODO: upgrade to v3 when Sidekiq upgrade to 6
 gem 'sidekiq-unique-jobs', '7.1.31' # TODO: can upgrade to latest when sidekiq upgrade to 7
-gem 'redis-rails', '5.0.2' # TODO: latest, may remove this Gem when upgrade to Rails 5.2. (https://github.com/redis-store/redis-rails/tree/master#a-quick-note-about-rails-52)
 
 gem 'whenever', '0.11.0', :require => false # TODO: latest version 1.0 @ 2019. Should migrate to sidekiq-cron.
 gem 'httparty', '~> 0.21.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 943c5a727..330f3d210 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -362,8 +362,6 @@ GEM
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rack-session (1.0.2)
-      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (5.2.8.1)
@@ -407,22 +405,6 @@ GEM
     rbnacl-libsodium (1.0.16)
       rbnacl (>= 3.0.1)
     redis (4.5.1)
-    redis-actionpack (5.4.0)
-      actionpack (>= 5, < 8)
-      redis-rack (>= 2.1.0, < 4)
-      redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.3.0)
-      activesupport (>= 3, < 8)
-      redis-store (>= 1.3, < 2)
-    redis-rack (3.0.0)
-      rack-session (>= 0.2.0)
-      redis-store (>= 1.2, < 2)
-    redis-rails (5.0.2)
-      redis-actionpack (>= 5.0, < 6)
-      redis-activesupport (>= 5.0, < 6)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.10.0)
-      redis (>= 4, < 6)
     regexp_parser (2.9.0)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -653,7 +635,6 @@ DEPENDENCIES
   rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)
   rbnacl-libsodium (= 1.0.16)
-  redis-rails (= 5.0.2)
   request_store (~> 1.5, >= 1.5.1)
   responders (~> 2.0)
   rest-client (= 1.8.0)

From c89a3864cecaef350f68cb4ccc6d64d1c8ed5ba4 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 26 Jan 2024 19:14:22 +0000
Subject: [PATCH 112/241] Upgrade Sidekiq to 7, get ready to migrate worker to
 active job

---
 Gemfile      |  4 ++--
 Gemfile.lock | 21 ++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index 12f9a38a3..5e0a7ecb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,8 +46,8 @@ gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
 
 # TODO: need Sidekiq 6 and Rails 6, before we can migrate worker to job, due to sidekiq_options (https://github.com/sidekiq/sidekiq/issues/4281)
-gem 'sidekiq', '5.2.10' # TODO, when upgrade to Ruby 2.7, need to upgrade Sidekiq to v6.0.5
-gem 'sidekiq-status', '2.1.3' # TODO: upgrade to v3 when Sidekiq upgrade to 6
+gem 'sidekiq', '< 7' # TODO, latest is 7
+gem 'sidekiq-status', '~> 3.0', '>= 3.0.3'
 gem 'sidekiq-unique-jobs', '7.1.31' # TODO: can upgrade to latest when sidekiq upgrade to 7
 
 gem 'whenever', '0.11.0', :require => false # TODO: latest version 1.0 @ 2019. Should migrate to sidekiq-cron.
diff --git a/Gemfile.lock b/Gemfile.lock
index 330f3d210..0ab46c308 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -88,7 +88,6 @@ GEM
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
-    base64 (0.2.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.0)
     bindex (0.8.1)
@@ -359,9 +358,6 @@ GEM
     racc (1.7.3)
     rack (2.2.8)
     rack-cors (0.3.0)
-    rack-protection (3.2.0)
-      base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (5.2.8.1)
@@ -404,7 +400,7 @@ GEM
       ffi
     rbnacl-libsodium (1.0.16)
       rbnacl (>= 3.0.1)
-    redis (4.5.1)
+    redis (4.8.1)
     regexp_parser (2.9.0)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -479,14 +475,13 @@ GEM
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
-    sidekiq (5.2.10)
-      connection_pool (~> 2.2, >= 2.2.2)
+    sidekiq (6.5.12)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 4.5, < 4.6.0)
-    sidekiq-status (2.1.3)
+      redis (>= 4.5.0, < 5)
+    sidekiq-status (3.0.3)
       chronic_duration
-      sidekiq (>= 5.0)
+      sidekiq (>= 6.0, < 8)
     sidekiq-unique-jobs (7.1.31)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
@@ -645,8 +640,8 @@ DEPENDENCIES
   rubyzip (~> 2.3, >= 2.3.2)
   sass-rails (~> 5.0)
   selenium-webdriver
-  sidekiq (= 5.2.10)
-  sidekiq-status (= 2.1.3)
+  sidekiq (< 7)
+  sidekiq-status (~> 3.0, >= 3.0.3)
   sidekiq-unique-jobs (= 7.1.31)
   simplecov (= 0.22.0)
   sitemap_generator (~> 6.3)

From 67e2ba99619f111050637dc19e870c3ebf7de4fa Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 29 Jan 2024 08:36:38 +0000
Subject: [PATCH 113/241] https://stackoverflow.com/a/71326657/556780

---
 .../api/trade_downloads_cache_cleanup_controller.rb           | 2 +-
 app/models/change_observer.rb                                 | 4 ++--
 app/models/cites_suspension_observer.rb                       | 2 +-
 app/models/document_search.rb                                 | 2 +-
 app/models/eu_decision_observer.rb                            | 2 +-
 app/models/eu_suspension_regulation_observer.rb               | 4 ++--
 app/models/quota_observer.rb                                  | 2 +-
 app/models/taxon_concept_observer.rb                          | 4 ++--
 app/models/trade/annual_report_upload.rb                      | 2 +-
 app/models/trade/batch_update.rb                              | 2 +-
 app/models/trade/shipment_observer.rb                         | 4 ++--
 app/models/trade/trade_data_download_observer.rb              | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/controllers/api/trade_downloads_cache_cleanup_controller.rb b/app/controllers/api/trade_downloads_cache_cleanup_controller.rb
index 5c3a226ad..12dfa355e 100644
--- a/app/controllers/api/trade_downloads_cache_cleanup_controller.rb
+++ b/app/controllers/api/trade_downloads_cache_cleanup_controller.rb
@@ -4,7 +4,7 @@ class Api::TradeDownloadsCacheCleanupController < ApplicationController
   def index
     message = ''
     begin
-      DownloadsCacheCleanupWorker.perform_async(:shipments)
+      DownloadsCacheCleanupWorker.perform_async('shipments')
     rescue
       message = 'Something went wrong'
     end
diff --git a/app/models/change_observer.rb b/app/models/change_observer.rb
index 5ed249762..63adb43fb 100644
--- a/app/models/change_observer.rb
+++ b/app/models/change_observer.rb
@@ -66,7 +66,7 @@ def before_destroy(model)
 
   def clear_cache(model)
     return unless model.respond_to?(:taxon_concept)
-    DownloadsCacheCleanupWorker.perform_async(model.class.to_s.tableize.to_sym)
+    DownloadsCacheCleanupWorker.perform_async(model.class.to_s.tableize)
   end
 
   def clear_show_tc_serializer_cache
@@ -85,6 +85,6 @@ def bump_dependents_timestamp(taxon_concept, updated_by_id)
       dependents_updated_at: Time.now,
       dependents_updated_by_id: updated_by_id
     )
-    DownloadsCacheCleanupWorker.perform_async(:taxon_concepts)
+    DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
   end
 end
diff --git a/app/models/cites_suspension_observer.rb b/app/models/cites_suspension_observer.rb
index 7cf68d41d..d03815dd9 100644
--- a/app/models/cites_suspension_observer.rb
+++ b/app/models/cites_suspension_observer.rb
@@ -1,7 +1,7 @@
 class CitesSuspensionObserver < TradeRestrictionObserver
 
   def after_destroy(cites_suspension)
-    DownloadsCacheCleanupWorker.perform_async(:cites_suspensions)
+    DownloadsCacheCleanupWorker.perform_async('cites_suspensions')
   end
 
 end
diff --git a/app/models/document_search.rb b/app/models/document_search.rb
index 3c3a08e16..383419242 100644
--- a/app/models/document_search.rb
+++ b/app/models/document_search.rb
@@ -252,7 +252,7 @@ def self.refresh_citations_and_documents
 
   def self.clear_cache
     RefreshDocumentsWorker.perform_async
-    DownloadsCacheCleanupWorker.perform_async(:documents)
+    DownloadsCacheCleanupWorker.perform_async('documents')
   end
 
 end
diff --git a/app/models/eu_decision_observer.rb b/app/models/eu_decision_observer.rb
index d06114982..66c08187c 100644
--- a/app/models/eu_decision_observer.rb
+++ b/app/models/eu_decision_observer.rb
@@ -1,7 +1,7 @@
 class EuDecisionObserver < ActiveRecord::Observer
 
   def after_destroy(eu_decision)
-    DownloadsCacheCleanupWorker.perform_async(:eu_decisions)
+    DownloadsCacheCleanupWorker.perform_async('eu_decisions')
   end
 
 end
diff --git a/app/models/eu_suspension_regulation_observer.rb b/app/models/eu_suspension_regulation_observer.rb
index 68eecab2b..4f45aa1ef 100644
--- a/app/models/eu_suspension_regulation_observer.rb
+++ b/app/models/eu_suspension_regulation_observer.rb
@@ -6,12 +6,12 @@ def after_create(eu_suspension_regulation)
         eu_suspension_regulation.eu_suspensions_event_id,
         eu_suspension_regulation.id
       )
-      DownloadsCacheCleanupWorker.perform_async(:eu_decisions)
+      DownloadsCacheCleanupWorker.perform_async('eu_decisions')
     end
   end
 
   def after_update(eu_suspension_regulation)
     eu_suspension_regulation.touch_suspensions_and_taxa
-    DownloadsCacheCleanupWorker.perform_async(:eu_decisions)
+    DownloadsCacheCleanupWorker.perform_async('eu_decisions')
   end
 end
diff --git a/app/models/quota_observer.rb b/app/models/quota_observer.rb
index 8ff5efbed..00110632f 100644
--- a/app/models/quota_observer.rb
+++ b/app/models/quota_observer.rb
@@ -1,7 +1,7 @@
 class QuotaObserver < TradeRestrictionObserver
 
   def after_destroy(quota)
-    DownloadsCacheCleanupWorker.perform_async(:quotas)
+    DownloadsCacheCleanupWorker.perform_async('quotas')
   end
 
 end
diff --git a/app/models/taxon_concept_observer.rb b/app/models/taxon_concept_observer.rb
index 6dfbcf2f2..1f0e8e5b3 100644
--- a/app/models/taxon_concept_observer.rb
+++ b/app/models/taxon_concept_observer.rb
@@ -40,7 +40,7 @@ def after_destroy(taxon_concept)
     Species::Search.increment_cache_iterator
     Species::TaxonConceptPrefixMatcher.increment_cache_iterator
     Checklist::Checklist.increment_cache_iterator
-    DownloadsCacheCleanupWorker.perform_async(:taxon_concepts)
+    DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
   end
 
   def after_update(taxon_concept)
@@ -103,7 +103,7 @@ def after_save(taxon_concept)
     if taxon_concept.name_status == 'H'
       taxon_concept.rebuild_relationships(taxon_concept.hybrid_parents_ids)
     end
-    DownloadsCacheCleanupWorker.perform_async(:taxon_concepts)
+    DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
   end
 
 end
diff --git a/app/models/trade/annual_report_upload.rb b/app/models/trade/annual_report_upload.rb
index 20ab731d7..77b3d442d 100644
--- a/app/models/trade/annual_report_upload.rb
+++ b/app/models/trade/annual_report_upload.rb
@@ -94,7 +94,7 @@ def submit(submitter)
     FileUtils.remove_dir(Rails.root.join('public', store_dir), :force => true)
 
     # clear downloads cache
-    DownloadsCacheCleanupWorker.perform_async(:shipments)
+    DownloadsCacheCleanupWorker.perform_async('shipments')
 
     # flag as submitted
     update_attributes({ # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
diff --git a/app/models/trade/batch_update.rb b/app/models/trade/batch_update.rb
index 81b7b2592..39ce3e216 100644
--- a/app/models/trade/batch_update.rb
+++ b/app/models/trade/batch_update.rb
@@ -21,7 +21,7 @@ def execute(update_params)
     Trade::Shipment.transaction do
       affected_shipments = @shipments.count
       @shipments.update_all(update_params.to_h)
-      DownloadsCacheCleanupWorker.perform_async(:shipments)
+      DownloadsCacheCleanupWorker.perform_async('shipments')
     end
     PermitCleanupWorker.perform_async(disconnected_permits_ids)
     affected_shipments
diff --git a/app/models/trade/shipment_observer.rb b/app/models/trade/shipment_observer.rb
index 3e0c300af..546d92f25 100644
--- a/app/models/trade/shipment_observer.rb
+++ b/app/models/trade/shipment_observer.rb
@@ -19,13 +19,13 @@ def before_destroy(shipment)
   end
 
   def after_save(shipment)
-    DownloadsCacheCleanupWorker.perform_async(:shipments)
+    DownloadsCacheCleanupWorker.perform_async('shipments')
     disconnected_permits_ids = @old_permits_ids - shipment.permits_ids
     PermitCleanupWorker.perform_async(disconnected_permits_ids)
   end
 
   def after_destroy(shipment)
-    DownloadsCacheCleanupWorker.perform_async(:shipments)
+    DownloadsCacheCleanupWorker.perform_async('shipments')
     disconnected_permits_ids = @old_permits_ids
     PermitCleanupWorker.perform_async(disconnected_permits_ids)
   end
diff --git a/app/models/trade/trade_data_download_observer.rb b/app/models/trade/trade_data_download_observer.rb
index 1abdab0a0..7b309bb67 100644
--- a/app/models/trade/trade_data_download_observer.rb
+++ b/app/models/trade/trade_data_download_observer.rb
@@ -1,7 +1,7 @@
 class Trade::TradeDataDownloadObserver < ActiveRecord::Observer
 
   def after_save(download_log)
-    DownloadsCacheCleanupWorker.perform_async(:trade_download_stats)
+    DownloadsCacheCleanupWorker.perform_async('trade_download_stats')
   end
 
 end

From ad94baa190b1e6493bcbb37240aac0afdfbd12d1 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 29 Jan 2024 13:07:27 +0000
Subject: [PATCH 114/241] DEPRECATION WARNING: Dangerous query method (method
 whose arguments are used as raw SQL) called with non-attribute argument(s)

---
 Capfile.old                                   | 30 -------------------
 .../admin/eu_decision_types_controller.rb     |  2 +-
 .../admin/srg_histories_controller.rb         |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 Capfile.old

diff --git a/Capfile.old b/Capfile.old
deleted file mode 100644
index 5dd20ef0d..000000000
--- a/Capfile.old
+++ /dev/null
@@ -1,30 +0,0 @@
-# Load DSL and set up stages
-require 'capistrano/setup'
-
-# Include default deployment tasks
-require 'capistrano/deploy'
-
-# Include tasks from other gems included in your Gemfile
-#
-# For documentation on these, see for example:
-#
-#   https://github.com/capistrano/rvm
-#   https://github.com/capistrano/rbenv
-#   https://github.com/capistrano/chruby
-#   https://github.com/capistrano/bundler
-#   https://github.com/capistrano/rails
-#   https://github.com/capistrano/passenger
-#
-require 'capistrano/rvm'
-# require 'capistrano/rbenv'
-# require 'capistrano/chruby'
-require 'capistrano/bundler'
-require 'capistrano/rails/assets'
-require 'capistrano/rails/migrations'
-#require 'capistrano/slack
-require 'capistrano/sidekiq'
-# require 'capistrano/passenger'
-require 'whenever/capistrano'
-# Load custom tasks from `lib/capistrano/tasks` if you have any defined
-Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
-
diff --git a/app/controllers/admin/eu_decision_types_controller.rb b/app/controllers/admin/eu_decision_types_controller.rb
index 49bd5574a..d0459697d 100644
--- a/app/controllers/admin/eu_decision_types_controller.rb
+++ b/app/controllers/admin/eu_decision_types_controller.rb
@@ -12,7 +12,7 @@ def index
 
   def collection
     @eu_decision_types ||= end_of_association_chain.page(params[:page]).
-      order('UPPER(name) ASC')
+      order(Arel.sql('UPPER(name) ASC'))
   end
 
   private
diff --git a/app/controllers/admin/srg_histories_controller.rb b/app/controllers/admin/srg_histories_controller.rb
index 7298860a6..745f9e153 100644
--- a/app/controllers/admin/srg_histories_controller.rb
+++ b/app/controllers/admin/srg_histories_controller.rb
@@ -3,7 +3,7 @@ class Admin::SrgHistoriesController < Admin::StandardAuthorizationController
 
   def collection
     @srg_histories ||= end_of_association_chain.page(params[:page]).
-      order('UPPER(name) ASC')
+      order(Arel.sql('UPPER(name) ASC'))
   end
 
   private

From 1498fab679b6e2b9b05b0fc458b6101468a38375 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 29 Jan 2024 15:39:14 +0000
Subject: [PATCH 115/241] No ES6 for assets precompile

---
 app/assets/javascripts/cites_trade/application.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/cites_trade/application.js b/app/assets/javascripts/cites_trade/application.js
index a727fe0e2..3a5365069 100644
--- a/app/assets/javascripts/cites_trade/application.js
+++ b/app/assets/javascripts/cites_trade/application.js
@@ -484,7 +484,7 @@ $(document).ready(function(){
 
   function setEuDisclaimerVisibility () {
     ['imp', 'exp'].forEach(function (type) {
-      const disclaimerEl = $('#eu_disclaimer_' + type)
+      var disclaimerEl = $('#eu_disclaimer_' + type)
 
       if (disclaimerEl.length) {
         hasEuDisclaimer(type) ? disclaimerEl.show() : disclaimerEl.hide()
@@ -493,7 +493,7 @@ $(document).ready(function(){
   }
 
   function hasEuDisclaimer (type) {
-    const selections = $('#'+ type + 'cty').val()
+    var selections = $('#'+ type + 'cty').val()
 
     if (!selections) {
       return false

From 7e25647d29b033e342a10d6104ff23680f126385 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 29 Jan 2024 21:16:27 +0000
Subject: [PATCH 116/241] New docker container for cap deploy

---
 Capfile                  |  4 ++--
 Dockerfile               |  8 ++++----
 Dockerfile.cap-deploy    | 40 ++++++++++++++++++++++++++++++++++++++++
 Gemfile                  |  2 +-
 Gemfile.lock             |  7 ++++---
 config/deploy.rb         |  4 ++++
 config/deploy/staging.rb |  3 ---
 config/schedule.rb       |  2 +-
 docker-compose.yml       | 21 +++++++++++++++++++++
 9 files changed, 77 insertions(+), 14 deletions(-)
 create mode 100644 Dockerfile.cap-deploy

diff --git a/Capfile b/Capfile
index fcc99a2ce..fea6d1f88 100644
--- a/Capfile
+++ b/Capfile
@@ -37,7 +37,7 @@ require 'capistrano/maintenance'
 require 'whenever/capistrano'
 require 'capistrano/local_precompile'
 require 'capistrano/sidekiq'
-
-
+install_plugin Capistrano::Sidekiq
+install_plugin Capistrano::Sidekiq::Systemd
 
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/Dockerfile b/Dockerfile
index 00fe5b167..c0bfd94ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,12 +14,12 @@ RUN apt-get update && apt-get install -y --force-yes \
 RUN mkdir /SAPI
 WORKDIR /SAPI
 
-COPY Gemfile /SAPI/Gemfile
-COPY Gemfile.lock /SAPI/Gemfile.lock
+# COPY Gemfile /SAPI/Gemfile
+# COPY Gemfile.lock /SAPI/Gemfile.lock
 RUN gem install bundler -v 1.17.3
-RUN bundle install
+# RUN bundle install
 
-COPY . /SAPI
+# COPY . /SAPI
 
 EXPOSE 3000
 CMD ["rails", "server", "-b", "0.0.0.0"]
diff --git a/Dockerfile.cap-deploy b/Dockerfile.cap-deploy
new file mode 100644
index 000000000..7e5125693
--- /dev/null
+++ b/Dockerfile.cap-deploy
@@ -0,0 +1,40 @@
+# Dockerfile
+# FROM --platform=linux/amd64 debian
+FROM ruby:2.6.10
+
+ENV DEBIAN_FRONTEND=noninteractive
+# Rails and SAPI has some additional dependencies, e.g. rake requires a JS
+# runtime, so attempt to get these from apt, where possible
+RUN apt-get update && apt-get install -y --force-yes \
+  # For RVM
+  gnupg procps curl libssl-dev \
+  # For assets local_precompile (cap deploy)
+  rsync nodejs \
+  # gems
+  libpq-dev postgresql-client
+
+RUN mkdir /SAPI
+WORKDIR /SAPI
+
+# https://stackoverflow.com/questions/43612927/how-to-correctly-install-rvm-in-docker
+RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN curl -sSL https://get.rvm.io | bash -s
+RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 2.6.10"
+# RVM installed in multi-user mode. However cap assume rvm is installed in single user mode.
+# Create a soft link to fake it.
+RUN mkdir -p ~/.rvm/bin && ln -s /usr/local/rvm/bin/rvm ~/.rvm/bin/rvm
+
+# Host SSH key/config
+RUN mkdir -p ~/.ssh && ln -s /run/secrets/host_ssh_key ~/.ssh/id_ed25519 && ln -s /run/secrets/host_ssh_config ~/.ssh/config
+
+ENTRYPOINT ["/bin/bash", "-l"]
+
+##########################################
+## Run the following in container
+##########################################
+# /bin/bash
+# source /etc/profile.d/rvm.sh
+# bundle
+# eval "$(ssh-agent -s)"
+# ssh-add
+# cap staging deploy
diff --git a/Gemfile b/Gemfile
index 5e0a7ecb5..77fa9d791 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,7 @@ group :development do
   gem 'capistrano-maintenance', '1.0.0', require: false
   gem 'capistrano-passenger', '0.2.0', require: false
   gem 'capistrano-local-precompile', '1.2.0', require: false
-  gem 'capistrano-sidekiq', '1.0.2'
+  gem 'capistrano-sidekiq', '~> 2.3', '>= 2.3.1'
   gem 'slackistrano', '0.1.9', require: false
   gem 'brightbox', '2.3.9'
   gem 'rack-cors', '0.3.0' ,:require => 'rack/cors' # TODO: remove when upgrade Rails.
diff --git a/Gemfile.lock b/Gemfile.lock
index 0ab46c308..4a91b1647 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -122,9 +122,10 @@ GEM
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capistrano-sidekiq (1.0.2)
+    capistrano-sidekiq (2.3.1)
       capistrano (>= 3.9.0)
-      sidekiq (>= 3.4)
+      capistrano-bundler
+      sidekiq (>= 6.0)
     capybara (3.36.0)
       addressable
       matrix
@@ -584,7 +585,7 @@ DEPENDENCIES
   capistrano-passenger (= 0.2.0)
   capistrano-rails (= 1.4.0)
   capistrano-rvm (= 0.1.2)
-  capistrano-sidekiq (= 1.0.2)
+  capistrano-sidekiq (~> 2.3, >= 2.3.1)
   capybara (>= 2.15)
   carrierwave (= 2.2.5)
   chartkick (= 4.2.1)
diff --git a/config/deploy.rb b/config/deploy.rb
index 46fd4af41..f80533a34 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -22,6 +22,10 @@
 set :rvm_type, :user
 set :rvm_ruby_version, '2.6.10'
 
+# Sidekiq config
+set :sidekiq_service_unit_user, :system
+set :sidekiq_service_unit_name, 'sidekiq_sapi'
+
 # Default value for :log_level is :debug
 # set :log_level, :debug
 
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
index e8d88fef6..2039a027a 100644
--- a/config/deploy/staging.rb
+++ b/config/deploy/staging.rb
@@ -13,9 +13,6 @@
 
 set :app_port, "80"
 
-set :whenever_environment, proc { fetch :stage }
-require 'whenever/capistrano'
-
 # server-based syntax
 # ======================
 # Defines a single server with a list of roles and multiple properties.
diff --git a/config/schedule.rb b/config/schedule.rb
index fcb94158d..87d1421a4 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -1,6 +1,6 @@
 set :output, 'log/cron.log'
 
-db_migrate_rebuild_period = @environment == 'production' ? :saturday : :day
+db_migrate_rebuild_period = Rails.env.production? ? :saturday : :day
 
 every db_migrate_rebuild_period, :at => '1:42am' do
   rake "db:migrate:rebuild"
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e8279009..b32d9a311 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,21 @@ services:
       POSTGRES_HOST_AUTH_METHOD: "trust"
       POSTGRES_DB: "sapi_development"
 
+  deploy:
+    container_name: sapi-cap-deploy
+    build:
+      context: ./
+      dockerfile: Dockerfile.cap-deploy
+    volumes:
+      - '.:/SAPI'
+    networks:
+      - sapi
+    stdin_open: true
+    tty: true
+    secrets:
+      - host_ssh_key
+      - host_ssh_config
+
   rails:
     container_name: sapi-rails
     build:
@@ -91,3 +106,9 @@ volumes:
   pgdata:
   bundler_gems:
   redis_data:
+
+secrets:
+  host_ssh_key:
+    file: ~/.ssh/id_ed25519
+  host_ssh_config:
+    file: ~/.ssh/config

From 9e88e34a101623fc563d32e4743fc96d58c16fee Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 30 Jan 2024 09:14:25 +0000
Subject: [PATCH 117/241] Ruby 2.7

---
 .ruby-version            | 2 +-
 .travis.yml              | 2 +-
 Dockerfile               | 2 +-
 Dockerfile.cap-deploy    | 4 ++--
 Gemfile                  | 2 +-
 Gemfile.lock             | 2 +-
 config/deploy.rb         | 2 +-
 config/deploy/staging.rb | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index a04abec91..6a81b4c83 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.10
+2.7.8
diff --git a/.travis.yml b/.travis.yml
index eef2cd5f1..6ef32e0d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ cache: bundler
 bundler_args: --without development production staging
 sudo: false
 rvm:
-  - 2.6.10
+  - 2.7.8
 addons:
   postgresql: 9.4
   code_climate:
diff --git a/Dockerfile b/Dockerfile
index c0bfd94ce..633fa1e8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile
-FROM ruby:2.6.10
+FROM ruby:2.7.8
 
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
 # runtime, so attempt to get these from apt, where possible
diff --git a/Dockerfile.cap-deploy b/Dockerfile.cap-deploy
index 7e5125693..c1559879d 100644
--- a/Dockerfile.cap-deploy
+++ b/Dockerfile.cap-deploy
@@ -1,6 +1,6 @@
 # Dockerfile
 # FROM --platform=linux/amd64 debian
-FROM ruby:2.6.10
+FROM ruby:2.7.8
 
 ENV DEBIAN_FRONTEND=noninteractive
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
@@ -19,7 +19,7 @@ WORKDIR /SAPI
 # https://stackoverflow.com/questions/43612927/how-to-correctly-install-rvm-in-docker
 RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN curl -sSL https://get.rvm.io | bash -s
-RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 2.6.10"
+RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 2.7.8"
 # RVM installed in multi-user mode. However cap assume rvm is installed in single user mode.
 # Create a soft link to fake it.
 RUN mkdir -p ~/.rvm/bin && ln -s /usr/local/rvm/bin/rvm ~/.rvm/bin/rvm
diff --git a/Gemfile b/Gemfile
index 77fa9d791..80f45c507 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.10'
+ruby '2.7.8'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '5.2.8.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a91b1647..12f9bfe12 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -660,7 +660,7 @@ DEPENDENCIES
   wkhtmltopdf-binary (~> 0.12.6.6)
 
 RUBY VERSION
-   ruby 2.6.10p229
+   ruby 2.7.8p225
 
 BUNDLED WITH
    1.17.3
diff --git a/config/deploy.rb b/config/deploy.rb
index f80533a34..fd9e5ebaf 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -20,7 +20,7 @@
 # set :format, :pretty
 
 set :rvm_type, :user
-set :rvm_ruby_version, '2.6.10'
+set :rvm_ruby_version, '2.7.8'
 
 # Sidekiq config
 set :sidekiq_service_unit_user, :system
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
index 2039a027a..3578ae487 100644
--- a/config/deploy/staging.rb
+++ b/config/deploy/staging.rb
@@ -1,5 +1,5 @@
 set :stage, :staging
-set :branch, :develop
+set :branch, ENV['CAP_BRANCH'] || 'develop'
 
 server "sapi-staging.linode.unep-wcmc.org", user: "wcmc", roles: %w{app web db}
 

From 2c302c61088755023d36ff0f226295a9b7b2dc33 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 30 Jan 2024 09:28:05 +0000
Subject: [PATCH 118/241] upgrade gems after ruby 2.7

---
 Gemfile      |  4 ++--
 Gemfile.lock | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 80f45c507..42a06a62b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,8 +26,8 @@ gem 'pg', '~> 1.5', '>= 1.5.4'
 gem 'pg_array_parser', '~> 0.0.9'
 gem 'nested-hstore', '~> 0.1.2'
 gem 'pg_search', '~> 2.3', '>= 2.3.6'
-gem 'oj', '3.14.2' # optimised JSON (picked by multi_json) # TODO: to upgrade to newer version, need >=Ruby 2.7
-gem 'nokogiri', '1.13.10' # TODO: 1.13.10 is the last version support 2.6. New version need Ruby 2.7+
+gem 'oj', '~> 3.16', '>= 3.16.3' # optimised JSON (picked by multi_json)
+gem 'nokogiri', '~> 1.15', '>= 1.15.5' # TODO: New version need Ruby 3
 gem 'inherited_resources', '1.13.1' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
 gem 'mobility', '~> 1.2', '>= 1.2.9'
 gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
diff --git a/Gemfile.lock b/Gemfile.lock
index 12f9bfe12..5281d092c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,6 +90,7 @@ GEM
       execjs (>= 1.2, < 3)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.0)
+    bigdecimal (3.1.6)
     bindex (0.8.1)
     bootsnap (1.17.1)
       msgpack (~> 1.2)
@@ -324,11 +325,12 @@ GEM
     net-ssh (7.2.1)
     netrc (0.11.0)
     nio4r (2.7.0)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     numerizer (0.1.1)
-    oj (3.14.2)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
     orm_adapter (0.5.0)
     paper_trail (13.0.0)
       activerecord (>= 5.2)
@@ -616,8 +618,8 @@ DEPENDENCIES
   mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
-  nokogiri (= 1.13.10)
-  oj (= 3.14.2)
+  nokogiri (~> 1.15, >= 1.15.5)
+  oj (~> 3.16, >= 3.16.3)
   paper_trail (= 13.0.0)
   pdfkit (~> 0.8.7.3)
   pg (~> 1.5, >= 1.5.4)

From a4cb0dc483badf16f74e5fbd23560ba6b8ce3698 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 30 Jan 2024 10:59:33 +0000
Subject: [PATCH 119/241] goodbye whenever, welcome sidekiq-cron

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 15 +++++--
 app/jobs/downloads_cache_update_job.rb        |  7 ++++
 .../elibrary_refresh_document_search_job.rb   | 17 ++++++++
 app/jobs/rebuild_job.rb                       | 12 ++++++
 app/jobs/refresh_sitemap_job.rb               |  8 ++++
 app/jobs/rst_processes_import_job.rb          |  7 ++++
 app/jobs/sunday_cleanup_job.rb                | 40 +++++++++++++++++++
 config/routes.rb                              |  4 +-
 config/schedule.rb                            | 29 --------------
 config/schedule.yml                           | 24 +++++++++++
 spec/jobs/downloads_cache_update_job_spec.rb  |  5 +++
 ...ibrary_refresh_document_search_job_spec.rb |  5 +++
 spec/jobs/rebuild_job_spec.rb                 |  5 +++
 spec/jobs/refresh_sitemap_job_spec.rb         |  5 +++
 spec/jobs/rst_processes_import_job_spec.rb    |  5 +++
 spec/jobs/sunday_cleanup_job_spec.rb          |  5 +++
 17 files changed, 160 insertions(+), 35 deletions(-)
 create mode 100644 app/jobs/downloads_cache_update_job.rb
 create mode 100644 app/jobs/elibrary_refresh_document_search_job.rb
 create mode 100644 app/jobs/rebuild_job.rb
 create mode 100644 app/jobs/refresh_sitemap_job.rb
 create mode 100644 app/jobs/rst_processes_import_job.rb
 create mode 100644 app/jobs/sunday_cleanup_job.rb
 delete mode 100644 config/schedule.rb
 create mode 100644 config/schedule.yml
 create mode 100644 spec/jobs/downloads_cache_update_job_spec.rb
 create mode 100644 spec/jobs/elibrary_refresh_document_search_job_spec.rb
 create mode 100644 spec/jobs/rebuild_job_spec.rb
 create mode 100644 spec/jobs/refresh_sitemap_job_spec.rb
 create mode 100644 spec/jobs/rst_processes_import_job_spec.rb
 create mode 100644 spec/jobs/sunday_cleanup_job_spec.rb

diff --git a/Gemfile b/Gemfile
index 42a06a62b..275bca69f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,8 +49,8 @@ gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_
 gem 'sidekiq', '< 7' # TODO, latest is 7
 gem 'sidekiq-status', '~> 3.0', '>= 3.0.3'
 gem 'sidekiq-unique-jobs', '7.1.31' # TODO: can upgrade to latest when sidekiq upgrade to 7
+gem 'sidekiq-cron', '~> 1.12'
 
-gem 'whenever', '0.11.0', :require => false # TODO: latest version 1.0 @ 2019. Should migrate to sidekiq-cron.
 gem 'httparty', '~> 0.21.0'
 
 gem 'kaminari', '~> 1.2', '>= 1.2.2' # TODO: Suggest migrate to pagy gem.
diff --git a/Gemfile.lock b/Gemfile.lock
index 5281d092c..4cbef0df9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -149,7 +149,6 @@ GEM
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
-    chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
     codeclimate-test-reporter (0.1.1)
@@ -216,6 +215,8 @@ GEM
       handlebars-source (~> 1.0)
     errbase (0.2.2)
     erubi (1.12.0)
+    et-orbi (1.2.7)
+      tzinfo
     execjs (2.9.1)
     factory_bot (5.2.0)
       activesupport (>= 4.2.0)
@@ -223,6 +224,9 @@ GEM
       factory_bot (~> 5.2.0)
       railties (>= 4.2.0)
     ffi (1.16.3)
+    fugit (1.9.0)
+      et-orbi (~> 1, >= 1.2.7)
+      raabro (~> 1.4)
     geoip (1.3.5)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -358,6 +362,7 @@ GEM
       ttfunk (~> 1.0.3)
     public_suffix (5.0.4)
     puma (3.12.6)
+    raabro (1.4.0)
     racc (1.7.3)
     rack (2.2.8)
     rack-cors (0.3.0)
@@ -482,6 +487,10 @@ GEM
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
+    sidekiq-cron (1.12.0)
+      fugit (~> 1.8)
+      globalid (>= 1.0.1)
+      sidekiq (>= 6)
     sidekiq-status (3.0.3)
       chronic_duration
       sidekiq (>= 6.0, < 8)
@@ -554,8 +563,6 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    whenever (0.11.0)
-      chronic (>= 0.6.3)
     wicked (1.3.4)
       railties (>= 3.0.7)
     wkhtmltopdf-binary (0.12.6.6)
@@ -644,6 +651,7 @@ DEPENDENCIES
   sass-rails (~> 5.0)
   selenium-webdriver
   sidekiq (< 7)
+  sidekiq-cron (~> 1.12)
   sidekiq-status (~> 3.0, >= 3.0.3)
   sidekiq-unique-jobs (= 7.1.31)
   simplecov (= 0.22.0)
@@ -657,7 +665,6 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   uuidtools (~> 2.2)
   web-console (>= 3.3.0)
-  whenever (= 0.11.0)
   wicked (= 1.3.4)
   wkhtmltopdf-binary (~> 0.12.6.6)
 
diff --git a/app/jobs/downloads_cache_update_job.rb b/app/jobs/downloads_cache_update_job.rb
new file mode 100644
index 000000000..868530add
--- /dev/null
+++ b/app/jobs/downloads_cache_update_job.rb
@@ -0,0 +1,7 @@
+class DownloadsCacheUpdateJob < ApplicationJob
+  queue_as :admin
+
+  def perform(*args)
+    DownloadsCache.update
+  end
+end
diff --git a/app/jobs/elibrary_refresh_document_search_job.rb b/app/jobs/elibrary_refresh_document_search_job.rb
new file mode 100644
index 000000000..4c446a512
--- /dev/null
+++ b/app/jobs/elibrary_refresh_document_search_job.rb
@@ -0,0 +1,17 @@
+class ElibraryRefreshDocumentSearchJob < ApplicationJob
+  queue_as :admin
+
+  def perform(*args)
+    if DocumentSearch.citations_need_refreshing?
+      elapsed_time = Benchmark.realtime do
+        DocumentSearch.refresh_citations_and_documents
+      end
+      puts "#{Time.now} Citations & documents refreshed in #{elapsed_time}s"
+    elsif DocumentSearch.documents_need_refreshing?
+      elapsed_time = Benchmark.realtime do
+        DocumentSearch.refresh_documents
+      end
+      puts "#{Time.now} Documents refreshed in #{elapsed_time}s"
+    end
+  end
+end
diff --git a/app/jobs/rebuild_job.rb b/app/jobs/rebuild_job.rb
new file mode 100644
index 000000000..5717de030
--- /dev/null
+++ b/app/jobs/rebuild_job.rb
@@ -0,0 +1,12 @@
+class RebuildJob < ApplicationJob
+  queue_as :admin
+
+  def perform(*args)
+    if Rails.env.production?
+      # Only run on Saturday in production
+      Sapi.rebuild if Date.today.saturday?
+    else
+      Sapi.rebuild
+    end
+  end
+end
diff --git a/app/jobs/refresh_sitemap_job.rb b/app/jobs/refresh_sitemap_job.rb
new file mode 100644
index 000000000..a44f1d0f8
--- /dev/null
+++ b/app/jobs/refresh_sitemap_job.rb
@@ -0,0 +1,8 @@
+class RefreshSitemapJob < ApplicationJob
+  queue_as :admin
+
+  def perform(*args)
+    # https://github.com/kjvarga/sitemap_generator/issues/231
+    SitemapGenerator::Interpreter.run
+  end
+end
diff --git a/app/jobs/rst_processes_import_job.rb b/app/jobs/rst_processes_import_job.rb
new file mode 100644
index 000000000..e5e6686ff
--- /dev/null
+++ b/app/jobs/rst_processes_import_job.rb
@@ -0,0 +1,7 @@
+class RstProcessesImportJob < ApplicationJob
+  queue_as :admin
+
+  def perform(*args)
+    Import::Rst::RstCases.import_all
+  end
+end
diff --git a/app/jobs/sunday_cleanup_job.rb b/app/jobs/sunday_cleanup_job.rb
new file mode 100644
index 000000000..d05b8e1c0
--- /dev/null
+++ b/app/jobs/sunday_cleanup_job.rb
@@ -0,0 +1,40 @@
+class SundayCleanupJob < ApplicationJob
+  queue_as :admin
+
+  def perform(*args)
+    # rake "dashboard_stats:cache:update"
+    DashboardStatsCache.update_dashboard_stats
+
+    # rake "db:common_names:cleanup"
+    Rails.logger.warn "### rake db:common_names:cleanup"
+    objects_to_delete = CommonName.
+      joins('LEFT JOIN taxon_commons tc ON tc.common_name_id = common_names.id').
+      where('tc.id IS NULL')
+    Rails.logger.warn "Going to delete #{objects_to_delete.count} common names"
+    sql = <<-SQL
+      WITH objects_to_delete AS (
+        #{objects_to_delete.to_sql}
+      )
+      DELETE FROM common_names
+      USING objects_to_delete
+      WHERE common_names.id = objects_to_delete.id
+    SQL
+    ApplicationRecord.connection.execute sql
+
+    # rake "db:taxon_names:cleanup"
+    Rails.logger.warn "### rake db:taxon_names:cleanup"
+    objects_to_delete = TaxonName.
+      joins('LEFT JOIN taxon_concepts tc ON tc.taxon_name_id = taxon_names.id').
+      where('tc.id IS NULL')
+    Rails.logger.warn "Going to delete #{objects_to_delete.count} taxon names"
+    sql = <<-SQL
+      WITH objects_to_delete AS (
+        #{objects_to_delete.to_sql}
+      )
+      DELETE FROM taxon_names
+      USING objects_to_delete
+      WHERE taxon_names.id = objects_to_delete.id
+    SQL
+    ApplicationRecord.connection.execute sql
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 9d7e27379..210228f3e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,6 @@
+require 'sidekiq/web'
+require 'sidekiq/cron/web'
+
 Rails.application.routes.draw do
   devise_for :users, :controllers => { :passwords => "passwords", :registrations => "registrations", :sessions => "sessions" }
   as :user do
@@ -17,7 +20,6 @@
   get 'admin/api_usage/overview' => 'admin/api_usage#index', :as => 'api_usage_overview'
   get 'admin/api_usage/user_overview/:id' => 'admin/api_usage#show', :as => 'api_user_usage'
 
-  require 'sidekiq/web'
   mount Sidekiq::Web => '/sidekiq'
   namespace :api do
     namespace :v1 do
diff --git a/config/schedule.rb b/config/schedule.rb
deleted file mode 100644
index 87d1421a4..000000000
--- a/config/schedule.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-set :output, 'log/cron.log'
-
-db_migrate_rebuild_period = Rails.env.production? ? :saturday : :day
-
-every db_migrate_rebuild_period, :at => '1:42am' do
-  rake "db:migrate:rebuild"
-end
-
-every :day, :at => '4:05am' do
-  rake "downloads:cache:update"
-end
-
-every :sunday, :at => '4:45am' do
-  rake "dashboard_stats:cache:update"
-  rake "db:common_names:cleanup"
-  rake "db:taxon_names:cleanup"
-end
-
-every 5.minutes do
-  rake "elibrary:refresh_document_search"
-end
-
-every 1.day, :at => '5:30 am' do
-  rake "-s sitemap:refresh"
-end
-
-every :sunday, :at => '1:30am' do
-  rake "rst_processes:import"
-end
diff --git a/config/schedule.yml b/config/schedule.yml
new file mode 100644
index 000000000..ce5959de4
--- /dev/null
+++ b/config/schedule.yml
@@ -0,0 +1,24 @@
+rebuild_job:
+  cron: "42 1 * * *"
+  class: "RebuildJob"
+  queue: admin
+downloads_cache_update_job:
+  cron: "5 4 * * *"
+  class: "DownloadsCacheUpdateJob"
+  queue: admin
+sunday_cleanup_job:
+  cron: "45 4 * * 0"
+  class: "SundayCleanupJob"
+  queue: admin
+elibrary_refresh_document_search_job:
+  cron: "*/5 * * * *"
+  class: "ElibraryRefreshDocumentSearchJob"
+  queue: admin
+refresh_sitemap_job:
+  cron: "30 5 * * *"
+  class: "RefreshSitemapJob"
+  queue: admin
+rst_processes_import_job:
+  cron: "30 1 * * 0"
+  class: "RstProcessesImportJob"
+  queue: admin
diff --git a/spec/jobs/downloads_cache_update_job_spec.rb b/spec/jobs/downloads_cache_update_job_spec.rb
new file mode 100644
index 000000000..ac7758fd2
--- /dev/null
+++ b/spec/jobs/downloads_cache_update_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe DownloadsCacheUpdateJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/jobs/elibrary_refresh_document_search_job_spec.rb b/spec/jobs/elibrary_refresh_document_search_job_spec.rb
new file mode 100644
index 000000000..65dfb5c13
--- /dev/null
+++ b/spec/jobs/elibrary_refresh_document_search_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ElibraryRefreshDocumentSearchJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/jobs/rebuild_job_spec.rb b/spec/jobs/rebuild_job_spec.rb
new file mode 100644
index 000000000..709f211ff
--- /dev/null
+++ b/spec/jobs/rebuild_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe RebuildJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/jobs/refresh_sitemap_job_spec.rb b/spec/jobs/refresh_sitemap_job_spec.rb
new file mode 100644
index 000000000..3aa5d0c9a
--- /dev/null
+++ b/spec/jobs/refresh_sitemap_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe RefreshSitemapJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/jobs/rst_processes_import_job_spec.rb b/spec/jobs/rst_processes_import_job_spec.rb
new file mode 100644
index 000000000..436edd23f
--- /dev/null
+++ b/spec/jobs/rst_processes_import_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe RstProcessesImportJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/jobs/sunday_cleanup_job_spec.rb b/spec/jobs/sunday_cleanup_job_spec.rb
new file mode 100644
index 000000000..6a0a52aeb
--- /dev/null
+++ b/spec/jobs/sunday_cleanup_job_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SundayCleanupJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 0779695b4b2612cbbf7662efe069fa65e464499d Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 30 Jan 2024 11:40:28 +0000
Subject: [PATCH 120/241] remove whenever

---
 Capfile                          | 1 -
 lib/capistrano/tasks/config.rake | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/Capfile b/Capfile
index fea6d1f88..666fbafec 100644
--- a/Capfile
+++ b/Capfile
@@ -34,7 +34,6 @@ require 'capistrano/rails/migrations'
 require 'capistrano/passenger'
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 require 'capistrano/maintenance'
-require 'whenever/capistrano'
 require 'capistrano/local_precompile'
 require 'capistrano/sidekiq'
 install_plugin Capistrano::Sidekiq
diff --git a/lib/capistrano/tasks/config.rake b/lib/capistrano/tasks/config.rake
index 4f827f765..eb001f599 100644
--- a/lib/capistrano/tasks/config.rake
+++ b/lib/capistrano/tasks/config.rake
@@ -287,15 +287,6 @@ namespace :config do
   end
 end
 
-namespace :config do
-  desc "Update crontab with whenever"
-  task :setup do
-    on roles(:app, :db) do
-      execute "cd '#{fetch(:backup_path)}' && /bin/bash -l -c '/home/#{fetch(:deploy_user)}/.rvm/gems/ruby-2.1.3/bin/whenever -f config/#{fetch(:application)}-schedule.rb --update-crontab'"
-    end
-  end
-end
-
 namespace :config do
   desc "Configure app specific nagios monitoring"
   task :setup do

From 7eaba6d23ba641b2d86d45e624a2225fdde6b8f0 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 30 Jan 2024 12:15:33 +0000
Subject: [PATCH 121/241] permit params for cache

---
 app/controllers/api/v1/purposes_controller.rb | 2 +-
 app/controllers/api/v1/sources_controller.rb  | 2 +-
 app/controllers/api/v1/terms_controller.rb    | 2 +-
 app/controllers/api/v1/units_controller.rb    | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v1/purposes_controller.rb b/app/controllers/api/v1/purposes_controller.rb
index 8b124c105..f5228ad4b 100644
--- a/app/controllers/api/v1/purposes_controller.rb
+++ b/app/controllers/api/v1/purposes_controller.rb
@@ -1,6 +1,6 @@
 class Api::V1::PurposesController < ApplicationController
   caches_action :index, :cache_path => Proc.new { |c|
-    { :locale => "en" }.merge(c.params.select { |k, v| !v.blank? && "locale" == k })
+    { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
   }
   def index
     @purposes = Purpose.all.order(:code)
diff --git a/app/controllers/api/v1/sources_controller.rb b/app/controllers/api/v1/sources_controller.rb
index 5f2c12df3..ae5753308 100644
--- a/app/controllers/api/v1/sources_controller.rb
+++ b/app/controllers/api/v1/sources_controller.rb
@@ -1,6 +1,6 @@
 class Api::V1::SourcesController < ApplicationController
   caches_action :index, :cache_path => Proc.new { |c|
-    { :locale => "en" }.merge(c.params.select { |k, v| !v.blank? && "locale" == k })
+    { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
   }
   def index
     @sources = Source.all.order(:code)
diff --git a/app/controllers/api/v1/terms_controller.rb b/app/controllers/api/v1/terms_controller.rb
index 59274f4d2..c28d70ce2 100644
--- a/app/controllers/api/v1/terms_controller.rb
+++ b/app/controllers/api/v1/terms_controller.rb
@@ -1,6 +1,6 @@
 class Api::V1::TermsController < ApplicationController
   caches_action :index, :cache_path => Proc.new { |c|
-    { :locale => "en" }.merge(c.params.select { |k, v| !v.blank? && "locale" == k })
+    { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
   }
   def index
     @terms = Term.all.order(:code)
diff --git a/app/controllers/api/v1/units_controller.rb b/app/controllers/api/v1/units_controller.rb
index c90ebb8fb..361c20993 100644
--- a/app/controllers/api/v1/units_controller.rb
+++ b/app/controllers/api/v1/units_controller.rb
@@ -1,8 +1,9 @@
 class Api::V1::UnitsController < ApplicationController
   caches_action :index, :cache_path => Proc.new { |c|
-    { :locale => "en" }.merge(c.params.select { |k, v| !v.blank? && "locale" == k })
+    { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
   }
   def index
+    # { :locale => "en" }.merge(params.select { |k, v| !v.blank? && "locale" == k })
     @units = Unit.all.order(:code)
     render :json => @units,
       :each_serializer => Species::UnitSerializer,

From 361f2b79877d070f93f4df4434c2c37a6adfc540 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 09:27:11 +0000
Subject: [PATCH 122/241] fix rspec

---
 spec/jobs/downloads_cache_update_job_spec.rb           | 2 +-
 spec/jobs/elibrary_refresh_document_search_job_spec.rb | 2 +-
 spec/jobs/rebuild_job_spec.rb                          | 2 +-
 spec/jobs/refresh_sitemap_job_spec.rb                  | 2 +-
 spec/jobs/rst_processes_import_job_spec.rb             | 2 +-
 spec/jobs/sunday_cleanup_job_spec.rb                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/jobs/downloads_cache_update_job_spec.rb b/spec/jobs/downloads_cache_update_job_spec.rb
index ac7758fd2..18f1468f8 100644
--- a/spec/jobs/downloads_cache_update_job_spec.rb
+++ b/spec/jobs/downloads_cache_update_job_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe DownloadsCacheUpdateJob, type: :job do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/jobs/elibrary_refresh_document_search_job_spec.rb b/spec/jobs/elibrary_refresh_document_search_job_spec.rb
index 65dfb5c13..965361409 100644
--- a/spec/jobs/elibrary_refresh_document_search_job_spec.rb
+++ b/spec/jobs/elibrary_refresh_document_search_job_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe ElibraryRefreshDocumentSearchJob, type: :job do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/jobs/rebuild_job_spec.rb b/spec/jobs/rebuild_job_spec.rb
index 709f211ff..1396ba492 100644
--- a/spec/jobs/rebuild_job_spec.rb
+++ b/spec/jobs/rebuild_job_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe RebuildJob, type: :job do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/jobs/refresh_sitemap_job_spec.rb b/spec/jobs/refresh_sitemap_job_spec.rb
index 3aa5d0c9a..917153e59 100644
--- a/spec/jobs/refresh_sitemap_job_spec.rb
+++ b/spec/jobs/refresh_sitemap_job_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe RefreshSitemapJob, type: :job do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/jobs/rst_processes_import_job_spec.rb b/spec/jobs/rst_processes_import_job_spec.rb
index 436edd23f..94800a77f 100644
--- a/spec/jobs/rst_processes_import_job_spec.rb
+++ b/spec/jobs/rst_processes_import_job_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe RstProcessesImportJob, type: :job do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/jobs/sunday_cleanup_job_spec.rb b/spec/jobs/sunday_cleanup_job_spec.rb
index 6a0a52aeb..e870354ba 100644
--- a/spec/jobs/sunday_cleanup_job_spec.rb
+++ b/spec/jobs/sunday_cleanup_job_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe SundayCleanupJob, type: :job do
   pending "add some examples to (or delete) #{__FILE__}"

From 6d4e1f770f7d0f46d5e4e3927a2c088eee5965de Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 09:56:09 +0000
Subject: [PATCH 123/241] Fix incorrect `head` when API with bad token.

---
 app/controllers/api/v1/shipments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/shipments_controller.rb b/app/controllers/api/v1/shipments_controller.rb
index 5a316c139..5628f47e2 100644
--- a/app/controllers/api/v1/shipments_controller.rb
+++ b/app/controllers/api/v1/shipments_controller.rb
@@ -166,7 +166,7 @@ def sanitized_attributes
   def authenticate
     token = request.headers['X-Authentication-Token']
     unless token == Rails.application.secrets[:shipments_api_token]
-      head status: :unauthorized
+      head :unauthorized
       return false
     end
   end

From 9782df9be66efe8306f871d79c57adadd6999622 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 10:48:00 +0000
Subject: [PATCH 124/241] Fix bugs by code review

---
 .../v1/document_geo_entities_controller.rb    | 15 --------
 .../api/v1/documents_controller.rb            |  4 +-
 .../api/v1/eu_decisions_controller.rb         |  2 +-
 app/controllers/api/v1/events_controller.rb   |  2 +-
 .../api/v1/shipments_controller.rb            | 38 ++++++++++---------
 .../api/v1/trade_plus_filters_controller.rb   |  5 ++-
 app/controllers/api/v1/units_controller.rb    |  1 -
 config/routes.rb                              |  5 +--
 lib/modules/trade/grouping/base.rb            |  4 ++
 9 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/app/controllers/api/v1/document_geo_entities_controller.rb b/app/controllers/api/v1/document_geo_entities_controller.rb
index 8034bf3a1..1892b0a51 100644
--- a/app/controllers/api/v1/document_geo_entities_controller.rb
+++ b/app/controllers/api/v1/document_geo_entities_controller.rb
@@ -1,6 +1,4 @@
 class Api::V1::DocumentGeoEntitiesController < ApplicationController
-  before_action :set_locale
-
   def index
     @geo_entities = GeoEntity.current.includes(:geo_entity_type).
       order("name_#{I18n.locale}")
@@ -26,17 +24,4 @@ def index
       each_serializer: Species::GeoEntitySerializer,
       meta: { total: @geo_entities.count }
   end
-
-  private
-
-  def set_locale
-    locale = params[:locale].try(:downcase).try(:strip) ||
-      'en'
-    I18n.locale =
-      if ['en', 'es', 'fr'].include?(locale)
-        locale
-      else
-        'en'
-      end
-  end
 end
diff --git a/app/controllers/api/v1/documents_controller.rb b/app/controllers/api/v1/documents_controller.rb
index 32fab4383..6a209523e 100644
--- a/app/controllers/api/v1/documents_controller.rb
+++ b/app/controllers/api/v1/documents_controller.rb
@@ -34,7 +34,7 @@ def index
 
     #TODO move pagination and ordering to the document_search module after refactoring of SQL mviews
     page = params[:page] || 1
-    per_page = params[:per_page] || 100
+    per_page = (params[:per_page] || 100).to_i
 
     ordered_docs =
       if params[:taxon_concepts_ids].present? && params[:event_type] == 'IdMaterials'
@@ -58,7 +58,7 @@ def index
       meta: {
         total: @search.cached_total_cnt,
         page: @search.page,
-        per_page: @search.per_page
+        per_page: per_page
       }
   end
 
diff --git a/app/controllers/api/v1/eu_decisions_controller.rb b/app/controllers/api/v1/eu_decisions_controller.rb
index bb132a17c..25e5ee695 100644
--- a/app/controllers/api/v1/eu_decisions_controller.rb
+++ b/app/controllers/api/v1/eu_decisions_controller.rb
@@ -60,7 +60,7 @@ def eu_decision_select_attrs
   end
 
   def sanitized_params
-    filters = permitted_params.inject({}) do |h, (k,v)|
+    filters = permitted_params.to_h.inject({}) do |h, (k,v)|
       h[k] = v.reject(&:empty?).map!(&:to_i)
       h
     end
diff --git a/app/controllers/api/v1/events_controller.rb b/app/controllers/api/v1/events_controller.rb
index bcc6f950b..82d244b92 100644
--- a/app/controllers/api/v1/events_controller.rb
+++ b/app/controllers/api/v1/events_controller.rb
@@ -4,7 +4,7 @@ def index
     @events = Event.
       select([:id, :name, :type, :published_at]).
       where(type: Event.elibrary_event_types.map(&:name)).
-      order('type, published_at DESC')
+      order(:type, published_at: :desc)
     render :json => @events,
       :each_serializer => Species::EventSerializer,
       :meta => { :total => @events.count(:all) }
diff --git a/app/controllers/api/v1/shipments_controller.rb b/app/controllers/api/v1/shipments_controller.rb
index 5628f47e2..2ef5433d0 100644
--- a/app/controllers/api/v1/shipments_controller.rb
+++ b/app/controllers/api/v1/shipments_controller.rb
@@ -8,7 +8,7 @@ class Api::V1::ShipmentsController < ApplicationController
   end
 
   def chart_query
-    @chart_data = Rails.cache.fetch(['chart_data', params], expires_in: 1.week) do
+    @chart_data = Rails.cache.fetch(['chart_data', permit_params], expires_in: 1.week) do
                     @grouping_class.new(['issue_type', 'year'])
                                              .countries_reported_range(params[:year])
                   end
@@ -55,20 +55,20 @@ def country_query
 
   # Compliance tool search & full list action
   def search_query
-    query = @grouping_class.new(sanitized_attributes, params)
+    query = @grouping_class.new(sanitized_attributes, permit_params)
     data = query.run
-    @search_data =  Rails.cache.fetch(['search_data', params], expires_in: 1.week) do
-                      query.build_hash(data, params)
+    @search_data =  Rails.cache.fetch(['search_data', permit_params], expires_in: 1.week) do
+                      query.build_hash(data, permit_params)
                     end
-    @filtered_data = query.filter(@search_data, params)
+    @filtered_data = query.filter(@search_data, permit_params)
     render :json => Kaminari.paginate_array(@filtered_data).page(params[:page]).per(params[:per_page]),
-           :meta => metadata(@filtered_data, params)
+           :meta => metadata(@filtered_data, permit_params)
   end
 
   def over_time_query
     # TODO Remember to implement permitted parameters here
-    query = @grouping_class.new(sanitized_attributes, params)
-    @over_time_data = Rails.cache.fetch(['over_time_data', params], expires_in: 1.week) do
+    query = @grouping_class.new(sanitized_attributes, permit_params)
+    @over_time_data = Rails.cache.fetch(['over_time_data', permit_params], expires_in: 1.week) do
       query.over_time_data
     end
 
@@ -78,8 +78,8 @@ def over_time_query
   # TODO refactor to merge this method and the over_time one above together
   def aggregated_over_time_query
     # TODO Remember to implement permitted parameters here
-    query = @grouping_class.new(sanitized_attributes, params)
-    @aggregated_over_time_data = Rails.cache.fetch(['aggregated_over_time_data', params], expires_in: 1.week) do
+    query = @grouping_class.new(sanitized_attributes, permit_params)
+    @aggregated_over_time_data = Rails.cache.fetch(['aggregated_over_time_data', permit_params], expires_in: 1.week) do
       query.aggregated_over_time_data
     end
 
@@ -87,26 +87,26 @@ def aggregated_over_time_query
   end
 
   def download_data
-    @download_data = Rails.cache.fetch(['download_data', params], expires_in: 1.week) do
+    @download_data = Rails.cache.fetch(['download_data', permit_params], expires_in: 1.week) do
                        Trade::DownloadDataRetriever.dashboard_download(download_params).to_a
                      end
     render :json => @download_data
   end
 
   def search_download_data
-    @download_data = Rails.cache.fetch(['search_download_data', params], expires_in: 1.week) do
+    @download_data = Rails.cache.fetch(['search_download_data', permit_params], expires_in: 1.week) do
                        Trade::DownloadDataRetriever.search_download(download_params).to_a
                      end
     render :json => @download_data
   end
 
   def search_download_all_data
-    query = @grouping_class.new(sanitized_attributes, params)
+    query = @grouping_class.new(sanitized_attributes, permit_params)
     data = query.run
-    @search_download_all_data = Rails.cache.fetch(['search_download_all_data', params], expires_in: 1.week) do
-                                  search_data = query.build_hash(data, params)
-                                  filtered_data = query.filter(search_data, params)
-                                  data_ids = query.filter_download_data(filtered_data, params)
+    @search_download_all_data = Rails.cache.fetch(['search_download_all_data', permit_params], expires_in: 1.week) do
+                                  search_data = query.build_hash(data, permit_params)
+                                  filtered_data = query.filter(search_data, permit_params)
+                                  data_ids = query.filter_download_data(filtered_data, permit_params)
                                   hash_params = params_hash_builder(data_ids, download_params)
                                   Trade::DownloadDataRetriever.search_download(hash_params).to_a
                                 end
@@ -115,6 +115,10 @@ def search_download_all_data
 
   private
 
+  def permit_params
+    params.permit!
+  end
+
   def set_pagination_headers(data, params)
     data = instance_variable_get("@#{data}").presence
     # Make sure the count works for both TradeView and ComplianceTool
diff --git a/app/controllers/api/v1/trade_plus_filters_controller.rb b/app/controllers/api/v1/trade_plus_filters_controller.rb
index 799ca37cc..b2c659bce 100644
--- a/app/controllers/api/v1/trade_plus_filters_controller.rb
+++ b/app/controllers/api/v1/trade_plus_filters_controller.rb
@@ -2,8 +2,9 @@ class Api::V1::TradePlusFiltersController < ApplicationController
   respond_to :json
 
   def index
-    filters_service = Trade::TradePlusFilters.new(params['locale'])
-    filters = Rails.cache.fetch(['trade_plus_filters', params['locale']], expires_in: 4.weeks) do
+    locale = params['locale'] || I18n.default_locale.to_s
+    filters_service = Trade::TradePlusFilters.new(locale)
+    filters = Rails.cache.fetch(['trade_plus_filters', locale], expires_in: 4.weeks) do
       res = ApplicationRecord.connection.execute(filters_service.query)
       filters_service.response_ordering(res)
     end
diff --git a/app/controllers/api/v1/units_controller.rb b/app/controllers/api/v1/units_controller.rb
index 361c20993..69bada19f 100644
--- a/app/controllers/api/v1/units_controller.rb
+++ b/app/controllers/api/v1/units_controller.rb
@@ -3,7 +3,6 @@ class Api::V1::UnitsController < ApplicationController
     { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
   }
   def index
-    # { :locale => "en" }.merge(params.select { |k, v| !v.blank? && "locale" == k })
     @units = Unit.all.order(:code)
     render :json => @units,
       :each_serializer => Species::UnitSerializer,
diff --git a/config/routes.rb b/config/routes.rb
index 210228f3e..827761932 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,7 +32,7 @@
       resources :purposes, :only => [:index]
       resources :trade_plus_filters, only: :index
       resources :eu_decisions, only: :index
-      resources :documents do
+      resources :documents, :only => [:index, :show] do
         collection do
           get 'download_zip'
         end
@@ -41,7 +41,6 @@
       resources :events, only: [:index]
       resources :document_tags, only: [:index]
       get '/dashboard_stats/:iso_code' => 'dashboard_stats#index'
-      resources :shipments, only: [:index]
       get '/shipments/chart' => 'shipments#chart_query'
       get '/shipments/grouped' => 'shipments#grouped_query'
       get '/shipments/over_time' => 'shipments#over_time_query'
@@ -161,7 +160,7 @@
         :only => [:index, :new, :create, :edit, :update, :destroy],
         :as => :cites_suspensions
       resources :taxon_instruments, :only => [:index, :new, :create, :edit, :update, :destroy]
-      resources :cites_captivity_processes, 
+      resources :cites_captivity_processes,
         :only => [:index, :new, :create, :edit, :update, :destroy]
     end
     resources :nomenclature_changes do # TODO: look like only support :index, :show, :destroy
diff --git a/lib/modules/trade/grouping/base.rb b/lib/modules/trade/grouping/base.rb
index 14ec6e4c9..964edf94a 100644
--- a/lib/modules/trade/grouping/base.rb
+++ b/lib/modules/trade/grouping/base.rb
@@ -122,6 +122,10 @@ def sanitise_condition
     condition_attributes = @opts.keep_if do |k, v|
       filtering_attributes.key?(k.to_sym) && v.present?
     end
+    unless condition_attributes.is_a?(Hash)
+      condition_attributes.permit!
+      condition_attributes = condition_attributes.to_h
+    end
     # Get default attributes if missing from params
     if @opts[:with_defaults]
       condition_attributes.reverse_merge!(self.class.default_filtering_attributes)

From 5c6036353752f899fb9750e838da51f2e2d4b49e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 11:50:41 +0000
Subject: [PATCH 125/241] DEPRECATION WARNING: The success? predicate is
 deprecated and will be removed in Rails 6.0. Please use successful? as
 provided by Rack::Response::Helpers.

---
 spec/controllers/admin/change_types_controller_spec.rb        | 2 +-
 spec/controllers/admin/designations_controller_spec.rb        | 2 +-
 spec/controllers/admin/distributions_controller_spec.rb       | 4 ++--
 spec/controllers/admin/events_controller_spec.rb              | 2 +-
 spec/controllers/admin/geo_entities_controller_spec.rb        | 2 +-
 spec/controllers/admin/instruments_controller_spec.rb         | 2 +-
 spec/controllers/admin/languages_controller_spec.rb           | 2 +-
 spec/controllers/admin/ranks_controller_spec.rb               | 2 +-
 spec/controllers/admin/references_controller_spec.rb          | 2 +-
 spec/controllers/admin/species_listings_controller_spec.rb    | 2 +-
 spec/controllers/admin/tags_controller_spec.rb                | 2 +-
 spec/controllers/admin/taxon_commons_controller_spec.rb       | 2 +-
 .../admin/taxon_concept_references_controller_spec.rb         | 2 +-
 spec/controllers/admin/taxon_concepts_controller_spec.rb      | 2 +-
 spec/controllers/admin/taxonomies_controller_spec.rb          | 2 +-
 spec/controllers/admin/users_controller_spec.rb               | 2 +-
 spec/controllers/trade/ember_controller_spec.rb               | 2 +-
 spec/controllers/trade/validation_rules_controller_spec.rb    | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/spec/controllers/admin/change_types_controller_spec.rb b/spec/controllers/admin/change_types_controller_spec.rb
index d655cb1cb..f8e4db2fc 100644
--- a/spec/controllers/admin/change_types_controller_spec.rb
+++ b/spec/controllers/admin/change_types_controller_spec.rb
@@ -34,7 +34,7 @@
     let(:change_type) { create(:change_type) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => change_type.id, :change_type => { :name => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => change_type.id, :change_type => { :name => nil } }, xhr: true
diff --git a/spec/controllers/admin/designations_controller_spec.rb b/spec/controllers/admin/designations_controller_spec.rb
index d071ee99f..b874b8e3b 100644
--- a/spec/controllers/admin/designations_controller_spec.rb
+++ b/spec/controllers/admin/designations_controller_spec.rb
@@ -43,7 +43,7 @@
     let(:designation) { create(:designation) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => designation.id, :designation => { :name => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => designation.id, :designation => { :name => nil } }, xhr: true
diff --git a/spec/controllers/admin/distributions_controller_spec.rb b/spec/controllers/admin/distributions_controller_spec.rb
index 5b16f14fc..8b6fe5732 100644
--- a/spec/controllers/admin/distributions_controller_spec.rb
+++ b/spec/controllers/admin/distributions_controller_spec.rb
@@ -9,7 +9,7 @@
   describe "XHR GET 'new'" do
     it "returns http success and renders the new template" do
       get :new, params: { :taxon_concept_id => @taxon_concept.id }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
       expect(response).to render_template('new')
     end
     it "assigns @geo_entities (country and territory) with two objects" do
@@ -90,7 +90,7 @@
             :geo_entity_id => geo_entity.id
           }
         }
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 
diff --git a/spec/controllers/admin/events_controller_spec.rb b/spec/controllers/admin/events_controller_spec.rb
index 40c6388ac..7243c8dc0 100644
--- a/spec/controllers/admin/events_controller_spec.rb
+++ b/spec/controllers/admin/events_controller_spec.rb
@@ -59,7 +59,7 @@
     let(:event) { create(:event) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => event.id, :event => { :name => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => event.id, :event => { :name => nil } }, xhr: true
diff --git a/spec/controllers/admin/geo_entities_controller_spec.rb b/spec/controllers/admin/geo_entities_controller_spec.rb
index abab4363c..27012d472 100644
--- a/spec/controllers/admin/geo_entities_controller_spec.rb
+++ b/spec/controllers/admin/geo_entities_controller_spec.rb
@@ -57,7 +57,7 @@
     let(:geo_entity) { create(:geo_entity, geo_entity_type: country_geo_entity_type) }
     it "responds with 200 when successful" do
       put :update, format: 'json', params: { id: geo_entity.id, geo_entity: { iso_code2: 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, format: 'json', params: { id: geo_entity.id, geo_entity: { iso_code2: nil } }, xhr: true
diff --git a/spec/controllers/admin/instruments_controller_spec.rb b/spec/controllers/admin/instruments_controller_spec.rb
index 306b91d6c..0f8c9f4bd 100644
--- a/spec/controllers/admin/instruments_controller_spec.rb
+++ b/spec/controllers/admin/instruments_controller_spec.rb
@@ -43,7 +43,7 @@
     let(:instrument) { create(:instrument) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => instrument.id, :instrument => { :name => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => instrument.id, :instrument => { :name => nil } }, xhr: true
diff --git a/spec/controllers/admin/languages_controller_spec.rb b/spec/controllers/admin/languages_controller_spec.rb
index c3f0deff6..6aa36b51b 100644
--- a/spec/controllers/admin/languages_controller_spec.rb
+++ b/spec/controllers/admin/languages_controller_spec.rb
@@ -31,7 +31,7 @@
     let(:language) { create(:language) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => language.id, :language => { :iso_code1 => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => language.id, :language => { :iso_code1 => 'zzz' } }, xhr: true
diff --git a/spec/controllers/admin/ranks_controller_spec.rb b/spec/controllers/admin/ranks_controller_spec.rb
index 80b933e37..ae668629b 100644
--- a/spec/controllers/admin/ranks_controller_spec.rb
+++ b/spec/controllers/admin/ranks_controller_spec.rb
@@ -31,7 +31,7 @@
     let(:rank) { create(:rank) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => rank.id, :rank => { :name => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => rank.id, :rank => { :name => nil } }, xhr: true
diff --git a/spec/controllers/admin/references_controller_spec.rb b/spec/controllers/admin/references_controller_spec.rb
index 0dd099223..a3a73b4f5 100644
--- a/spec/controllers/admin/references_controller_spec.rb
+++ b/spec/controllers/admin/references_controller_spec.rb
@@ -43,7 +43,7 @@
     let(:reference) { create(:reference) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => reference.id, :reference => { :citation => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => reference.id, :reference => { :citation => nil } }, xhr: true
diff --git a/spec/controllers/admin/species_listings_controller_spec.rb b/spec/controllers/admin/species_listings_controller_spec.rb
index 6d074ff5a..6062287f5 100644
--- a/spec/controllers/admin/species_listings_controller_spec.rb
+++ b/spec/controllers/admin/species_listings_controller_spec.rb
@@ -34,7 +34,7 @@
     let(:species_listing) { create(:species_listing) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => species_listing.id, :species_listing => { :name => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => species_listing.id, :species_listing => { :name => nil } }, xhr: true
diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb
index 2946d0310..ec9116d37 100644
--- a/spec/controllers/admin/tags_controller_spec.rb
+++ b/spec/controllers/admin/tags_controller_spec.rb
@@ -27,7 +27,7 @@
     context "when JSON" do
       it "responds with 200 when successful" do
         put :update, :format => 'json', params: { :id => preset_tag.id, :tag => { dummy: 'test' } }, xhr: true
-        expect(response).to be_success
+        expect(response).to be_successful
       end
       it "responds with json error when not successful" do
         put :update, :format => 'json', params: { :id => preset_tag.id, :tag => { :model => 'FakeCategory' } }, xhr: true
diff --git a/spec/controllers/admin/taxon_commons_controller_spec.rb b/spec/controllers/admin/taxon_commons_controller_spec.rb
index 9f82012a1..e81b244dc 100644
--- a/spec/controllers/admin/taxon_commons_controller_spec.rb
+++ b/spec/controllers/admin/taxon_commons_controller_spec.rb
@@ -11,7 +11,7 @@
   describe "XHR GET 'new'" do
     it "returns http success and renders the new template" do
       get :new, params: { :taxon_concept_id => @taxon_concept.id, :format => 'js' }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
       expect(response).to render_template('new')
     end
   end
diff --git a/spec/controllers/admin/taxon_concept_references_controller_spec.rb b/spec/controllers/admin/taxon_concept_references_controller_spec.rb
index 559d5e909..995a4692b 100644
--- a/spec/controllers/admin/taxon_concept_references_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concept_references_controller_spec.rb
@@ -88,7 +88,7 @@
   describe "XHR GET 'new'" do
     it "returns http success and renders the new template" do
       get :new, params: { :taxon_concept_id => @taxon_concept.id }, xhr: true, :format => 'js'
-      expect(response).to be_success
+      expect(response).to be_successful
       expect(response).to render_template('new')
     end
   end
diff --git a/spec/controllers/admin/taxon_concepts_controller_spec.rb b/spec/controllers/admin/taxon_concepts_controller_spec.rb
index 0767f4562..1bd9719ae 100644
--- a/spec/controllers/admin/taxon_concepts_controller_spec.rb
+++ b/spec/controllers/admin/taxon_concepts_controller_spec.rb
@@ -71,7 +71,7 @@
       it "responds with 200 when successful" do
         put :update, :format => 'json', params: { :id => taxon_concept.id,
           :taxon_concept => { dummy: 'test' } }, xhr: true
-        expect(response).to be_success
+        expect(response).to be_successful
       end
       it "responds with json error when not successful" do
         put :update, :format => 'json', params: { :id => taxon_concept.id,
diff --git a/spec/controllers/admin/taxonomies_controller_spec.rb b/spec/controllers/admin/taxonomies_controller_spec.rb
index 192b6de76..b9e5817af 100644
--- a/spec/controllers/admin/taxonomies_controller_spec.rb
+++ b/spec/controllers/admin/taxonomies_controller_spec.rb
@@ -43,7 +43,7 @@
     let(:taxonomy) { create(:taxonomy) }
     it "responds with 200 when successful" do
       put :update, :format => 'json', params: { :id => taxonomy.id, :taxonomy => { :name => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
     end
     it "responds with json when not successful" do
       put :update, :format => 'json', params: { :id => taxonomy.id, :taxonomy => { :name => nil } }, xhr: true
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 27a50e530..0661ce596 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -39,7 +39,7 @@
     let(:user) { create(:user) }
     it "responds with 200 when successful" do
       put :update, :format => 'js', params: { :id => user.id, :user => { :name => 'ZZ' } }, xhr: true
-      expect(response).to be_success
+      expect(response).to be_successful
       expect(response).to render_template('create')
     end
     it "responds with template new when not successful" do
diff --git a/spec/controllers/trade/ember_controller_spec.rb b/spec/controllers/trade/ember_controller_spec.rb
index 3e5b55b4b..535a7942b 100644
--- a/spec/controllers/trade/ember_controller_spec.rb
+++ b/spec/controllers/trade/ember_controller_spec.rb
@@ -6,7 +6,7 @@
   describe "GET 'start'" do
     it "returns http success" do
       get 'start'
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 
diff --git a/spec/controllers/trade/validation_rules_controller_spec.rb b/spec/controllers/trade/validation_rules_controller_spec.rb
index 8e3bbb719..1c8927ad7 100644
--- a/spec/controllers/trade/validation_rules_controller_spec.rb
+++ b/spec/controllers/trade/validation_rules_controller_spec.rb
@@ -6,7 +6,7 @@
   describe "GET index" do
     it "should return success" do
       get :index, format: :json
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 end

From 0d9ee2ab8188332a98772d8f6f60e552301aa81a Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 15:41:08 +0000
Subject: [PATCH 126/241] downgrade papertail due to
 https://github.com/paper-trail-gem/paper_trail/blob/master/doc/pt_13_yaml_safe_load.md

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 275bca69f..135c92980 100644
--- a/Gemfile
+++ b/Gemfile
@@ -145,7 +145,7 @@ end
 gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest version is 1.6.4 @ 2018
 
 gem 'request_store', '~> 1.5', '>= 1.5.1'
-gem 'paper_trail', '13.0.0' # TODO: latest is 15.1.0. Can upgrade to newer version when we at Rails 6
+gem 'paper_trail', '12.3.0' # TODO: latest is 15.1.0. Can't upgrade until we fix https://github.com/paper-trail-gem/paper_trail/blob/master/doc/pt_13_yaml_safe_load.md
 
 gem 'dotenv-rails', '2.0.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4cbef0df9..8d8da5958 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ GEM
     oj (3.16.3)
       bigdecimal (>= 3.0)
     orm_adapter (0.5.0)
-    paper_trail (13.0.0)
+    paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.24.0)
@@ -627,7 +627,7 @@ DEPENDENCIES
   nested_form (~> 0.3.2)
   nokogiri (~> 1.15, >= 1.15.5)
   oj (~> 3.16, >= 3.16.3)
-  paper_trail (= 13.0.0)
+  paper_trail (= 12.3.0)
   pdfkit (~> 0.8.7.3)
   pg (~> 1.5, >= 1.5.4)
   pg_array_parser (~> 0.0.9)

From 1dfc47319fdb93a8395cb69680d0ab187061fc8c Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 18:28:21 +0000
Subject: [PATCH 127/241] strong param fix

---
 app/helpers/admin_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 76351f3c7..db14ba1f2 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -8,7 +8,7 @@ def ancestors_path(taxon_concept)
       name = taxon_concept.data["#{r.name.downcase}_name"]
       id = taxon_concept.data["#{r.name.downcase}_id"]
       if name && id
-        link_to(name, params.merge(:taxon_concept_id => id), :title => r.name)
+        link_to(name, params.permit!.merge(:taxon_concept_id => id), :title => r.name)
       else
         nil
       end

From 6f4dfecaf55948c556d2690913c117ec5a465877 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 30 Jan 2024 18:15:15 +0000
Subject: [PATCH 128/241] Rails 6.0; rails app:update + rails diff; able to
 start web server but rspec fail

---
 .gitignore                                    |  10 +-
 Dockerfile.cap-deploy                         |   2 +
 Gemfile                                       |  32 +--
 Gemfile.lock                                  | 240 ++++++++++--------
 bin/bundle                                    |   3 -
 bin/setup                                     |  12 +-
 bin/spring                                    |  15 --
 bin/update                                    |  31 ---
 config/application.rb                         |   2 +-
 config/cable.yml                              |   2 +-
 config/environments/development.rb            |   5 +-
 config/environments/production.rb             |  33 ++-
 config/environments/test.rb                   |  20 +-
 .../0_new_framework_defaults_5_2.rb           |  38 ---
 .../0_new_framework_defaults_6_0.rb           |  45 ++++
 .../initializers/content_security_policy.rb   |   5 +
 config/puma.rb                                |   7 +-
 config/spring.rb                              |  12 +-
 18 files changed, 264 insertions(+), 250 deletions(-)
 delete mode 100755 bin/bundle
 delete mode 100755 bin/spring
 delete mode 100755 bin/update
 delete mode 100644 config/initializers/0_new_framework_defaults_5_2.rb
 create mode 100644 config/initializers/0_new_framework_defaults_6_0.rb

diff --git a/.gitignore b/.gitignore
index 0004f2107..bdeed6a06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,13 +13,15 @@
 !/log/.keep
 !/tmp/.keep
 
-# Ignore uploaded files in development
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/
+!/tmp/pids/.keep
+
+# Ignore uploaded files in development.
 /storage/*
 !/storage/.keep
 
-/node_modules
-/yarn-error.log
-
 /public/assets
 .byebug_history
 
diff --git a/Dockerfile.cap-deploy b/Dockerfile.cap-deploy
index c1559879d..3ea5832e8 100644
--- a/Dockerfile.cap-deploy
+++ b/Dockerfile.cap-deploy
@@ -6,6 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
 # runtime, so attempt to get these from apt, where possible
 RUN apt-get update && apt-get install -y --force-yes \
+  # For ruby?
+  libsodium-dev libgmp3-dev \
   # For RVM
   gnupg procps curl libssl-dev \
   # For assets local_precompile (cap deploy)
diff --git a/Gemfile b/Gemfile
index 135c92980..03a44af37 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,17 +4,20 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '2.7.8'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '5.2.8.1'
+gem 'rails', '6.0.6.1'
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 4.1'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
+gem 'sass-rails', '>= 6'
+# https://stackoverflow.com/questions/55213868/rails-6-how-to-disable-webpack-and-use-sprockets-instead
+gem 'sprockets', '3.7.2'
+gem 'sprockets-rails', :require => 'sprockets/railtie'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
+gem 'coffee-rails', '~> 5.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'mini_racer', platforms: :ruby
 
@@ -27,10 +30,10 @@ gem 'pg_array_parser', '~> 0.0.9'
 gem 'nested-hstore', '~> 0.1.2'
 gem 'pg_search', '~> 2.3', '>= 2.3.6'
 gem 'oj', '~> 3.16', '>= 3.16.3' # optimised JSON (picked by multi_json)
-gem 'nokogiri', '~> 1.15', '>= 1.15.5' # TODO: New version need Ruby 3
-gem 'inherited_resources', '1.13.1' # Deprecated (https://github.com/activeadmin/inherited_resources#notice) # TODO: need upgrade when upgrade to Rails 6
+gem 'inherited_resources', '~> 1.14' # Deprecated (https://github.com/activeadmin/inherited_resources#notice)
+gem 'nokogiri', '1.15.5' # TODO: New version need Ruby 3
 gem 'mobility', '~> 1.2', '>= 1.2.9'
-gem 'devise', '4.4.3' # TODO: version 4.4.3 work under <=Rails 5.3 and <=Ruby 2.6
+gem 'devise', '4.7.3' # TODO: need upgrade to 4.8+ when upgrade to rails 6.1
 gem 'cancancan', '2.3.0' # TODO, can upgrade to 3.0 after Rails 6
 gem 'ahoy_matey', '4.2.1' # TODO: latest 5.0.2. Can't upgrade to 5.0 until upgrade to Rails 6
 gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
@@ -43,9 +46,8 @@ gem 'wicked', '1.3.4'
 gem 'groupdate', '6.2.1' # TODO: can upgrade after rails 6.1 and newer ruby 3
 
 gem 'rubyzip', '~> 2.3', '>= 2.3.2'
-gem 'responders', '~> 2.0' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
+gem 'responders', '~> 3.1', '>= 3.1.1' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
 
-# TODO: need Sidekiq 6 and Rails 6, before we can migrate worker to job, due to sidekiq_options (https://github.com/sidekiq/sidekiq/issues/4281)
 gem 'sidekiq', '< 7' # TODO, latest is 7
 gem 'sidekiq-status', '~> 3.0', '>= 3.0.3'
 gem 'sidekiq-unique-jobs', '7.1.31' # TODO: can upgrade to latest when sidekiq upgrade to 7
@@ -71,24 +73,24 @@ gem 'rails-observers', '~> 0.1.5' # A feature that removed from core in Rails 4.
 
 gem 'strong_migrations', '~> 1.7'
 
-# Use ActiveModel has_secure_password
+# Use Active Model has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use ActiveStorage variant
 # gem 'mini_magick', '~> 4.8'
 
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.1.0', require: false
+gem 'bootsnap', '>= 1.4.2', require: false
 
 # To use Jbuilder templates for JSON
-# gem 'jbuilder', '~> 2.5'
+# gem 'jbuilder', '~> 2.7'
 
 gem 'rest-client', '1.8.0', require: false # TODO, should upgrade for better compatibility with newer Ruby but breaking change. Seems not many place using it, worth a try.
 
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'listen', '~> 3.2'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 	gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -132,8 +134,8 @@ group :test do
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '>= 2.15'
   gem 'selenium-webdriver'
-  # Easy installation and use of chromedriver to run system tests with Chrome
-  gem 'chromedriver-helper'
+  # Easy installation and use of web drivers to run system tests with browsers
+  gem 'webdrivers'
 
   gem 'rails-controller-testing'
   gem "codeclimate-test-reporter", '0.1.1', require: nil # TODO, should be removed
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d8da5958..0a5bf8350 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,55 +2,69 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (5.2.8.1)
-      actionpack (= 5.2.8.1)
+    actioncable (6.0.6.1)
+      actionpack (= 6.0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      actionview (= 5.2.8.1)
-      activejob (= 5.2.8.1)
+    actionmailbox (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.8.1)
-      actionview (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
+    actionpack (6.0.6.1)
+      actionview (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-action_caching (1.2.2)
       actionpack (>= 4.0.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actionview (5.2.8.1)
-      activesupport (= 5.2.8.1)
+    actiontext (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.6.1)
+      activesupport (= 6.0.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active-model-adapter-source (2.1.1)
       ember-data-source (>= 1.13, < 3.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (5.2.8.1)
-      activesupport (= 5.2.8.1)
+    activejob (6.0.6.1)
+      activesupport (= 6.0.6.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.8.1)
-      activesupport (= 5.2.8.1)
-    activerecord (5.2.8.1)
-      activemodel (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      arel (>= 9.0)
-    activestorage (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      activerecord (= 5.2.8.1)
-      marcel (~> 1.0.0)
-    activesupport (5.2.8.1)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activestorage (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      marcel (~> 1.0)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     acts-as-taggable-on (8.1.0)
       activerecord (>= 5.0, < 6.2)
     addressable (2.8.6)
@@ -67,9 +81,6 @@ GEM
     appsignal (1.3.3)
       rack
       thread_safe
-    archive-zip (0.12.0)
-      io-like (~> 0.3.0)
-    arel (9.0.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
     aws-sdk (2.11.632)
@@ -92,7 +103,7 @@ GEM
     bcrypt_pbkdf (1.1.0)
     bigdecimal (3.1.6)
     bindex (0.8.1)
-    bootsnap (1.17.1)
+    bootsnap (1.18.1)
       msgpack (~> 1.2)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
@@ -127,7 +138,7 @@ GEM
       capistrano (>= 3.9.0)
       capistrano-bundler
       sidekiq (>= 6.0)
-    capybara (3.36.0)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -145,17 +156,13 @@ GEM
       mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     chartkick (4.2.1)
-    childprocess (4.1.0)
-    chromedriver-helper (2.1.1)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
     codeclimate-test-reporter (0.1.1)
       simplecov (>= 0.7.1, < 1.0.0)
-    coffee-rails (4.2.2)
+    coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
+      railties (>= 5.2.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -177,17 +184,16 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
-    device_detector (1.0.7)
-    devise (4.4.3)
+    device_detector (1.1.2)
+    devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.0.1)
     dotenv-rails (2.0.1)
       dotenv (= 2.0.1)
@@ -252,12 +258,11 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    inherited_resources (1.13.1)
-      actionpack (>= 5.2, < 7.1)
-      has_scope (~> 0.6)
-      railties (>= 5.2, < 7.1)
-      responders (>= 2, < 4)
-    io-like (0.3.1)
+    inherited_resources (1.14.0)
+      actionpack (>= 6.0)
+      has_scope (>= 0.6)
+      railties (>= 6.0)
+      responders (>= 2)
     jmespath (1.6.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
@@ -280,12 +285,12 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
+    language_server-protocol (3.17.0.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -313,7 +318,7 @@ GEM
       activerecord
       activesupport
     nested_form (0.3.2)
-    net-imap (0.3.7)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -361,25 +366,28 @@ GEM
       ruby-rc4
       ttfunk (~> 1.0.3)
     public_suffix (5.0.4)
-    puma (3.12.6)
+    puma (4.3.12)
+      nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.3)
     rack (2.2.8)
     rack-cors (0.3.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (5.2.8.1)
-      actioncable (= 5.2.8.1)
-      actionmailer (= 5.2.8.1)
-      actionpack (= 5.2.8.1)
-      actionview (= 5.2.8.1)
-      activejob (= 5.2.8.1)
-      activemodel (= 5.2.8.1)
-      activerecord (= 5.2.8.1)
-      activestorage (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
+    rails (6.0.6.1)
+      actioncable (= 6.0.6.1)
+      actionmailbox (= 6.0.6.1)
+      actionmailer (= 6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actiontext (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.8.1)
+      railties (= 6.0.6.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -389,16 +397,17 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
+    railties (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
@@ -412,9 +421,9 @@ GEM
     regexp_parser (2.9.0)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -443,46 +452,54 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.12.1)
-    rubocop (1.50.2)
+    rubocop (1.60.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-rails (2.19.1)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.20.0)
-      rubocop (~> 1.33)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby-vips (2.2.0)
       ffi (~> 1.12)
-    ruby_dep (1.5.0)
     rubyzip (2.3.2)
     safely_block (0.3.0)
       errbase (>= 0.1.1)
     sass (3.4.25)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    selenium-webdriver (4.1.0)
-      childprocess (>= 0.5, < 5.0)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    selenium-webdriver (4.9.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
@@ -548,18 +565,20 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
     uuidtools (2.2.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (3.7.0)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
+    web-console (4.2.1)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
-      railties (>= 5.0)
+      railties (>= 6.0.0)
+    webdrivers (5.3.1)
+      nokogiri (~> 1.6)
+      rubyzip (>= 1.3.0)
+      selenium-webdriver (~> 4.0, < 4.11)
+    websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -568,6 +587,7 @@ GEM
     wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
@@ -582,7 +602,7 @@ DEPENDENCIES
   appsignal (= 1.3.3)
   aws-sdk (~> 2)
   bcrypt_pbkdf (= 1.1.0)
-  bootsnap (>= 1.1.0)
+  bootsnap (>= 1.4.2)
   bootstrap-sass (= 2.3.2.2)
   brightbox (= 2.3.9)
   byebug
@@ -598,13 +618,12 @@ DEPENDENCIES
   capybara (>= 2.15)
   carrierwave (= 2.2.5)
   chartkick (= 4.2.1)
-  chromedriver-helper
   codeclimate-test-reporter (= 0.1.1)
-  coffee-rails (~> 4.2)
+  coffee-rails (~> 5.0)
   coveralls (= 0.7.1)
   dalli (= 2.7.10)
   database_cleaner (~> 2.0, >= 2.0.2)
-  devise (= 4.4.3)
+  devise (= 4.7.3)
   dotenv-rails (= 2.0.1)
   ed25519 (= 1.2.4)
   ember-data-source (= 1.13.0)
@@ -616,16 +635,16 @@ DEPENDENCIES
   groupdate (= 6.2.1)
   handlebars-source (= 1.0.12)
   httparty (~> 0.21.0)
-  inherited_resources (= 1.13.1)
+  inherited_resources (~> 1.14)
   jslint_on_rails (= 1.1.1)
   json_spec (= 1.1.5)
   kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
-  listen (>= 3.0.5, < 3.2)
+  listen (~> 3.2)
   mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
-  nokogiri (~> 1.15, >= 1.15.5)
+  nokogiri (= 1.15.5)
   oj (~> 3.16, >= 3.16.3)
   paper_trail (= 12.3.0)
   pdfkit (~> 0.8.7.3)
@@ -633,22 +652,22 @@ DEPENDENCIES
   pg_array_parser (~> 0.0.9)
   pg_search (~> 2.3, >= 2.3.6)
   prawn (= 0.13.2)
-  puma (~> 3.11)
+  puma (~> 4.1)
   rack-cors (= 0.3.0)
-  rails (= 5.2.8.1)
+  rails (= 6.0.6.1)
   rails-controller-testing
   rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)
   rbnacl-libsodium (= 1.0.16)
   request_store (~> 1.5, >= 1.5.1)
-  responders (~> 2.0)
+  responders (~> 3.1, >= 3.1.1)
   rest-client (= 1.8.0)
   rspec-collection_matchers (~> 1.2, >= 1.2.1)
   rspec-rails (= 5.1.2)
   rubocop-rails
   rubocop-rspec
   rubyzip (~> 2.3, >= 2.3.2)
-  sass-rails (~> 5.0)
+  sass-rails (>= 6)
   selenium-webdriver
   sidekiq (< 7)
   sidekiq-cron (~> 1.12)
@@ -659,12 +678,15 @@ DEPENDENCIES
   slackistrano (= 0.1.9)
   spring
   spring-watcher-listen (~> 2.0.0)
+  sprockets (= 3.7.2)
+  sprockets-rails
   strong_migrations (~> 1.7)
   susy (~> 2.2, >= 2.2.14)
   test-unit (= 3.1.5)
   uglifier (>= 1.3.0)
   uuidtools (~> 2.2)
   web-console (>= 3.3.0)
+  webdrivers
   wicked (= 1.3.4)
   wkhtmltopdf-binary (~> 0.12.6.6)
 
diff --git a/bin/bundle b/bin/bundle
deleted file mode 100755
index f19acf5b5..000000000
--- a/bin/bundle
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/setup b/bin/setup
index 94fd4d797..5853b5ea8 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-include FileUtils
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -9,24 +8,25 @@ def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
-chdir APP_ROOT do
-  # This script is a starting point to setup your application.
+FileUtils.chdir APP_ROOT do
+  # This script is a way to setup or update your development environment automatically.
+  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies if using Yarn
+  # Install JavaScript dependencies
   # system('bin/yarn')
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
-  #   cp 'config/database.yml.sample', 'config/database.yml'
+  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:setup'
+  system! 'bin/rails db:prepare'
 
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'
diff --git a/bin/spring b/bin/spring
deleted file mode 100755
index 7fe232c3a..000000000
--- a/bin/spring
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file loads spring without using Bundler, in order to be fast.
-# It gets overwritten when you run the `spring binstub` command.
-
-unless defined?(Spring)
-  require 'rubygems'
-  require 'bundler'
-
-  if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
-    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) }
-    gem 'spring', match[1]
-    require 'spring/binstub'
-  end
-end
diff --git a/bin/update b/bin/update
deleted file mode 100755
index 58bfaed51..000000000
--- a/bin/update
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-include FileUtils
-
-# path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
-
-def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
-end
-
-chdir APP_ROOT do
-  # This script is a way to update your development environment automatically.
-  # Add necessary update steps to this file.
-
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
-  # Install JavaScript dependencies if using Yarn
-  # system('bin/yarn')
-
-  puts "\n== Updating database =="
-  system! 'bin/rails db:migrate'
-
-  puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
-
-  puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
-end
diff --git a/config/application.rb b/config/application.rb
index 1437b1d05..18fac72ea 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -10,7 +10,7 @@
 module SAPI
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
diff --git a/config/cable.yml b/config/cable.yml
index c1fe5018d..5fb9fec5a 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -2,7 +2,7 @@ development:
   adapter: async
 
 test:
-  adapter: async
+  adapter: test
 
 production:
   adapter: redis
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 27fbdd214..bd2b4a5de 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,6 +16,7 @@
   # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
@@ -27,7 +28,7 @@
     config.cache_store = :null_store
   end
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
+  # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
@@ -52,7 +53,7 @@
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
-  # Raises error for missing translations
+  # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
 
   # Use an evented file watcher to asynchronously detect changes in source code,
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 23defb097..90c218765 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -24,13 +24,12 @@
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
+  # Compress CSS using a preprocessor.
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'
 
@@ -38,10 +37,10 @@
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
+  # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
-  # Mount Action Cable outside main process or domain
+  # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
@@ -59,9 +58,10 @@
   # Use a different cache store in production.
   config.cache_store = :mem_cache_store
 
-  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque
-  # config.active_job.queue_name_prefix = "sapi_#{Rails.env}"
+  # config.active_job.queue_name_prefix = "sapi_production"
+
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
@@ -92,6 +92,27 @@
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
+  # Inserts middleware to perform automatic connection switching.
+  # The `database_selector` hash is used to pass options to the DatabaseSelector
+  # middleware. The `delay` is used to determine how long to wait after a write
+  # to send a subsequent read to the primary.
+  #
+  # The `database_resolver` class is used by the middleware to determine which
+  # database is appropriate to use based on the time delay.
+  #
+  # The `database_resolver_context` class is used by the middleware to set
+  # timestamps for the last write to the primary. The resolver uses the context
+  # class timestamps to determine how long to wait before reading from the
+  # replica.
+  #
+  # By default Rails will store a last write timestamp in the session. The
+  # DatabaseSelector middleware is designed as such you can define your own
+  # strategy for connection switching and pass that into the middleware through
+  # these configuration options.
+  # config.active_record.database_selector = { delay: 2.seconds }
+  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
+  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
+
   # Custom ember settings
   config.ember.variant = :production
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 5164afd1d..9579685c1 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,11 +1,13 @@
+# The test environment is used exclusively to run your application's
+# test suite. You never need to work with it otherwise. Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs. Don't rely on the data there!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
+  config.action_view.cache_template_loading = true
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
@@ -22,6 +24,7 @@
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
+  config.cache_store = :null_store
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
@@ -29,7 +32,7 @@
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Store uploaded files on the local file system in a temporary directory
+  # Store uploaded files on the local file system in a temporary directory.
   config.active_storage.service = :test
 
   config.action_mailer.perform_caching = false
@@ -42,12 +45,9 @@
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  # Raises error for missing translations
+  # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
 
-  # Custom cache settings
-  config.cache_store = :null_store
-
   # Custom ember settings
   config.ember.variant = :development
 
diff --git a/config/initializers/0_new_framework_defaults_5_2.rb b/config/initializers/0_new_framework_defaults_5_2.rb
deleted file mode 100644
index 4c3a4be4c..000000000
--- a/config/initializers/0_new_framework_defaults_5_2.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 5.2 upgrade.
-#
-# Once upgraded flip defaults one by one to migrate to the new default.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-
-# Make Active Record use stable #cache_key alongside new #cache_version method.
-# This is needed for recyclable cache keys.
-Rails.application.config.active_record.cache_versioning = true
-
-# Use AES-256-GCM authenticated encryption for encrypted cookies.
-# Also, embed cookie expiry in signed or encrypted cookies for increased security.
-#
-# This option is not backwards compatible with earlier Rails versions.
-# It's best enabled when your entire app is migrated and stable on 5.2.
-#
-# Existing cookies will be converted on read then written with the new scheme.
-Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
-
-# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
-# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
-Rails.application.config.active_support.use_authenticated_message_encryption = true
-
-# Add default protection from forgery to ActionController::Base instead of in
-# ApplicationController.
-Rails.application.config.action_controller.default_protect_from_forgery = true
-
-# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
-# 'f' after migrating old data.
-# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
-
-# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
-Rails.application.config.active_support.use_sha1_digests = true
-
-# Make `form_with` generate id attributes for any generated HTML tags.
-Rails.application.config.action_view.form_with_generates_ids = true
diff --git a/config/initializers/0_new_framework_defaults_6_0.rb b/config/initializers/0_new_framework_defaults_6_0.rb
new file mode 100644
index 000000000..92240ef5f
--- /dev/null
+++ b/config/initializers/0_new_framework_defaults_6_0.rb
@@ -0,0 +1,45 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 6.0 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Don't force requests from old versions of IE to be UTF-8 encoded.
+# Rails.application.config.action_view.default_enforce_utf8 = false
+
+# Embed purpose and expiry metadata inside signed and encrypted
+# cookies for increased security.
+#
+# This option is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.0.
+# Rails.application.config.action_dispatch.use_cookies_with_metadata = true
+
+# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification.
+# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
+
+# Return false instead of self when enqueuing is aborted from a callback.
+# Rails.application.config.active_job.return_false_on_aborted_enqueue = true
+
+# Send Active Storage analysis and purge jobs to dedicated queues.
+# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
+# Rails.application.config.active_storage.queues.purge    = :active_storage_purge
+
+# When assigning to a collection of attachments declared via `has_many_attached`, replace existing
+# attachments instead of appending. Use #attach to add new attachments without replacing existing ones.
+# Rails.application.config.active_storage.replace_on_assign_to_many = true
+
+# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
+#
+# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob),
+# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions.
+# If you send mail in the background, job workers need to have a copy of
+# MailDeliveryJob to ensure all delivery jobs are processed properly.
+# Make sure your entire app is migrated and stable on 6.0 before using this setting.
+# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
+
+# Enable the same cache key to be reused when the object being cached of type
+# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count)
+# of the relation's cache key into the cache version to support recycling cache key.
+# Rails.application.config.active_record.collection_cache_versioning = true
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index d3bcaa5ec..35d0f26fc 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -11,6 +11,8 @@
 #   policy.object_src  :none
 #   policy.script_src  :self, :https
 #   policy.style_src   :self, :https
+#   # If you are using webpack-dev-server then specify webpack-dev-server host
+#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
 
 #   # Specify URI for violation reports
 #   # policy.report_uri "/csp-violation-report-endpoint"
@@ -19,6 +21,9 @@
 # If you are using UJS then enable automatic nonce generation
 # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
 
+# Set the nonce only to specific directives
+# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
+
 # Report CSP violations to a specified URI
 # For further information see the following documentation:
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
diff --git a/config/puma.rb b/config/puma.rb
index b2102072b..5ed443774 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -4,8 +4,9 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-threads threads_count, threads_count
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+threads min_threads_count, max_threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
@@ -19,7 +20,7 @@
 pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
 
 # Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
+# Workers are forked web server processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
diff --git a/config/spring.rb b/config/spring.rb
index 9fa7863f9..db5bf1307 100644
--- a/config/spring.rb
+++ b/config/spring.rb
@@ -1,6 +1,6 @@
-%w[
-  .ruby-version
-  .rbenv-vars
-  tmp/restart.txt
-  tmp/caching-dev.txt
-].each { |path| Spring.watch(path) }
+Spring.watch(
+  ".ruby-version",
+  ".rbenv-vars",
+  "tmp/restart.txt",
+  "tmp/caching-dev.txt"
+)

From b89aa2ca7f3fe27957b62a9a6e7c2f92ad68c84e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 11:29:28 +0000
Subject: [PATCH 129/241] rollback to classic autoloader for now

---
 config/application.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/application.rb b/config/application.rb
index 18fac72ea..16faccc5a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -11,6 +11,7 @@ module SAPI
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 6.0
+    config.autoloader = :classic # TODO https://guides.rubyonrails.org/classic_to_zeitwerk_howto.html
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

From 6184763c70066e5de26ebe381cef72fd769ce802 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 11:29:46 +0000
Subject: [PATCH 130/241] fix rspec for Rails 6

---
 ...nomenclature_change_output_reassignments_table.rb |  2 --
 spec/controllers/admin/exports_controller_spec.rb    | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/db/migrate/20141113153137_create_nomenclature_change_output_reassignments_table.rb b/db/migrate/20141113153137_create_nomenclature_change_output_reassignments_table.rb
index d9bf4c32d..8d73b8845 100644
--- a/db/migrate/20141113153137_create_nomenclature_change_output_reassignments_table.rb
+++ b/db/migrate/20141113153137_create_nomenclature_change_output_reassignments_table.rb
@@ -8,8 +8,6 @@ def change
       t.text     :note_en
       t.integer  :created_by_id, :null => false
       t.integer  :updated_by_id, :null => false
-      t.datetime :created_at, :null => false
-      t.datetime :updated_at, :null => false
       t.text     :note_es
       t.text     :note_fr
       t.text     :internal_note
diff --git a/spec/controllers/admin/exports_controller_spec.rb b/spec/controllers/admin/exports_controller_spec.rb
index ee3225f0c..8d3cdd61d 100644
--- a/spec/controllers/admin/exports_controller_spec.rb
+++ b/spec/controllers/admin/exports_controller_spec.rb
@@ -20,7 +20,7 @@
         allow_any_instance_of(Species::TaxonConceptsNamesExport).to receive(:public_file_name).and_return('taxon_concepts_names.csv')
         get :download, params: { :data_type => "Names" }
         expect(response.content_type).to eq("text/csv")
-        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"")
+        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"; filename*=UTF-8''taxon_concepts_names.csv")
       end
       it "redirects when no results" do
         get :download, params: { :data_type => "Names" }
@@ -33,7 +33,7 @@
         allow_any_instance_of(Species::TaxonConceptsNamesExport).to receive(:public_file_name).and_return('taxon_concepts_names.csv')
         get :download, params: { :data_type => "Names", :filters => { :taxonomy => 'CITES_EU' } }
         expect(response.content_type).to eq("text/csv")
-        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"")
+        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"; filename*=UTF-8''taxon_concepts_names.csv")
       end
       it "redirects when no results" do
         get :download, params: { :data_type => "Names", :filters => { :taxonomy => 'CITES_EU' } }
@@ -46,7 +46,7 @@
         allow_any_instance_of(Species::TaxonConceptsNamesExport).to receive(:public_file_name).and_return('taxon_concepts_names.csv')
         get :download, params: { :data_type => "Names", :filters => { :taxonomy => 'CMS' } }
         expect(response.content_type).to eq("text/csv")
-        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"")
+        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_names.csv\"; filename*=UTF-8''taxon_concepts_names.csv")
       end
       it "redirects when no results" do
         get :download, params: { :data_type => "Names", :filters => { :taxonomy => 'CMS' } }
@@ -65,7 +65,7 @@
         allow_any_instance_of(Species::TaxonConceptsDistributionsExport).to receive(:public_file_name).and_return('taxon_concepts_distributions.csv')
         get :download, params: { :data_type => "Distributions" }
         expect(response.content_type).to eq("text/csv")
-        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"")
+        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"; filename*=UTF-8''taxon_concepts_distributions.csv")
       end
       it "redirects when no results" do
         get :download, params: { :data_type => "Distributions" }
@@ -79,7 +79,7 @@
         allow_any_instance_of(Species::TaxonConceptsDistributionsExport).to receive(:public_file_name).and_return('taxon_concepts_distributions.csv')
         get :download, params: { :data_type => "Distributions", :filters => { :taxonomy => 'CITES_EU' } }
         expect(response.content_type).to eq("text/csv")
-        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"")
+        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"; filename*=UTF-8''taxon_concepts_distributions.csv")
       end
       it "redirects when no results" do
         get :download, params: { :data_type => "Distributions", :filters => { :taxonomy => 'CITES_EU' } }
@@ -93,7 +93,7 @@
         allow_any_instance_of(Species::TaxonConceptsDistributionsExport).to receive(:public_file_name).and_return('taxon_concepts_distributions.csv')
         get :download, params: { :data_type => "Distributions", :filters => { :taxonomy => 'CMS' } }
         expect(response.content_type).to eq("text/csv")
-        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"")
+        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"taxon_concepts_distributions.csv\"; filename*=UTF-8''taxon_concepts_distributions.csv")
       end
       it "redirects when no results" do
         get :download, params: { :data_type => "Distributions", :filters => { :taxonomy => 'CMS' } }

From 2419d932f929e36e469f53c377569e5ace41b1af Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 11:47:23 +0000
Subject: [PATCH 131/241] fix rspec for Rails 6

---
 spec/controllers/cites_trade/exports_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/cites_trade/exports_controller_spec.rb b/spec/controllers/cites_trade/exports_controller_spec.rb
index 37338609c..e53576f88 100644
--- a/spec/controllers/cites_trade/exports_controller_spec.rb
+++ b/spec/controllers/cites_trade/exports_controller_spec.rb
@@ -18,7 +18,7 @@
         allow(Trade::TradeDataDownloadLogger).to receive(:organization_from).and_return("UNEP-WCMC")
         get :download, params: { :filters => { :report_type => :comptab } }
         expect(response.content_type).to eq("text/csv")
-        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"shipments.csv\"")
+        expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"shipments.csv\"; filename*=UTF-8''shipments.csv")
       end
       it "logs download information from public interface to the TradeDataDownload model" do
         create(:shipment)

From 624af4d5488676eaea5a48e1644a3c61c579f94d Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 14:14:58 +0000
Subject: [PATCH 132/241] Time as_json now convert the value to String.

---
 app/models/checklist/timeline_event.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/checklist/timeline_event.rb b/app/models/checklist/timeline_event.rb
index 20f6c1b3f..d0f73825c 100644
--- a/app/models/checklist/timeline_event.rb
+++ b/app/models/checklist/timeline_event.rb
@@ -15,6 +15,8 @@ class Checklist::TimelineEvent
   #:hash_ann_parent_symbol e.g. CoP15
   #:pos - position (%)
   def initialize(options)
+    options[:effective_at] = Time.zone.parse(options[:effective_at]) if options[:effective_at].is_a?(String)
+
     # if it is an auto-inserted deletion it won't have an id
     id = options[:id] || (
       (options[:species_listing_id] << 16) +

From 2cd90e84bc0955c5962e82d827b3d9ef21de73b3 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 14:33:23 +0000
Subject: [PATCH 133/241] DEPRECATION WARNING: update_attributes is deprecated
 and will be removed from Rails 6.1 (please, use update instead)

---
 .../admin/taxon_concept_comments_controller.rb            | 2 +-
 app/controllers/admin/users_controller.rb                 | 2 +-
 app/controllers/trade/sandbox_shipments_controller.rb     | 2 +-
 app/controllers/trade/shipments_controller.rb             | 2 +-
 app/controllers/trade/validation_errors_controller.rb     | 2 +-
 app/models/event.rb                                       | 4 ++--
 app/models/iucn_mapping_manager.rb                        | 2 +-
 app/models/nomenclature_change/full_reassignment.rb       | 6 +++---
 .../nomenclature_change/input_taxon_concept_processor.rb  | 2 +-
 .../to_accepted_name_transformation.rb                    | 2 +-
 .../nomenclature_change/to_synonym_transformation.rb      | 2 +-
 app/models/trade/annual_report_upload.rb                  | 4 ++--
 app/models/trade/validation_rule.rb                       | 2 +-
 app/workers/changes_history_generator_worker.rb           | 2 +-
 app/workers/submission_worker.rb                          | 6 +++---
 lib/tasks/import_countries.rake                           | 2 +-
 lib/tasks/import_orchids_T_to_A.rake                      | 2 +-
 lib/tasks/import_trade_codes.rake                         | 8 +++++---
 lib/tasks/import_trade_names.rake                         | 5 ++---
 lib/tasks/trade_db_resolve_ip_to_country.rake             | 2 +-
 .../trade/annual_report_uploads_controller_spec.rb        | 2 +-
 spec/models/designation_spec.rb                           | 8 ++++----
 spec/models/document_search_spec.rb                       | 8 ++++----
 spec/models/document_spec.rb                              | 4 ++--
 spec/models/geo_entity_search_spec.rb                     | 2 +-
 spec/models/nomenclature_change/split/constructor_spec.rb | 2 +-
 spec/models/taxonomy_spec.rb                              | 4 ++--
 spec/models/trade/inclusion_validation_rule_spec.rb       | 6 +++---
 spec/models/trade/sandbox_template_spec.rb                | 2 +-
 spec/models/trade/validation_rule_spec.rb                 | 6 +++---
 30 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/app/controllers/admin/taxon_concept_comments_controller.rb b/app/controllers/admin/taxon_concept_comments_controller.rb
index 7e990df1c..1c0c2becc 100644
--- a/app/controllers/admin/taxon_concept_comments_controller.rb
+++ b/app/controllers/admin/taxon_concept_comments_controller.rb
@@ -23,7 +23,7 @@ def create
   def update
     @taxon_concept = TaxonConcept.find(params[:taxon_concept_id])
     @comment = @taxon_concept.comments.find(params[:id])
-    @comment.update_attributes(comment_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    @comment.update(comment_params)
     redirect_to admin_taxon_concept_comments_url(@taxon_concept),
       notice: 'Operation succeeded'
   end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 6da5fcc65..910704e6a 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -21,7 +21,7 @@ def update
       if user_params[:password].blank?
         @user.update_without_password(user_params)
       else
-        @user.update_attributes(user_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        @user.update(user_params)
       end
     respond_to do |format|
       format.js {
diff --git a/app/controllers/trade/sandbox_shipments_controller.rb b/app/controllers/trade/sandbox_shipments_controller.rb
index 1620fd683..c581d2cb3 100644
--- a/app/controllers/trade/sandbox_shipments_controller.rb
+++ b/app/controllers/trade/sandbox_shipments_controller.rb
@@ -16,7 +16,7 @@ def update
     aru = Trade::AnnualReportUpload.find(params[:annual_report_upload_id])
     sandbox_klass = Trade::SandboxTemplate.ar_klass(aru.sandbox.table_name)
     @sandbox_shipment = sandbox_klass.find(params[:id])
-    @sandbox_shipment.update_attributes(sandbox_shipment_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    @sandbox_shipment.update(sandbox_shipment_params)
     head :no_content
   end
 
diff --git a/app/controllers/trade/shipments_controller.rb b/app/controllers/trade/shipments_controller.rb
index 87b7f13b6..62b3b8d7a 100644
--- a/app/controllers/trade/shipments_controller.rb
+++ b/app/controllers/trade/shipments_controller.rb
@@ -20,7 +20,7 @@ def create
   def update
     @shipment = Trade::Shipment.find(params[:id])
     update_params = populate_accepted_taxon_concept(shipment_params)
-    if @shipment.update_attributes(update_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    if @shipment.update(update_params)
       render :json => @shipment, :status => :ok
     else
       render :json => { "errors" => @shipment.errors }, :status => :unprocessable_entity
diff --git a/app/controllers/trade/validation_errors_controller.rb b/app/controllers/trade/validation_errors_controller.rb
index 6a14e82e1..f08dc83b7 100644
--- a/app/controllers/trade/validation_errors_controller.rb
+++ b/app/controllers/trade/validation_errors_controller.rb
@@ -8,7 +8,7 @@ def show
 
   def update
     @validation_error = Trade::ValidationError.find(params[:id])
-    if @validation_error.update_attributes(validation_error_params) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    if @validation_error.update(validation_error_params)
       render json: @validation_error, status: :ok
     else
       render json: { 'errors' => @validation_error.errors },
diff --git a/app/models/event.rb b/app/models/event.rb
index 1d4c5731e..d2ed69491 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -109,11 +109,11 @@ def self.search(query)
   end
 
   def activate!
-    update_attributes(:is_current => true) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    update(:is_current => true)
   end
 
   def deactivate!
-    update_attributes(:is_current => false) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    update(:is_current => false)
   end
 
   protected
diff --git a/app/models/iucn_mapping_manager.rb b/app/models/iucn_mapping_manager.rb
index c847d1d5a..9e3506750 100644
--- a/app/models/iucn_mapping_manager.rb
+++ b/app/models/iucn_mapping_manager.rb
@@ -42,7 +42,7 @@ def map_taxon_concept(taxon_concept, map, data)
       begin
         match = data["result"].first
         puts "#{taxon_concept.full_name} #{taxon_concept.author_year} <=>  #{match["scientific_name"]} #{match["authority"]}"
-        map.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        map.update(
           :iucn_taxon_name => match['scientific_name'],
           :iucn_taxon_id => match['taxonid'],
           :iucn_author => match['authority'],
diff --git a/app/models/nomenclature_change/full_reassignment.rb b/app/models/nomenclature_change/full_reassignment.rb
index 88ea5aa7e..345f56f63 100644
--- a/app/models/nomenclature_change/full_reassignment.rb
+++ b/app/models/nomenclature_change/full_reassignment.rb
@@ -41,14 +41,14 @@ def process
     Rails.logger.debug "FULL REASSIGNMENT Document Citations (#{@old_taxon_concept.document_citation_taxon_concepts.count})"
     # need validations to be applied to avoid duplicates exception
     @old_taxon_concept.document_citation_taxon_concepts.each do |dctc|
-      dctc.update_attributes(update_attrs) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      dctc.update(update_attrs)
     end
     # shipments
     Rails.logger.debug "FULL REASSIGNMENT Shipments"
     Trade::Shipment.where(taxon_concept_id: @old_taxon_concept.id).update_all(update_attrs)
-    @old_taxon_concept.update_attributes(dependents_updated_at: update_timestamp) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    @old_taxon_concept.update(dependents_updated_at: update_timestamp)
     @old_taxon_concept.reload
-    @new_taxon_concept.update_attributes(dependents_updated_at: update_timestamp) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    @new_taxon_concept.update(dependents_updated_at: update_timestamp)
   end
 
 end
diff --git a/app/models/nomenclature_change/input_taxon_concept_processor.rb b/app/models/nomenclature_change/input_taxon_concept_processor.rb
index c23e1c10a..72c6dda9c 100644
--- a/app/models/nomenclature_change/input_taxon_concept_processor.rb
+++ b/app/models/nomenclature_change/input_taxon_concept_processor.rb
@@ -8,7 +8,7 @@ def run
     return false unless @input.taxon_concept
     Rails.logger.debug("Processing input #{@input.taxon_concept.full_name}")
     tc = @input.taxon_concept
-    tc.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    tc.update(
       nomenclature_note_en: "#{tc.nomenclature_note_en} #{@input.note_en}",
       nomenclature_note_es: "#{tc.nomenclature_note_es} #{@input.note_es}",
       nomenclature_note_fr: "#{tc.nomenclature_note_fr} #{@input.note_fr}"
diff --git a/app/models/nomenclature_change/to_accepted_name_transformation.rb b/app/models/nomenclature_change/to_accepted_name_transformation.rb
index 716392896..34687ffe9 100644
--- a/app/models/nomenclature_change/to_accepted_name_transformation.rb
+++ b/app/models/nomenclature_change/to_accepted_name_transformation.rb
@@ -13,7 +13,7 @@ def process
       @non_accepted_taxon_concept.inverse_trade_name_relationships
     )
 
-    @non_accepted_taxon_concept.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    @non_accepted_taxon_concept.update(
       parent_id: @new_parent.id,
       name_status: 'A'
     )
diff --git a/app/models/nomenclature_change/to_synonym_transformation.rb b/app/models/nomenclature_change/to_synonym_transformation.rb
index 4edc3da2f..2021ff322 100644
--- a/app/models/nomenclature_change/to_synonym_transformation.rb
+++ b/app/models/nomenclature_change/to_synonym_transformation.rb
@@ -27,7 +27,7 @@ def process
   def relink_relationships(relationships, new_taxon_concept)
     relationships.includes(:taxon_concept, :taxon_relationship_type).each do |rel|
       Rails.logger.debug "Relinking #{rel.taxon_relationship_type.name} relationship from #{rel.taxon_concept.full_name} to #{new_taxon_concept.full_name}"
-      rel.update_attributes(taxon_concept_id: new_taxon_concept.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      rel.update(taxon_concept_id: new_taxon_concept.id)
     end
   end
 
diff --git a/app/models/trade/annual_report_upload.rb b/app/models/trade/annual_report_upload.rb
index 77b3d442d..7487fce4e 100644
--- a/app/models/trade/annual_report_upload.rb
+++ b/app/models/trade/annual_report_upload.rb
@@ -97,11 +97,11 @@ def submit(submitter)
     DownloadsCacheCleanupWorker.perform_async('shipments')
 
     # flag as submitted
-    update_attributes({ # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    update(
       submitted_at: DateTime.now,
       submitted_by_id: submitter.id,
       number_of_records_submitted: records_submitted
-    })
+    )
 
     # This has been temporarily disabled as originally part of EPIX
     #ChangesHistoryGeneratorWorker.perform_async(self.id, submitter.id)
diff --git a/app/models/trade/validation_rule.rb b/app/models/trade/validation_rule.rb
index 9ead03ef6..bda8ebdd1 100644
--- a/app/models/trade/validation_rule.rb
+++ b/app/models/trade/validation_rule.rb
@@ -106,7 +106,7 @@ def update_or_create_error_record(annual_report_upload, existing_record, error_c
       if error_count == 0
         existing_record.destroy
       else
-        existing_record.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        existing_record.update(
           error_count: error_count
         )
       end
diff --git a/app/workers/changes_history_generator_worker.rb b/app/workers/changes_history_generator_worker.rb
index d14540d45..a95b2b277 100644
--- a/app/workers/changes_history_generator_worker.rb
+++ b/app/workers/changes_history_generator_worker.rb
@@ -23,7 +23,7 @@ def perform(aru_id, user_id)
       obj = s3.bucket(bucket_name).object(filename)
       obj.upload_file(tempfile.path)
 
-      aru.update_attributes(aws_storage_path: obj.public_url) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      aru.update(aws_storage_path: obj.public_url)
     rescue Aws::S3::Errors::ServiceError => e
       Rails.logger.warn "Something went wrong while uploading #{aru.id} to S3"
       Appsignal.add_exception(e) if defined? Appsignal
diff --git a/app/workers/submission_worker.rb b/app/workers/submission_worker.rb
index 4078e8651..3ecc8805a 100644
--- a/app/workers/submission_worker.rb
+++ b/app/workers/submission_worker.rb
@@ -41,11 +41,11 @@ def perform(aru_id, submitter_id)
     aru.sandbox.destroy
 
     # flag as submitted
-    aru.update_attributes({ # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    aru.update(
       submitted_at: DateTime.now,
       submitted_by_id: submitter.id,
       number_of_records_submitted: records_submitted
-    })
+    )
 
     NotificationMailer.changelog(submitter, aru, tempfile).deliver_now
 
@@ -62,7 +62,7 @@ def upload_on_S3(aru, tempfile)
       obj = s3.bucket(bucket_name).object(filename)
       obj.upload_file(tempfile.path)
 
-      aru.update_attributes(aws_storage_path: obj.public_url) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      aru.update(aws_storage_path: obj.public_url)
     rescue Aws::S3::Errors::ServiceError => e
       Rails.logger.warn "Something went wrong while uploading #{aru.id} to S3"
       Appsignal.add_exception(e) if defined? Appsignal
diff --git a/lib/tasks/import_countries.rake b/lib/tasks/import_countries.rake
index 65cec168a..df241a366 100644
--- a/lib/tasks/import_countries.rake
+++ b/lib/tasks/import_countries.rake
@@ -44,7 +44,7 @@ namespace :import do
     CSV.foreach("lib/files/country_codes_en_es_fr_utf8.csv") do |row|
       country = GeoEntity.find_or_initialize_by(iso_code2: row[0].strip.upcase)
       unless country.id.nil?
-        country.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        country.update(
           :name_fr => row[1].strip, :name_es => row[2].strip
         )
       end
diff --git a/lib/tasks/import_orchids_T_to_A.rake b/lib/tasks/import_orchids_T_to_A.rake
index babb04cbc..3d5ee8c44 100644
--- a/lib/tasks/import_orchids_T_to_A.rake
+++ b/lib/tasks/import_orchids_T_to_A.rake
@@ -12,7 +12,7 @@ namespace :import do
         puts "There was a problem with this Taxon Concept #{row['ID'].strip}"
         next
       end
-      @nomenclature_change.update_attributes(:status => NomenclatureChange::SUBMITTED) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      @nomenclature_change.update(:status => NomenclatureChange::SUBMITTED)
     end
   end
 end
diff --git a/lib/tasks/import_trade_codes.rake b/lib/tasks/import_trade_codes.rake
index 5bd4ea20d..550b50f3c 100644
--- a/lib/tasks/import_trade_codes.rake
+++ b/lib/tasks/import_trade_codes.rake
@@ -6,9 +6,11 @@ namespace :import do
       current_count = klass.count
       CSV.foreach("lib/files/#{klass.to_s.downcase}_codes_utf8.csv") do |row|
         code = klass.find_or_initialize_by(code: row[0].strip.upcase)
-        code.update_attributes(:name_en => row[1].strip, # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
-                               :name_fr => row[2].strip,
-                               :name_es => row[3].strip)
+        code.update(
+          :name_en => row[1].strip,
+          :name_fr => row[2].strip,
+          :name_es => row[3].strip
+        )
       end
       puts "#{klass.count - current_count} new #{klass} added"
     end
diff --git a/lib/tasks/import_trade_names.rake b/lib/tasks/import_trade_names.rake
index 73fdcd2f6..a37cb8344 100644
--- a/lib/tasks/import_trade_names.rake
+++ b/lib/tasks/import_trade_names.rake
@@ -146,15 +146,14 @@ namespace :import do
       puts "Updating #{tc.full_name}"
       unless tc.accepted_names.any?
         puts "from synonym to trade_name"
-        tc.update_attributes(:name_status => "T", :parent_id => nil, # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
-                            :legacy_trade_code => cites_code)
+        tc.update(:name_status => "T", :parent_id => nil, :legacy_trade_code => cites_code)
       end
       puts "Update its children's taxon_name_id"
       tc.children.each do |child|
         if child.accepted_names.any?
           puts "looking at #{child.full_name} scientific_name"
           taxon_name = TaxonName.find_or_create_by(scientific_name: child.full_name)
-          child.update_attributes(:parent_id => nil, :taxon_name_id => taxon_name.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          child.update(:parent_id => nil, :taxon_name_id => taxon_name.id)
         end
       end
     end
diff --git a/lib/tasks/trade_db_resolve_ip_to_country.rake b/lib/tasks/trade_db_resolve_ip_to_country.rake
index 66b61d885..fb08d2573 100644
--- a/lib/tasks/trade_db_resolve_ip_to_country.rake
+++ b/lib/tasks/trade_db_resolve_ip_to_country.rake
@@ -5,6 +5,6 @@ task :trade_db_resolve_ip_to_country => :environment do
   trade_downloads.each do |td|
     puts "Updating Trade download #{td.id}"
     geo_ip_data = Sapi::GeoIP.instance.resolve(td.user_ip)
-    td.update_attributes!(geo_ip_data) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+    td.update!(geo_ip_data)
   end
 end
diff --git a/spec/controllers/trade/annual_report_uploads_controller_spec.rb b/spec/controllers/trade/annual_report_uploads_controller_spec.rb
index 60f0721ff..ca4b6b97e 100644
--- a/spec/controllers/trade/annual_report_uploads_controller_spec.rb
+++ b/spec/controllers/trade/annual_report_uploads_controller_spec.rb
@@ -30,7 +30,7 @@ def exporter_csv
       @aru.save(:validate => false)
       @completed_aru = build(:annual_report_upload)
       @completed_aru.save(:validate => false)
-      @completed_aru.update_attributes(submitted_at: Time.now) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      @completed_aru.update(submitted_at: Time.now)
     end
     it "should return all annual report uploads" do
       get :index, format: :json
diff --git a/spec/models/designation_spec.rb b/spec/models/designation_spec.rb
index 5c001216c..f7c9da237 100644
--- a/spec/models/designation_spec.rb
+++ b/spec/models/designation_spec.rb
@@ -33,14 +33,14 @@
     context "when updating a non-protected name" do
       let(:designation) { create(:designation) }
       specify {
-        expect(designation.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        expect(designation.update(
           { :name => 'RULES OF INTERGALACTIC TRADE' }
         )).to be_truthy
       }
     end
     context "when updating a protected name" do
       specify {
-        expect(cites.update_attributes( # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        expect(cites.update(
           { :name => 'RULES OF INTERGALACTIC TRADE' }
         )).to be_falsey
       }
@@ -48,13 +48,13 @@
     context "when updating taxonomy with no dependent objects attached" do
       let(:designation) { create(:designation) }
       let(:taxonomy) { create(:taxonomy) }
-      specify { expect(designation.update_attributes(:taxonomy_id => taxonomy.id)).to be_truthy } # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      specify { expect(designation.update(:taxonomy_id => taxonomy.id)).to be_truthy }
     end
     context "when updating taxonomy with dependent objects attached" do
       let(:designation) { create(:designation) }
       let!(:change_type) { create(:change_type, :designation => designation) }
       let(:taxonomy) { create(:taxonomy) }
-      specify { expect(designation.update_attributes(:taxonomy_id => taxonomy.id)).to be_falsey } # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      specify { expect(designation.update(:taxonomy_id => taxonomy.id)).to be_falsey }
     end
   end
   describe :destroy do
diff --git a/spec/models/document_search_spec.rb b/spec/models/document_search_spec.rb
index 1d668d96b..d1a943966 100644
--- a/spec/models/document_search_spec.rb
+++ b/spec/models/document_search_spec.rb
@@ -334,7 +334,7 @@
     context "when document updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
       specify do
         travel_to(Time.now - (DocumentSearch::REFRESH_INTERVAL - 1).minutes) do
-          @d.update_attributes!(is_public: true) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          @d.update!(is_public: true)
         end
 
         expect(DocumentSearch.documents_need_refreshing?).to be_truthy
@@ -406,7 +406,7 @@
       context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
           travel_to(@recent_time) do
-            @c.update_attributes!(elib_legacy_id: 1) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+            @c.update!(elib_legacy_id: 1)
           end
 
           expect(@c.reload.updated_at).to be > @refresh_threshold
@@ -455,7 +455,7 @@
       context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
           travel_to(@recent_time) do
-            @c_tc.update_attributes!(taxon_concept_id: create_cites_eu_species.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+            @c_tc.update!(taxon_concept_id: create_cites_eu_species.id)
           end
 
           expect(@c.reload.updated_at).to be > @refresh_threshold
@@ -493,7 +493,7 @@
       context "updated in last #{DocumentSearch::REFRESH_INTERVAL} minutes" do
         specify do
           travel_to(@recent_time) do
-            @c_ge.update_attributes!(geo_entity_id: @ge2.id) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+            @c_ge.update!(geo_entity_id: @ge2.id)
           end
 
           expect(@c.reload.updated_at).to be > @refresh_threshold
diff --git a/spec/models/document_spec.rb b/spec/models/document_spec.rb
index 9c7a9b099..1d043e538 100644
--- a/spec/models/document_spec.rb
+++ b/spec/models/document_spec.rb
@@ -81,13 +81,13 @@
     }
     context "when primary document sort_index_updated" do
       specify "secondary document sort_index is in sync" do
-        primary_document.update_attributes(sort_index: 3) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        primary_document.update(sort_index: 3)
         expect(secondary_document.reload.sort_index).to eq(3)
       end
     end
     context "when secondary document sort_index_updated" do
       specify "primary document sort_index is in sync" do
-        secondary_document.update_attributes(sort_index: 3) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+        secondary_document.update(sort_index: 3)
         expect(primary_document.reload.sort_index).to eq(3)
       end
     end
diff --git a/spec/models/geo_entity_search_spec.rb b/spec/models/geo_entity_search_spec.rb
index 9ab78db4b..838c183ad 100644
--- a/spec/models/geo_entity_search_spec.rb
+++ b/spec/models/geo_entity_search_spec.rb
@@ -108,7 +108,7 @@
     subject { GeoEntitySearch.new({ geo_entity_types_set: '3' }) }
     specify do
       subject.cached_results
-      @burma.update_attributes({ is_current: false }) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      @burma.update({ is_current: false })
       expect(subject.cached_results).not_to include(@burma)
     end
   end
diff --git a/spec/models/nomenclature_change/split/constructor_spec.rb b/spec/models/nomenclature_change/split/constructor_spec.rb
index 073d7251d..ee214e59c 100644
--- a/spec/models/nomenclature_change/split/constructor_spec.rb
+++ b/spec/models/nomenclature_change/split/constructor_spec.rb
@@ -188,7 +188,7 @@
 
 
           # split.input.distribution_reassignments.first.
-          #   update_attributes(output_ids: [split.outputs.first.id])
+          #   update(output_ids: [split.outputs.first.id])
           constructor.build_document_reassignments
           expect(split.input.document_citation_reassignments.first.
             output_ids).not_to include(non_default_output.id)
diff --git a/spec/models/taxonomy_spec.rb b/spec/models/taxonomy_spec.rb
index 8d55efc45..037e7418c 100644
--- a/spec/models/taxonomy_spec.rb
+++ b/spec/models/taxonomy_spec.rb
@@ -31,10 +31,10 @@
   describe :update do
     context "when updating a non-protected name" do
       let(:taxonomy) { create(:taxonomy) }
-      specify { expect(taxonomy.update_attributes({ :name => 'WORLD OF LOLCATS' })).to be_truthy } # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      specify { expect(taxonomy.update({ :name => 'WORLD OF LOLCATS' })).to be_truthy }
     end
     context "when updating a protected name" do
-      specify { expect(cites_eu.update_attributes({ :name => 'WORLD OF LOLCATS' })).to be_falsey } # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      specify { expect(cites_eu.update({ :name => 'WORLD OF LOLCATS' })).to be_falsey }
     end
   end
   describe :destroy do
diff --git a/spec/models/trade/inclusion_validation_rule_spec.rb b/spec/models/trade/inclusion_validation_rule_spec.rb
index 4d34c840a..4f395796f 100644
--- a/spec/models/trade/inclusion_validation_rule_spec.rb
+++ b/spec/models/trade/inclusion_validation_rule_spec.rb
@@ -111,8 +111,8 @@
     context "when updates and error fixed for all records" do
       specify "error record is destroyed" do
         travel_to(Time.now + 1) do
-          @shipment2.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
-          @shipment3.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          @shipment2.update(taxon_name: 'Canis lupus')
+          @shipment3.update(taxon_name: 'Canis lupus')
           expect {
             validation_rule.refresh_errors_if_needed(annual_report_upload)
           }.to change { Trade::ValidationError.count }.by(-1)
@@ -123,7 +123,7 @@
     context "when updates and error fixed for some records" do
       specify "error record is updated to reflect new error_count" do
         travel_to(Time.now + 1) do
-          @shipment2.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          @shipment2.update(taxon_name: 'Canis lupus')
           expect {
             validation_rule.refresh_errors_if_needed(annual_report_upload)
           }.to change { @validation_error.reload.error_count }.by(-1)
diff --git a/spec/models/trade/sandbox_template_spec.rb b/spec/models/trade/sandbox_template_spec.rb
index 8fbc73953..76be7ef57 100644
--- a/spec/models/trade/sandbox_template_spec.rb
+++ b/spec/models/trade/sandbox_template_spec.rb
@@ -54,7 +54,7 @@
       @shipment1 = sandbox_klass.create(:taxon_name => canis_lupus.full_name)
     end
     specify {
-      @shipment1.update_attributes(:taxon_name => canis_aureus.full_name) # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+      @shipment1.update(:taxon_name => canis_aureus.full_name)
       expect(@shipment1.reload.taxon_concept_id).to eq(canis_aureus.id)
     }
   end
diff --git a/spec/models/trade/validation_rule_spec.rb b/spec/models/trade/validation_rule_spec.rb
index ed62b7997..6688b55b1 100644
--- a/spec/models/trade/validation_rule_spec.rb
+++ b/spec/models/trade/validation_rule_spec.rb
@@ -101,8 +101,8 @@
     context "when updates and error fixed for all records" do
       specify "error record is destroyed" do
         travel_to(Time.now + 1) do
-          @shipment2.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
-          @shipment3.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          @shipment2.update(taxon_name: 'Canis lupus')
+          @shipment3.update(taxon_name: 'Canis lupus')
           expect {
             validation_rule.refresh_errors_if_needed(annual_report_upload)
           }.to change { Trade::ValidationError.count }.by(-1)
@@ -113,7 +113,7 @@
     context "when updates and error fixed for some records" do
       specify "error record is updated to reflect new error_count" do
         travel_to(Time.now + 1) do
-          @shipment2.update_attributes(taxon_name: 'Canis lupus') # TODO: `update_attributes` is deprecated in Rails 6, and removed from Rails 7.
+          @shipment2.update(taxon_name: 'Canis lupus')
           expect {
             validation_rule.refresh_errors_if_needed(annual_report_upload)
           }.to change { @validation_error.reload.error_count }.by(-1)

From 2f50a8fad55cadefa420ac4bde9913b3c239e3f0 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 14:57:45 +0000
Subject: [PATCH 134/241] fix environment (copy from production to staging)

---
 config/environments/production.rb |  3 +--
 config/environments/staging.rb    | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 90c218765..7cd7b0fef 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -35,7 +35,7 @@
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+  config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
@@ -61,7 +61,6 @@
   # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "sapi_production"
-
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 435915493..ce7c7de92 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -24,13 +24,12 @@
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
+  # Compress CSS using a preprocessor.
   # config.assets.css_compressor = :sass
 
   # Don't fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'
 
@@ -92,6 +91,27 @@
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
+  # Inserts middleware to perform automatic connection switching.
+  # The `database_selector` hash is used to pass options to the DatabaseSelector
+  # middleware. The `delay` is used to determine how long to wait after a write
+  # to send a subsequent read to the primary.
+  #
+  # The `database_resolver` class is used by the middleware to determine which
+  # database is appropriate to use based on the time delay.
+  #
+  # The `database_resolver_context` class is used by the middleware to set
+  # timestamps for the last write to the primary. The resolver uses the context
+  # class timestamps to determine how long to wait before reading from the
+  # replica.
+  #
+  # By default Rails will store a last write timestamp in the session. The
+  # DatabaseSelector middleware is designed as such you can define your own
+  # strategy for connection switching and pass that into the middleware through
+  # these configuration options.
+  # config.active_record.database_selector = { delay: 2.seconds }
+  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
+  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
+
   # Custom ember settings
   config.ember.variant = :production
 

From 6262531667082e64faa1f00ad68f2469152d2222 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 15:05:45 +0000
Subject: [PATCH 135/241] enable 6.0 default

---
 .../initializers/0_new_framework_defaults_6_0.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/initializers/0_new_framework_defaults_6_0.rb b/config/initializers/0_new_framework_defaults_6_0.rb
index 92240ef5f..223024573 100644
--- a/config/initializers/0_new_framework_defaults_6_0.rb
+++ b/config/initializers/0_new_framework_defaults_6_0.rb
@@ -14,21 +14,21 @@
 #
 # This option is not backwards compatible with earlier Rails versions.
 # It's best enabled when your entire app is migrated and stable on 6.0.
-# Rails.application.config.action_dispatch.use_cookies_with_metadata = true
+Rails.application.config.action_dispatch.use_cookies_with_metadata = true
 
 # Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification.
-# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
+Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
 
 # Return false instead of self when enqueuing is aborted from a callback.
-# Rails.application.config.active_job.return_false_on_aborted_enqueue = true
+Rails.application.config.active_job.return_false_on_aborted_enqueue = true
 
 # Send Active Storage analysis and purge jobs to dedicated queues.
-# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
-# Rails.application.config.active_storage.queues.purge    = :active_storage_purge
+Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
+Rails.application.config.active_storage.queues.purge    = :active_storage_purge
 
 # When assigning to a collection of attachments declared via `has_many_attached`, replace existing
 # attachments instead of appending. Use #attach to add new attachments without replacing existing ones.
-# Rails.application.config.active_storage.replace_on_assign_to_many = true
+Rails.application.config.active_storage.replace_on_assign_to_many = true
 
 # Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
 #
@@ -37,9 +37,9 @@
 # If you send mail in the background, job workers need to have a copy of
 # MailDeliveryJob to ensure all delivery jobs are processed properly.
 # Make sure your entire app is migrated and stable on 6.0 before using this setting.
-# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
+Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
 
 # Enable the same cache key to be reused when the object being cached of type
 # `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count)
 # of the relation's cache key into the cache version to support recycling cache key.
-# Rails.application.config.active_record.collection_cache_versioning = true
+Rails.application.config.active_record.collection_cache_versioning = true

From 942df65d87c85bc12660193932690e2a87f121d9 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 15:30:21 +0000
Subject: [PATCH 136/241] upgrade gems

---
 Gemfile      |  6 +++---
 Gemfile.lock | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 03a44af37..45240d1be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'inherited_resources', '~> 1.14' # Deprecated (https://github.com/activeadmi
 gem 'nokogiri', '1.15.5' # TODO: New version need Ruby 3
 gem 'mobility', '~> 1.2', '>= 1.2.9'
 gem 'devise', '4.7.3' # TODO: need upgrade to 4.8+ when upgrade to rails 6.1
-gem 'cancancan', '2.3.0' # TODO, can upgrade to 3.0 after Rails 6
+gem 'cancancan', '~> 3.5'
 gem 'ahoy_matey', '4.2.1' # TODO: latest 5.0.2. Can't upgrade to 5.0 until upgrade to Rails 6
 gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
 
@@ -123,7 +123,7 @@ end
 group :test, :development do
   gem "rspec-rails", '5.1.2' # TODO: should upgrade once to rails 6.1
   gem 'rspec-collection_matchers', '~> 1.2', '>= 1.2.1'
-  gem "json_spec", '1.1.5'
+  gem 'json_spec', '~> 1.1', '>= 1.1.5'
   gem 'database_cleaner', '~> 2.0', '>= 2.0.2'
   gem "launchy", '2.4.3'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -174,7 +174,7 @@ gem 'test-unit', '3.1.5' # annoyingly, rails console won't start without it in s
 
 gem 'susy', '~> 2.2', '>= 2.2.14' # TODO: Deprecated. (https://github.com/oddbird/susy#power-tools-for-the-web-deprecated)
 gem 'gon', '~> 6.4'
-gem "chartkick", '4.2.1' # TODO: latest 5.0.5 @ 2023. Should upgrade to v4 once we upgrade to Rails 6 and Ruby 2.7
+gem 'chartkick', '~> 5.0', '>= 5.0.5'
 gem 'nested_form', '~> 0.3.2' # TODO: Deprecated. (https://github.com/ryanb/nested_form#unmaintained)
 gem 'bootstrap-sass', '2.3.2.2' # TODO: latest 3.4.1 @ 2019. Can't upgrade unless we sure bootstrap v3 backward compatible with boostrap v2
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a5bf8350..b0bc39bbf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
       redis (>= 1.0, < 6)
     builder (3.2.4)
     byebug (11.1.3)
-    cancancan (2.3.0)
+    cancancan (3.5.0)
     capistrano (3.11.0)
       airbrussh (>= 1.0.0)
       i18n
@@ -155,7 +155,7 @@ GEM
       marcel (~> 1.0.0)
       mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
-    chartkick (4.2.1)
+    chartkick (5.0.5)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
     codeclimate-test-reporter (0.1.1)
@@ -606,7 +606,7 @@ DEPENDENCIES
   bootstrap-sass (= 2.3.2.2)
   brightbox (= 2.3.9)
   byebug
-  cancancan (= 2.3.0)
+  cancancan (~> 3.5)
   capistrano (= 3.11.0)
   capistrano-bundler (= 1.5.0)
   capistrano-local-precompile (= 1.2.0)
@@ -617,7 +617,7 @@ DEPENDENCIES
   capistrano-sidekiq (~> 2.3, >= 2.3.1)
   capybara (>= 2.15)
   carrierwave (= 2.2.5)
-  chartkick (= 4.2.1)
+  chartkick (~> 5.0, >= 5.0.5)
   codeclimate-test-reporter (= 0.1.1)
   coffee-rails (~> 5.0)
   coveralls (= 0.7.1)
@@ -637,7 +637,7 @@ DEPENDENCIES
   httparty (~> 0.21.0)
   inherited_resources (~> 1.14)
   jslint_on_rails (= 1.1.1)
-  json_spec (= 1.1.5)
+  json_spec (~> 1.1, >= 1.1.5)
   kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
   listen (~> 3.2)

From 067a37fe3e4a525176c741309b44c58d33c9d4b9 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 31 Jan 2024 16:48:21 +0000
Subject: [PATCH 137/241] upgrade gems

---
 Gemfile      | 4 ++--
 Gemfile.lock | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 45240d1be..d88be10a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,7 +35,7 @@ gem 'nokogiri', '1.15.5' # TODO: New version need Ruby 3
 gem 'mobility', '~> 1.2', '>= 1.2.9'
 gem 'devise', '4.7.3' # TODO: need upgrade to 4.8+ when upgrade to rails 6.1
 gem 'cancancan', '~> 3.5'
-gem 'ahoy_matey', '4.2.1' # TODO: latest 5.0.2. Can't upgrade to 5.0 until upgrade to Rails 6
+gem 'ahoy_matey', '4.2.1' # TODO: latest 5.0.2. Can't upgrade to 5.0 until upgrade to Rails 6.1
 gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
 
 # TODO: starting from v1.4, it break our test due to redirection changes:
@@ -57,7 +57,7 @@ gem 'httparty', '~> 0.21.0'
 
 gem 'kaminari', '~> 1.2', '>= 1.2.2' # TODO: Suggest migrate to pagy gem.
 
-gem 'acts-as-taggable-on', '8.1.0' # TODO: latest v10 @ 2023. Can upgrade after upgrade to Rails 6.
+gem 'acts-as-taggable-on', '9.0.1' # TODO: latest v10 @ 2023. Can upgrade after upgrade to Rails 6.1
 gem 'carrierwave', '2.2.5' # TODO: latest is 3.0.5 @ 2023. can upgrade to v3 after Rails 6
 
 # PDF
diff --git a/Gemfile.lock b/Gemfile.lock
index b0bc39bbf..4cfdd64d8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -65,8 +65,8 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    acts-as-taggable-on (8.1.0)
-      activerecord (>= 5.0, < 6.2)
+    acts-as-taggable-on (9.0.1)
+      activerecord (>= 6.0, < 7.1)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
@@ -596,7 +596,7 @@ DEPENDENCIES
   actionpack-action_caching (~> 1.2, >= 1.2.2)
   actionpack-page_caching (~> 1.2, >= 1.2.4)
   active_model_serializers (= 0.8.4)
-  acts-as-taggable-on (= 8.1.0)
+  acts-as-taggable-on (= 9.0.1)
   ahoy_matey (= 4.2.1)
   annotate (= 2.5.0)
   appsignal (= 1.3.3)

From 524c85a07f9e7c390ec7f98d77887ec7a15f191f Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 1 Feb 2024 16:27:29 +0000
Subject: [PATCH 138/241] Classic to Zeitwerk
 (https://guides.rubyonrails.org/classic_to_zeitwerk_howto.html)

---
 Capfile                                       |  2 +-
 app/controllers/admin/documents_controller.rb |  4 +-
 .../api/v1/documents_controller.rb            |  2 -
 .../checklist/documents_controller.rb         |  2 -
 .../trade/trade_data_download_logger.rb       |  2 +-
 app/models/admin.rb                           |  5 --
 .../cites_captivity_process.rb                |  0
 .../cites_rst_process.rb                      |  0
 app/models/{ => concerns}/m_listing_change.rb |  0
 app/models/document/proposal.rb               |  2 +-
 .../document/review_of_significant_trade.rb   |  2 +-
 app/models/{ => eu_decisions}/eu_opinion.rb   |  0
 .../{ => eu_decisions}/eu_suspension.rb       |  0
 app/models/{ => events}/cites_ac.rb           |  0
 app/models/{ => events}/cites_cop.rb          |  0
 app/models/{ => events}/cites_cop_observer.rb |  0
 .../cites_extraordinary_meeting.rb            |  0
 app/models/{ => events}/cites_pc.rb           |  0
 .../cites_suspension_notification.rb          |  0
 .../cites_suspension_notification_observer.rb |  0
 app/models/{ => events}/cites_tc.rb           |  0
 app/models/{ => events}/ec_srg.rb             |  0
 .../{ => events}/eu_council_regulation.rb     |  0
 app/models/{ => events}/eu_event_observer.rb  |  0
 .../eu_implementing_regulation.rb             |  0
 app/models/{ => events}/eu_regulation.rb      |  0
 .../{ => events}/eu_regulation_observer.rb    |  0
 .../{ => events}/eu_suspension_regulation.rb  |  0
 .../eu_suspension_regulation_observer.rb      |  0
 app/models/{ => events}/id_materials.rb       |  0
 app/models/{document => }/proposal_details.rb |  2 +-
 app/models/{document => }/review_details.rb   |  2 +-
 app/models/{ => trade_codes}/purpose.rb       |  0
 app/models/{ => trade_codes}/source.rb        |  0
 app/models/{ => trade_codes}/term.rb          |  0
 app/models/{ => trade_codes}/unit.rb          |  0
 .../cites_suspension.rb                       |  0
 .../cites_suspension_observer.rb              |  0
 app/models/{ => trade_restrictions}/quota.rb  |  0
 .../quota_observer.rb                         |  0
 ...pendix_year_validation_rule_serializer.rb} |  0
 .../checklist/checklist.rb                    |  0
 .../checklist/checklist_params.rb             |  0
 .../checklist/column_display_name_mapping.rb  |  0
 .../checklist/csv/document.rb                 |  0
 .../checklist/csv/history.rb                  |  0
 .../checklist/csv/history_content.rb          |  0
 .../checklist/csv/index.rb                    |  0
 .../checklist/csv/index_content.rb            |  0
 .../checklist/higher_taxa_injector.rb         |  0
 .../checklist/higher_taxa_item.rb             |  0
 app/{models => services}/checklist/history.rb |  0
 .../checklist/history_fetcher.rb              |  0
 app/{models => services}/checklist/index.rb   |  0
 .../checklist/index_fetcher.rb                |  0
 .../checklist/json/document.rb                |  0
 .../checklist/json/history.rb                 |  0
 .../checklist/json/history_content.rb         |  0
 .../checklist/json/index.rb                   |  0
 .../checklist/json/index_content.rb           |  0
 .../checklist/pdf/document.rb                 |  0
 .../checklist/pdf/helpers.rb                  |  0
 .../checklist/pdf/history.rb                  |  0
 .../checklist/pdf/history_annotations_key.rb  |  0
 .../checklist/pdf/history_content.rb          |  0
 .../checklist/pdf/index.rb                    |  0
 .../checklist/pdf/index_annotations_key.rb    |  0
 .../checklist/pdf/index_content.rb            |  0
 .../checklist/pdf/index_fetcher.rb            |  0
 .../checklist/pdf/index_query.rb              |  0
 .../checklist/timeline.rb                     |  0
 .../checklist/timeline_event.rb               |  0
 .../checklist/timeline_interval.rb            |  0
 .../checklist/timeline_year.rb                |  0
 .../checklist/timelines_for_taxon_concept.rb  |  0
 .../cms_mapping_manager.rb                    |  0
 .../country_dictionary.rb                     |  0
 app/{models => services}/dashboard_stats.rb   |  0
 app/{models => services}/document_batch.rb    |  0
 .../document_collection_order.rb              |  0
 app/{models => services}/document_search.rb   |  0
 .../document_search_params.rb                 |  0
 .../events_by_type_stats.rb                   |  0
 app/{models => services}/geo_entity_search.rb |  0
 .../iucn_mapping_manager.rb                   |  0
 ...ept_filter_by_appendix_population_query.rb |  0
 ..._taxon_concept_filter_by_appendix_query.rb |  0
 ...n_concept_filter_by_id_with_descendants.rb |  0
 ...ter_by_scientific_name_with_descendants.rb |  0
 .../cascading_notes_processor.rb              |  0
 .../delete_unreassigned_processor.rb          |  0
 .../nomenclature_change/full_reassignment.rb  |  0
 .../input_taxon_concept_processor.rb          |  0
 .../nomenclature_change/lump/constructor.rb   |  0
 .../nomenclature_change/lump/processor.rb     |  0
 .../output_taxon_concept_processor.rb         |  0
 .../nomenclature_change/processor.rb          |  0
 .../reassignment_copy_processor.rb            |  0
 .../reassignment_processor.rb                 |  0
 .../reassignment_summarizer.rb                |  0
 .../reassignment_transfer_processor.rb        |  0
 .../nomenclature_change/split/constructor.rb  |  0
 .../nomenclature_change/split/processor.rb    |  0
 .../status_change/constructor_helpers.rb      |  0
 .../status_change/processor_helpers.rb        |  0
 .../status_change_processor.rb                |  0
 .../status_downgrade_processor.rb             |  0
 .../status_swap/constructor.rb                |  0
 .../status_swap/processor.rb                  |  0
 .../status_to_accepted/constructor.rb         |  0
 .../status_to_accepted/processor.rb           |  0
 .../status_to_synonym/constructor.rb          |  0
 .../status_to_synonym/processor.rb            |  0
 .../status_upgrade_processor.rb               |  0
 .../taxonomic_tree_name_resolver.rb           |  0
 .../to_accepted_name_transformation.rb        |  0
 .../to_synonym_transformation.rb              |  0
 .../trade_shipments_resolver.rb               |  0
 app/{models => services}/search_params.rb     |  0
 .../species/cites_listings_export.rb          |  0
 .../species/cites_processes_export.rb         |  0
 .../species/cms_listings_export.rb            |  0
 .../species/cms_mappings_export.rb            |  0
 .../species/common_names_export.rb            |  0
 .../species/csv_copy_export.rb                |  0
 .../species/documents_export.rb               |  0
 .../species/eu_decisions_export.rb            |  0
 .../species/eu_listings_export.rb             |  0
 .../species/id_manual_documents_export.rb     |  0
 .../species/iucn_mappings_export.rb           |  0
 .../species/listings_export.rb                |  0
 .../species/listings_export_factory.rb        |  0
 .../species/orphaned_taxon_concepts_export.rb |  0
 .../species/restrictions_export.rb            |  0
 app/{models => services}/species/search.rb    |  0
 .../species/search_params.rb                  |  0
 .../species_reference_output_export.rb        |  0
 .../standard_reference_output_export.rb       |  0
 .../synonyms_and_trade_names_export.rb        |  0
 .../species/taxon_concept_prefix_matcher.rb   |  0
 .../taxon_concepts_distributions_export.rb    |  0
 .../species/taxon_concepts_names_export.rb    |  0
 .../taxon_concept_data.rb                     |  0
 .../taxon_concept_matcher.rb                  |  0
 .../taxon_concept_prefix_matcher.rb           |  0
 .../taxon_concept_view_stats.rb               |  0
 .../trade/batch_update.rb                     |  0
 app/{models => services}/trade/filter.rb      |  0
 .../trade/permit_matcher.rb                   |  0
 .../trade/reported_taxon_concept_resolver.rb  |  0
 app/{models => services}/trade/sandbox.rb     |  0
 .../trade/sandbox_filter.rb                   |  0
 .../trade/sandbox_search_params.rb            |  0
 .../trade/search_params.rb                    |  0
 .../trade/shipment_report_queries.rb          |  0
 .../trade/shipments_comptab_export.rb         |  0
 .../trade/shipments_export.rb                 |  0
 .../trade/shipments_export_factory.rb         |  0
 .../trade/shipments_gross_exports_export.rb   |  0
 .../trade/shipments_gross_imports_export.rb   |  0
 .../trade/shipments_net_exports_export.rb     |  0
 .../trade/shipments_net_imports_export.rb     |  0
 .../trade/trade_data_downloads_export.rb      |  0
 .../trade/csv_source_file_uploader.rb         |  2 -
 app/workers/manual_download_worker.rb         |  2 -
 config/application.rb                         |  4 +-
 config/initializers/acts_as_taggable_on.rb    | 16 +++++
 config/initializers/ahoy.rb                   |  2 +-
 config/initializers/preload_sti_models.rb     | 32 +++++++---
 config/initializers/sidekiq.rb                |  2 +-
 lib/modules/hash_deep_slice.rb                | 28 ---------
 lib/modules/import/rst/formatter.rb           | 29 ++++++++-
 lib/modules/sapi/geo_i_p.rb                   | 61 +++++++++++++++++++
 lib/modules/sapi/geoip.rb                     | 59 ------------------
 lib/tasks/elibrary/document_files_importer.rb |  1 -
 lib/tasks/elibrary/import.rake                |  4 +-
 .../manual_document_files_importer.rb         |  1 -
 lib/tasks/export_trade_db.rake                |  2 -
 spec/factories/documents.rb                   |  4 +-
 .../cites_captivity_process_spec.rb           |  0
 .../{ => eu_decisions}/eu_opinion_spec.rb     |  0
 .../{ => eu_decisions}/eu_suspension_spec.rb  |  0
 spec/models/{ => events}/cites_cop_spec.rb    |  0
 .../cites_suspension_notification_spec.rb     |  0
 .../models/{ => events}/eu_regulation_spec.rb |  0
 spec/models/html_to_latex_spec.rb             |  2 -
 spec/models/{ => trade_codes}/purpose_spec.rb |  0
 spec/models/{ => trade_codes}/source_spec.rb  |  0
 spec/models/{ => trade_codes}/term_spec.rb    |  0
 spec/models/{ => trade_codes}/unit_spec.rb    |  0
 .../cites_suspension_spec.rb                  |  0
 .../{ => trade_restrictions}/quota_spec.rb    |  0
 spec/models/zeitwerk_compliance_spec.rb       |  8 +++
 .../checklist/annotations_spec.rb             |  0
 .../appendix_population_and_region_spec.rb    |  0
 .../checklist/appendix_population_spec.rb     |  0
 .../checklist/appendix_spec.rb                |  0
 .../checklist/checklist_spec.rb               |  0
 .../checklist/common_names_spec.rb            |  0
 .../checklist/higher_taxa_injector_spec.rb    |  0
 .../checklist/higher_taxa_item_spec.rb        |  0
 .../checklist/order_spec.rb                   |  0
 .../pdf/history_annotations_key_spec.rb       |  0
 .../checklist/pdf/history_spec.rb             |  0
 .../pdf/index_annotations_key_spec.rb         |  0
 .../checklist/pdf/index_fetcher_spec.rb       |  0
 .../checklist/scientific_name_spec.rb         |  0
 .../checklist/synonyms_spec.rb                |  0
 .../taxon_concept_prefix_matcher_spec.rb      |  0
 .../checklist/timeline_spec.rb                |  0
 .../timelines_for_taxon_concept_spec.rb       |  0
 .../dashboard_stats_species_spec.rb           |  0
 .../dashboard_stats_trade_spec.rb             |  0
 .../document_batch_spec.rb                    |  0
 .../document_search_spec.rb                   |  0
 .../geo_entity_search_spec.rb                 |  0
 .../delete_unreassigned_processor_spec.rb     |  0
 .../full_reassignment_spec.rb                 |  0
 .../lump/constructor_spec.rb                  |  0
 .../output_taxon_concept_processor_spec.rb    |  0
 .../lump/processor_spec.rb                    |  0
 .../reassignment_copy_processor_spec.rb       |  0
 .../reassignment_transfer_processor_spec.rb   |  0
 .../split/constructor_spec.rb                 |  0
 .../output_taxon_concept_processor_spec.rb    |  0
 .../split/processor_spec.rb                   |  0
 .../status_swap/constructor_spec.rb           |  0
 .../status_swap/processor_spec.rb             |  0
 .../status_to_accepted/processor_spec.rb      |  0
 .../status_to_synonym/constructor_spec.rb     |  0
 .../output_taxon_concept_processor_spec.rb    |  0
 .../status_to_synonym/processor_spec.rb       |  0
 .../species/common_names_export_spec.rb       |  0
 .../species/documents_export_spec.rb          |  0
 .../species/hybrid_prefix_matcher_spec.rb     |  0
 .../invisible_subspecies_search_spec.rb       |  0
 .../species/listings_export_spec.rb           |  0
 .../orphaned_taxon_concepts_export_spec.rb    |  0
 .../species/search_spec.rb                    |  0
 .../species/species_reference_output_spec.rb  |  0
 .../species/standard_reference_output_spec.rb |  0
 .../synonyms_and_trade_names_export_spec.rb   |  0
 .../taxon_concept_prefix_matcher_spec.rb      |  0
 .../species/taxon_concepts_export_spec.rb     |  0
 .../species/trade_name_prefix_matcher_spec.rb |  0
 .../species/visible_subspecies_search_spec.rb |  0
 .../taxon_concept_data_spec.rb                |  0
 .../taxon_concept_prefix_matcher_spec.rb      |  0
 .../{models => services}/trade/filter_spec.rb |  0
 .../trade/permit_matcher_spec.rb              |  0
 .../reported_taxon_concept_resolver_spec.rb   |  0
 .../trade/sandbox_filter_spec.rb              |  0
 .../trade/sandbox_spec.rb                     |  0
 .../trade/shipments_comptab_export_spec.rb    |  0
 .../trade/shipments_export_spec.rb            |  0
 .../shipments_gross_exports_export_spec.rb    |  0
 .../shipments_gross_imports_export_spec.rb    |  0
 .../shipments_net_exports_export_spec.rb      |  0
 .../shipments_net_imports_export_spec.rb      |  0
 259 files changed, 153 insertions(+), 131 deletions(-)
 rename app/{models => controllers/concerns}/trade/trade_data_download_logger.rb (98%)
 delete mode 100644 app/models/admin.rb
 rename app/models/{ => cites_processes}/cites_captivity_process.rb (100%)
 rename app/models/{ => cites_processes}/cites_rst_process.rb (100%)
 rename app/models/{ => concerns}/m_listing_change.rb (100%)
 rename app/models/{ => eu_decisions}/eu_opinion.rb (100%)
 rename app/models/{ => eu_decisions}/eu_suspension.rb (100%)
 rename app/models/{ => events}/cites_ac.rb (100%)
 rename app/models/{ => events}/cites_cop.rb (100%)
 rename app/models/{ => events}/cites_cop_observer.rb (100%)
 rename app/models/{ => events}/cites_extraordinary_meeting.rb (100%)
 rename app/models/{ => events}/cites_pc.rb (100%)
 rename app/models/{ => events}/cites_suspension_notification.rb (100%)
 rename app/models/{ => events}/cites_suspension_notification_observer.rb (100%)
 rename app/models/{ => events}/cites_tc.rb (100%)
 rename app/models/{ => events}/ec_srg.rb (100%)
 rename app/models/{ => events}/eu_council_regulation.rb (100%)
 rename app/models/{ => events}/eu_event_observer.rb (100%)
 rename app/models/{ => events}/eu_implementing_regulation.rb (100%)
 rename app/models/{ => events}/eu_regulation.rb (100%)
 rename app/models/{ => events}/eu_regulation_observer.rb (100%)
 rename app/models/{ => events}/eu_suspension_regulation.rb (100%)
 rename app/models/{ => events}/eu_suspension_regulation_observer.rb (100%)
 rename app/models/{ => events}/id_materials.rb (100%)
 rename app/models/{document => }/proposal_details.rb (92%)
 rename app/models/{document => }/review_details.rb (92%)
 rename app/models/{ => trade_codes}/purpose.rb (100%)
 rename app/models/{ => trade_codes}/source.rb (100%)
 rename app/models/{ => trade_codes}/term.rb (100%)
 rename app/models/{ => trade_codes}/unit.rb (100%)
 rename app/models/{ => trade_restrictions}/cites_suspension.rb (100%)
 rename app/models/{ => trade_restrictions}/cites_suspension_observer.rb (100%)
 rename app/models/{ => trade_restrictions}/quota.rb (100%)
 rename app/models/{ => trade_restrictions}/quota_observer.rb (100%)
 rename app/serializers/trade/{species_name_appendix_year_validation_rule_serializer.rb => taxon_concept_appendix_year_validation_rule_serializer.rb} (100%)
 rename app/{models => services}/checklist/checklist.rb (100%)
 rename app/{models => services}/checklist/checklist_params.rb (100%)
 rename app/{models => services}/checklist/column_display_name_mapping.rb (100%)
 rename app/{models => services}/checklist/csv/document.rb (100%)
 rename app/{models => services}/checklist/csv/history.rb (100%)
 rename app/{models => services}/checklist/csv/history_content.rb (100%)
 rename app/{models => services}/checklist/csv/index.rb (100%)
 rename app/{models => services}/checklist/csv/index_content.rb (100%)
 rename app/{models => services}/checklist/higher_taxa_injector.rb (100%)
 rename app/{models => services}/checklist/higher_taxa_item.rb (100%)
 rename app/{models => services}/checklist/history.rb (100%)
 rename app/{models => services}/checklist/history_fetcher.rb (100%)
 rename app/{models => services}/checklist/index.rb (100%)
 rename app/{models => services}/checklist/index_fetcher.rb (100%)
 rename app/{models => services}/checklist/json/document.rb (100%)
 rename app/{models => services}/checklist/json/history.rb (100%)
 rename app/{models => services}/checklist/json/history_content.rb (100%)
 rename app/{models => services}/checklist/json/index.rb (100%)
 rename app/{models => services}/checklist/json/index_content.rb (100%)
 rename app/{models => services}/checklist/pdf/document.rb (100%)
 rename app/{models => services}/checklist/pdf/helpers.rb (100%)
 rename app/{models => services}/checklist/pdf/history.rb (100%)
 rename app/{models => services}/checklist/pdf/history_annotations_key.rb (100%)
 rename app/{models => services}/checklist/pdf/history_content.rb (100%)
 rename app/{models => services}/checklist/pdf/index.rb (100%)
 rename app/{models => services}/checklist/pdf/index_annotations_key.rb (100%)
 rename app/{models => services}/checklist/pdf/index_content.rb (100%)
 rename app/{models => services}/checklist/pdf/index_fetcher.rb (100%)
 rename app/{models => services}/checklist/pdf/index_query.rb (100%)
 rename app/{models => services}/checklist/timeline.rb (100%)
 rename app/{models => services}/checklist/timeline_event.rb (100%)
 rename app/{models => services}/checklist/timeline_interval.rb (100%)
 rename app/{models => services}/checklist/timeline_year.rb (100%)
 rename app/{models => services}/checklist/timelines_for_taxon_concept.rb (100%)
 rename app/{models => services}/cms_mapping_manager.rb (100%)
 rename app/{models => services}/country_dictionary.rb (100%)
 rename app/{models => services}/dashboard_stats.rb (100%)
 rename app/{models => services}/document_batch.rb (100%)
 rename app/{models => services}/document_collection_order.rb (100%)
 rename app/{models => services}/document_search.rb (100%)
 rename app/{models => services}/document_search_params.rb (100%)
 rename app/{models => services}/events_by_type_stats.rb (100%)
 rename app/{models => services}/geo_entity_search.rb (100%)
 rename app/{models => services}/iucn_mapping_manager.rb (100%)
 rename app/{models => services}/m_taxon_concept_filter_by_appendix_population_query.rb (100%)
 rename app/{models => services}/m_taxon_concept_filter_by_appendix_query.rb (100%)
 rename app/{models => services}/m_taxon_concept_filter_by_id_with_descendants.rb (100%)
 rename app/{models => services}/m_taxon_concept_filter_by_scientific_name_with_descendants.rb (100%)
 rename app/{models => services}/nomenclature_change/cascading_notes_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/delete_unreassigned_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/full_reassignment.rb (100%)
 rename app/{models => services}/nomenclature_change/input_taxon_concept_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/lump/constructor.rb (100%)
 rename app/{models => services}/nomenclature_change/lump/processor.rb (100%)
 rename app/{models => services}/nomenclature_change/output_taxon_concept_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/processor.rb (100%)
 rename app/{models => services}/nomenclature_change/reassignment_copy_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/reassignment_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/reassignment_summarizer.rb (100%)
 rename app/{models => services}/nomenclature_change/reassignment_transfer_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/split/constructor.rb (100%)
 rename app/{models => services}/nomenclature_change/split/processor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_change/constructor_helpers.rb (100%)
 rename app/{models => services}/nomenclature_change/status_change/processor_helpers.rb (100%)
 rename app/{models => services}/nomenclature_change/status_change_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_downgrade_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_swap/constructor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_swap/processor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_to_accepted/constructor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_to_accepted/processor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_to_synonym/constructor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_to_synonym/processor.rb (100%)
 rename app/{models => services}/nomenclature_change/status_upgrade_processor.rb (100%)
 rename app/{models => services}/nomenclature_change/taxonomic_tree_name_resolver.rb (100%)
 rename app/{models => services}/nomenclature_change/to_accepted_name_transformation.rb (100%)
 rename app/{models => services}/nomenclature_change/to_synonym_transformation.rb (100%)
 rename app/{models => services}/nomenclature_change/trade_shipments_resolver.rb (100%)
 rename app/{models => services}/search_params.rb (100%)
 rename app/{models => services}/species/cites_listings_export.rb (100%)
 rename app/{models => services}/species/cites_processes_export.rb (100%)
 rename app/{models => services}/species/cms_listings_export.rb (100%)
 rename app/{models => services}/species/cms_mappings_export.rb (100%)
 rename app/{models => services}/species/common_names_export.rb (100%)
 rename app/{models => services}/species/csv_copy_export.rb (100%)
 rename app/{models => services}/species/documents_export.rb (100%)
 rename app/{models => services}/species/eu_decisions_export.rb (100%)
 rename app/{models => services}/species/eu_listings_export.rb (100%)
 rename app/{models => services}/species/id_manual_documents_export.rb (100%)
 rename app/{models => services}/species/iucn_mappings_export.rb (100%)
 rename app/{models => services}/species/listings_export.rb (100%)
 rename app/{models => services}/species/listings_export_factory.rb (100%)
 rename app/{models => services}/species/orphaned_taxon_concepts_export.rb (100%)
 rename app/{models => services}/species/restrictions_export.rb (100%)
 rename app/{models => services}/species/search.rb (100%)
 rename app/{models => services}/species/search_params.rb (100%)
 rename app/{models => services}/species/species_reference_output_export.rb (100%)
 rename app/{models => services}/species/standard_reference_output_export.rb (100%)
 rename app/{models => services}/species/synonyms_and_trade_names_export.rb (100%)
 rename app/{models => services}/species/taxon_concept_prefix_matcher.rb (100%)
 rename app/{models => services}/species/taxon_concepts_distributions_export.rb (100%)
 rename app/{models => services}/species/taxon_concepts_names_export.rb (100%)
 rename app/{models => services}/taxon_concept_data.rb (100%)
 rename app/{models => services}/taxon_concept_matcher.rb (100%)
 rename app/{models => services}/taxon_concept_prefix_matcher.rb (100%)
 rename app/{models => services}/taxon_concept_view_stats.rb (100%)
 rename app/{models => services}/trade/batch_update.rb (100%)
 rename app/{models => services}/trade/filter.rb (100%)
 rename app/{models => services}/trade/permit_matcher.rb (100%)
 rename app/{models => services}/trade/reported_taxon_concept_resolver.rb (100%)
 rename app/{models => services}/trade/sandbox.rb (100%)
 rename app/{models => services}/trade/sandbox_filter.rb (100%)
 rename app/{models => services}/trade/sandbox_search_params.rb (100%)
 rename app/{models => services}/trade/search_params.rb (100%)
 rename app/{models => services}/trade/shipment_report_queries.rb (100%)
 rename app/{models => services}/trade/shipments_comptab_export.rb (100%)
 rename app/{models => services}/trade/shipments_export.rb (100%)
 rename app/{models => services}/trade/shipments_export_factory.rb (100%)
 rename app/{models => services}/trade/shipments_gross_exports_export.rb (100%)
 rename app/{models => services}/trade/shipments_gross_imports_export.rb (100%)
 rename app/{models => services}/trade/shipments_net_exports_export.rb (100%)
 rename app/{models => services}/trade/shipments_net_imports_export.rb (100%)
 rename app/{models => services}/trade/trade_data_downloads_export.rb (100%)
 delete mode 100644 lib/modules/hash_deep_slice.rb
 create mode 100644 lib/modules/sapi/geo_i_p.rb
 delete mode 100644 lib/modules/sapi/geoip.rb
 rename spec/models/{ => cites_processes}/cites_captivity_process_spec.rb (100%)
 rename spec/models/{ => eu_decisions}/eu_opinion_spec.rb (100%)
 rename spec/models/{ => eu_decisions}/eu_suspension_spec.rb (100%)
 rename spec/models/{ => events}/cites_cop_spec.rb (100%)
 rename spec/models/{ => events}/cites_suspension_notification_spec.rb (100%)
 rename spec/models/{ => events}/eu_regulation_spec.rb (100%)
 rename spec/models/{ => trade_codes}/purpose_spec.rb (100%)
 rename spec/models/{ => trade_codes}/source_spec.rb (100%)
 rename spec/models/{ => trade_codes}/term_spec.rb (100%)
 rename spec/models/{ => trade_codes}/unit_spec.rb (100%)
 rename spec/models/{ => trade_restrictions}/cites_suspension_spec.rb (100%)
 rename spec/models/{ => trade_restrictions}/quota_spec.rb (100%)
 create mode 100644 spec/models/zeitwerk_compliance_spec.rb
 rename spec/{models => services}/checklist/annotations_spec.rb (100%)
 rename spec/{models => services}/checklist/appendix_population_and_region_spec.rb (100%)
 rename spec/{models => services}/checklist/appendix_population_spec.rb (100%)
 rename spec/{models => services}/checklist/appendix_spec.rb (100%)
 rename spec/{models => services}/checklist/checklist_spec.rb (100%)
 rename spec/{models => services}/checklist/common_names_spec.rb (100%)
 rename spec/{models => services}/checklist/higher_taxa_injector_spec.rb (100%)
 rename spec/{models => services}/checklist/higher_taxa_item_spec.rb (100%)
 rename spec/{models => services}/checklist/order_spec.rb (100%)
 rename spec/{models => services}/checklist/pdf/history_annotations_key_spec.rb (100%)
 rename spec/{models => services}/checklist/pdf/history_spec.rb (100%)
 rename spec/{models => services}/checklist/pdf/index_annotations_key_spec.rb (100%)
 rename spec/{models => services}/checklist/pdf/index_fetcher_spec.rb (100%)
 rename spec/{models => services}/checklist/scientific_name_spec.rb (100%)
 rename spec/{models => services}/checklist/synonyms_spec.rb (100%)
 rename spec/{models => services}/checklist/taxon_concept_prefix_matcher_spec.rb (100%)
 rename spec/{models => services}/checklist/timeline_spec.rb (100%)
 rename spec/{models => services}/checklist/timelines_for_taxon_concept_spec.rb (100%)
 rename spec/{models => services}/dashboard_stats_species_spec.rb (100%)
 rename spec/{models => services}/dashboard_stats_trade_spec.rb (100%)
 rename spec/{models => services}/document_batch_spec.rb (100%)
 rename spec/{models => services}/document_search_spec.rb (100%)
 rename spec/{models => services}/geo_entity_search_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/delete_unreassigned_processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/full_reassignment_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/lump/constructor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/lump/output_taxon_concept_processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/lump/processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/reassignment_copy_processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/reassignment_transfer_processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/split/constructor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/split/output_taxon_concept_processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/split/processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/status_swap/constructor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/status_swap/processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/status_to_accepted/processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/status_to_synonym/constructor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/status_to_synonym/output_taxon_concept_processor_spec.rb (100%)
 rename spec/{models => services}/nomenclature_change/status_to_synonym/processor_spec.rb (100%)
 rename spec/{models => services}/species/common_names_export_spec.rb (100%)
 rename spec/{models => services}/species/documents_export_spec.rb (100%)
 rename spec/{models => services}/species/hybrid_prefix_matcher_spec.rb (100%)
 rename spec/{models => services}/species/invisible_subspecies_search_spec.rb (100%)
 rename spec/{models => services}/species/listings_export_spec.rb (100%)
 rename spec/{models => services}/species/orphaned_taxon_concepts_export_spec.rb (100%)
 rename spec/{models => services}/species/search_spec.rb (100%)
 rename spec/{models => services}/species/species_reference_output_spec.rb (100%)
 rename spec/{models => services}/species/standard_reference_output_spec.rb (100%)
 rename spec/{models => services}/species/synonyms_and_trade_names_export_spec.rb (100%)
 rename spec/{models => services}/species/taxon_concept_prefix_matcher_spec.rb (100%)
 rename spec/{models => services}/species/taxon_concepts_export_spec.rb (100%)
 rename spec/{models => services}/species/trade_name_prefix_matcher_spec.rb (100%)
 rename spec/{models => services}/species/visible_subspecies_search_spec.rb (100%)
 rename spec/{models => services}/taxon_concept_data_spec.rb (100%)
 rename spec/{models => services}/taxon_concept_prefix_matcher_spec.rb (100%)
 rename spec/{models => services}/trade/filter_spec.rb (100%)
 rename spec/{models => services}/trade/permit_matcher_spec.rb (100%)
 rename spec/{models => services}/trade/reported_taxon_concept_resolver_spec.rb (100%)
 rename spec/{models => services}/trade/sandbox_filter_spec.rb (100%)
 rename spec/{models => services}/trade/sandbox_spec.rb (100%)
 rename spec/{models => services}/trade/shipments_comptab_export_spec.rb (100%)
 rename spec/{models => services}/trade/shipments_export_spec.rb (100%)
 rename spec/{models => services}/trade/shipments_gross_exports_export_spec.rb (100%)
 rename spec/{models => services}/trade/shipments_gross_imports_export_spec.rb (100%)
 rename spec/{models => services}/trade/shipments_net_exports_export_spec.rb (100%)
 rename spec/{models => services}/trade/shipments_net_imports_export_spec.rb (100%)

diff --git a/Capfile b/Capfile
index 666fbafec..7699784be 100644
--- a/Capfile
+++ b/Capfile
@@ -9,7 +9,7 @@ require 'capistrano/setup'
 require 'capistrano/deploy'
 
 
-require "capistrano/scm/git"
+require 'capistrano/scm/git'
 install_plugin Capistrano::SCM::Git
 
 
diff --git a/app/controllers/admin/documents_controller.rb b/app/controllers/admin/documents_controller.rb
index 7c49a0d4a..9867fcd28 100644
--- a/app/controllers/admin/documents_controller.rb
+++ b/app/controllers/admin/documents_controller.rb
@@ -21,9 +21,9 @@ def edit
     edit! do |format|
       load_associations
       if @document.is_a?(Document::ReviewOfSignificantTrade)
-        @document.review_details ||= Document::ReviewDetails.new
+        @document.review_details ||= ReviewDetails.new
       elsif @document.is_a?(Document::Proposal)
-        @document.proposal_details ||= Document::ProposalDetails.new
+        @document.proposal_details ||= ProposalDetails.new
       end
       @document.citations.build
       format.html { render 'new' }
diff --git a/app/controllers/api/v1/documents_controller.rb b/app/controllers/api/v1/documents_controller.rb
index 6a209523e..72530d605 100644
--- a/app/controllers/api/v1/documents_controller.rb
+++ b/app/controllers/api/v1/documents_controller.rb
@@ -84,8 +84,6 @@ def show
   end
 
   def download_zip
-    require 'zip'
-
     @documents = Document.find(params[:ids].split(','))
 
     t = Tempfile.new('tmp-zip-' + request.remote_ip)
diff --git a/app/controllers/checklist/documents_controller.rb b/app/controllers/checklist/documents_controller.rb
index 0217d9da1..be3d57fd2 100644
--- a/app/controllers/checklist/documents_controller.rb
+++ b/app/controllers/checklist/documents_controller.rb
@@ -77,8 +77,6 @@ def render_403
   end
 
   def full_volume_downloader
-    require 'zip'
-
     t = Tempfile.new('tmp-zip-' + request.remote_ip)
     missing_files = []
     vol_path = [Rails.root, '/public/ID_manual_volumes/', params['locale'], '/'].join
diff --git a/app/models/trade/trade_data_download_logger.rb b/app/controllers/concerns/trade/trade_data_download_logger.rb
similarity index 98%
rename from app/models/trade/trade_data_download_logger.rb
rename to app/controllers/concerns/trade/trade_data_download_logger.rb
index 11ebae4cc..ed2c46e35 100644
--- a/app/models/trade/trade_data_download_logger.rb
+++ b/app/controllers/concerns/trade/trade_data_download_logger.rb
@@ -1,4 +1,4 @@
-require 'sapi/geoip'
+require 'sapi/geo_i_p'
 module Trade::TradeDataDownloadLogger
 
   module_function
diff --git a/app/models/admin.rb b/app/models/admin.rb
deleted file mode 100644
index a38e3f484..000000000
--- a/app/models/admin.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Admin
-  def self.table_name_prefix
-    'admin_'
-  end
-end
diff --git a/app/models/cites_captivity_process.rb b/app/models/cites_processes/cites_captivity_process.rb
similarity index 100%
rename from app/models/cites_captivity_process.rb
rename to app/models/cites_processes/cites_captivity_process.rb
diff --git a/app/models/cites_rst_process.rb b/app/models/cites_processes/cites_rst_process.rb
similarity index 100%
rename from app/models/cites_rst_process.rb
rename to app/models/cites_processes/cites_rst_process.rb
diff --git a/app/models/m_listing_change.rb b/app/models/concerns/m_listing_change.rb
similarity index 100%
rename from app/models/m_listing_change.rb
rename to app/models/concerns/m_listing_change.rb
diff --git a/app/models/document/proposal.rb b/app/models/document/proposal.rb
index 49ec4dc02..100a7c14c 100644
--- a/app/models/document/proposal.rb
+++ b/app/models/document/proposal.rb
@@ -33,7 +33,7 @@ def self.display_name
   # attr_accessible :proposal_details_attributes
 
   has_one :proposal_details,
-    :class_name => 'Document::ProposalDetails',
+    :class_name => 'ProposalDetails',
     :foreign_key => 'document_id',
     dependent: :destroy
   accepts_nested_attributes_for :proposal_details, :allow_destroy => true
diff --git a/app/models/document/review_of_significant_trade.rb b/app/models/document/review_of_significant_trade.rb
index f834612f6..09b5e43a5 100644
--- a/app/models/document/review_of_significant_trade.rb
+++ b/app/models/document/review_of_significant_trade.rb
@@ -33,7 +33,7 @@ def self.display_name
   # attr_accessible :review_details_attributes
 
   has_one :review_details,
-    :class_name => 'Document::ReviewDetails',
+    :class_name => 'ReviewDetails',
     :foreign_key => 'document_id',
     dependent: :destroy
   accepts_nested_attributes_for :review_details, :allow_destroy => true
diff --git a/app/models/eu_opinion.rb b/app/models/eu_decisions/eu_opinion.rb
similarity index 100%
rename from app/models/eu_opinion.rb
rename to app/models/eu_decisions/eu_opinion.rb
diff --git a/app/models/eu_suspension.rb b/app/models/eu_decisions/eu_suspension.rb
similarity index 100%
rename from app/models/eu_suspension.rb
rename to app/models/eu_decisions/eu_suspension.rb
diff --git a/app/models/cites_ac.rb b/app/models/events/cites_ac.rb
similarity index 100%
rename from app/models/cites_ac.rb
rename to app/models/events/cites_ac.rb
diff --git a/app/models/cites_cop.rb b/app/models/events/cites_cop.rb
similarity index 100%
rename from app/models/cites_cop.rb
rename to app/models/events/cites_cop.rb
diff --git a/app/models/cites_cop_observer.rb b/app/models/events/cites_cop_observer.rb
similarity index 100%
rename from app/models/cites_cop_observer.rb
rename to app/models/events/cites_cop_observer.rb
diff --git a/app/models/cites_extraordinary_meeting.rb b/app/models/events/cites_extraordinary_meeting.rb
similarity index 100%
rename from app/models/cites_extraordinary_meeting.rb
rename to app/models/events/cites_extraordinary_meeting.rb
diff --git a/app/models/cites_pc.rb b/app/models/events/cites_pc.rb
similarity index 100%
rename from app/models/cites_pc.rb
rename to app/models/events/cites_pc.rb
diff --git a/app/models/cites_suspension_notification.rb b/app/models/events/cites_suspension_notification.rb
similarity index 100%
rename from app/models/cites_suspension_notification.rb
rename to app/models/events/cites_suspension_notification.rb
diff --git a/app/models/cites_suspension_notification_observer.rb b/app/models/events/cites_suspension_notification_observer.rb
similarity index 100%
rename from app/models/cites_suspension_notification_observer.rb
rename to app/models/events/cites_suspension_notification_observer.rb
diff --git a/app/models/cites_tc.rb b/app/models/events/cites_tc.rb
similarity index 100%
rename from app/models/cites_tc.rb
rename to app/models/events/cites_tc.rb
diff --git a/app/models/ec_srg.rb b/app/models/events/ec_srg.rb
similarity index 100%
rename from app/models/ec_srg.rb
rename to app/models/events/ec_srg.rb
diff --git a/app/models/eu_council_regulation.rb b/app/models/events/eu_council_regulation.rb
similarity index 100%
rename from app/models/eu_council_regulation.rb
rename to app/models/events/eu_council_regulation.rb
diff --git a/app/models/eu_event_observer.rb b/app/models/events/eu_event_observer.rb
similarity index 100%
rename from app/models/eu_event_observer.rb
rename to app/models/events/eu_event_observer.rb
diff --git a/app/models/eu_implementing_regulation.rb b/app/models/events/eu_implementing_regulation.rb
similarity index 100%
rename from app/models/eu_implementing_regulation.rb
rename to app/models/events/eu_implementing_regulation.rb
diff --git a/app/models/eu_regulation.rb b/app/models/events/eu_regulation.rb
similarity index 100%
rename from app/models/eu_regulation.rb
rename to app/models/events/eu_regulation.rb
diff --git a/app/models/eu_regulation_observer.rb b/app/models/events/eu_regulation_observer.rb
similarity index 100%
rename from app/models/eu_regulation_observer.rb
rename to app/models/events/eu_regulation_observer.rb
diff --git a/app/models/eu_suspension_regulation.rb b/app/models/events/eu_suspension_regulation.rb
similarity index 100%
rename from app/models/eu_suspension_regulation.rb
rename to app/models/events/eu_suspension_regulation.rb
diff --git a/app/models/eu_suspension_regulation_observer.rb b/app/models/events/eu_suspension_regulation_observer.rb
similarity index 100%
rename from app/models/eu_suspension_regulation_observer.rb
rename to app/models/events/eu_suspension_regulation_observer.rb
diff --git a/app/models/id_materials.rb b/app/models/events/id_materials.rb
similarity index 100%
rename from app/models/id_materials.rb
rename to app/models/events/id_materials.rb
diff --git a/app/models/document/proposal_details.rb b/app/models/proposal_details.rb
similarity index 92%
rename from app/models/document/proposal_details.rb
rename to app/models/proposal_details.rb
index f95e7373f..af43f21bc 100644
--- a/app/models/document/proposal_details.rb
+++ b/app/models/proposal_details.rb
@@ -12,7 +12,7 @@
 #  proposal_number     :text
 #
 
-class Document::ProposalDetails < ApplicationRecord
+class ProposalDetails < ApplicationRecord
   # Used in DocumentsController
   # attr_accessible :document_id, :proposal_nature, :proposal_outcome_id,
   #   :representation, :proposal_number
diff --git a/app/models/document/review_details.rb b/app/models/review_details.rb
similarity index 92%
rename from app/models/document/review_details.rb
rename to app/models/review_details.rb
index eb9e62d26..f12e1d8ab 100644
--- a/app/models/document/review_details.rb
+++ b/app/models/review_details.rb
@@ -11,7 +11,7 @@
 #  updated_at           :datetime         not null
 #
 
-class Document::ReviewDetails < ApplicationRecord
+class ReviewDetails < ApplicationRecord
   # Used by DocumentController.
   # attr_accessible :document_id, :review_phase_id, :process_stage_id, :recommended_category
   self.table_name = 'review_details'
diff --git a/app/models/purpose.rb b/app/models/trade_codes/purpose.rb
similarity index 100%
rename from app/models/purpose.rb
rename to app/models/trade_codes/purpose.rb
diff --git a/app/models/source.rb b/app/models/trade_codes/source.rb
similarity index 100%
rename from app/models/source.rb
rename to app/models/trade_codes/source.rb
diff --git a/app/models/term.rb b/app/models/trade_codes/term.rb
similarity index 100%
rename from app/models/term.rb
rename to app/models/trade_codes/term.rb
diff --git a/app/models/unit.rb b/app/models/trade_codes/unit.rb
similarity index 100%
rename from app/models/unit.rb
rename to app/models/trade_codes/unit.rb
diff --git a/app/models/cites_suspension.rb b/app/models/trade_restrictions/cites_suspension.rb
similarity index 100%
rename from app/models/cites_suspension.rb
rename to app/models/trade_restrictions/cites_suspension.rb
diff --git a/app/models/cites_suspension_observer.rb b/app/models/trade_restrictions/cites_suspension_observer.rb
similarity index 100%
rename from app/models/cites_suspension_observer.rb
rename to app/models/trade_restrictions/cites_suspension_observer.rb
diff --git a/app/models/quota.rb b/app/models/trade_restrictions/quota.rb
similarity index 100%
rename from app/models/quota.rb
rename to app/models/trade_restrictions/quota.rb
diff --git a/app/models/quota_observer.rb b/app/models/trade_restrictions/quota_observer.rb
similarity index 100%
rename from app/models/quota_observer.rb
rename to app/models/trade_restrictions/quota_observer.rb
diff --git a/app/serializers/trade/species_name_appendix_year_validation_rule_serializer.rb b/app/serializers/trade/taxon_concept_appendix_year_validation_rule_serializer.rb
similarity index 100%
rename from app/serializers/trade/species_name_appendix_year_validation_rule_serializer.rb
rename to app/serializers/trade/taxon_concept_appendix_year_validation_rule_serializer.rb
diff --git a/app/models/checklist/checklist.rb b/app/services/checklist/checklist.rb
similarity index 100%
rename from app/models/checklist/checklist.rb
rename to app/services/checklist/checklist.rb
diff --git a/app/models/checklist/checklist_params.rb b/app/services/checklist/checklist_params.rb
similarity index 100%
rename from app/models/checklist/checklist_params.rb
rename to app/services/checklist/checklist_params.rb
diff --git a/app/models/checklist/column_display_name_mapping.rb b/app/services/checklist/column_display_name_mapping.rb
similarity index 100%
rename from app/models/checklist/column_display_name_mapping.rb
rename to app/services/checklist/column_display_name_mapping.rb
diff --git a/app/models/checklist/csv/document.rb b/app/services/checklist/csv/document.rb
similarity index 100%
rename from app/models/checklist/csv/document.rb
rename to app/services/checklist/csv/document.rb
diff --git a/app/models/checklist/csv/history.rb b/app/services/checklist/csv/history.rb
similarity index 100%
rename from app/models/checklist/csv/history.rb
rename to app/services/checklist/csv/history.rb
diff --git a/app/models/checklist/csv/history_content.rb b/app/services/checklist/csv/history_content.rb
similarity index 100%
rename from app/models/checklist/csv/history_content.rb
rename to app/services/checklist/csv/history_content.rb
diff --git a/app/models/checklist/csv/index.rb b/app/services/checklist/csv/index.rb
similarity index 100%
rename from app/models/checklist/csv/index.rb
rename to app/services/checklist/csv/index.rb
diff --git a/app/models/checklist/csv/index_content.rb b/app/services/checklist/csv/index_content.rb
similarity index 100%
rename from app/models/checklist/csv/index_content.rb
rename to app/services/checklist/csv/index_content.rb
diff --git a/app/models/checklist/higher_taxa_injector.rb b/app/services/checklist/higher_taxa_injector.rb
similarity index 100%
rename from app/models/checklist/higher_taxa_injector.rb
rename to app/services/checklist/higher_taxa_injector.rb
diff --git a/app/models/checklist/higher_taxa_item.rb b/app/services/checklist/higher_taxa_item.rb
similarity index 100%
rename from app/models/checklist/higher_taxa_item.rb
rename to app/services/checklist/higher_taxa_item.rb
diff --git a/app/models/checklist/history.rb b/app/services/checklist/history.rb
similarity index 100%
rename from app/models/checklist/history.rb
rename to app/services/checklist/history.rb
diff --git a/app/models/checklist/history_fetcher.rb b/app/services/checklist/history_fetcher.rb
similarity index 100%
rename from app/models/checklist/history_fetcher.rb
rename to app/services/checklist/history_fetcher.rb
diff --git a/app/models/checklist/index.rb b/app/services/checklist/index.rb
similarity index 100%
rename from app/models/checklist/index.rb
rename to app/services/checklist/index.rb
diff --git a/app/models/checklist/index_fetcher.rb b/app/services/checklist/index_fetcher.rb
similarity index 100%
rename from app/models/checklist/index_fetcher.rb
rename to app/services/checklist/index_fetcher.rb
diff --git a/app/models/checklist/json/document.rb b/app/services/checklist/json/document.rb
similarity index 100%
rename from app/models/checklist/json/document.rb
rename to app/services/checklist/json/document.rb
diff --git a/app/models/checklist/json/history.rb b/app/services/checklist/json/history.rb
similarity index 100%
rename from app/models/checklist/json/history.rb
rename to app/services/checklist/json/history.rb
diff --git a/app/models/checklist/json/history_content.rb b/app/services/checklist/json/history_content.rb
similarity index 100%
rename from app/models/checklist/json/history_content.rb
rename to app/services/checklist/json/history_content.rb
diff --git a/app/models/checklist/json/index.rb b/app/services/checklist/json/index.rb
similarity index 100%
rename from app/models/checklist/json/index.rb
rename to app/services/checklist/json/index.rb
diff --git a/app/models/checklist/json/index_content.rb b/app/services/checklist/json/index_content.rb
similarity index 100%
rename from app/models/checklist/json/index_content.rb
rename to app/services/checklist/json/index_content.rb
diff --git a/app/models/checklist/pdf/document.rb b/app/services/checklist/pdf/document.rb
similarity index 100%
rename from app/models/checklist/pdf/document.rb
rename to app/services/checklist/pdf/document.rb
diff --git a/app/models/checklist/pdf/helpers.rb b/app/services/checklist/pdf/helpers.rb
similarity index 100%
rename from app/models/checklist/pdf/helpers.rb
rename to app/services/checklist/pdf/helpers.rb
diff --git a/app/models/checklist/pdf/history.rb b/app/services/checklist/pdf/history.rb
similarity index 100%
rename from app/models/checklist/pdf/history.rb
rename to app/services/checklist/pdf/history.rb
diff --git a/app/models/checklist/pdf/history_annotations_key.rb b/app/services/checklist/pdf/history_annotations_key.rb
similarity index 100%
rename from app/models/checklist/pdf/history_annotations_key.rb
rename to app/services/checklist/pdf/history_annotations_key.rb
diff --git a/app/models/checklist/pdf/history_content.rb b/app/services/checklist/pdf/history_content.rb
similarity index 100%
rename from app/models/checklist/pdf/history_content.rb
rename to app/services/checklist/pdf/history_content.rb
diff --git a/app/models/checklist/pdf/index.rb b/app/services/checklist/pdf/index.rb
similarity index 100%
rename from app/models/checklist/pdf/index.rb
rename to app/services/checklist/pdf/index.rb
diff --git a/app/models/checklist/pdf/index_annotations_key.rb b/app/services/checklist/pdf/index_annotations_key.rb
similarity index 100%
rename from app/models/checklist/pdf/index_annotations_key.rb
rename to app/services/checklist/pdf/index_annotations_key.rb
diff --git a/app/models/checklist/pdf/index_content.rb b/app/services/checklist/pdf/index_content.rb
similarity index 100%
rename from app/models/checklist/pdf/index_content.rb
rename to app/services/checklist/pdf/index_content.rb
diff --git a/app/models/checklist/pdf/index_fetcher.rb b/app/services/checklist/pdf/index_fetcher.rb
similarity index 100%
rename from app/models/checklist/pdf/index_fetcher.rb
rename to app/services/checklist/pdf/index_fetcher.rb
diff --git a/app/models/checklist/pdf/index_query.rb b/app/services/checklist/pdf/index_query.rb
similarity index 100%
rename from app/models/checklist/pdf/index_query.rb
rename to app/services/checklist/pdf/index_query.rb
diff --git a/app/models/checklist/timeline.rb b/app/services/checklist/timeline.rb
similarity index 100%
rename from app/models/checklist/timeline.rb
rename to app/services/checklist/timeline.rb
diff --git a/app/models/checklist/timeline_event.rb b/app/services/checklist/timeline_event.rb
similarity index 100%
rename from app/models/checklist/timeline_event.rb
rename to app/services/checklist/timeline_event.rb
diff --git a/app/models/checklist/timeline_interval.rb b/app/services/checklist/timeline_interval.rb
similarity index 100%
rename from app/models/checklist/timeline_interval.rb
rename to app/services/checklist/timeline_interval.rb
diff --git a/app/models/checklist/timeline_year.rb b/app/services/checklist/timeline_year.rb
similarity index 100%
rename from app/models/checklist/timeline_year.rb
rename to app/services/checklist/timeline_year.rb
diff --git a/app/models/checklist/timelines_for_taxon_concept.rb b/app/services/checklist/timelines_for_taxon_concept.rb
similarity index 100%
rename from app/models/checklist/timelines_for_taxon_concept.rb
rename to app/services/checklist/timelines_for_taxon_concept.rb
diff --git a/app/models/cms_mapping_manager.rb b/app/services/cms_mapping_manager.rb
similarity index 100%
rename from app/models/cms_mapping_manager.rb
rename to app/services/cms_mapping_manager.rb
diff --git a/app/models/country_dictionary.rb b/app/services/country_dictionary.rb
similarity index 100%
rename from app/models/country_dictionary.rb
rename to app/services/country_dictionary.rb
diff --git a/app/models/dashboard_stats.rb b/app/services/dashboard_stats.rb
similarity index 100%
rename from app/models/dashboard_stats.rb
rename to app/services/dashboard_stats.rb
diff --git a/app/models/document_batch.rb b/app/services/document_batch.rb
similarity index 100%
rename from app/models/document_batch.rb
rename to app/services/document_batch.rb
diff --git a/app/models/document_collection_order.rb b/app/services/document_collection_order.rb
similarity index 100%
rename from app/models/document_collection_order.rb
rename to app/services/document_collection_order.rb
diff --git a/app/models/document_search.rb b/app/services/document_search.rb
similarity index 100%
rename from app/models/document_search.rb
rename to app/services/document_search.rb
diff --git a/app/models/document_search_params.rb b/app/services/document_search_params.rb
similarity index 100%
rename from app/models/document_search_params.rb
rename to app/services/document_search_params.rb
diff --git a/app/models/events_by_type_stats.rb b/app/services/events_by_type_stats.rb
similarity index 100%
rename from app/models/events_by_type_stats.rb
rename to app/services/events_by_type_stats.rb
diff --git a/app/models/geo_entity_search.rb b/app/services/geo_entity_search.rb
similarity index 100%
rename from app/models/geo_entity_search.rb
rename to app/services/geo_entity_search.rb
diff --git a/app/models/iucn_mapping_manager.rb b/app/services/iucn_mapping_manager.rb
similarity index 100%
rename from app/models/iucn_mapping_manager.rb
rename to app/services/iucn_mapping_manager.rb
diff --git a/app/models/m_taxon_concept_filter_by_appendix_population_query.rb b/app/services/m_taxon_concept_filter_by_appendix_population_query.rb
similarity index 100%
rename from app/models/m_taxon_concept_filter_by_appendix_population_query.rb
rename to app/services/m_taxon_concept_filter_by_appendix_population_query.rb
diff --git a/app/models/m_taxon_concept_filter_by_appendix_query.rb b/app/services/m_taxon_concept_filter_by_appendix_query.rb
similarity index 100%
rename from app/models/m_taxon_concept_filter_by_appendix_query.rb
rename to app/services/m_taxon_concept_filter_by_appendix_query.rb
diff --git a/app/models/m_taxon_concept_filter_by_id_with_descendants.rb b/app/services/m_taxon_concept_filter_by_id_with_descendants.rb
similarity index 100%
rename from app/models/m_taxon_concept_filter_by_id_with_descendants.rb
rename to app/services/m_taxon_concept_filter_by_id_with_descendants.rb
diff --git a/app/models/m_taxon_concept_filter_by_scientific_name_with_descendants.rb b/app/services/m_taxon_concept_filter_by_scientific_name_with_descendants.rb
similarity index 100%
rename from app/models/m_taxon_concept_filter_by_scientific_name_with_descendants.rb
rename to app/services/m_taxon_concept_filter_by_scientific_name_with_descendants.rb
diff --git a/app/models/nomenclature_change/cascading_notes_processor.rb b/app/services/nomenclature_change/cascading_notes_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/cascading_notes_processor.rb
rename to app/services/nomenclature_change/cascading_notes_processor.rb
diff --git a/app/models/nomenclature_change/delete_unreassigned_processor.rb b/app/services/nomenclature_change/delete_unreassigned_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/delete_unreassigned_processor.rb
rename to app/services/nomenclature_change/delete_unreassigned_processor.rb
diff --git a/app/models/nomenclature_change/full_reassignment.rb b/app/services/nomenclature_change/full_reassignment.rb
similarity index 100%
rename from app/models/nomenclature_change/full_reassignment.rb
rename to app/services/nomenclature_change/full_reassignment.rb
diff --git a/app/models/nomenclature_change/input_taxon_concept_processor.rb b/app/services/nomenclature_change/input_taxon_concept_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/input_taxon_concept_processor.rb
rename to app/services/nomenclature_change/input_taxon_concept_processor.rb
diff --git a/app/models/nomenclature_change/lump/constructor.rb b/app/services/nomenclature_change/lump/constructor.rb
similarity index 100%
rename from app/models/nomenclature_change/lump/constructor.rb
rename to app/services/nomenclature_change/lump/constructor.rb
diff --git a/app/models/nomenclature_change/lump/processor.rb b/app/services/nomenclature_change/lump/processor.rb
similarity index 100%
rename from app/models/nomenclature_change/lump/processor.rb
rename to app/services/nomenclature_change/lump/processor.rb
diff --git a/app/models/nomenclature_change/output_taxon_concept_processor.rb b/app/services/nomenclature_change/output_taxon_concept_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/output_taxon_concept_processor.rb
rename to app/services/nomenclature_change/output_taxon_concept_processor.rb
diff --git a/app/models/nomenclature_change/processor.rb b/app/services/nomenclature_change/processor.rb
similarity index 100%
rename from app/models/nomenclature_change/processor.rb
rename to app/services/nomenclature_change/processor.rb
diff --git a/app/models/nomenclature_change/reassignment_copy_processor.rb b/app/services/nomenclature_change/reassignment_copy_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/reassignment_copy_processor.rb
rename to app/services/nomenclature_change/reassignment_copy_processor.rb
diff --git a/app/models/nomenclature_change/reassignment_processor.rb b/app/services/nomenclature_change/reassignment_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/reassignment_processor.rb
rename to app/services/nomenclature_change/reassignment_processor.rb
diff --git a/app/models/nomenclature_change/reassignment_summarizer.rb b/app/services/nomenclature_change/reassignment_summarizer.rb
similarity index 100%
rename from app/models/nomenclature_change/reassignment_summarizer.rb
rename to app/services/nomenclature_change/reassignment_summarizer.rb
diff --git a/app/models/nomenclature_change/reassignment_transfer_processor.rb b/app/services/nomenclature_change/reassignment_transfer_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/reassignment_transfer_processor.rb
rename to app/services/nomenclature_change/reassignment_transfer_processor.rb
diff --git a/app/models/nomenclature_change/split/constructor.rb b/app/services/nomenclature_change/split/constructor.rb
similarity index 100%
rename from app/models/nomenclature_change/split/constructor.rb
rename to app/services/nomenclature_change/split/constructor.rb
diff --git a/app/models/nomenclature_change/split/processor.rb b/app/services/nomenclature_change/split/processor.rb
similarity index 100%
rename from app/models/nomenclature_change/split/processor.rb
rename to app/services/nomenclature_change/split/processor.rb
diff --git a/app/models/nomenclature_change/status_change/constructor_helpers.rb b/app/services/nomenclature_change/status_change/constructor_helpers.rb
similarity index 100%
rename from app/models/nomenclature_change/status_change/constructor_helpers.rb
rename to app/services/nomenclature_change/status_change/constructor_helpers.rb
diff --git a/app/models/nomenclature_change/status_change/processor_helpers.rb b/app/services/nomenclature_change/status_change/processor_helpers.rb
similarity index 100%
rename from app/models/nomenclature_change/status_change/processor_helpers.rb
rename to app/services/nomenclature_change/status_change/processor_helpers.rb
diff --git a/app/models/nomenclature_change/status_change_processor.rb b/app/services/nomenclature_change/status_change_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_change_processor.rb
rename to app/services/nomenclature_change/status_change_processor.rb
diff --git a/app/models/nomenclature_change/status_downgrade_processor.rb b/app/services/nomenclature_change/status_downgrade_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_downgrade_processor.rb
rename to app/services/nomenclature_change/status_downgrade_processor.rb
diff --git a/app/models/nomenclature_change/status_swap/constructor.rb b/app/services/nomenclature_change/status_swap/constructor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_swap/constructor.rb
rename to app/services/nomenclature_change/status_swap/constructor.rb
diff --git a/app/models/nomenclature_change/status_swap/processor.rb b/app/services/nomenclature_change/status_swap/processor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_swap/processor.rb
rename to app/services/nomenclature_change/status_swap/processor.rb
diff --git a/app/models/nomenclature_change/status_to_accepted/constructor.rb b/app/services/nomenclature_change/status_to_accepted/constructor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_to_accepted/constructor.rb
rename to app/services/nomenclature_change/status_to_accepted/constructor.rb
diff --git a/app/models/nomenclature_change/status_to_accepted/processor.rb b/app/services/nomenclature_change/status_to_accepted/processor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_to_accepted/processor.rb
rename to app/services/nomenclature_change/status_to_accepted/processor.rb
diff --git a/app/models/nomenclature_change/status_to_synonym/constructor.rb b/app/services/nomenclature_change/status_to_synonym/constructor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_to_synonym/constructor.rb
rename to app/services/nomenclature_change/status_to_synonym/constructor.rb
diff --git a/app/models/nomenclature_change/status_to_synonym/processor.rb b/app/services/nomenclature_change/status_to_synonym/processor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_to_synonym/processor.rb
rename to app/services/nomenclature_change/status_to_synonym/processor.rb
diff --git a/app/models/nomenclature_change/status_upgrade_processor.rb b/app/services/nomenclature_change/status_upgrade_processor.rb
similarity index 100%
rename from app/models/nomenclature_change/status_upgrade_processor.rb
rename to app/services/nomenclature_change/status_upgrade_processor.rb
diff --git a/app/models/nomenclature_change/taxonomic_tree_name_resolver.rb b/app/services/nomenclature_change/taxonomic_tree_name_resolver.rb
similarity index 100%
rename from app/models/nomenclature_change/taxonomic_tree_name_resolver.rb
rename to app/services/nomenclature_change/taxonomic_tree_name_resolver.rb
diff --git a/app/models/nomenclature_change/to_accepted_name_transformation.rb b/app/services/nomenclature_change/to_accepted_name_transformation.rb
similarity index 100%
rename from app/models/nomenclature_change/to_accepted_name_transformation.rb
rename to app/services/nomenclature_change/to_accepted_name_transformation.rb
diff --git a/app/models/nomenclature_change/to_synonym_transformation.rb b/app/services/nomenclature_change/to_synonym_transformation.rb
similarity index 100%
rename from app/models/nomenclature_change/to_synonym_transformation.rb
rename to app/services/nomenclature_change/to_synonym_transformation.rb
diff --git a/app/models/nomenclature_change/trade_shipments_resolver.rb b/app/services/nomenclature_change/trade_shipments_resolver.rb
similarity index 100%
rename from app/models/nomenclature_change/trade_shipments_resolver.rb
rename to app/services/nomenclature_change/trade_shipments_resolver.rb
diff --git a/app/models/search_params.rb b/app/services/search_params.rb
similarity index 100%
rename from app/models/search_params.rb
rename to app/services/search_params.rb
diff --git a/app/models/species/cites_listings_export.rb b/app/services/species/cites_listings_export.rb
similarity index 100%
rename from app/models/species/cites_listings_export.rb
rename to app/services/species/cites_listings_export.rb
diff --git a/app/models/species/cites_processes_export.rb b/app/services/species/cites_processes_export.rb
similarity index 100%
rename from app/models/species/cites_processes_export.rb
rename to app/services/species/cites_processes_export.rb
diff --git a/app/models/species/cms_listings_export.rb b/app/services/species/cms_listings_export.rb
similarity index 100%
rename from app/models/species/cms_listings_export.rb
rename to app/services/species/cms_listings_export.rb
diff --git a/app/models/species/cms_mappings_export.rb b/app/services/species/cms_mappings_export.rb
similarity index 100%
rename from app/models/species/cms_mappings_export.rb
rename to app/services/species/cms_mappings_export.rb
diff --git a/app/models/species/common_names_export.rb b/app/services/species/common_names_export.rb
similarity index 100%
rename from app/models/species/common_names_export.rb
rename to app/services/species/common_names_export.rb
diff --git a/app/models/species/csv_copy_export.rb b/app/services/species/csv_copy_export.rb
similarity index 100%
rename from app/models/species/csv_copy_export.rb
rename to app/services/species/csv_copy_export.rb
diff --git a/app/models/species/documents_export.rb b/app/services/species/documents_export.rb
similarity index 100%
rename from app/models/species/documents_export.rb
rename to app/services/species/documents_export.rb
diff --git a/app/models/species/eu_decisions_export.rb b/app/services/species/eu_decisions_export.rb
similarity index 100%
rename from app/models/species/eu_decisions_export.rb
rename to app/services/species/eu_decisions_export.rb
diff --git a/app/models/species/eu_listings_export.rb b/app/services/species/eu_listings_export.rb
similarity index 100%
rename from app/models/species/eu_listings_export.rb
rename to app/services/species/eu_listings_export.rb
diff --git a/app/models/species/id_manual_documents_export.rb b/app/services/species/id_manual_documents_export.rb
similarity index 100%
rename from app/models/species/id_manual_documents_export.rb
rename to app/services/species/id_manual_documents_export.rb
diff --git a/app/models/species/iucn_mappings_export.rb b/app/services/species/iucn_mappings_export.rb
similarity index 100%
rename from app/models/species/iucn_mappings_export.rb
rename to app/services/species/iucn_mappings_export.rb
diff --git a/app/models/species/listings_export.rb b/app/services/species/listings_export.rb
similarity index 100%
rename from app/models/species/listings_export.rb
rename to app/services/species/listings_export.rb
diff --git a/app/models/species/listings_export_factory.rb b/app/services/species/listings_export_factory.rb
similarity index 100%
rename from app/models/species/listings_export_factory.rb
rename to app/services/species/listings_export_factory.rb
diff --git a/app/models/species/orphaned_taxon_concepts_export.rb b/app/services/species/orphaned_taxon_concepts_export.rb
similarity index 100%
rename from app/models/species/orphaned_taxon_concepts_export.rb
rename to app/services/species/orphaned_taxon_concepts_export.rb
diff --git a/app/models/species/restrictions_export.rb b/app/services/species/restrictions_export.rb
similarity index 100%
rename from app/models/species/restrictions_export.rb
rename to app/services/species/restrictions_export.rb
diff --git a/app/models/species/search.rb b/app/services/species/search.rb
similarity index 100%
rename from app/models/species/search.rb
rename to app/services/species/search.rb
diff --git a/app/models/species/search_params.rb b/app/services/species/search_params.rb
similarity index 100%
rename from app/models/species/search_params.rb
rename to app/services/species/search_params.rb
diff --git a/app/models/species/species_reference_output_export.rb b/app/services/species/species_reference_output_export.rb
similarity index 100%
rename from app/models/species/species_reference_output_export.rb
rename to app/services/species/species_reference_output_export.rb
diff --git a/app/models/species/standard_reference_output_export.rb b/app/services/species/standard_reference_output_export.rb
similarity index 100%
rename from app/models/species/standard_reference_output_export.rb
rename to app/services/species/standard_reference_output_export.rb
diff --git a/app/models/species/synonyms_and_trade_names_export.rb b/app/services/species/synonyms_and_trade_names_export.rb
similarity index 100%
rename from app/models/species/synonyms_and_trade_names_export.rb
rename to app/services/species/synonyms_and_trade_names_export.rb
diff --git a/app/models/species/taxon_concept_prefix_matcher.rb b/app/services/species/taxon_concept_prefix_matcher.rb
similarity index 100%
rename from app/models/species/taxon_concept_prefix_matcher.rb
rename to app/services/species/taxon_concept_prefix_matcher.rb
diff --git a/app/models/species/taxon_concepts_distributions_export.rb b/app/services/species/taxon_concepts_distributions_export.rb
similarity index 100%
rename from app/models/species/taxon_concepts_distributions_export.rb
rename to app/services/species/taxon_concepts_distributions_export.rb
diff --git a/app/models/species/taxon_concepts_names_export.rb b/app/services/species/taxon_concepts_names_export.rb
similarity index 100%
rename from app/models/species/taxon_concepts_names_export.rb
rename to app/services/species/taxon_concepts_names_export.rb
diff --git a/app/models/taxon_concept_data.rb b/app/services/taxon_concept_data.rb
similarity index 100%
rename from app/models/taxon_concept_data.rb
rename to app/services/taxon_concept_data.rb
diff --git a/app/models/taxon_concept_matcher.rb b/app/services/taxon_concept_matcher.rb
similarity index 100%
rename from app/models/taxon_concept_matcher.rb
rename to app/services/taxon_concept_matcher.rb
diff --git a/app/models/taxon_concept_prefix_matcher.rb b/app/services/taxon_concept_prefix_matcher.rb
similarity index 100%
rename from app/models/taxon_concept_prefix_matcher.rb
rename to app/services/taxon_concept_prefix_matcher.rb
diff --git a/app/models/taxon_concept_view_stats.rb b/app/services/taxon_concept_view_stats.rb
similarity index 100%
rename from app/models/taxon_concept_view_stats.rb
rename to app/services/taxon_concept_view_stats.rb
diff --git a/app/models/trade/batch_update.rb b/app/services/trade/batch_update.rb
similarity index 100%
rename from app/models/trade/batch_update.rb
rename to app/services/trade/batch_update.rb
diff --git a/app/models/trade/filter.rb b/app/services/trade/filter.rb
similarity index 100%
rename from app/models/trade/filter.rb
rename to app/services/trade/filter.rb
diff --git a/app/models/trade/permit_matcher.rb b/app/services/trade/permit_matcher.rb
similarity index 100%
rename from app/models/trade/permit_matcher.rb
rename to app/services/trade/permit_matcher.rb
diff --git a/app/models/trade/reported_taxon_concept_resolver.rb b/app/services/trade/reported_taxon_concept_resolver.rb
similarity index 100%
rename from app/models/trade/reported_taxon_concept_resolver.rb
rename to app/services/trade/reported_taxon_concept_resolver.rb
diff --git a/app/models/trade/sandbox.rb b/app/services/trade/sandbox.rb
similarity index 100%
rename from app/models/trade/sandbox.rb
rename to app/services/trade/sandbox.rb
diff --git a/app/models/trade/sandbox_filter.rb b/app/services/trade/sandbox_filter.rb
similarity index 100%
rename from app/models/trade/sandbox_filter.rb
rename to app/services/trade/sandbox_filter.rb
diff --git a/app/models/trade/sandbox_search_params.rb b/app/services/trade/sandbox_search_params.rb
similarity index 100%
rename from app/models/trade/sandbox_search_params.rb
rename to app/services/trade/sandbox_search_params.rb
diff --git a/app/models/trade/search_params.rb b/app/services/trade/search_params.rb
similarity index 100%
rename from app/models/trade/search_params.rb
rename to app/services/trade/search_params.rb
diff --git a/app/models/trade/shipment_report_queries.rb b/app/services/trade/shipment_report_queries.rb
similarity index 100%
rename from app/models/trade/shipment_report_queries.rb
rename to app/services/trade/shipment_report_queries.rb
diff --git a/app/models/trade/shipments_comptab_export.rb b/app/services/trade/shipments_comptab_export.rb
similarity index 100%
rename from app/models/trade/shipments_comptab_export.rb
rename to app/services/trade/shipments_comptab_export.rb
diff --git a/app/models/trade/shipments_export.rb b/app/services/trade/shipments_export.rb
similarity index 100%
rename from app/models/trade/shipments_export.rb
rename to app/services/trade/shipments_export.rb
diff --git a/app/models/trade/shipments_export_factory.rb b/app/services/trade/shipments_export_factory.rb
similarity index 100%
rename from app/models/trade/shipments_export_factory.rb
rename to app/services/trade/shipments_export_factory.rb
diff --git a/app/models/trade/shipments_gross_exports_export.rb b/app/services/trade/shipments_gross_exports_export.rb
similarity index 100%
rename from app/models/trade/shipments_gross_exports_export.rb
rename to app/services/trade/shipments_gross_exports_export.rb
diff --git a/app/models/trade/shipments_gross_imports_export.rb b/app/services/trade/shipments_gross_imports_export.rb
similarity index 100%
rename from app/models/trade/shipments_gross_imports_export.rb
rename to app/services/trade/shipments_gross_imports_export.rb
diff --git a/app/models/trade/shipments_net_exports_export.rb b/app/services/trade/shipments_net_exports_export.rb
similarity index 100%
rename from app/models/trade/shipments_net_exports_export.rb
rename to app/services/trade/shipments_net_exports_export.rb
diff --git a/app/models/trade/shipments_net_imports_export.rb b/app/services/trade/shipments_net_imports_export.rb
similarity index 100%
rename from app/models/trade/shipments_net_imports_export.rb
rename to app/services/trade/shipments_net_imports_export.rb
diff --git a/app/models/trade/trade_data_downloads_export.rb b/app/services/trade/trade_data_downloads_export.rb
similarity index 100%
rename from app/models/trade/trade_data_downloads_export.rb
rename to app/services/trade/trade_data_downloads_export.rb
diff --git a/app/uploaders/trade/csv_source_file_uploader.rb b/app/uploaders/trade/csv_source_file_uploader.rb
index 1d92b664d..f33eb07bb 100644
--- a/app/uploaders/trade/csv_source_file_uploader.rb
+++ b/app/uploaders/trade/csv_source_file_uploader.rb
@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'fileutils'
-
 class Trade::CsvSourceFileUploader < CarrierWave::Uploader::Base
 
   # Include RMagick or MiniMagick support:
diff --git a/app/workers/manual_download_worker.rb b/app/workers/manual_download_worker.rb
index 35aea3ca4..5ca21d137 100644
--- a/app/workers/manual_download_worker.rb
+++ b/app/workers/manual_download_worker.rb
@@ -54,8 +54,6 @@ def download_location(ext, params)
   end
 
   def zip_file_generator
-    require 'zip'
-
     missing_files = []
     pdf_file_paths = []
     tmp_dir_path = [Rails.root, "/tmp/", SecureRandom.hex(8)].join
diff --git a/config/application.rb b/config/application.rb
index 16faccc5a..5f5670c07 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,7 +1,8 @@
 require_relative 'boot'
 
 require 'rails/all'
-require "susy"
+require 'zip'
+require 'susy'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -11,7 +12,6 @@ module SAPI
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 6.0
-    config.autoloader = :classic # TODO https://guides.rubyonrails.org/classic_to_zeitwerk_howto.html
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index bd6585dcd..b00cc59c5 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -7,4 +7,20 @@
 #   attr_accessible :tag_id, :context, :taggable, :taggable_id, :taggable_type, :tagger_id, :tagger_type
 # end
 
+
+
+# TODO
+# DEPRECATION WARNING: Initialization autoloaded the constant ComparisonAttributes.
+#
+# Being able to do this is deprecated. Autoloading during initialization is going
+# to be an error condition in future versions of Rails.
+#
+# Reloading does not reboot the application, and therefore code executed during
+# initialization does not run again. So, if you reload ComparisonAttributes, for example,
+# the expected changes won't be reflected in that stale Module object.
+#
+# `config.autoloader` is set to `classic`. This autoloaded constant would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
+#
+# Please, check the "Autoloading and Reloading Constants" guide for solutions.
+#  (called from <top (required)> at /SAPI/config/environment.rb:5)
 ActsAsTaggableOn::Tagging.send :include, ComparisonAttributes
diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb
index 41e76e86d..ebac64204 100644
--- a/config/initializers/ahoy.rb
+++ b/config/initializers/ahoy.rb
@@ -1,4 +1,4 @@
-require 'sapi/geoip'
+require 'sapi/geo_i_p'
 
 class Ahoy::Store < Ahoy::DatabaseStore
   UUID_NAMESPACE = UUIDTools::UUID.parse("dcd74c26-8fc9-453a-a9c2-afc445c3258d")
diff --git a/config/initializers/preload_sti_models.rb b/config/initializers/preload_sti_models.rb
index 2a6a892a4..5ef919421 100644
--- a/config/initializers/preload_sti_models.rb
+++ b/config/initializers/preload_sti_models.rb
@@ -1,10 +1,28 @@
-if Rails.env.development?
+# https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#single-table-inheritance
 
-  require_dependency File.join("app", "models", "document.rb")
-  Dir.glob(Rails.root.join("app/models/document/*.rb")).each do |path|
-    require_dependency path
-  end
-  %w[cites_cop cites_ac cites_pc cites_tc cites_extraordinary_meeting ec_srg].each do |c|
-    require_dependency File.join("app", "models", "#{c}.rb")
+# https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#option-2-preload-a-collapsed-directory
+events = "#{Rails.root}/app/models/events"
+Rails.autoloaders.main.collapse(events)
+trade_codes = "#{Rails.root}/app/models/trade_codes"
+Rails.autoloaders.main.collapse(trade_codes)
+trade_restrictions = "#{Rails.root}/app/models/trade_restrictions"
+Rails.autoloaders.main.collapse(trade_restrictions)
+eu_decisions = "#{Rails.root}/app/models/eu_decisions"
+Rails.autoloaders.main.collapse(eu_decisions)
+cites_processes = "#{Rails.root}/app/models/cites_processes"
+Rails.autoloaders.main.collapse(cites_processes)
+
+unless Rails.application.config.eager_load
+  Rails.application.config.to_prepare do
+    # https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#option-2-preload-a-collapsed-directory
+    Rails.autoloaders.main.eager_load_dir(events)
+    Rails.autoloaders.main.eager_load_dir(trade_codes)
+    Rails.autoloaders.main.eager_load_dir(trade_restrictions)
+    Rails.autoloaders.main.eager_load_dir(eu_decisions)
+    Rails.autoloaders.main.eager_load_dir(cites_processes)
+    # https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#option-3-preload-a-regular-directory
+    Rails.autoloaders.main.eager_load_dir("#{Rails.root}/app/models/document")
+    Rails.autoloaders.main.eager_load_dir("#{Rails.root}/app/models/document_tag")
+    Rails.autoloaders.main.eager_load_dir("#{Rails.root}/app/models/nomenclature_change")
   end
 end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index f62ab9ee2..75dbad6cb 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,6 +1,6 @@
 require 'sidekiq'
 require 'sidekiq-status'
-require "sidekiq-unique-jobs"
+require 'sidekiq-unique-jobs'
 
 Sidekiq.configure_client do |config|
   config.client_middleware do |chain|
diff --git a/lib/modules/hash_deep_slice.rb b/lib/modules/hash_deep_slice.rb
deleted file mode 100644
index 78410bb63..000000000
--- a/lib/modules/hash_deep_slice.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-Hash.class_eval do
-
-  def deep_slice(*allowed_keys)
-    sliced = {}
-    allowed_keys.each do |allowed_key|
-      if allowed_key.is_a?(Hash)
-        allowed_key.each do |allowed_subkey, allowed_subkey_values|
-          if has_key?(allowed_subkey)
-            value = self[allowed_subkey]
-            if value.is_a?(Hash)
-              sliced[allowed_subkey] = value.deep_slice(*Array.wrap(allowed_subkey_values))
-            elsif value.nil?
-              sliced[allowed_subkey] = ''
-            else
-              raise ArgumentError, "can only deep-slice hash values, but value for #{allowed_subkey.inspect} was of type #{value.class.name}"
-            end
-          end
-        end
-      else
-        if has_key?(allowed_key)
-          sliced[allowed_key] = self[allowed_key]
-        end
-      end
-    end
-    sliced
-  end
-
-end
diff --git a/lib/modules/import/rst/formatter.rb b/lib/modules/import/rst/formatter.rb
index 88b7517c7..1fa029fd9 100644
--- a/lib/modules/import/rst/formatter.rb
+++ b/lib/modules/import/rst/formatter.rb
@@ -1,5 +1,3 @@
-require 'hash_deep_slice'
-
 module Import::Rst::Formatter
   class << self
     def format_data(data)
@@ -7,5 +5,32 @@ def format_data(data)
         item.deep_slice('id', 'countryId', 'status', 'startDate' ,'species' => 'name', 'meeting' => 'name')
       end
     end
+
+    private
+
+    def deep_slice(*allowed_keys)
+      sliced = {}
+      allowed_keys.each do |allowed_key|
+        if allowed_key.is_a?(Hash)
+          allowed_key.each do |allowed_subkey, allowed_subkey_values|
+            if has_key?(allowed_subkey)
+              value = self[allowed_subkey]
+              if value.is_a?(Hash)
+                sliced[allowed_subkey] = value.deep_slice(*Array.wrap(allowed_subkey_values))
+              elsif value.nil?
+                sliced[allowed_subkey] = ''
+              else
+                raise ArgumentError, "can only deep-slice hash values, but value for #{allowed_subkey.inspect} was of type #{value.class.name}"
+              end
+            end
+          end
+        else
+          if has_key?(allowed_key)
+            sliced[allowed_key] = self[allowed_key]
+          end
+        end
+      end
+      sliced
+    end
   end
 end
diff --git a/lib/modules/sapi/geo_i_p.rb b/lib/modules/sapi/geo_i_p.rb
new file mode 100644
index 000000000..039272220
--- /dev/null
+++ b/lib/modules/sapi/geo_i_p.rb
@@ -0,0 +1,61 @@
+# Returns UTF8
+module Sapi
+  class GeoIP
+    include Singleton
+
+    def initialize
+      begin
+        @city_db = GEO_IP_CONFIG['city_db'] && ::GeoIP.new(GEO_IP_CONFIG['city_db'])
+      rescue Errno::ENOENT
+        @city_db = nil
+      end
+      begin
+        @org_db = GEO_IP_CONFIG['org_db'] && ::GeoIP.new(GEO_IP_CONFIG['org_db'])
+      rescue Errno::ENOENT
+        @org_db = nil
+      end
+    end
+
+    def resolve(ip)
+      result = country_and_city(ip).merge(organisation(ip))
+      result.each do |k, v|
+        result[k] =
+          if v.nil?
+            'Unknown'
+          else
+            v.force_encoding("ISO-8859-1").encode("UTF-8")
+          end
+      end
+    end
+
+    def country_and_city(ip)
+      cdb_names = @city_db && @city_db.city(ip)
+      country = cdb_names.try(:country_code2)
+      city = cdb_names.try(:city_name)
+      {
+        country: country,
+        city: city
+      }
+    end
+
+    def organisation(ip)
+      org_names = @org_db && @org_db.organization(ip)
+      org = org_names.try(:isp)
+      { organization: org }
+    end
+
+    def default_separator(ip)
+      invalid_addresses = ['127.0.0.1', nil, 'localhost', 'nil', '', 'unknown']
+
+      if invalid_addresses.include?(ip)
+        :comma
+      else
+        ip_data = country_and_city(ip)
+        country = ip_data[:country]
+        separator_char = (country ? DEFAULT_COUNTRY_SEPARATORS[country.to_sym] : ',')
+        (separator_char == ';' ? :semicolon : :comma)
+      end
+    end
+
+  end
+end
diff --git a/lib/modules/sapi/geoip.rb b/lib/modules/sapi/geoip.rb
deleted file mode 100644
index d171d3d4f..000000000
--- a/lib/modules/sapi/geoip.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# Returns UTF8
-class Sapi::GeoIP
-  include Singleton
-
-  def initialize
-    begin
-      @city_db = GEO_IP_CONFIG['city_db'] && ::GeoIP.new(GEO_IP_CONFIG['city_db'])
-    rescue Errno::ENOENT
-      @city_db = nil
-    end
-    begin
-      @org_db = GEO_IP_CONFIG['org_db'] && ::GeoIP.new(GEO_IP_CONFIG['org_db'])
-    rescue Errno::ENOENT
-      @org_db = nil
-    end
-  end
-
-  def resolve(ip)
-    result = country_and_city(ip).merge(organisation(ip))
-    result.each do |k, v|
-      result[k] =
-        if v.nil?
-          'Unknown'
-        else
-          v.force_encoding("ISO-8859-1").encode("UTF-8")
-        end
-    end
-  end
-
-  def country_and_city(ip)
-    cdb_names = @city_db && @city_db.city(ip)
-    country = cdb_names.try(:country_code2)
-    city = cdb_names.try(:city_name)
-    {
-      country: country,
-      city: city
-    }
-  end
-
-  def organisation(ip)
-    org_names = @org_db && @org_db.organization(ip)
-    org = org_names.try(:isp)
-    { organization: org }
-  end
-
-  def default_separator(ip)
-    invalid_addresses = ['127.0.0.1', nil, 'localhost', 'nil', '', 'unknown']
-
-    if invalid_addresses.include?(ip)
-      :comma
-    else
-      ip_data = country_and_city(ip)
-      country = ip_data[:country]
-      separator_char = (country ? DEFAULT_COUNTRY_SEPARATORS[country.to_sym] : ',')
-      (separator_char == ';' ? :semicolon : :comma)
-    end
-  end
-
-end
diff --git a/lib/tasks/elibrary/document_files_importer.rb b/lib/tasks/elibrary/document_files_importer.rb
index b9df41c48..ee7871632 100644
--- a/lib/tasks/elibrary/document_files_importer.rb
+++ b/lib/tasks/elibrary/document_files_importer.rb
@@ -1,4 +1,3 @@
-require 'fileutils'
 # The purpose of this is to go over all document records and match them
 # with respective files.
 # Where files are present, create the expected directory structure, e.g.
diff --git a/lib/tasks/elibrary/import.rake b/lib/tasks/elibrary/import.rake
index d23670f70..8a70dd9e6 100644
--- a/lib/tasks/elibrary/import.rake
+++ b/lib/tasks/elibrary/import.rake
@@ -12,8 +12,8 @@ namespace :elibrary do
     DocumentCitationTaxonConcept.delete_all
     DocumentCitation.delete_all
     puts "Deleting documents"
-    Document::ProposalDetails.delete_all
-    Document::ReviewDetails.delete_all
+    ProposalDetails.delete_all
+    ReviewDetails.delete_all
     Document.delete_all
     DocumentTag.delete_all
   end
diff --git a/lib/tasks/elibrary/manual_document_files_importer.rb b/lib/tasks/elibrary/manual_document_files_importer.rb
index 08edd1767..a5e3d3f62 100644
--- a/lib/tasks/elibrary/manual_document_files_importer.rb
+++ b/lib/tasks/elibrary/manual_document_files_importer.rb
@@ -1,4 +1,3 @@
-require 'fileutils'
 # The purpose of this is to go over all document records and match them
 # with respective files.
 # Where files are present, create the expected directory structure, e.g.
diff --git a/lib/tasks/export_trade_db.rake b/lib/tasks/export_trade_db.rake
index 545d5473a..c4c9281ef 100644
--- a/lib/tasks/export_trade_db.rake
+++ b/lib/tasks/export_trade_db.rake
@@ -1,5 +1,3 @@
-require 'zip'
-require 'fileutils'
 namespace :export do
   task :trade_db => :environment do
     RECORDS_PER_FILE = 500000
diff --git a/spec/factories/documents.rb b/spec/factories/documents.rb
index 91831d343..6726954b0 100644
--- a/spec/factories/documents.rb
+++ b/spec/factories/documents.rb
@@ -42,12 +42,12 @@
     geo_entity
   end
 
-  factory :proposal_details, class: Document::ProposalDetails do
+  factory :proposal_details, class: ProposalDetails do
     document
     proposal_outcome
   end
 
-  factory :review_details, class: Document::ReviewDetails do
+  factory :review_details, class: ReviewDetails do
     document
     review_phase
   end
diff --git a/spec/models/cites_captivity_process_spec.rb b/spec/models/cites_processes/cites_captivity_process_spec.rb
similarity index 100%
rename from spec/models/cites_captivity_process_spec.rb
rename to spec/models/cites_processes/cites_captivity_process_spec.rb
diff --git a/spec/models/eu_opinion_spec.rb b/spec/models/eu_decisions/eu_opinion_spec.rb
similarity index 100%
rename from spec/models/eu_opinion_spec.rb
rename to spec/models/eu_decisions/eu_opinion_spec.rb
diff --git a/spec/models/eu_suspension_spec.rb b/spec/models/eu_decisions/eu_suspension_spec.rb
similarity index 100%
rename from spec/models/eu_suspension_spec.rb
rename to spec/models/eu_decisions/eu_suspension_spec.rb
diff --git a/spec/models/cites_cop_spec.rb b/spec/models/events/cites_cop_spec.rb
similarity index 100%
rename from spec/models/cites_cop_spec.rb
rename to spec/models/events/cites_cop_spec.rb
diff --git a/spec/models/cites_suspension_notification_spec.rb b/spec/models/events/cites_suspension_notification_spec.rb
similarity index 100%
rename from spec/models/cites_suspension_notification_spec.rb
rename to spec/models/events/cites_suspension_notification_spec.rb
diff --git a/spec/models/eu_regulation_spec.rb b/spec/models/events/eu_regulation_spec.rb
similarity index 100%
rename from spec/models/eu_regulation_spec.rb
rename to spec/models/events/eu_regulation_spec.rb
diff --git a/spec/models/html_to_latex_spec.rb b/spec/models/html_to_latex_spec.rb
index d58f7fe45..5595d7909 100644
--- a/spec/models/html_to_latex_spec.rb
+++ b/spec/models/html_to_latex_spec.rb
@@ -1,6 +1,4 @@
 require 'spec_helper'
-# https://stackoverflow.com/a/46904732/556780
-require_dependency Rails.root.join('lib', 'modules', 'html_to_latex')
 
 describe HtmlToLatex do
   describe :convert do
diff --git a/spec/models/purpose_spec.rb b/spec/models/trade_codes/purpose_spec.rb
similarity index 100%
rename from spec/models/purpose_spec.rb
rename to spec/models/trade_codes/purpose_spec.rb
diff --git a/spec/models/source_spec.rb b/spec/models/trade_codes/source_spec.rb
similarity index 100%
rename from spec/models/source_spec.rb
rename to spec/models/trade_codes/source_spec.rb
diff --git a/spec/models/term_spec.rb b/spec/models/trade_codes/term_spec.rb
similarity index 100%
rename from spec/models/term_spec.rb
rename to spec/models/trade_codes/term_spec.rb
diff --git a/spec/models/unit_spec.rb b/spec/models/trade_codes/unit_spec.rb
similarity index 100%
rename from spec/models/unit_spec.rb
rename to spec/models/trade_codes/unit_spec.rb
diff --git a/spec/models/cites_suspension_spec.rb b/spec/models/trade_restrictions/cites_suspension_spec.rb
similarity index 100%
rename from spec/models/cites_suspension_spec.rb
rename to spec/models/trade_restrictions/cites_suspension_spec.rb
diff --git a/spec/models/quota_spec.rb b/spec/models/trade_restrictions/quota_spec.rb
similarity index 100%
rename from spec/models/quota_spec.rb
rename to spec/models/trade_restrictions/quota_spec.rb
diff --git a/spec/models/zeitwerk_compliance_spec.rb b/spec/models/zeitwerk_compliance_spec.rb
new file mode 100644
index 000000000..0cd4e3aac
--- /dev/null
+++ b/spec/models/zeitwerk_compliance_spec.rb
@@ -0,0 +1,8 @@
+require "spec_helper"
+
+# https://guides.rubyonrails.org/classic_to_zeitwerk_howto.html#rspec
+RSpec.describe "Zeitwerk compliance" do
+  it "eager loads all files without errors" do
+    expect { Rails.application.eager_load! }.not_to raise_error
+  end
+end
diff --git a/spec/models/checklist/annotations_spec.rb b/spec/services/checklist/annotations_spec.rb
similarity index 100%
rename from spec/models/checklist/annotations_spec.rb
rename to spec/services/checklist/annotations_spec.rb
diff --git a/spec/models/checklist/appendix_population_and_region_spec.rb b/spec/services/checklist/appendix_population_and_region_spec.rb
similarity index 100%
rename from spec/models/checklist/appendix_population_and_region_spec.rb
rename to spec/services/checklist/appendix_population_and_region_spec.rb
diff --git a/spec/models/checklist/appendix_population_spec.rb b/spec/services/checklist/appendix_population_spec.rb
similarity index 100%
rename from spec/models/checklist/appendix_population_spec.rb
rename to spec/services/checklist/appendix_population_spec.rb
diff --git a/spec/models/checklist/appendix_spec.rb b/spec/services/checklist/appendix_spec.rb
similarity index 100%
rename from spec/models/checklist/appendix_spec.rb
rename to spec/services/checklist/appendix_spec.rb
diff --git a/spec/models/checklist/checklist_spec.rb b/spec/services/checklist/checklist_spec.rb
similarity index 100%
rename from spec/models/checklist/checklist_spec.rb
rename to spec/services/checklist/checklist_spec.rb
diff --git a/spec/models/checklist/common_names_spec.rb b/spec/services/checklist/common_names_spec.rb
similarity index 100%
rename from spec/models/checklist/common_names_spec.rb
rename to spec/services/checklist/common_names_spec.rb
diff --git a/spec/models/checklist/higher_taxa_injector_spec.rb b/spec/services/checklist/higher_taxa_injector_spec.rb
similarity index 100%
rename from spec/models/checklist/higher_taxa_injector_spec.rb
rename to spec/services/checklist/higher_taxa_injector_spec.rb
diff --git a/spec/models/checklist/higher_taxa_item_spec.rb b/spec/services/checklist/higher_taxa_item_spec.rb
similarity index 100%
rename from spec/models/checklist/higher_taxa_item_spec.rb
rename to spec/services/checklist/higher_taxa_item_spec.rb
diff --git a/spec/models/checklist/order_spec.rb b/spec/services/checklist/order_spec.rb
similarity index 100%
rename from spec/models/checklist/order_spec.rb
rename to spec/services/checklist/order_spec.rb
diff --git a/spec/models/checklist/pdf/history_annotations_key_spec.rb b/spec/services/checklist/pdf/history_annotations_key_spec.rb
similarity index 100%
rename from spec/models/checklist/pdf/history_annotations_key_spec.rb
rename to spec/services/checklist/pdf/history_annotations_key_spec.rb
diff --git a/spec/models/checklist/pdf/history_spec.rb b/spec/services/checklist/pdf/history_spec.rb
similarity index 100%
rename from spec/models/checklist/pdf/history_spec.rb
rename to spec/services/checklist/pdf/history_spec.rb
diff --git a/spec/models/checklist/pdf/index_annotations_key_spec.rb b/spec/services/checklist/pdf/index_annotations_key_spec.rb
similarity index 100%
rename from spec/models/checklist/pdf/index_annotations_key_spec.rb
rename to spec/services/checklist/pdf/index_annotations_key_spec.rb
diff --git a/spec/models/checklist/pdf/index_fetcher_spec.rb b/spec/services/checklist/pdf/index_fetcher_spec.rb
similarity index 100%
rename from spec/models/checklist/pdf/index_fetcher_spec.rb
rename to spec/services/checklist/pdf/index_fetcher_spec.rb
diff --git a/spec/models/checklist/scientific_name_spec.rb b/spec/services/checklist/scientific_name_spec.rb
similarity index 100%
rename from spec/models/checklist/scientific_name_spec.rb
rename to spec/services/checklist/scientific_name_spec.rb
diff --git a/spec/models/checklist/synonyms_spec.rb b/spec/services/checklist/synonyms_spec.rb
similarity index 100%
rename from spec/models/checklist/synonyms_spec.rb
rename to spec/services/checklist/synonyms_spec.rb
diff --git a/spec/models/checklist/taxon_concept_prefix_matcher_spec.rb b/spec/services/checklist/taxon_concept_prefix_matcher_spec.rb
similarity index 100%
rename from spec/models/checklist/taxon_concept_prefix_matcher_spec.rb
rename to spec/services/checklist/taxon_concept_prefix_matcher_spec.rb
diff --git a/spec/models/checklist/timeline_spec.rb b/spec/services/checklist/timeline_spec.rb
similarity index 100%
rename from spec/models/checklist/timeline_spec.rb
rename to spec/services/checklist/timeline_spec.rb
diff --git a/spec/models/checklist/timelines_for_taxon_concept_spec.rb b/spec/services/checklist/timelines_for_taxon_concept_spec.rb
similarity index 100%
rename from spec/models/checklist/timelines_for_taxon_concept_spec.rb
rename to spec/services/checklist/timelines_for_taxon_concept_spec.rb
diff --git a/spec/models/dashboard_stats_species_spec.rb b/spec/services/dashboard_stats_species_spec.rb
similarity index 100%
rename from spec/models/dashboard_stats_species_spec.rb
rename to spec/services/dashboard_stats_species_spec.rb
diff --git a/spec/models/dashboard_stats_trade_spec.rb b/spec/services/dashboard_stats_trade_spec.rb
similarity index 100%
rename from spec/models/dashboard_stats_trade_spec.rb
rename to spec/services/dashboard_stats_trade_spec.rb
diff --git a/spec/models/document_batch_spec.rb b/spec/services/document_batch_spec.rb
similarity index 100%
rename from spec/models/document_batch_spec.rb
rename to spec/services/document_batch_spec.rb
diff --git a/spec/models/document_search_spec.rb b/spec/services/document_search_spec.rb
similarity index 100%
rename from spec/models/document_search_spec.rb
rename to spec/services/document_search_spec.rb
diff --git a/spec/models/geo_entity_search_spec.rb b/spec/services/geo_entity_search_spec.rb
similarity index 100%
rename from spec/models/geo_entity_search_spec.rb
rename to spec/services/geo_entity_search_spec.rb
diff --git a/spec/models/nomenclature_change/delete_unreassigned_processor_spec.rb b/spec/services/nomenclature_change/delete_unreassigned_processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/delete_unreassigned_processor_spec.rb
rename to spec/services/nomenclature_change/delete_unreassigned_processor_spec.rb
diff --git a/spec/models/nomenclature_change/full_reassignment_spec.rb b/spec/services/nomenclature_change/full_reassignment_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/full_reassignment_spec.rb
rename to spec/services/nomenclature_change/full_reassignment_spec.rb
diff --git a/spec/models/nomenclature_change/lump/constructor_spec.rb b/spec/services/nomenclature_change/lump/constructor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/lump/constructor_spec.rb
rename to spec/services/nomenclature_change/lump/constructor_spec.rb
diff --git a/spec/models/nomenclature_change/lump/output_taxon_concept_processor_spec.rb b/spec/services/nomenclature_change/lump/output_taxon_concept_processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/lump/output_taxon_concept_processor_spec.rb
rename to spec/services/nomenclature_change/lump/output_taxon_concept_processor_spec.rb
diff --git a/spec/models/nomenclature_change/lump/processor_spec.rb b/spec/services/nomenclature_change/lump/processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/lump/processor_spec.rb
rename to spec/services/nomenclature_change/lump/processor_spec.rb
diff --git a/spec/models/nomenclature_change/reassignment_copy_processor_spec.rb b/spec/services/nomenclature_change/reassignment_copy_processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/reassignment_copy_processor_spec.rb
rename to spec/services/nomenclature_change/reassignment_copy_processor_spec.rb
diff --git a/spec/models/nomenclature_change/reassignment_transfer_processor_spec.rb b/spec/services/nomenclature_change/reassignment_transfer_processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/reassignment_transfer_processor_spec.rb
rename to spec/services/nomenclature_change/reassignment_transfer_processor_spec.rb
diff --git a/spec/models/nomenclature_change/split/constructor_spec.rb b/spec/services/nomenclature_change/split/constructor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/split/constructor_spec.rb
rename to spec/services/nomenclature_change/split/constructor_spec.rb
diff --git a/spec/models/nomenclature_change/split/output_taxon_concept_processor_spec.rb b/spec/services/nomenclature_change/split/output_taxon_concept_processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/split/output_taxon_concept_processor_spec.rb
rename to spec/services/nomenclature_change/split/output_taxon_concept_processor_spec.rb
diff --git a/spec/models/nomenclature_change/split/processor_spec.rb b/spec/services/nomenclature_change/split/processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/split/processor_spec.rb
rename to spec/services/nomenclature_change/split/processor_spec.rb
diff --git a/spec/models/nomenclature_change/status_swap/constructor_spec.rb b/spec/services/nomenclature_change/status_swap/constructor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/status_swap/constructor_spec.rb
rename to spec/services/nomenclature_change/status_swap/constructor_spec.rb
diff --git a/spec/models/nomenclature_change/status_swap/processor_spec.rb b/spec/services/nomenclature_change/status_swap/processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/status_swap/processor_spec.rb
rename to spec/services/nomenclature_change/status_swap/processor_spec.rb
diff --git a/spec/models/nomenclature_change/status_to_accepted/processor_spec.rb b/spec/services/nomenclature_change/status_to_accepted/processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/status_to_accepted/processor_spec.rb
rename to spec/services/nomenclature_change/status_to_accepted/processor_spec.rb
diff --git a/spec/models/nomenclature_change/status_to_synonym/constructor_spec.rb b/spec/services/nomenclature_change/status_to_synonym/constructor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/status_to_synonym/constructor_spec.rb
rename to spec/services/nomenclature_change/status_to_synonym/constructor_spec.rb
diff --git a/spec/models/nomenclature_change/status_to_synonym/output_taxon_concept_processor_spec.rb b/spec/services/nomenclature_change/status_to_synonym/output_taxon_concept_processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/status_to_synonym/output_taxon_concept_processor_spec.rb
rename to spec/services/nomenclature_change/status_to_synonym/output_taxon_concept_processor_spec.rb
diff --git a/spec/models/nomenclature_change/status_to_synonym/processor_spec.rb b/spec/services/nomenclature_change/status_to_synonym/processor_spec.rb
similarity index 100%
rename from spec/models/nomenclature_change/status_to_synonym/processor_spec.rb
rename to spec/services/nomenclature_change/status_to_synonym/processor_spec.rb
diff --git a/spec/models/species/common_names_export_spec.rb b/spec/services/species/common_names_export_spec.rb
similarity index 100%
rename from spec/models/species/common_names_export_spec.rb
rename to spec/services/species/common_names_export_spec.rb
diff --git a/spec/models/species/documents_export_spec.rb b/spec/services/species/documents_export_spec.rb
similarity index 100%
rename from spec/models/species/documents_export_spec.rb
rename to spec/services/species/documents_export_spec.rb
diff --git a/spec/models/species/hybrid_prefix_matcher_spec.rb b/spec/services/species/hybrid_prefix_matcher_spec.rb
similarity index 100%
rename from spec/models/species/hybrid_prefix_matcher_spec.rb
rename to spec/services/species/hybrid_prefix_matcher_spec.rb
diff --git a/spec/models/species/invisible_subspecies_search_spec.rb b/spec/services/species/invisible_subspecies_search_spec.rb
similarity index 100%
rename from spec/models/species/invisible_subspecies_search_spec.rb
rename to spec/services/species/invisible_subspecies_search_spec.rb
diff --git a/spec/models/species/listings_export_spec.rb b/spec/services/species/listings_export_spec.rb
similarity index 100%
rename from spec/models/species/listings_export_spec.rb
rename to spec/services/species/listings_export_spec.rb
diff --git a/spec/models/species/orphaned_taxon_concepts_export_spec.rb b/spec/services/species/orphaned_taxon_concepts_export_spec.rb
similarity index 100%
rename from spec/models/species/orphaned_taxon_concepts_export_spec.rb
rename to spec/services/species/orphaned_taxon_concepts_export_spec.rb
diff --git a/spec/models/species/search_spec.rb b/spec/services/species/search_spec.rb
similarity index 100%
rename from spec/models/species/search_spec.rb
rename to spec/services/species/search_spec.rb
diff --git a/spec/models/species/species_reference_output_spec.rb b/spec/services/species/species_reference_output_spec.rb
similarity index 100%
rename from spec/models/species/species_reference_output_spec.rb
rename to spec/services/species/species_reference_output_spec.rb
diff --git a/spec/models/species/standard_reference_output_spec.rb b/spec/services/species/standard_reference_output_spec.rb
similarity index 100%
rename from spec/models/species/standard_reference_output_spec.rb
rename to spec/services/species/standard_reference_output_spec.rb
diff --git a/spec/models/species/synonyms_and_trade_names_export_spec.rb b/spec/services/species/synonyms_and_trade_names_export_spec.rb
similarity index 100%
rename from spec/models/species/synonyms_and_trade_names_export_spec.rb
rename to spec/services/species/synonyms_and_trade_names_export_spec.rb
diff --git a/spec/models/species/taxon_concept_prefix_matcher_spec.rb b/spec/services/species/taxon_concept_prefix_matcher_spec.rb
similarity index 100%
rename from spec/models/species/taxon_concept_prefix_matcher_spec.rb
rename to spec/services/species/taxon_concept_prefix_matcher_spec.rb
diff --git a/spec/models/species/taxon_concepts_export_spec.rb b/spec/services/species/taxon_concepts_export_spec.rb
similarity index 100%
rename from spec/models/species/taxon_concepts_export_spec.rb
rename to spec/services/species/taxon_concepts_export_spec.rb
diff --git a/spec/models/species/trade_name_prefix_matcher_spec.rb b/spec/services/species/trade_name_prefix_matcher_spec.rb
similarity index 100%
rename from spec/models/species/trade_name_prefix_matcher_spec.rb
rename to spec/services/species/trade_name_prefix_matcher_spec.rb
diff --git a/spec/models/species/visible_subspecies_search_spec.rb b/spec/services/species/visible_subspecies_search_spec.rb
similarity index 100%
rename from spec/models/species/visible_subspecies_search_spec.rb
rename to spec/services/species/visible_subspecies_search_spec.rb
diff --git a/spec/models/taxon_concept_data_spec.rb b/spec/services/taxon_concept_data_spec.rb
similarity index 100%
rename from spec/models/taxon_concept_data_spec.rb
rename to spec/services/taxon_concept_data_spec.rb
diff --git a/spec/models/taxon_concept_prefix_matcher_spec.rb b/spec/services/taxon_concept_prefix_matcher_spec.rb
similarity index 100%
rename from spec/models/taxon_concept_prefix_matcher_spec.rb
rename to spec/services/taxon_concept_prefix_matcher_spec.rb
diff --git a/spec/models/trade/filter_spec.rb b/spec/services/trade/filter_spec.rb
similarity index 100%
rename from spec/models/trade/filter_spec.rb
rename to spec/services/trade/filter_spec.rb
diff --git a/spec/models/trade/permit_matcher_spec.rb b/spec/services/trade/permit_matcher_spec.rb
similarity index 100%
rename from spec/models/trade/permit_matcher_spec.rb
rename to spec/services/trade/permit_matcher_spec.rb
diff --git a/spec/models/trade/reported_taxon_concept_resolver_spec.rb b/spec/services/trade/reported_taxon_concept_resolver_spec.rb
similarity index 100%
rename from spec/models/trade/reported_taxon_concept_resolver_spec.rb
rename to spec/services/trade/reported_taxon_concept_resolver_spec.rb
diff --git a/spec/models/trade/sandbox_filter_spec.rb b/spec/services/trade/sandbox_filter_spec.rb
similarity index 100%
rename from spec/models/trade/sandbox_filter_spec.rb
rename to spec/services/trade/sandbox_filter_spec.rb
diff --git a/spec/models/trade/sandbox_spec.rb b/spec/services/trade/sandbox_spec.rb
similarity index 100%
rename from spec/models/trade/sandbox_spec.rb
rename to spec/services/trade/sandbox_spec.rb
diff --git a/spec/models/trade/shipments_comptab_export_spec.rb b/spec/services/trade/shipments_comptab_export_spec.rb
similarity index 100%
rename from spec/models/trade/shipments_comptab_export_spec.rb
rename to spec/services/trade/shipments_comptab_export_spec.rb
diff --git a/spec/models/trade/shipments_export_spec.rb b/spec/services/trade/shipments_export_spec.rb
similarity index 100%
rename from spec/models/trade/shipments_export_spec.rb
rename to spec/services/trade/shipments_export_spec.rb
diff --git a/spec/models/trade/shipments_gross_exports_export_spec.rb b/spec/services/trade/shipments_gross_exports_export_spec.rb
similarity index 100%
rename from spec/models/trade/shipments_gross_exports_export_spec.rb
rename to spec/services/trade/shipments_gross_exports_export_spec.rb
diff --git a/spec/models/trade/shipments_gross_imports_export_spec.rb b/spec/services/trade/shipments_gross_imports_export_spec.rb
similarity index 100%
rename from spec/models/trade/shipments_gross_imports_export_spec.rb
rename to spec/services/trade/shipments_gross_imports_export_spec.rb
diff --git a/spec/models/trade/shipments_net_exports_export_spec.rb b/spec/services/trade/shipments_net_exports_export_spec.rb
similarity index 100%
rename from spec/models/trade/shipments_net_exports_export_spec.rb
rename to spec/services/trade/shipments_net_exports_export_spec.rb
diff --git a/spec/models/trade/shipments_net_imports_export_spec.rb b/spec/services/trade/shipments_net_imports_export_spec.rb
similarity index 100%
rename from spec/models/trade/shipments_net_imports_export_spec.rb
rename to spec/services/trade/shipments_net_imports_export_spec.rb

From 5b8b820c91d22a2bfba73285eb5229479e33f62f Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 1 Feb 2024 16:51:58 +0000
Subject: [PATCH 139/241] add Service/Serializers group in coverage page.

---
 spec/spec_helper.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 56a0d9f0f..bf9260178 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,7 +8,10 @@
 formatters.push CodeClimate::TestReporter::Formatter if ENV['CI']
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
-SimpleCov.start 'rails'
+SimpleCov.start 'rails' do
+  add_group "Services", "app/services"
+  add_group "Serializers", "app/serializers"
+end
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'

From 0bcd5a81d60549943f35f3ec8c52d6c27d09cc99 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 1 Feb 2024 17:58:36 +0000
Subject: [PATCH 140/241] Upgrade gem to remove DEPRECATION WARNING

---
 Gemfile      | 2 +-
 Gemfile.lock | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index d88be10a4..8d193e05f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -153,7 +153,7 @@ gem 'dotenv-rails', '2.0.1'
 
 gem 'sitemap_generator', '~> 6.3'
 
-gem 'appsignal', '1.3.3' # TODO: should upgrade to latest after all upgrade.
+gem 'appsignal', '~> 3.5', '>= 3.5.5'
 gem 'test-unit', '3.1.5' # annoyingly, rails console won't start without it in staging / production
 
 ### GEM for frontend ###
diff --git a/Gemfile.lock b/Gemfile.lock
index 4cfdd64d8..344cc962d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,9 +78,8 @@ GEM
       sshkit (>= 1.6.1, != 1.7.0)
     annotate (2.5.0)
       rake
-    appsignal (1.3.3)
+    appsignal (3.5.5)
       rack
-      thread_safe
     ast (2.4.2)
     aws-eventstream (1.3.0)
     aws-sdk (2.11.632)
@@ -599,7 +598,7 @@ DEPENDENCIES
   acts-as-taggable-on (= 9.0.1)
   ahoy_matey (= 4.2.1)
   annotate (= 2.5.0)
-  appsignal (= 1.3.3)
+  appsignal (~> 3.5, >= 3.5.5)
   aws-sdk (~> 2)
   bcrypt_pbkdf (= 1.1.0)
   bootsnap (>= 1.4.2)

From f5aede0996294cbfac56161491a4854a7b5c6653 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 1 Feb 2024 18:08:09 +0000
Subject: [PATCH 141/241] 
 https://thoughtbot.com/blog/rails-6-warning-message-upgrade

---
 config/initializers/acts_as_taggable_on.rb | 30 +++-------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index b00cc59c5..7d43529f1 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -1,26 +1,4 @@
-# Migrated to Strong Parameters
-# ActsAsTaggableOn::Tag.class_eval do
-#   attr_accessible :name
-# end
-
-# ActsAsTaggableOn::Tagging.class_eval do
-#   attr_accessible :tag_id, :context, :taggable, :taggable_id, :taggable_type, :tagger_id, :tagger_type
-# end
-
-
-
-# TODO
-# DEPRECATION WARNING: Initialization autoloaded the constant ComparisonAttributes.
-#
-# Being able to do this is deprecated. Autoloading during initialization is going
-# to be an error condition in future versions of Rails.
-#
-# Reloading does not reboot the application, and therefore code executed during
-# initialization does not run again. So, if you reload ComparisonAttributes, for example,
-# the expected changes won't be reflected in that stale Module object.
-#
-# `config.autoloader` is set to `classic`. This autoloaded constant would have been unloaded if `config.autoloader` had been set to `:zeitwerk`.
-#
-# Please, check the "Autoloading and Reloading Constants" guide for solutions.
-#  (called from <top (required)> at /SAPI/config/environment.rb:5)
-ActsAsTaggableOn::Tagging.send :include, ComparisonAttributes
+# https://thoughtbot.com/blog/rails-6-warning-message-upgrade
+Rails.application.reloader.to_prepare do
+  ActsAsTaggableOn::Tagging.send :include, ComparisonAttributes
+end

From 95606b97174b85e09496204db709cbcc524c771b Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 1 Feb 2024 21:10:29 +0000
Subject: [PATCH 142/241] Ruby 3.0.6

---
 .ruby-version                        |   2 +-
 .travis.yml                          |   2 +-
 Dockerfile                           |   2 +-
 Dockerfile.cap-deploy                |  16 ++-
 Gemfile                              |   8 +-
 Gemfile.lock                         |  27 ++---
 app/models/trade/sandbox_template.rb |   4 +-
 app/models/trade_restriction.rb      |   2 +-
 app/services/cms_mapping_manager.rb  | 162 +++++++++++++--------------
 app/services/iucn_mapping_manager.rb | 146 ++++++++++++------------
 config/deploy.rb                     |   2 +-
 spec/spec_helper.rb                  |   2 +-
 12 files changed, 185 insertions(+), 190 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 6a81b4c83..818bd47ab 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.8
+3.0.6
diff --git a/.travis.yml b/.travis.yml
index 6ef32e0d6..48ddd864b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ cache: bundler
 bundler_args: --without development production staging
 sudo: false
 rvm:
-  - 2.7.8
+  - 3.0.6
 addons:
   postgresql: 9.4
   code_climate:
diff --git a/Dockerfile b/Dockerfile
index 633fa1e8a..c8b325004 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile
-FROM ruby:2.7.8
+FROM ruby:3.0.6
 
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
 # runtime, so attempt to get these from apt, where possible
diff --git a/Dockerfile.cap-deploy b/Dockerfile.cap-deploy
index 3ea5832e8..d88a2d0b6 100644
--- a/Dockerfile.cap-deploy
+++ b/Dockerfile.cap-deploy
@@ -1,11 +1,12 @@
 # Dockerfile
-# FROM --platform=linux/amd64 debian
-FROM ruby:2.7.8
+FROM ubuntu:jammy
 
 ENV DEBIAN_FRONTEND=noninteractive
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
 # runtime, so attempt to get these from apt, where possible
 RUN apt-get update && apt-get install -y --force-yes \
+  # SSH
+  openssh-client \
   # For ruby?
   libsodium-dev libgmp3-dev \
   # For RVM
@@ -21,11 +22,19 @@ WORKDIR /SAPI
 # https://stackoverflow.com/questions/43612927/how-to-correctly-install-rvm-in-docker
 RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN curl -sSL https://get.rvm.io | bash -s
-RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 2.7.8"
+RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 3.0.6"
 # RVM installed in multi-user mode. However cap assume rvm is installed in single user mode.
 # Create a soft link to fake it.
 RUN mkdir -p ~/.rvm/bin && ln -s /usr/local/rvm/bin/rvm ~/.rvm/bin/rvm
 
+COPY Gemfile /SAPI/Gemfile
+COPY Gemfile.lock /SAPI/Gemfile.lock
+
+ENV BUNDLE_SILENCE_ROOT_WARNING=1
+RUN /bin/bash -c "source /etc/profile.d/rvm.sh \
+    && gem install bundler:1.17.3 \
+    && bundle"
+
 # Host SSH key/config
 RUN mkdir -p ~/.ssh && ln -s /run/secrets/host_ssh_key ~/.ssh/id_ed25519 && ln -s /run/secrets/host_ssh_config ~/.ssh/config
 
@@ -36,7 +45,6 @@ ENTRYPOINT ["/bin/bash", "-l"]
 ##########################################
 # /bin/bash
 # source /etc/profile.d/rvm.sh
-# bundle
 # eval "$(ssh-agent -s)"
 # ssh-add
 # cap staging deploy
diff --git a/Gemfile b/Gemfile
index 8d193e05f..696100fdf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.8'
+ruby '3.0.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '6.0.6.1'
@@ -85,8 +85,6 @@ gem 'bootsnap', '>= 1.4.2', require: false
 # To use Jbuilder templates for JSON
 # gem 'jbuilder', '~> 2.7'
 
-gem 'rest-client', '1.8.0', require: false # TODO, should upgrade for better compatibility with newer Ruby but breaking change. Seems not many place using it, worth a try.
-
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
@@ -140,8 +138,8 @@ group :test do
   gem 'rails-controller-testing'
   gem "codeclimate-test-reporter", '0.1.1', require: nil # TODO, should be removed
   gem 'factory_bot_rails', '5.2.0'
-  gem 'simplecov', '0.22.0', :require => false # TODO: latest
-  gem 'coveralls', '0.7.1', :require => false
+  gem 'simplecov', '~> 0.22.0', :require => false
+  gem 'coveralls_reborn', '~> 0.28.0', require: false
 end
 
 gem 'geoip', '1.3.5' # TODO: no change logs, no idea if safe to update. Latest version is 1.6.4 @ 2018
diff --git a/Gemfile.lock b/Gemfile.lock
index 344cc962d..3b7ba8ed9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,12 +168,11 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    coveralls_reborn (0.28.0)
+      simplecov (~> 0.22.0)
+      term-ansicolor (~> 1.7)
+      thor (~> 1.2)
+      tins (~> 1.32)
     crass (1.0.6)
     dalli (2.7.10)
     database_cleaner (2.0.2)
@@ -192,7 +191,6 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    domain_name (0.6.20240107)
     dotenv (2.0.1)
     dotenv-rails (2.0.1)
       dotenv (= 2.0.1)
@@ -247,8 +245,6 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
     hashery (2.1.2)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
@@ -301,7 +297,6 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (2.99.3)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
@@ -331,7 +326,6 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     net-ssh (7.2.1)
-    netrc (0.11.0)
     nio4r (2.7.0)
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
@@ -423,10 +417,6 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -619,7 +609,7 @@ DEPENDENCIES
   chartkick (~> 5.0, >= 5.0.5)
   codeclimate-test-reporter (= 0.1.1)
   coffee-rails (~> 5.0)
-  coveralls (= 0.7.1)
+  coveralls_reborn (~> 0.28.0)
   dalli (= 2.7.10)
   database_cleaner (~> 2.0, >= 2.0.2)
   devise (= 4.7.3)
@@ -660,7 +650,6 @@ DEPENDENCIES
   rbnacl-libsodium (= 1.0.16)
   request_store (~> 1.5, >= 1.5.1)
   responders (~> 3.1, >= 3.1.1)
-  rest-client (= 1.8.0)
   rspec-collection_matchers (~> 1.2, >= 1.2.1)
   rspec-rails (= 5.1.2)
   rubocop-rails
@@ -672,7 +661,7 @@ DEPENDENCIES
   sidekiq-cron (~> 1.12)
   sidekiq-status (~> 3.0, >= 3.0.3)
   sidekiq-unique-jobs (= 7.1.31)
-  simplecov (= 0.22.0)
+  simplecov (~> 0.22.0)
   sitemap_generator (~> 6.3)
   slackistrano (= 0.1.9)
   spring
@@ -690,7 +679,7 @@ DEPENDENCIES
   wkhtmltopdf-binary (~> 0.12.6.6)
 
 RUBY VERSION
-   ruby 2.7.8p225
+   ruby 3.0.6p216
 
 BUNDLED WITH
    1.17.3
diff --git a/app/models/trade/sandbox_template.rb b/app/models/trade/sandbox_template.rb
index e58c7f2ba..3aa616909 100644
--- a/app/models/trade/sandbox_template.rb
+++ b/app/models/trade/sandbox_template.rb
@@ -92,8 +92,8 @@ def self.sanitize(id = nil)
           )
         end
 
-        def save(attributes = {})
-          super(attributes)
+        def save(*args, **options, &block)
+          super(*args, **options, &block)
           sanitize
         end
 
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index 06a4cb3f3..763000242 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -139,7 +139,7 @@ def self.to_csv(file_path, filters)
       when :semicolon then ';'
       else ','
       end
-    CSV.open(file_path, 'wb', { :col_sep => csv_separator_char }) do |csv|
+    CSV.open(file_path, 'wb', col_sep: csv_separator_char) do |csv|
       csv << Species::RestrictionsExport::TAXONOMY_COLUMN_NAMES +
         ['Remarks'] + self.csv_columns_headers
       ids = []
diff --git a/app/services/cms_mapping_manager.rb b/app/services/cms_mapping_manager.rb
index df966f3b5..045368fdd 100644
--- a/app/services/cms_mapping_manager.rb
+++ b/app/services/cms_mapping_manager.rb
@@ -1,87 +1,87 @@
 class CmsMappingManager
+  # Broken and not in-use (https://unep-wcmc.slack.com/archives/GR2EA1B0C/p1706268513001039)
+  # class << self
 
-  class << self
+  #   def sync
+  #     config_location ||= Rails.root.join('config/secrets.yml')
+  #     @config = YAML.load_file(config_location)[Rails.env]
+  #     index_url = @config['cms']['index']
+  #     @show_url = @config['cms']['show']
+  #     puts "#{index_url}"
+  #     url = URI.escape(index_url)
+  #     cms = Taxonomy.where(:name => Taxonomy::CMS).first
+  #     species = JSON.parse(RestClient.get(url))
+  #     species.each do |sp|
+  #       taxon_concept = TaxonConcept.where(:full_name => sp["scientific_name"],
+  #                                          :taxonomy_id => cms.id).first
+  #       mapping = CmsMapping.find_or_create_by(
+  #         taxon_concept_id: taxon_concept.try(:id), cms_taxon_name: sp["scientific_name"], cms_uuid: sp["node_uuid"])
 
-    def sync
-      config_location ||= Rails.root.join('config/secrets.yml')
-      @config = YAML.load_file(config_location)[Rails.env]
-      index_url = @config['cms']['index']
-      @show_url = @config['cms']['show']
-      puts "#{index_url}"
-      url = URI.escape(index_url)
-      cms = Taxonomy.where(:name => Taxonomy::CMS).first
-      species = JSON.parse(RestClient.get(url))
-      species.each do |sp|
-        taxon_concept = TaxonConcept.where(:full_name => sp["scientific_name"],
-                                           :taxonomy_id => cms.id).first
-        mapping = CmsMapping.find_or_create_by(
-          taxon_concept_id: taxon_concept.try(:id), cms_taxon_name: sp["scientific_name"], cms_uuid: sp["node_uuid"])
+  #       analyse mapping
+  #     end
+  #   end
 
-        analyse mapping
-      end
-    end
+  #   def analyse(mapping)
+  #     url = URI.escape(@show_url + mapping.cms_taxon_name)
+  #     species = JSON.parse(RestClient.get(url)).first
+  #     if species
+  #       puts "setting mapping details for #{mapping.cms_taxon_name}"
+  #       mapping.cms_author = species["taxonomy"]["author"]
+  #       taxon_concept = mapping.taxon_concept
+  #       mapping.details = {
+  #         'distributions_splus' => taxon_concept && taxon_concept.distributions.size,
+  #         'distributions_cms' => species["geographic_range"]["range_states"].size,
+  #         'instruments_splus' => taxon_concept && taxon_concept.instruments.map(&:name).join(", "),
+  #         'instruments_cms' => species["assessment_information"].map do |ai|
+  #           ai["instrument"] && ai["instrument"]["instrument"]
+  #         end.join(", "),
+  #         'listing_splus' => taxon_concept && taxon_concept.listing_changes.first &&
+  #           "#{taxon_concept.listing_changes.first.species_listing.name}: #{taxon_concept.
+  #             listing_changes.first.effective_at.strftime("%d/%m/%Y")}",
+  #         'listing_cms' =>
+  #           if species["appendix_1_date"]
+  #             "Appendix I: #{Date.parse(species["appendix_1_date"]).strftime("%d/%m/%Y")}"
+  #           elsif species["appendix_2_date"]
+  #             "Appendix II: #{Date.parse(species["appendix_2_date"]).strftime("%d/%m/%Y")}"
+  #           else
+  #             nil
+  #           end
+  #       }
+  #       mapping.save
+  #     end
+  #   end
 
-    def analyse(mapping)
-      url = URI.escape(@show_url + mapping.cms_taxon_name)
-      species = JSON.parse(RestClient.get(url)).first
-      if species
-        puts "setting mapping details for #{mapping.cms_taxon_name}"
-        mapping.cms_author = species["taxonomy"]["author"]
-        taxon_concept = mapping.taxon_concept
-        mapping.details = {
-          'distributions_splus' => taxon_concept && taxon_concept.distributions.size,
-          'distributions_cms' => species["geographic_range"]["range_states"].size,
-          'instruments_splus' => taxon_concept && taxon_concept.instruments.map(&:name).join(", "),
-          'instruments_cms' => species["assessment_information"].map do |ai|
-            ai["instrument"] && ai["instrument"]["instrument"]
-          end.join(", "),
-          'listing_splus' => taxon_concept && taxon_concept.listing_changes.first &&
-            "#{taxon_concept.listing_changes.first.species_listing.name}: #{taxon_concept.
-              listing_changes.first.effective_at.strftime("%d/%m/%Y")}",
-          'listing_cms' =>
-            if species["appendix_1_date"]
-              "Appendix I: #{Date.parse(species["appendix_1_date"]).strftime("%d/%m/%Y")}"
-            elsif species["appendix_2_date"]
-              "Appendix II: #{Date.parse(species["appendix_2_date"]).strftime("%d/%m/%Y")}"
-            else
-              nil
-            end
-        }
-        mapping.save
-      end
-    end
-
-    # Finds CITES' taxon concepts that match the CMS Species or Subspecies and
-    # copies the distributions and distribution references from the CITES to the CMS taxon concept.
-    # It also creates a taxon_relationship of EQUAL_TO between both taxon concepts
-    def fill_cms_distributions
-      species = Rank.where(:name => Rank::SPECIES).first
-      subspecies = Rank.where(:name => Rank::SUBSPECIES).first
-      cms = Taxonomy.where(:name => Taxonomy::CMS).first
-      cites = Taxonomy.where(:name => Taxonomy::CITES_EU).first
-      equal_to = TaxonRelationshipType.where(:name => TaxonRelationshipType::EQUAL_TO).first
-      TaxonConcept.where(:rank_id => [species.id, subspecies.id],
-                         :taxonomy_id => cms.id).each do |taxon|
-        matching_cites_taxon = TaxonConcept.where(:rank_id => taxon.rank_id,
-                                                  :full_name => taxon.full_name,
-                                                  :taxonomy_id => cites.id).first
-        next unless matching_cites_taxon
-        puts "found a match for #{taxon.full_name} #{taxon.id} matches #{matching_cites_taxon.id}"
-        matching_cites_taxon.distributions.each do |dist|
-          distribution = Distribution.find_or_initialize_by(
-            taxon_concept_id: taxon.id, geo_entity_id: ist.geo_entity_id)
-          distribution.tag_list = dist.tag_list
-          distribution.save
-          dist.distribution_references.each do |reference|
-            DistributionReference.find_or_create_by(
-              distribution_id: distribution.id, reference_id: reference.reference_id)
-          end
-        end
-        puts "creating taxon relationship"
-        TaxonRelationship.create(:taxon_concept_id => matching_cites_taxon.id,
-                                 :other_taxon_concept_id => taxon.id,
-                                 :taxon_relationship_type_id => equal_to.id)
-      end
-    end
-  end
+  #   # Finds CITES' taxon concepts that match the CMS Species or Subspecies and
+  #   # copies the distributions and distribution references from the CITES to the CMS taxon concept.
+  #   # It also creates a taxon_relationship of EQUAL_TO between both taxon concepts
+  #   def fill_cms_distributions
+  #     species = Rank.where(:name => Rank::SPECIES).first
+  #     subspecies = Rank.where(:name => Rank::SUBSPECIES).first
+  #     cms = Taxonomy.where(:name => Taxonomy::CMS).first
+  #     cites = Taxonomy.where(:name => Taxonomy::CITES_EU).first
+  #     equal_to = TaxonRelationshipType.where(:name => TaxonRelationshipType::EQUAL_TO).first
+  #     TaxonConcept.where(:rank_id => [species.id, subspecies.id],
+  #                        :taxonomy_id => cms.id).each do |taxon|
+  #       matching_cites_taxon = TaxonConcept.where(:rank_id => taxon.rank_id,
+  #                                                 :full_name => taxon.full_name,
+  #                                                 :taxonomy_id => cites.id).first
+  #       next unless matching_cites_taxon
+  #       puts "found a match for #{taxon.full_name} #{taxon.id} matches #{matching_cites_taxon.id}"
+  #       matching_cites_taxon.distributions.each do |dist|
+  #         distribution = Distribution.find_or_initialize_by(
+  #           taxon_concept_id: taxon.id, geo_entity_id: ist.geo_entity_id)
+  #         distribution.tag_list = dist.tag_list
+  #         distribution.save
+  #         dist.distribution_references.each do |reference|
+  #           DistributionReference.find_or_create_by(
+  #             distribution_id: distribution.id, reference_id: reference.reference_id)
+  #         end
+  #       end
+  #       puts "creating taxon relationship"
+  #       TaxonRelationship.create(:taxon_concept_id => matching_cites_taxon.id,
+  #                                :other_taxon_concept_id => taxon.id,
+  #                                :taxon_relationship_type_id => equal_to.id)
+  #     end
+  #   end
+  # end
 end
diff --git a/app/services/iucn_mapping_manager.rb b/app/services/iucn_mapping_manager.rb
index 9e3506750..150e9b0fb 100644
--- a/app/services/iucn_mapping_manager.rb
+++ b/app/services/iucn_mapping_manager.rb
@@ -1,82 +1,82 @@
 class IucnMappingManager
+  # Broken and not in-use (https://unep-wcmc.slack.com/archives/GR2EA1B0C/p1706268513001039)
+  # class << self
 
-  class << self
+  #   def sync
+  #     species = Rank.where(:name => Rank::SPECIES).first
+  #     @subspecies = Rank.where(:name => Rank::SUBSPECIES).first
+  #     taxonomy = Taxonomy.where(:name => Taxonomy::CITES_EU).first
 
-    def sync
-      species = Rank.where(:name => Rank::SPECIES).first
-      @subspecies = Rank.where(:name => Rank::SUBSPECIES).first
-      taxonomy = Taxonomy.where(:name => Taxonomy::CITES_EU).first
+  #     TaxonConcept.where(:rank_id => [species.id, @subspecies.id], :name_status => ['A', 'S'],
+  #                        :taxonomy_id => taxonomy.id).each do |taxon_concept|
+  #       sync_taxon_concept taxon_concept
+  #     end
+  #   end
 
-      TaxonConcept.where(:rank_id => [species.id, @subspecies.id], :name_status => ['A', 'S'],
-                         :taxonomy_id => taxonomy.id).each do |taxon_concept|
-        sync_taxon_concept taxon_concept
-      end
-    end
+  #   def sync_taxon_concept(taxon_concept)
+  #     mapping = IucnMapping.find_or_create_by(taxon_concept_id: taxon_concept.id)
+  #     full_name = if taxon_concept.rank_id == @subspecies.id
+  #                   taxon_concept.full_name.insert(taxon_concept.full_name.rindex(/ /), " ssp.")
+  #                 else
+  #                   taxon_concept.full_name
+  #                 end
+  #     data = fetch_data_for_name full_name
+  #     if !data || !data["result"] || data["result"].empty?
+  #       puts "#{taxon_concept.full_name} NO MATCH"
+  #     else
+  #       map_taxon_concept taxon_concept, mapping, data
+  #     end
+  #   end
 
-    def sync_taxon_concept(taxon_concept)
-      mapping = IucnMapping.find_or_create_by(taxon_concept_id: taxon_concept.id)
-      full_name = if taxon_concept.rank_id == @subspecies.id
-                    taxon_concept.full_name.insert(taxon_concept.full_name.rindex(/ /), " ssp.")
-                  else
-                    taxon_concept.full_name
-                  end
-      data = fetch_data_for_name full_name
-      if !data || !data["result"] || data["result"].empty?
-        puts "#{taxon_concept.full_name} NO MATCH"
-      else
-        map_taxon_concept taxon_concept, mapping, data
-      end
-    end
+  #   def fetch_data_for_name(full_name)
+  #     @config_location ||= Rails.root.join('config/secrets.yml')
+  #     @config ||= YAML.load_file(@config_location)[Rails.env]
+  #     @token ||= @config['iucn_redlist']['token']
+  #     @url ||= @config['iucn_redlist']['url']
+  #     puts "#{@url}#{full_name.downcase}?token=#{@token}"
+  #     url = URI.escape("#{@url}#{full_name.downcase}?token=#{@token}")
+  #     JSON.parse(RestClient.get(url))
+  #   end
 
-    def fetch_data_for_name(full_name)
-      @config_location ||= Rails.root.join('config/secrets.yml')
-      @config ||= YAML.load_file(@config_location)[Rails.env]
-      @token ||= @config['iucn_redlist']['token']
-      @url ||= @config['iucn_redlist']['url']
-      puts "#{@url}#{full_name.downcase}?token=#{@token}"
-      url = URI.escape("#{@url}#{full_name.downcase}?token=#{@token}")
-      JSON.parse(RestClient.get(url))
-    end
+  #   def map_taxon_concept(taxon_concept, map, data)
+  #     begin
+  #       match = data["result"].first
+  #       puts "#{taxon_concept.full_name} #{taxon_concept.author_year} <=>  #{match["scientific_name"]} #{match["authority"]}"
+  #       map.update(
+  #         :iucn_taxon_name => match['scientific_name'],
+  #         :iucn_taxon_id => match['taxonid'],
+  #         :iucn_author => match['authority'],
+  #         :iucn_category => match['category'],
+  #         :details => {
+  #           :match => type_of_match(taxon_concept, match),
+  #           :no_matches => data["result"].size
+  #         },
+  #         :accepted_name_id => taxon_concept.name_status == 'S' ? taxon_concept.accepted_names.first.try(:id) : nil
+  #       )
+  #     rescue Exception => e
+  #       puts "#######################################################################"
+  #       puts "########################## EXCEPTION Taxon Concept #{taxon_concept.id} ###########"
+  #       puts e.message
+  #     end
+  #   end
 
-    def map_taxon_concept(taxon_concept, map, data)
-      begin
-        match = data["result"].first
-        puts "#{taxon_concept.full_name} #{taxon_concept.author_year} <=>  #{match["scientific_name"]} #{match["authority"]}"
-        map.update(
-          :iucn_taxon_name => match['scientific_name'],
-          :iucn_taxon_id => match['taxonid'],
-          :iucn_author => match['authority'],
-          :iucn_category => match['category'],
-          :details => {
-            :match => type_of_match(taxon_concept, match),
-            :no_matches => data["result"].size
-          },
-          :accepted_name_id => taxon_concept.name_status == 'S' ? taxon_concept.accepted_names.first.try(:id) : nil
-        )
-      rescue Exception => e
-        puts "#######################################################################"
-        puts "########################## EXCEPTION Taxon Concept #{taxon_concept.id} ###########"
-        puts e.message
-      end
-    end
+  #   def type_of_match(tc, match)
+  #     if tc.full_name == match["scientific_name"]
+  #       if strip_authors(tc.author_year) == strip_authors(match["authority"])
+  #         puts "FULL_MATCH!"
+  #         "FULL_MATCH"
+  #       else
+  #         puts "NAME_MATCH"
+  #         "NAME_MATCH"
+  #       end
+  #     end
+  #   end
 
-    def type_of_match(tc, match)
-      if tc.full_name == match["scientific_name"]
-        if strip_authors(tc.author_year) == strip_authors(match["authority"])
-          puts "FULL_MATCH!"
-          "FULL_MATCH"
-        else
-          puts "NAME_MATCH"
-          "NAME_MATCH"
-        end
-      end
-    end
-
-    def strip_authors(author)
-      return '' unless author
-      author.split(" ").
-        reject { |p| ["and", "&", "&amp;", ","].include?(p) }.
-        join(" ")
-    end
-  end
+  #   def strip_authors(author)
+  #     return '' unless author
+  #     author.split(" ").
+  #       reject { |p| ["and", "&", "&amp;", ","].include?(p) }.
+  #       join(" ")
+  #   end
+  # end
 end
diff --git a/config/deploy.rb b/config/deploy.rb
index fd9e5ebaf..3ece01f92 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -20,7 +20,7 @@
 # set :format, :pretty
 
 set :rvm_type, :user
-set :rvm_ruby_version, '2.7.8'
+set :rvm_ruby_version, '3.0.6'
 
 # Sidekiq config
 set :sidekiq_service_unit_user, :system
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bf9260178..5f795b2c5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,7 +7,7 @@
 formatters = [Coveralls::SimpleCov::Formatter, SimpleCov::Formatter::HTMLFormatter]
 formatters.push CodeClimate::TestReporter::Formatter if ENV['CI']
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
+SimpleCov.formatters = formatters
 SimpleCov.start 'rails' do
   add_group "Services", "app/services"
   add_group "Serializers", "app/serializers"

From bc7aa8e651092b1ded23e98fc018d27eee919f23 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 09:49:39 +0000
Subject: [PATCH 143/241] update cap to support ruby 3

---
 Gemfile          |  6 +++---
 Gemfile.lock     | 14 +++++++-------
 config/deploy.rb |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 696100fdf..3532dbf33 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,9 +96,9 @@ group :development do
   gem 'annotate', "2.5.0"
   # gem 'sextant'
   # Deploy with Capistrano
-  gem 'capistrano', '3.11.0', require: false
-  gem 'capistrano-rails',   '1.4.0', require: false
-  gem 'capistrano-bundler', '1.5.0', require: false
+  gem 'capistrano', '3.18.0', require: false
+  gem 'capistrano-rails',   '1.6.3', require: false
+  gem 'capistrano-bundler', '1.6.0', require: false
   gem 'capistrano-rvm', '0.1.2', require: false
   gem 'capistrano-maintenance', '1.0.0', require: false
   gem 'capistrano-passenger', '0.2.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 3b7ba8ed9..f3e8e21cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,12 +114,12 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     cancancan (3.5.0)
-    capistrano (3.11.0)
+    capistrano (3.18.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.5.0)
+    capistrano-bundler (1.6.0)
       capistrano (~> 3.1)
     capistrano-local-precompile (1.2.0)
       capistrano (>= 3.8)
@@ -127,9 +127,9 @@ GEM
       capistrano (>= 3.0)
     capistrano-passenger (0.2.0)
       capistrano (~> 3.0)
-    capistrano-rails (1.4.0)
+    capistrano-rails (1.6.3)
       capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
+      capistrano-bundler (>= 1.1, < 3)
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
@@ -596,12 +596,12 @@ DEPENDENCIES
   brightbox (= 2.3.9)
   byebug
   cancancan (~> 3.5)
-  capistrano (= 3.11.0)
-  capistrano-bundler (= 1.5.0)
+  capistrano (= 3.18.0)
+  capistrano-bundler (= 1.6.0)
   capistrano-local-precompile (= 1.2.0)
   capistrano-maintenance (= 1.0.0)
   capistrano-passenger (= 0.2.0)
-  capistrano-rails (= 1.4.0)
+  capistrano-rails (= 1.6.3)
   capistrano-rvm (= 0.1.2)
   capistrano-sidekiq (~> 2.3, >= 2.3.1)
   capybara (>= 2.15)
diff --git a/config/deploy.rb b/config/deploy.rb
index 3ece01f92..a8056ce7f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock '3.11.0'
+lock '3.18.0'
 
 set :application, 'sapi'
 set :repo_url, 'git@github.com:unepwcmc/SAPI.git'

From cc96ac6b04507dd7c7f27de2900707b208d23af5 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 10:20:34 +0000
Subject: [PATCH 144/241] Rails 6.1; app:update; rails diff

---
 .gitattributes                                |  10 ++
 Gemfile                                       |  18 ++-
 Gemfile.lock                                  | 152 +++++++++---------
 bin/rails                                     |   5 +-
 bin/rake                                      |   5 +-
 bin/setup                                     |   6 +-
 bin/spring                                    |  14 ++
 bin/yarn                                      |  12 +-
 config.ru                                     |   3 +-
 config/application.rb                         |  13 +-
 config/boot.rb                                |   4 +-
 config/environment.rb                         |   2 +-
 config/environments/development.rb            |  20 ++-
 config/environments/production.rb             |  17 +-
 config/environments/staging.rb                |  13 +-
 config/environments/test.rb                   |  13 +-
 .../0_new_framework_defaults_6_0.rb           |  45 ------
 .../0_new_framework_defaults_6_1.rb           |  67 ++++++++
 config/initializers/backtrace_silencers.rb    |   7 +-
 .../initializers/filter_parameter_logging.rb  |   4 +-
 config/initializers/permissions_policy.rb     |  11 ++
 config/puma.rb                                |   7 +-
 22 files changed, 286 insertions(+), 162 deletions(-)
 create mode 100644 .gitattributes
 create mode 100755 bin/spring
 delete mode 100644 config/initializers/0_new_framework_defaults_6_0.rb
 create mode 100644 config/initializers/0_new_framework_defaults_6_1.rb
 create mode 100644 config/initializers/permissions_policy.rb

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..516857104
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,10 @@
+# See https://git-scm.com/docs/gitattributes for more about git attribute files.
+
+# Mark the database schema as having been generated.
+db/schema.rb linguist-generated
+
+# Mark the yarn lockfile as having been generated.
+yarn.lock linguist-generated
+
+# Mark any vendored files as having been vendored.
+vendor/* linguist-vendored
diff --git a/Gemfile b/Gemfile
index 3532dbf33..d9221351c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '3.0.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '6.0.6.1'
+gem 'rails', '6.1.7.6'
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3'
 # Use Puma as the app server
-gem 'puma', '~> 4.1'
+gem 'puma', '~> 5.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6'
 # https://stackoverflow.com/questions/55213868/rails-6-how-to-disable-webpack-and-use-sprockets-instead
@@ -80,18 +80,20 @@ gem 'strong_migrations', '~> 1.7'
 # gem 'mini_magick', '~> 4.8'
 
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.4.2', require: false
+gem 'bootsnap', '>= 1.4.4', require: false
 
 # To use Jbuilder templates for JSON
 # gem 'jbuilder', '~> 2.7'
 
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
-  gem 'listen', '~> 3.2'
+  gem 'web-console', '>= 4.1.0'
+  # Display performance information such as SQL time and flame graphs for each request in your browser.
+  # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
+  gem 'rack-mini-profiler', '~> 2.0'
+  gem 'listen', '~> 3.3'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 	gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
 
   gem 'annotate', "2.5.0"
   # gem 'sextant'
@@ -130,8 +132,8 @@ end
 
 group :test do
   # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '>= 2.15'
-  gem 'selenium-webdriver'
+  gem 'capybara', '>= 3.26'
+  gem 'selenium-webdriver', '>= 4.0.0.rc1'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f3e8e21cb..201596d00 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,27 +2,29 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (6.0.6.1)
-      actionpack (= 6.0.6.1)
+    actioncable (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actionmailbox (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       mail (>= 2.7.1)
-    actionmailer (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
+    actionmailer (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6.1)
-      actionview (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.7.6)
+      actionview (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
@@ -30,14 +32,14 @@ GEM
       actionpack (>= 4.0.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actiontext (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actiontext (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6.1)
-      activesupport (= 6.0.6.1)
+    actionview (6.1.7.6)
+      activesupport (= 6.1.7.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -46,25 +48,27 @@ GEM
       ember-data-source (>= 1.13, < 3.0)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (6.0.6.1)
-      activesupport (= 6.0.6.1)
+    activejob (6.1.7.6)
+      activesupport (= 6.1.7.6)
       globalid (>= 0.3.6)
-    activemodel (6.0.6.1)
-      activesupport (= 6.0.6.1)
-    activerecord (6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-    activestorage (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
+    activemodel (6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activerecord (6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activestorage (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       marcel (~> 1.0)
-    activesupport (6.0.6.1)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     acts-as-taggable-on (9.0.1)
       activerecord (>= 6.0, < 7.1)
     addressable (2.8.6)
@@ -231,8 +235,8 @@ GEM
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     geoip (1.3.5)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     gon (6.4.0)
       actionpack (>= 3.0.20)
       i18n (>= 0.7)
@@ -359,28 +363,30 @@ GEM
       ruby-rc4
       ttfunk (~> 1.0.3)
     public_suffix (5.0.4)
-    puma (4.3.12)
+    puma (5.6.8)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.3)
     rack (2.2.8)
     rack-cors (0.3.0)
+    rack-mini-profiler (2.3.4)
+      rack (>= 1.2.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.0.6.1)
-      actioncable (= 6.0.6.1)
-      actionmailbox (= 6.0.6.1)
-      actionmailer (= 6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actiontext (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.6.1)
+    rails (6.1.7.6)
+      actioncable (= 6.1.7.6)
+      actionmailbox (= 6.1.7.6)
+      actionmailer (= 6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actiontext (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -395,12 +401,12 @@ GEM
       nokogiri (~> 1.14)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
+    railties (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
@@ -518,9 +524,6 @@ GEM
       capistrano (>= 3.0.1)
       json
     spring (2.1.1)
-    spring-watcher-listen (2.0.1)
-      listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -544,14 +547,13 @@ GEM
     test-unit (3.1.5)
       power_assert
     thor (1.3.0)
-    thread_safe (0.3.6)
     tilt (2.3.0)
     timeout (0.4.1)
     tins (1.32.1)
       sync
     ttfunk (1.0.3)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.5.0)
@@ -591,7 +593,7 @@ DEPENDENCIES
   appsignal (~> 3.5, >= 3.5.5)
   aws-sdk (~> 2)
   bcrypt_pbkdf (= 1.1.0)
-  bootsnap (>= 1.4.2)
+  bootsnap (>= 1.4.4)
   bootstrap-sass (= 2.3.2.2)
   brightbox (= 2.3.9)
   byebug
@@ -604,7 +606,7 @@ DEPENDENCIES
   capistrano-rails (= 1.6.3)
   capistrano-rvm (= 0.1.2)
   capistrano-sidekiq (~> 2.3, >= 2.3.1)
-  capybara (>= 2.15)
+  capybara (>= 3.26)
   carrierwave (= 2.2.5)
   chartkick (~> 5.0, >= 5.0.5)
   codeclimate-test-reporter (= 0.1.1)
@@ -629,7 +631,7 @@ DEPENDENCIES
   json_spec (~> 1.1, >= 1.1.5)
   kaminari (~> 1.2, >= 1.2.2)
   launchy (= 2.4.3)
-  listen (~> 3.2)
+  listen (~> 3.3)
   mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
@@ -641,9 +643,10 @@ DEPENDENCIES
   pg_array_parser (~> 0.0.9)
   pg_search (~> 2.3, >= 2.3.6)
   prawn (= 0.13.2)
-  puma (~> 4.1)
+  puma (~> 5.0)
   rack-cors (= 0.3.0)
-  rails (= 6.0.6.1)
+  rack-mini-profiler (~> 2.0)
+  rails (= 6.1.7.6)
   rails-controller-testing
   rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)
@@ -656,7 +659,7 @@ DEPENDENCIES
   rubocop-rspec
   rubyzip (~> 2.3, >= 2.3.2)
   sass-rails (>= 6)
-  selenium-webdriver
+  selenium-webdriver (>= 4.0.0.rc1)
   sidekiq (< 7)
   sidekiq-cron (~> 1.12)
   sidekiq-status (~> 3.0, >= 3.0.3)
@@ -665,7 +668,6 @@ DEPENDENCIES
   sitemap_generator (~> 6.3)
   slackistrano (= 0.1.9)
   spring
-  spring-watcher-listen (~> 2.0.0)
   sprockets (= 3.7.2)
   sprockets-rails
   strong_migrations (~> 1.7)
@@ -673,7 +675,7 @@ DEPENDENCIES
   test-unit (= 3.1.5)
   uglifier (>= 1.3.0)
   uuidtools (~> 2.2)
-  web-console (>= 3.3.0)
+  web-console (>= 4.1.0)
   webdrivers
   wicked (= 1.3.4)
   wkhtmltopdf-binary (~> 0.12.6.6)
diff --git a/bin/rails b/bin/rails
index 073966023..21d3e02d8 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+load File.expand_path("spring", __dir__)
 APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+require_relative "../config/boot"
+require "rails/commands"
diff --git a/bin/rake b/bin/rake
index 17240489f..7327f471e 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
+load File.expand_path("spring", __dir__)
+require_relative "../config/boot"
+require "rake"
 Rake.application.run
diff --git a/bin/setup b/bin/setup
index 5853b5ea8..2f3d36d37 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'fileutils'
+require "fileutils"
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -9,8 +9,8 @@ def system!(*args)
 end
 
 FileUtils.chdir APP_ROOT do
-  # This script is a way to setup or update your development environment automatically.
-  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
diff --git a/bin/spring b/bin/spring
new file mode 100755
index 000000000..b4147e843
--- /dev/null
+++ b/bin/spring
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
+  gem "bundler"
+  require "bundler"
+
+  # Load Spring without loading other gems in the Gemfile, for speed.
+  Bundler.locked_gems&.specs&.find { |spec| spec.name == "spring" }&.tap do |spring|
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem "spring", spring.version
+    require "spring/binstub"
+  rescue Gem::LoadError
+    # Ignore when Spring is not installed.
+  end
+end
diff --git a/bin/yarn b/bin/yarn
index 460dd565b..9fab2c350 100755
--- a/bin/yarn
+++ b/bin/yarn
@@ -1,9 +1,15 @@
 #!/usr/bin/env ruby
 APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
-  begin
-    exec "yarnpkg", *ARGV
-  rescue Errno::ENOENT
+  yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
+    select { |dir| File.expand_path(dir) != __dir__ }.
+    product(["yarn", "yarn.cmd", "yarn.ps1"]).
+    map { |dir, file| File.expand_path(file, dir) }.
+    find { |file| File.executable?(file) }
+
+  if yarn
+    exec yarn, *ARGV
+  else
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
     exit 1
diff --git a/config.ru b/config.ru
index f7ba0b527..4a3c09a68 100644
--- a/config.ru
+++ b/config.ru
@@ -1,5 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require_relative 'config/environment'
+require_relative "config/environment"
 
 run Rails.application
+Rails.application.load_server
diff --git a/config/application.rb b/config/application.rb
index 5f5670c07..0cc5846e0 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -11,12 +11,15 @@
 module SAPI
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 6.1
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration can go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded after loading
-    # the framework and any gems in your application.
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    config.time_zone = "London"
+    # config.eager_load_paths << Rails.root.join("extras")
 
     # @see https://gist.github.com/maxivak/381f1e964923f1d469c8d39da8e2522f
     # TODO: Rails 7.1 https://stackoverflow.com/a/77198784/556780
diff --git a/config/boot.rb b/config/boot.rb
index b9e460cef..3cda23b4d 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require 'bundler/setup' # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.
diff --git a/config/environment.rb b/config/environment.rb
index 426333bb4..cac531577 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative 'application'
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bd2b4a5de..bf5152379 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+
 Rails.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
+  # In the development environment your application's code is reloaded any time
+  # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
@@ -39,6 +41,12 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
@@ -54,12 +62,18 @@
   config.assets.quiet = true
 
   # Raises error for missing translations.
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
+  # Uncomment if you wish to allow Action Cable access from any origin.
+  # config.action_cable.disable_request_forgery_protection = true
+
   # Custom ember settings
   config.ember.variant = :development
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7cd7b0fef..79c3f6a68 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -31,7 +33,7 @@
   config.assets.compile = false
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # config.asset_host = 'http://assets.example.com'
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
@@ -48,8 +50,8 @@
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Use the lowest log level to ensure availability of diagnostic information
-  # when problems arise.
+  # Include generic and useful information about system operation, but avoid logging too much
+  # information to avoid inadvertent exposure of personally identifiable information (PII).
   config.log_level = :warn # @see https://github.com/heartcombo/devise#password-reset-tokens-and-rails-logs
 
   # Prepend all log lines with the following tags.
@@ -61,6 +63,7 @@
   # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "sapi_production"
+
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
@@ -75,11 +78,17 @@
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
+  # Log disallowed deprecations.
+  config.active_support.disallowed_deprecation = :log
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
   # Use a different logger for distributed setups.
-  # require 'syslog/logger'
+  # require "syslog/logger"
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
   if ENV["RAILS_LOG_TO_STDOUT"].present?
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index ce7c7de92..fb92d8c2f 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -31,7 +33,7 @@
   config.assets.compile = false
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # config.asset_host = 'http://assets.example.com'
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
@@ -60,7 +62,8 @@
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
-  # config.active_job.queue_name_prefix = "sapi_#{Rails.env}"
+  # config.active_job.queue_name_prefix = "sapi_staging"
+
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
@@ -75,6 +78,12 @@
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
+  # Log disallowed deprecations.
+  config.active_support.disallowed_deprecation = :log
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 9579685c1..1607373bb 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
 # your test database is "scratch space" for the test suite and is wiped
@@ -45,8 +47,17 @@
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raises error for missing translations.
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 
   # Custom ember settings
   config.ember.variant = :development
diff --git a/config/initializers/0_new_framework_defaults_6_0.rb b/config/initializers/0_new_framework_defaults_6_0.rb
deleted file mode 100644
index 223024573..000000000
--- a/config/initializers/0_new_framework_defaults_6_0.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 6.0 upgrade.
-#
-# Once upgraded flip defaults one by one to migrate to the new default.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-
-# Don't force requests from old versions of IE to be UTF-8 encoded.
-# Rails.application.config.action_view.default_enforce_utf8 = false
-
-# Embed purpose and expiry metadata inside signed and encrypted
-# cookies for increased security.
-#
-# This option is not backwards compatible with earlier Rails versions.
-# It's best enabled when your entire app is migrated and stable on 6.0.
-Rails.application.config.action_dispatch.use_cookies_with_metadata = true
-
-# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification.
-Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
-
-# Return false instead of self when enqueuing is aborted from a callback.
-Rails.application.config.active_job.return_false_on_aborted_enqueue = true
-
-# Send Active Storage analysis and purge jobs to dedicated queues.
-Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
-Rails.application.config.active_storage.queues.purge    = :active_storage_purge
-
-# When assigning to a collection of attachments declared via `has_many_attached`, replace existing
-# attachments instead of appending. Use #attach to add new attachments without replacing existing ones.
-Rails.application.config.active_storage.replace_on_assign_to_many = true
-
-# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
-#
-# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob),
-# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions.
-# If you send mail in the background, job workers need to have a copy of
-# MailDeliveryJob to ensure all delivery jobs are processed properly.
-# Make sure your entire app is migrated and stable on 6.0 before using this setting.
-Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
-
-# Enable the same cache key to be reused when the object being cached of type
-# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count)
-# of the relation's cache key into the cache version to support recycling cache key.
-Rails.application.config.active_record.collection_cache_versioning = true
diff --git a/config/initializers/0_new_framework_defaults_6_1.rb b/config/initializers/0_new_framework_defaults_6_1.rb
new file mode 100644
index 000000000..9526b835a
--- /dev/null
+++ b/config/initializers/0_new_framework_defaults_6_1.rb
@@ -0,0 +1,67 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 6.1 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Support for inversing belongs_to -> has_many Active Record associations.
+# Rails.application.config.active_record.has_many_inversing = true
+
+# Track Active Storage variants in the database.
+# Rails.application.config.active_storage.track_variants = true
+
+# Apply random variation to the delay when retrying failed jobs.
+# Rails.application.config.active_job.retry_jitter = 0.15
+
+# Stop executing `after_enqueue`/`after_perform` callbacks if
+# `before_enqueue`/`before_perform` respectively halts with `throw :abort`.
+# Rails.application.config.active_job.skip_after_callbacks_if_terminated = true
+
+# Specify cookies SameSite protection level: either :none, :lax, or :strict.
+#
+# This change is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.1.
+# Rails.application.config.action_dispatch.cookies_same_site_protection = :lax
+
+# Generate CSRF tokens that are encoded in URL-safe Base64.
+#
+# This change is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.1.
+# Rails.application.config.action_controller.urlsafe_csrf_tokens = true
+
+# Specify whether `ActiveSupport::TimeZone.utc_to_local` returns a time with an
+# UTC offset or a UTC time.
+# ActiveSupport.utc_to_local_returns_utc_offset_times = true
+
+# Change the default HTTP status code to `308` when redirecting non-GET/HEAD
+# requests to HTTPS in `ActionDispatch::SSL` middleware.
+# Rails.application.config.action_dispatch.ssl_default_redirect_status = 308
+
+# Use new connection handling API. For most applications this won't have any
+# effect. For applications using multiple databases, this new API provides
+# support for granular connection swapping.
+# Rails.application.config.active_record.legacy_connection_handling = false
+
+# Make `form_with` generate non-remote forms by default.
+# Rails.application.config.action_view.form_with_generates_remote_forms = false
+
+# Set the default queue name for the analysis job to the queue adapter default.
+# Rails.application.config.active_storage.queues.analysis = nil
+
+# Set the default queue name for the purge job to the queue adapter default.
+# Rails.application.config.active_storage.queues.purge = nil
+
+# Set the default queue name for the incineration job to the queue adapter default.
+# Rails.application.config.action_mailbox.queues.incineration = nil
+
+# Set the default queue name for the routing job to the queue adapter default.
+# Rails.application.config.action_mailbox.queues.routing = nil
+
+# Set the default queue name for the mail deliver job to the queue adapter default.
+# Rails.application.config.action_mailer.deliver_later_queue_name = nil
+
+# Generate a `Link` header that gives a hint to modern browsers about
+# preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`.
+# Rails.application.config.action_view.preload_links_header = true
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 59385cdf3..33699c309 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,7 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
 
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 4a994e1e7..4b34a0366 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -1,4 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+Rails.application.config.filter_parameters += [
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
new file mode 100644
index 000000000..00f64d71b
--- /dev/null
+++ b/config/initializers/permissions_policy.rb
@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end
diff --git a/config/puma.rb b/config/puma.rb
index 5ed443774..d9b3e836c 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -8,9 +8,14 @@
 min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
 threads min_threads_count, max_threads_count
 
+# Specifies the `worker_timeout` threshold that Puma will use to wait before
+# terminating a worker in development environments.
+#
+worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
+
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port        ENV.fetch("PORT") { 3000 }
+port ENV.fetch("PORT") { 3000 }
 
 # Specifies the `environment` that Puma will run in.
 #

From a191f331e0bbf8295c9e6a1b865b3b4480ec648e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 10:44:28 +0000
Subject: [PATCH 145/241] Upgrade gems for Rails 6.1

---
 Gemfile      |  8 ++++----
 Gemfile.lock | 36 +++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/Gemfile b/Gemfile
index d9221351c..9b31257ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,9 +31,9 @@ gem 'nested-hstore', '~> 0.1.2'
 gem 'pg_search', '~> 2.3', '>= 2.3.6'
 gem 'oj', '~> 3.16', '>= 3.16.3' # optimised JSON (picked by multi_json)
 gem 'inherited_resources', '~> 1.14' # Deprecated (https://github.com/activeadmin/inherited_resources#notice)
-gem 'nokogiri', '1.15.5' # TODO: New version need Ruby 3
+gem 'nokogiri', '~> 1.16'
 gem 'mobility', '~> 1.2', '>= 1.2.9'
-gem 'devise', '4.7.3' # TODO: need upgrade to 4.8+ when upgrade to rails 6.1
+gem 'devise', '~> 4.9', '>= 4.9.3'
 gem 'cancancan', '~> 3.5'
 gem 'ahoy_matey', '4.2.1' # TODO: latest 5.0.2. Can't upgrade to 5.0 until upgrade to Rails 6.1
 gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
@@ -43,7 +43,7 @@ gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.
 #   rspec ./spec/controllers/admin/nomenclature_changes/split_controller_spec.rb:191
 gem 'wicked', '1.3.4'
 
-gem 'groupdate', '6.2.1' # TODO: can upgrade after rails 6.1 and newer ruby 3
+gem 'groupdate', '~> 6.4'
 
 gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 3.1', '>= 3.1.1' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
@@ -121,7 +121,7 @@ group :development do
 end
 
 group :test, :development do
-  gem "rspec-rails", '5.1.2' # TODO: should upgrade once to rails 6.1
+  gem 'rspec-rails', '~> 6.1', '>= 6.1.1'
   gem 'rspec-collection_matchers', '~> 1.2', '>= 1.2.1'
   gem 'json_spec', '~> 1.1', '>= 1.1.5'
   gem 'database_cleaner', '~> 2.0', '>= 2.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 201596d00..e7779cdf4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,7 +187,7 @@ GEM
     database_cleaner-core (2.0.1)
     date (3.3.4)
     device_detector (1.1.2)
-    devise (4.7.3)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -220,7 +220,6 @@ GEM
       railties (>= 4.2)
     ember-source (1.8.0)
       handlebars-source (~> 1.0)
-    errbase (0.2.2)
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
@@ -242,8 +241,8 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    groupdate (6.2.1)
-      activesupport (>= 5.2)
+    groupdate (6.4.0)
+      activesupport (>= 6.1)
     handlebars-source (1.0.12)
     has_scope (0.8.2)
       actionpack (>= 5.2)
@@ -331,7 +330,7 @@ GEM
       net-protocol
     net-ssh (7.2.1)
     nio4r (2.7.0)
-    nokogiri (1.15.5)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     numerizer (0.1.1)
@@ -438,14 +437,14 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
+    rspec-rails (6.1.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
     rspec-support (3.12.1)
     rubocop (1.60.2)
       json (~> 2.3)
@@ -478,8 +477,7 @@ GEM
     ruby-vips (2.2.0)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    safely_block (0.3.0)
-      errbase (>= 0.1.1)
+    safely_block (0.4.0)
     sass (3.4.25)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -614,7 +612,7 @@ DEPENDENCIES
   coveralls_reborn (~> 0.28.0)
   dalli (= 2.7.10)
   database_cleaner (~> 2.0, >= 2.0.2)
-  devise (= 4.7.3)
+  devise (~> 4.9, >= 4.9.3)
   dotenv-rails (= 2.0.1)
   ed25519 (= 1.2.4)
   ember-data-source (= 1.13.0)
@@ -623,7 +621,7 @@ DEPENDENCIES
   factory_bot_rails (= 5.2.0)
   geoip (= 1.3.5)
   gon (~> 6.4)
-  groupdate (= 6.2.1)
+  groupdate (~> 6.4)
   handlebars-source (= 1.0.12)
   httparty (~> 0.21.0)
   inherited_resources (~> 1.14)
@@ -635,7 +633,7 @@ DEPENDENCIES
   mobility (~> 1.2, >= 1.2.9)
   nested-hstore (~> 0.1.2)
   nested_form (~> 0.3.2)
-  nokogiri (= 1.15.5)
+  nokogiri (~> 1.16)
   oj (~> 3.16, >= 3.16.3)
   paper_trail (= 12.3.0)
   pdfkit (~> 0.8.7.3)
@@ -654,7 +652,7 @@ DEPENDENCIES
   request_store (~> 1.5, >= 1.5.1)
   responders (~> 3.1, >= 3.1.1)
   rspec-collection_matchers (~> 1.2, >= 1.2.1)
-  rspec-rails (= 5.1.2)
+  rspec-rails (~> 6.1, >= 6.1.1)
   rubocop-rails
   rubocop-rspec
   rubyzip (~> 2.3, >= 2.3.2)

From 68d4f49b70b7050636d10406959235f9e3433b8d Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 11:08:35 +0000
Subject: [PATCH 146/241] fix rspec

---
 lib/csv_column_headers_validator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/csv_column_headers_validator.rb b/lib/csv_column_headers_validator.rb
index 77cc783bf..ce8f0303e 100644
--- a/lib/csv_column_headers_validator.rb
+++ b/lib/csv_column_headers_validator.rb
@@ -28,7 +28,7 @@ def validate_each(record, attribute, value)
       end
     rescue => e
       Rails.logger.error e.inspect
-      record.errors.add(attribute, "file cannot be processed", {})
+      record.errors.add(attribute, "file cannot be processed")
     end
   end
 end

From 7b1d8caa7fa4870d75d30ae56160568bf3eb1ba4 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Fri, 12 Jan 2024 17:42:36 +0000
Subject: [PATCH 147/241] chore: begin to test content of taxon_concepts API
 route

---
 .../api/taxon_concepts_controller_spec.rb     | 90 +++++++++++++++++++
 spec/factories.rb                             |  7 ++
 2 files changed, 97 insertions(+)

diff --git a/spec/controllers/api/taxon_concepts_controller_spec.rb b/spec/controllers/api/taxon_concepts_controller_spec.rb
index 361a7832a..28aecdec7 100644
--- a/spec/controllers/api/taxon_concepts_controller_spec.rb
+++ b/spec/controllers/api/taxon_concepts_controller_spec.rb
@@ -14,4 +14,94 @@
       expect(@ahoy_event1).to eq(@ahoy_event2)
     end
   end
+
+  context "GET show" do
+    context "Minimal taxon" do
+      let!(:taxon_concept) {
+        create(:taxon_concept)
+      }
+      let!(:m_taxon_concept) {
+        taxon_concept.m_taxon_concept
+      }
+
+      it "Serialises a minimal taxon correctly" do
+        get :show, params: { :id => taxon_concept.id }
+
+        response_body = parse_json(response.body)
+
+        # Make sure we have the correct taxon
+        expect(
+          response_body['taxon_concept']['full_name']
+        ).to eq(
+          taxon_concept.full_name
+        )
+
+        # We expect the response to be a superset of the following:
+        expected = {
+          "id"=>taxon_concept.id,
+          "parent_id"=>taxon_concept.parent_id,
+          "full_name"=>taxon_concept.full_name,
+          "author_year"=>nil,
+          "standard_references"=>[],
+          "common_names"=>[],
+          "distributions"=>[],
+          "subspecies"=>[],
+          "distribution_references"=>[],
+          "name_status"=>"A",
+          "nomenclature_note_en"=>nil,
+          "nomenclature_notification"=>false,
+          "cites_listing"=>nil,
+          "eu_listing"=>nil,
+          "accepted_names"=>[],
+          "synonyms"=>[],
+          "references"=>[],
+          "cites_quotas"=>[],
+          "cites_suspensions"=>[],
+          "cites_listings"=>[],
+          "eu_listings"=>[],
+          "eu_decisions"=>[],
+          "cites_processes"=>[]
+        }
+
+        expect(
+          response_body['taxon_concept'].slice(*(expected.keys))
+        ).to eq(expected)
+      end
+    end
+
+    context "Taxon with CITES Processes" do
+      let!(:taxon_concept) {
+        create(
+          :taxon_concept,
+        )
+      }
+
+      let!(:cites_rst_process) {
+        create(
+          :cites_rst_process,
+          taxon_concept: taxon_concept
+        )
+      }
+
+      it "Serialises a minimal taxon correctly" do
+        get :show, params: { :id => taxon_concept.id }
+
+        response_body = parse_json(response.body)
+
+        # Make sure we have the correct taxon
+        expect(
+          response_body['taxon_concept']['full_name']
+        ).to eq(
+          taxon_concept.full_name
+        )
+
+        # Check that CITES RST processes are included in the response
+        expect(
+          response_body['taxon_concept']['cites_processes'].length
+        ).to eq(
+          1
+        )
+      end
+    end
+  end
 end
diff --git a/spec/factories.rb b/spec/factories.rb
index 0060c9fff..c4807d486 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -57,6 +57,13 @@
     sequence(:scientific_name) { |n| "Lupus#{n}" }
   end
 
+  factory :cites_rst_process do
+    taxon_concept
+    geo_entity
+    start_date { '2011-01-01' }
+    status { 'Trade Suspension' }
+  end
+
   factory :cites_suspension do
     taxon_concept
     start_notification

From 60c8c96e68006774fd978bb16bbb10ae0af802fa Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Fri, 2 Feb 2024 13:42:35 +0000
Subject: [PATCH 148/241] fix: order() expects literals to be wrapped in
 Arel.sql

---
 .../show_taxon_concept_serializer_cites.rb    | 71 +++++++++++--------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/app/serializers/species/show_taxon_concept_serializer_cites.rb b/app/serializers/species/show_taxon_concept_serializer_cites.rb
index 4da10c10a..323eeffc3 100644
--- a/app/serializers/species/show_taxon_concept_serializer_cites.rb
+++ b/app/serializers/species/show_taxon_concept_serializer_cites.rb
@@ -76,12 +76,14 @@ def quotas
                 '[Quota for ' || (taxon_concept->>'rank')::TEXT || ' <i>' || (taxon_concept->>'full_name')::TEXT || '</i>]'
               END AS subspecies_info
             SQL
-      ).
-      order(<<-SQL
-              trade_restrictions.start_date DESC,
-              geo_entity_en->>'name' ASC, trade_restrictions.notes ASC,
-              subspecies_info DESC
-            SQL
+      ).order(
+        Arel.sql(
+          <<-SQL
+            trade_restrictions.start_date DESC,
+            geo_entity_en->>'name' ASC, trade_restrictions.notes ASC,
+            subspecies_info DESC
+          SQL
+        )
       ).all
   end
 
@@ -122,12 +124,14 @@ def cites_suspensions
                 '[Suspension for ' || (taxon_concept->>'rank')::TEXT || ' <i>' || (taxon_concept->>'full_name')::TEXT || '</i>]'
               END AS subspecies_info
             SQL
-      ).
-      order(<<-SQL
-              trade_restrictions.is_current DESC,
-              trade_restrictions.start_date DESC, geo_entity_en->>'name' ASC,
-              subspecies_info DESC
-            SQL
+      ).order(
+        Arel.sql(
+          <<-SQL
+            trade_restrictions.is_current DESC,
+            trade_restrictions.start_date DESC, geo_entity_en->>'name' ASC,
+            subspecies_info DESC
+          SQL
+        )
       ).all
   end
 
@@ -147,11 +151,14 @@ def eu_decisions
       ", object_and_children, ancestors, object.id, ancestors_field).
       select(eu_decision_select_attrs).
       joins('LEFT JOIN eu_suspensions_applicability_view v ON eu_decisions.id = v.id').
-      order(<<-SQL
+      order(
+        Arel.sql(
+          <<-SQL
             geo_entity_en->>'name' ASC,
             start_date DESC,
             subspecies_info DESC
-        SQL
+          SQL
+        )
       ).all
   end
 
@@ -245,14 +252,16 @@ def cites_listing_changes
                 ELSE NULL
               END AS subspecies_info
            SQL
-      ).
-      order(<<-SQL
-          effective_at DESC,
-          change_type_order ASC,
-          species_listing_name ASC,
-          subspecies_info DESC,
-          party_full_name_en ASC
-        SQL
+      ).order(
+        Arel.sql(
+          <<-SQL
+            effective_at DESC,
+            change_type_order ASC,
+            species_listing_name ASC,
+            subspecies_info DESC,
+            party_full_name_en ASC
+          SQL
+        )
       ).all
   end
 
@@ -311,14 +320,16 @@ def eu_listing_changes
                 ELSE NULL
               END AS subspecies_info
            SQL
-      ).
-      order(<<-SQL
-          effective_at DESC,
-          change_type_order ASC,
-          species_listing_name ASC,
-          subspecies_info DESC,
-          party_full_name_en ASC
-        SQL
+      ).order(
+        Arel.sql(
+          <<-SQL
+            effective_at DESC,
+            change_type_order ASC,
+            species_listing_name ASC,
+            subspecies_info DESC,
+            party_full_name_en ASC
+          SQL
+        )
       ).all
   end
 

From e15dc9b937b21b59a78d11ece908cabcc3c6843a Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 13:56:26 +0000
Subject: [PATCH 149/241] DEPRECATION WARNING: Enumerating ActiveModel::Errors
 as a hash has been deprecated.

---
 app/models/nomenclature_change/output.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/nomenclature_change/output.rb b/app/models/nomenclature_change/output.rb
index 0bbd1ef49..febb1e042 100644
--- a/app/models/nomenclature_change/output.rb
+++ b/app/models/nomenclature_change/output.rb
@@ -183,9 +183,11 @@ def validate_tmp_taxon_concept
     unless @tmp_taxon_concept
       errors.add(:new_taxon_concept, "can\'t be blank")
     end
-
     return true if @tmp_taxon_concept.valid?
-    @tmp_taxon_concept.errors.each do |attribute, message|
+
+    @tmp_taxon_concept.errors.each do |error|
+      attribute = error.attribute
+      message = error.message
       if [:parent_id, :rank, :name_status, :author_year, :full_name].
         include?(attribute)
         errors.add(:"new_#{attribute}", message)

From 4ede79584176f49b5bc1cf12747af9edf1936342 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 13:56:47 +0000
Subject: [PATCH 150/241] DEPRECATION WARNING: Calling `<<` to an
 ActiveModel::Errors message array in order to add an error is deprecated.
 Please call `ActiveModel::Errors#add` instead.

---
 app/models/nomenclature_change.rb | 2 +-
 app/services/trade/sandbox.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/nomenclature_change.rb b/app/models/nomenclature_change.rb
index e61ecd79a..2335d2e98 100644
--- a/app/models/nomenclature_change.rb
+++ b/app/models/nomenclature_change.rb
@@ -48,7 +48,7 @@ def cannot_update_when_locked
     if status_was == NomenclatureChange::CLOSED ||
       status_was == NomenclatureChange::SUBMITTED &&
       status != NomenclatureChange::CLOSED
-      errors[:base] << "Nomenclature change is locked for updates"
+      errors.add(:base, "Nomenclature change is locked for updates")
       return false
     end
   end
diff --git a/app/services/trade/sandbox.rb b/app/services/trade/sandbox.rb
index 14178b730..f74a47252 100644
--- a/app/services/trade/sandbox.rb
+++ b/app/services/trade/sandbox.rb
@@ -28,7 +28,7 @@ def copy_from_sandbox_to_shipments(submitter)
       @moved_rows_cnt = pg_result.first['copy_transactions_from_sandbox_to_shipments'].to_i
       if @moved_rows_cnt < 0
         # if -1 returned, not all rows have been moved
-        @annual_report_upload.errors[:base] << "Submit failed, could not save all rows."
+        @annual_report_upload.errors.add(:base, "Submit failed, could not save all rows.")
         success = false
         raise ActiveRecord::Rollback
       end

From ccb968c7a7ab69e337bc559eb2aed807ca0ae110 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 14:25:43 +0000
Subject: [PATCH 151/241] DEPRECATION WARNING: connection_config is deprecated
 and will be removed from Rails 7.0 (Use connection_db_config instead)

---
 lib/psql_command.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/psql_command.rb b/lib/psql_command.rb
index df40d77d9..3e06cd9c6 100644
--- a/lib/psql_command.rb
+++ b/lib/psql_command.rb
@@ -1,7 +1,7 @@
 class PsqlCommand
 
   def initialize(sql_cmd)
-    db_conf = ApplicationRecord.connection_config
+    db_conf = ApplicationRecord.connection_db_config.configuration_hash
     @host = db_conf[:host] || 'localhost'
     @port = db_conf[:port] || 5432
     @username = db_conf[:username]

From 8110f42a7927b89d65441ce65639e97a4535839e Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Fri, 2 Feb 2024 15:25:09 +0000
Subject: [PATCH 152/241] fix: wrap another two order clauses in an Arel.sql

---
 .../admin/distributions_controller.rb         |  7 +++--
 app/models/m_taxon_concept.rb                 | 28 +++++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/controllers/admin/distributions_controller.rb b/app/controllers/admin/distributions_controller.rb
index 4886cb23d..299f4208f 100644
--- a/app/controllers/admin/distributions_controller.rb
+++ b/app/controllers/admin/distributions_controller.rb
@@ -5,8 +5,11 @@ class Admin::DistributionsController < Admin::TaxonConceptAssociatedTypesControl
   before_action :load_search, :only => [:index]
 
   def index
-    @distributions = @taxon_concept.distributions.
-      joins(:geo_entity).order('UPPER(geo_entities.name_en) ASC')
+    @distributions = @taxon_concept.distributions.joins(
+      :geo_entity
+    ).order(
+      Arel.sql('UPPER(geo_entities.name_en) ASC')
+    )
   end
 
   def edit
diff --git a/app/models/m_taxon_concept.rb b/app/models/m_taxon_concept.rb
index 56b8035f4..5a4ce3642 100644
--- a/app/models/m_taxon_concept.rb
+++ b/app/models/m_taxon_concept.rb
@@ -111,17 +111,23 @@ class MTaxonConcept < ApplicationRecord
 
   belongs_to :taxon_concept, :foreign_key => :id, optional: true
   has_many :cites_listing_changes, :foreign_key => :taxon_concept_id, :class_name => 'MCitesListingChange'
-  has_many :historic_cites_listing_changes_for_downloads, -> { where(show_in_downloads: true).order(
-    <<-SQL
-      effective_at,
-      CASE
-      WHEN change_type_name = 'ADDITION' THEN 0
-      WHEN change_type_name = 'RESERVATION' THEN 1
-      WHEN change_type_name = 'RESERVATION_WITHDRAWAL' THEN 2
-      WHEN change_type_name = 'DELETION' THEN 3
-      END
-    SQL
-    ) }, :foreign_key => :taxon_concept_id,
+  has_many :historic_cites_listing_changes_for_downloads, -> {
+    where(
+      show_in_downloads: true
+    ).order(
+      Arel.sql(
+        <<-SQL
+          effective_at,
+          CASE
+          WHEN change_type_name = 'ADDITION' THEN 0
+          WHEN change_type_name = 'RESERVATION' THEN 1
+          WHEN change_type_name = 'RESERVATION_WITHDRAWAL' THEN 2
+          WHEN change_type_name = 'DELETION' THEN 3
+          END
+        SQL
+      )
+    )
+  }, :foreign_key => :taxon_concept_id,
     :class_name => 'MCitesListingChange'
   has_many :current_cites_additions, -> { where(is_current: true, change_type_name: ChangeType::ADDITION).order('effective_at DESC, species_listing_name ASC') },
     :foreign_key => :taxon_concept_id,

From f934375f5ed36e081b7083e1a0301e09ec38c593 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 2 Feb 2024 22:52:04 +0000
Subject: [PATCH 153/241] Upgrade Gems and add comments to gemfile

---
 Gemfile                             | 10 ++++------
 Gemfile.lock                        | 27 ++++++++++++---------------
 config/environments/development.rb  |  9 ---------
 config/initializers/ahoy.rb         |  2 +-
 db/migrate/20240202224209_ahoy_5.rb |  9 +++++++++
 5 files changed, 26 insertions(+), 31 deletions(-)
 create mode 100644 db/migrate/20240202224209_ahoy_5.rb

diff --git a/Gemfile b/Gemfile
index 9b31257ff..4edee0214 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,7 +35,7 @@ gem 'nokogiri', '~> 1.16'
 gem 'mobility', '~> 1.2', '>= 1.2.9'
 gem 'devise', '~> 4.9', '>= 4.9.3'
 gem 'cancancan', '~> 3.5'
-gem 'ahoy_matey', '4.2.1' # TODO: latest 5.0.2. Can't upgrade to 5.0 until upgrade to Rails 6.1
+gem 'ahoy_matey', '~> 5.0', '>= 5.0.2'
 gem 'uuidtools', '~> 2.2' # For Ahoy. (https://github.com/ankane/ahoy/blob/v2.2.1/docs/Ahoy-2-Upgrade.md#activerecordstore)
 
 # TODO: starting from v1.4, it break our test due to redirection changes:
@@ -48,7 +48,7 @@ gem 'groupdate', '~> 6.4'
 gem 'rubyzip', '~> 2.3', '>= 2.3.2'
 gem 'responders', '~> 3.1', '>= 3.1.1' # https://guides.rubyonrails.org/v4.2/upgrading_ruby_on_rails.html#responders
 
-gem 'sidekiq', '< 7' # TODO, latest is 7
+gem 'sidekiq', '< 7' # TODO, latest is 7, which required Redis 6.2+, but our servers running Redis 4.0.9.
 gem 'sidekiq-status', '~> 3.0', '>= 3.0.3'
 gem 'sidekiq-unique-jobs', '7.1.31' # TODO: can upgrade to latest when sidekiq upgrade to 7
 gem 'sidekiq-cron', '~> 1.12'
@@ -57,8 +57,8 @@ gem 'httparty', '~> 0.21.0'
 
 gem 'kaminari', '~> 1.2', '>= 1.2.2' # TODO: Suggest migrate to pagy gem.
 
-gem 'acts-as-taggable-on', '9.0.1' # TODO: latest v10 @ 2023. Can upgrade after upgrade to Rails 6.1
-gem 'carrierwave', '2.2.5' # TODO: latest is 3.0.5 @ 2023. can upgrade to v3 after Rails 6
+gem 'acts-as-taggable-on', '~> 10.0'
+gem 'carrierwave', '~> 3.0', '>= 3.0.5'
 
 # PDF
 gem 'prawn', '0.13.2'
@@ -108,9 +108,7 @@ group :development do
   gem 'capistrano-sidekiq', '~> 2.3', '>= 2.3.1'
   gem 'slackistrano', '0.1.9', require: false
   gem 'brightbox', '2.3.9'
-  gem 'rack-cors', '0.3.0' ,:require => 'rack/cors' # TODO: remove when upgrade Rails.
   gem 'jslint_on_rails', '1.1.1'
-  # gem 'rubocop', '0.40.0', require: false
   gem 'rubocop-rails'
   gem 'rubocop-rspec'
   gem 'rbnacl', '4.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index e7779cdf4..68b634e8e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,15 +69,15 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    acts-as-taggable-on (9.0.1)
-      activerecord (>= 6.0, < 7.1)
+    acts-as-taggable-on (10.0.0)
+      activerecord (>= 6.1, < 7.2)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
-    ahoy_matey (4.2.1)
-      activesupport (>= 5.2)
-      device_detector
-      safely_block (>= 0.2.1)
+    ahoy_matey (5.0.2)
+      activesupport (>= 6.1)
+      device_detector (>= 1)
+      safely_block (>= 0.4)
     airbrussh (1.5.1)
       sshkit (>= 1.6.1, != 1.7.0)
     annotate (2.5.0)
@@ -150,13 +150,12 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.5)
-      activemodel (>= 5.0.0)
-      activesupport (>= 5.0.0)
+    carrierwave (3.0.5)
+      activemodel (>= 6.0.0)
+      activesupport (>= 6.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
-      mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     chartkick (5.0.5)
     chronic_duration (0.10.6)
@@ -367,7 +366,6 @@ GEM
     raabro (1.4.0)
     racc (1.7.3)
     rack (2.2.8)
-    rack-cors (0.3.0)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
     rack-test (2.1.0)
@@ -585,8 +583,8 @@ DEPENDENCIES
   actionpack-action_caching (~> 1.2, >= 1.2.2)
   actionpack-page_caching (~> 1.2, >= 1.2.4)
   active_model_serializers (= 0.8.4)
-  acts-as-taggable-on (= 9.0.1)
-  ahoy_matey (= 4.2.1)
+  acts-as-taggable-on (~> 10.0)
+  ahoy_matey (~> 5.0, >= 5.0.2)
   annotate (= 2.5.0)
   appsignal (~> 3.5, >= 3.5.5)
   aws-sdk (~> 2)
@@ -605,7 +603,7 @@ DEPENDENCIES
   capistrano-rvm (= 0.1.2)
   capistrano-sidekiq (~> 2.3, >= 2.3.1)
   capybara (>= 3.26)
-  carrierwave (= 2.2.5)
+  carrierwave (~> 3.0, >= 3.0.5)
   chartkick (~> 5.0, >= 5.0.5)
   codeclimate-test-reporter (= 0.1.1)
   coffee-rails (~> 5.0)
@@ -642,7 +640,6 @@ DEPENDENCIES
   pg_search (~> 2.3, >= 2.3.6)
   prawn (= 0.13.2)
   puma (~> 5.0)
-  rack-cors (= 0.3.0)
   rack-mini-profiler (~> 2.0)
   rails (= 6.1.7.6)
   rails-controller-testing
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bf5152379..9bf634ce9 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -83,13 +83,4 @@
   config.action_mailer.default_url_options = {
     host: Rails.application.secrets.mailer[:host] || 'http://localhost:3000'
   }
-
-  # CORS settings
-  # TODO: Rails 5 should build-in, need change this part when upgrade.
-  config.middleware.use Rack::Cors do
-    allow do
-      origins '*'
-      resource '*', :headers => :any, :methods => [:get, :post, :delete, :put, :options, :head]
-    end
-  end
 end
diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb
index ebac64204..dd54da01c 100644
--- a/config/initializers/ahoy.rb
+++ b/config/initializers/ahoy.rb
@@ -51,7 +51,7 @@ def ensure_uuid(id)
 Ahoy.track_bots = Rails.env.test?
 Ahoy.geocode = false # we use our own geocoder (Sapi::GeoIP)
 Ahoy.mask_ips = true
-Ahoy.cookies = false # TODO: when upgrade to Ahoy v5, change value to :none
+Ahoy.cookies = :none
 
 # https://github.com/ankane/ahoy/tree/v2.2.1#exceptions
 Safely.report_exception_method = ->(e) { Appsignal.add_exception(exception) if defined? Appsignal }
diff --git a/db/migrate/20240202224209_ahoy_5.rb b/db/migrate/20240202224209_ahoy_5.rb
new file mode 100644
index 000000000..94d63435a
--- /dev/null
+++ b/db/migrate/20240202224209_ahoy_5.rb
@@ -0,0 +1,9 @@
+class Ahoy5 < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    # https://github.com/ankane/ahoy/tree/v5.0.2?tab=readme-ov-file#50
+    # before v1.4.0, they named it `visitor_id` instead of `visitor_token`.
+    add_index :ahoy_visits, [:visitor_id, :started_at], algorithm: :concurrently
+  end
+end

From 8f8bdea2ba6e07d059bb3b000436b1985ab50c07 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sat, 3 Feb 2024 22:41:40 +0000
Subject: [PATCH 154/241] fix ahoy config

---
 config/initializers/ahoy.rb | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb
index dd54da01c..e82c8e65d 100644
--- a/config/initializers/ahoy.rb
+++ b/config/initializers/ahoy.rb
@@ -4,7 +4,8 @@ class Ahoy::Store < Ahoy::DatabaseStore
   UUID_NAMESPACE = UUIDTools::UUID.parse("dcd74c26-8fc9-453a-a9c2-afc445c3258d")
 
   def authenticate(data)
-    # disables automatic linking of visits and users
+    # https://github.com/ankane/ahoy/tree/v5.0.2?tab=readme-ov-file#gdpr-compliance-1
+    # disables automatic linking of visits and users (for GDPR compliance)
   end
 
   def visit_model
@@ -15,11 +16,31 @@ def event_model
     Ahoy::Event
   end
 
+  # https://github.com/ankane/ahoy/issues/549
+  # This project start using ahoy since version 1.0.1
+  # The DB migration file come with version 1.0.1 create columns `id` and `visitor_id`.
+  # (https://github.com/ankane/ahoy/blob/v1.0.1/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb)
+  # However it has changed since version 1.4.0, from `id` to `visit_token`, and from `visitor_id` to `visitor_token`.
+  # (https://github.com/ankane/ahoy/blob/v1.4.0/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb)
+  # When we upgrade this gem, we need to check the source code of Ahoy::DatabaseStore,
+  # (5.0.2 as reference: https://github.com/ankane/ahoy/blob/v5.0.2/lib/ahoy/database_store.rb)
+  # see how the latest `visit` method look like, and override it with the old column names.
   def visit
-    @visit ||= visit_model.find_by(id: ensure_uuid(ahoy.visit_token)) if ahoy.visit_token
+    unless defined?(@visit)
+      if ahoy.send(:existing_visit_token) || ahoy.instance_variable_get(:@visit_token)
+        # find_by raises error by default with Mongoid when not found
+        @visit = visit_model.where(id: ensure_uuid(ahoy.visit_token)).take if ahoy.visit_token
+      elsif !Ahoy.cookies? && ahoy.visitor_token
+        @visit = visit_model.where(visitor_id: ensure_uuid(ahoy.visitor_token)).where(started_at: Ahoy.visit_duration.ago..).order(started_at: :desc).first
+      else
+        @visit = nil
+      end
+    end
+    @visit
   end
 
   def track_visit(data)
+    # Map the new column names (since 1.4.0), to old column name (< 1.4.0).
     data[:id] = ensure_uuid(data.delete(:visit_token))
     data[:visitor_id] = ensure_uuid(data.delete(:visitor_token))
 
@@ -32,6 +53,7 @@ def track_visit(data)
   end
 
   def track_event(data)
+    # Map the new column names (since 1.4.0), to old column name (< 1.4.0).
     data[:id] = ensure_uuid(data.delete(:event_id))
     super(data)
   end

From 9903b217f1ecdab657a0faaf3dce2b15afa2dbdb Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 4 Feb 2024 17:49:54 +0000
Subject: [PATCH 155/241] Remove rails-observers gem.

---
 Gemfile                                       |   1 -
 Gemfile.lock                                  |   3 -
 app/controllers/admin/purposes_controller.rb  |   1 -
 app/controllers/admin/sources_controller.rb   |   1 -
 app/controllers/admin/terms_controller.rb     |   1 -
 app/controllers/admin/units_controller.rb     |   1 -
 app/models/annotation.rb                      |   7 +
 app/models/annotation_observer.rb             |   9 --
 app/models/change_observer.rb                 |  90 -----------
 app/models/change_type.rb                     |   1 +
 app/models/concerns/changable.rb              | 151 ++++++++++++++++++
 app/models/concerns/deletable.rb              |  20 +++
 app/models/designation.rb                     |   1 +
 app/models/destroy_observer.rb                |  18 ---
 app/models/distribution.rb                    |   1 +
 app/models/document.rb                        |  41 +++++
 app/models/document_observer.rb               |  49 ------
 app/models/eu_decision.rb                     |   9 ++
 app/models/eu_decision_observer.rb            |   7 -
 app/models/eu_decision_type.rb                |   2 +
 app/models/events/cites_cop.rb                |   6 +
 app/models/events/cites_cop_observer.rb       |   8 -
 .../events/cites_suspension_notification.rb   |   5 +
 .../cites_suspension_notification_observer.rb |   8 -
 app/models/events/eu_council_regulation.rb    |   2 +-
 app/models/events/eu_event.rb                 |   6 +
 app/models/events/eu_event_observer.rb        |  10 --
 .../events/eu_implementing_regulation.rb      |   2 +-
 app/models/events/eu_regulation.rb            |  19 ++-
 app/models/events/eu_regulation_observer.rb   |  19 ---
 app/models/events/eu_suspension_regulation.rb |  19 ++-
 .../eu_suspension_regulation_observer.rb      |  17 --
 app/models/geo_entity.rb                      |   7 +
 app/models/geo_entity_observer.rb             |  10 --
 app/models/instrument.rb                      |   1 +
 app/models/language.rb                        |   2 +
 app/models/listing_change.rb                  |  58 +++++++
 app/models/listing_change_observer.rb         |  58 -------
 app/models/nomenclature_change.rb             |  13 ++
 app/models/nomenclature_change_observer.rb    |  16 --
 app/models/preset_tag.rb                      |   1 +
 app/models/rank.rb                            |   1 +
 app/models/reference.rb                       |   1 +
 app/models/species_listing.rb                 |   1 +
 app/models/taxon_common.rb                    |   1 +
 app/models/taxon_concept.rb                   |  80 ++++++++++
 app/models/taxon_concept_observer.rb          | 109 -------------
 app/models/taxon_concept_reference.rb         |   1 +
 app/models/taxon_instrument.rb                |   1 +
 app/models/taxon_relationship.rb              |   1 +
 app/models/taxonomy.rb                        |   1 +
 app/models/trade/annual_report_upload.rb      |   6 +
 .../trade/annual_report_upload_observer.rb    |  11 --
 app/models/trade/shipment.rb                  |  29 ++++
 app/models/trade/shipment_observer.rb         |  33 ----
 app/models/trade/trade_data_download.rb       |   7 +
 .../trade/trade_data_download_observer.rb     |   7 -
 app/models/trade_codes/purpose.rb             |  20 +++
 app/models/trade_codes/source.rb              |  20 +++
 app/models/trade_codes/term.rb                |  20 +++
 app/models/trade_codes/unit.rb                |  20 +++
 app/models/trade_restriction.rb               |  74 +++++++++
 app/models/trade_restriction_observer.rb      |  88 ----------
 .../trade_restrictions/cites_suspension.rb    |   8 +
 .../cites_suspension_observer.rb              |   7 -
 app/models/trade_restrictions/quota.rb        |   9 ++
 .../trade_restrictions/quota_observer.rb      |   7 -
 app/models/user.rb                            |   2 +
 app/sweepers/purpose_sweeper.rb               |  29 ----
 app/sweepers/source_sweeper.rb                |  29 ----
 app/sweepers/term_sweeper.rb                  |  29 ----
 app/sweepers/unit_sweeper.rb                  |  29 ----
 config/application.rb                         |  11 --
 73 files changed, 671 insertions(+), 722 deletions(-)
 delete mode 100644 app/models/annotation_observer.rb
 delete mode 100644 app/models/change_observer.rb
 create mode 100644 app/models/concerns/changable.rb
 create mode 100644 app/models/concerns/deletable.rb
 delete mode 100644 app/models/destroy_observer.rb
 delete mode 100644 app/models/document_observer.rb
 delete mode 100644 app/models/eu_decision_observer.rb
 delete mode 100644 app/models/events/cites_cop_observer.rb
 delete mode 100644 app/models/events/cites_suspension_notification_observer.rb
 create mode 100644 app/models/events/eu_event.rb
 delete mode 100644 app/models/events/eu_event_observer.rb
 delete mode 100644 app/models/events/eu_regulation_observer.rb
 delete mode 100644 app/models/events/eu_suspension_regulation_observer.rb
 delete mode 100644 app/models/geo_entity_observer.rb
 delete mode 100644 app/models/listing_change_observer.rb
 delete mode 100644 app/models/nomenclature_change_observer.rb
 delete mode 100644 app/models/taxon_concept_observer.rb
 delete mode 100644 app/models/trade/annual_report_upload_observer.rb
 delete mode 100644 app/models/trade/shipment_observer.rb
 delete mode 100644 app/models/trade/trade_data_download_observer.rb
 delete mode 100644 app/models/trade_restriction_observer.rb
 delete mode 100644 app/models/trade_restrictions/cites_suspension_observer.rb
 delete mode 100644 app/models/trade_restrictions/quota_observer.rb
 delete mode 100644 app/sweepers/purpose_sweeper.rb
 delete mode 100644 app/sweepers/source_sweeper.rb
 delete mode 100644 app/sweepers/term_sweeper.rb
 delete mode 100644 app/sweepers/unit_sweeper.rb

diff --git a/Gemfile b/Gemfile
index 4edee0214..50108cb66 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,6 @@ gem 'pdfkit', '~> 0.8.7.3'
 gem 'wkhtmltopdf-binary', '~> 0.12.6.6'
 
 gem 'aws-sdk', '~> 2' # TODO: v2 Deprecated, need to upgrade to v3
-gem 'rails-observers', '~> 0.1.5' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', :platforms => :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index 68b634e8e..0cb6203d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -396,8 +396,6 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-observers (0.1.5)
-      activemodel (>= 4.0)
     railties (6.1.7.6)
       actionpack (= 6.1.7.6)
       activesupport (= 6.1.7.6)
@@ -643,7 +641,6 @@ DEPENDENCIES
   rack-mini-profiler (~> 2.0)
   rails (= 6.1.7.6)
   rails-controller-testing
-  rails-observers (~> 0.1.5)
   rbnacl (= 4.0.2)
   rbnacl-libsodium (= 1.0.16)
   request_store (~> 1.5, >= 1.5.1)
diff --git a/app/controllers/admin/purposes_controller.rb b/app/controllers/admin/purposes_controller.rb
index a597f6025..ec6712fcf 100644
--- a/app/controllers/admin/purposes_controller.rb
+++ b/app/controllers/admin/purposes_controller.rb
@@ -1,6 +1,5 @@
 class Admin::PurposesController < Admin::StandardAuthorizationController
   respond_to :json, :only => [:update]
-  cache_sweeper :purpose_sweeper
 
   def index
     index! do |format|
diff --git a/app/controllers/admin/sources_controller.rb b/app/controllers/admin/sources_controller.rb
index f8546d6a2..4fc87ba1c 100644
--- a/app/controllers/admin/sources_controller.rb
+++ b/app/controllers/admin/sources_controller.rb
@@ -1,6 +1,5 @@
 class Admin::SourcesController < Admin::StandardAuthorizationController
   respond_to :json, :only => [:update]
-  cache_sweeper :source_sweeper
 
   def index
     index! do |format|
diff --git a/app/controllers/admin/terms_controller.rb b/app/controllers/admin/terms_controller.rb
index 16ec47534..96909bc95 100644
--- a/app/controllers/admin/terms_controller.rb
+++ b/app/controllers/admin/terms_controller.rb
@@ -1,6 +1,5 @@
 class Admin::TermsController < Admin::StandardAuthorizationController
   respond_to :json, :only => [:update]
-  cache_sweeper :term_sweeper
 
   def index
     index! do |format|
diff --git a/app/controllers/admin/units_controller.rb b/app/controllers/admin/units_controller.rb
index ccf0a4690..d264c61e5 100644
--- a/app/controllers/admin/units_controller.rb
+++ b/app/controllers/admin/units_controller.rb
@@ -1,6 +1,5 @@
 class Admin::UnitsController < Admin::StandardAuthorizationController
   respond_to :json, :only => [:update]
-  cache_sweeper :unit_sweeper
 
   def index
     index! do |format|
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 6439e0205..159651181 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -23,6 +23,7 @@
 #
 
 class Annotation < ApplicationRecord
+  include Deletable
   extend Mobility
   include TrackWhoDoesIt
 
@@ -43,6 +44,12 @@ class Annotation < ApplicationRecord
   scope :for_eu, -> { joins(:event).where("events.type = 'EuRegulation'").
     order([:parent_symbol, :symbol]) }
 
+  before_save do
+    if event
+      self.parent_symbol = event.name
+    end
+  end
+
   def self.search(query)
     if query.present?
       where("UPPER(symbol) LIKE UPPER(:query)
diff --git a/app/models/annotation_observer.rb b/app/models/annotation_observer.rb
deleted file mode 100644
index 51eb32907..000000000
--- a/app/models/annotation_observer.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AnnotationObserver < ActiveRecord::Observer
-
-  def before_save(annotation)
-    if annotation.event
-      annotation.parent_symbol = annotation.event.name
-    end
-  end
-
-end
diff --git a/app/models/change_observer.rb b/app/models/change_observer.rb
deleted file mode 100644
index 63adb43fb..000000000
--- a/app/models/change_observer.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-class ChangeObserver < ActiveRecord::Observer
-  observe :taxon_common, :distribution, :eu_decision,
-    :listing_change, :taxon_concept_reference,
-    :taxon_instrument, :taxon_relationship, :cites_suspension, :quota,
-    :geo_entity, :language
-
-  def after_save(model)
-    clear_cache model
-
-    # For models that are not directly related to taxon concepts
-    # but for which is anyway preferable for the changes to be reflacted
-    # immedtiately on the public interface, clear the entire serializer cache.
-    # Models like GeoEntity and Language are not directly linked to TaxonConcept,
-    # so bumping the dependents_updated_at timestamp seems a bit confusing.
-    # Also there's currently no easy way to tell who updated those objects.
-    # It's quite rare that updates to those objects will occur,
-    # so there shouldn't be no harm in clearning the entire serializer cache.
-    unless model.respond_to?(:taxon_concept)
-      clear_show_tc_serializer_cache
-      return
-    end
-
-    if model.taxon_concept
-      bump_dependents_timestamp(model.taxon_concept, model.updated_by_id)
-    end
-    # Rails 5.1 to 5.2
-    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `attribute_before_last_save` instead.
-    #
-    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
-    #
-    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
-    #
-    # == Original code ==
-    # if model.taxon_concept.nil? && model.taxon_concept_id_was ||
-    #   model.taxon_concept && model.taxon_concept_id_was && model.taxon_concept_id != model.taxon_concept_id_was
-    #   previous_taxon_concept = TaxonConcept.find_by_id(model.taxon_concept_id_was)
-    #   if previous_taxon_concept
-    #     bump_dependents_timestamp(previous_taxon_concept, model.updated_by_id)
-    #   end
-    # end
-    # == Changed to fix deprecation warnings ==
-    if model.taxon_concept.nil? && model.taxon_concept_id_before_last_save ||
-      model.taxon_concept && model.taxon_concept_id_before_last_save && model.taxon_concept_id != model.taxon_concept_id_before_last_save
-      previous_taxon_concept = TaxonConcept.find_by_id(model.taxon_concept_id_before_last_save)
-      if previous_taxon_concept
-        bump_dependents_timestamp(previous_taxon_concept, model.updated_by_id)
-      end
-    end
-  end
-
-  def before_destroy(model)
-    clear_cache model
-    if model.respond_to?(:taxon_concept) && model.taxon_concept && model.can_be_deleted?
-      # currently no easy means to tell who deleted the dependent object
-      bump_dependents_timestamp(model.taxon_concept, nil)
-    end
-  end
-
-  protected
-
-  def clear_cache(model)
-    return unless model.respond_to?(:taxon_concept)
-    DownloadsCacheCleanupWorker.perform_async(model.class.to_s.tableize)
-  end
-
-  def clear_show_tc_serializer_cache
-    ##
-    # Disabling because we use memcache on production, but memcache doesn't implement this method.
-    # For now, changes to records that appear in serializers will not change until the caches are expired,
-    # which is 24 hours. Possible solution:
-    # https://unep-wcmc.codebasehq.com/projects/cites-support-maintenance/tickets/114
-
-    Rails.cache.delete_matched('*ShowTaxonConceptSerializer*') unless Rails.env.production?
-  end
-
-  def bump_dependents_timestamp(taxon_concept, updated_by_id)
-    return unless taxon_concept
-    TaxonConcept.where(id: taxon_concept.id).update_all(
-      dependents_updated_at: Time.now,
-      dependents_updated_by_id: updated_by_id
-    )
-    DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
-  end
-end
diff --git a/app/models/change_type.rb b/app/models/change_type.rb
index 28fb8c732..613c8d0fe 100644
--- a/app/models/change_type.rb
+++ b/app/models/change_type.rb
@@ -13,6 +13,7 @@
 #
 
 class ChangeType < ApplicationRecord
+  include Deletable
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
diff --git a/app/models/concerns/changable.rb b/app/models/concerns/changable.rb
new file mode 100644
index 000000000..40dad5b3f
--- /dev/null
+++ b/app/models/concerns/changable.rb
@@ -0,0 +1,151 @@
+module Changable
+  extend ActiveSupport::Concern
+
+  included do
+    #########################################################
+    ### after save
+    after_save :changable_after_save_callback
+    after_commit :changable_after_save_callback_on_commit, on: [:create, :update]
+    #########################################################
+    ### before destroy
+    before_destroy :changable_before_destroy_callback
+    after_commit :changable_before_destroy_callback_on_commit, on: :destroy
+  end
+
+  private
+
+  def changable_before_destroy_callback
+    if respond_to?(:taxon_concept) && taxon_concept && can_be_deleted?
+      # currently no easy means to tell who deleted the dependent object
+      changable_bump_dependents_timestamp_part_one(taxon_concept, nil)
+    end
+  end
+
+  def changable_before_destroy_callback_on_commit
+    changable_clear_cache
+    if respond_to?(:taxon_concept) && taxon_concept && can_be_deleted?
+      # currently no easy means to tell who deleted the dependent object
+      changable_bump_dependents_timestamp_part_two
+    end
+  end
+
+  def changable_after_save_callback
+    unless respond_to?(:taxon_concept)
+      return
+    end
+
+    if taxon_concept
+      changable_bump_dependents_timestamp_part_one(taxon_concept, updated_by_id)
+    end
+    # Rails 5.1 to 5.2
+    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `attribute_before_last_save` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+    #
+    # == Original code ==
+    # if taxon_concept.nil? && taxon_concept_id_was ||
+    #   taxon_concept && taxon_concept_id_was && taxon_concept_id != taxon_concept_id_was
+    #   previous_taxon_concept = TaxonConcept.find_by_id(taxon_concept_id_was)
+    #   if previous_taxon_concept
+    #     bump_dependents_timestamp(previous_taxon_concept, updated_by_id)
+    #   end
+    # end
+    # == Changed to fix deprecation warnings ==
+    if taxon_concept.nil? && taxon_concept_id_before_last_save ||
+      taxon_concept && taxon_concept_id_before_last_save && taxon_concept_id != taxon_concept_id_before_last_save
+      previous_taxon_concept = TaxonConcept.find_by_id(taxon_concept_id_before_last_save)
+      if previous_taxon_concept
+        changable_bump_dependents_timestamp_part_one(previous_taxon_concept, updated_by_id)
+      end
+    end
+  end
+
+  def changable_after_save_callback_on_commit
+    changable_clear_cache
+
+    # For models that are not directly related to taxon concepts
+    # but for which is anyway preferable for the changes to be reflacted
+    # immedtiately on the public interface, clear the entire serializer cache.
+    # Models like GeoEntity and Language are not directly linked to TaxonConcept,
+    # so bumping the dependents_updated_at timestamp seems a bit confusing.
+    # Also there's currently no easy way to tell who updated those objects.
+    # It's quite rare that updates to those objects will occur,
+    # so there shouldn't be no harm in clearning the entire serializer cache.
+    unless respond_to?(:taxon_concept)
+      changable_clear_show_tc_serializer_cache
+      return
+    end
+
+    if taxon_concept
+      changable_bump_dependents_timestamp_part_two
+    end
+    # Rails 5.1 to 5.2
+    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `attribute_before_last_save` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+    #
+    # == Original code ==
+    # if taxon_concept.nil? && taxon_concept_id_was ||
+    #   taxon_concept && taxon_concept_id_was && taxon_concept_id != taxon_concept_id_was
+    #   previous_taxon_concept = TaxonConcept.find_by_id(taxon_concept_id_was)
+    #   if previous_taxon_concept
+    #     bump_dependents_timestamp(previous_taxon_concept, updated_by_id)
+    #   end
+    # end
+    # == Changed to fix deprecation warnings ==
+    if taxon_concept.nil? && taxon_concept_id_before_last_save ||
+      taxon_concept && taxon_concept_id_before_last_save && taxon_concept_id != taxon_concept_id_before_last_save
+      previous_taxon_concept = TaxonConcept.find_by_id(taxon_concept_id_before_last_save)
+      if previous_taxon_concept
+        changable_bump_dependents_timestamp_part_two
+      end
+    end
+  end
+
+  def changable_clear_cache
+    return unless respond_to?(:taxon_concept)
+
+    DownloadsCacheCleanupWorker.perform_async(self.class.to_s.tableize)
+  end
+
+  def changable_bump_dependents_timestamp_part_one(taxon_concept, updated_by_id)
+    return unless taxon_concept
+
+    TaxonConcept.where(id: taxon_concept.id).update_all(
+      dependents_updated_at: Time.now,
+      dependents_updated_by_id: updated_by_id
+    )
+  end
+
+  def changable_bump_dependents_timestamp_part_two
+    return unless taxon_concept
+
+    DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
+  end
+
+  def changable_clear_show_tc_serializer_cache
+    ##
+    # Disabling because we use memcache on production, but memcache doesn't implement this method.
+    # For now, changes to records that appear in serializers will not change until the caches are expired,
+    # which is 24 hours. Possible solution:
+    # https://unep-wcmc.codebasehq.com/projects/cites-support-maintenance/tickets/114
+
+    Rails.cache.delete_matched('*ShowTaxonConceptSerializer*') unless Rails.env.production?
+  end
+end
diff --git a/app/models/concerns/deletable.rb b/app/models/concerns/deletable.rb
new file mode 100644
index 000000000..138ed5366
--- /dev/null
+++ b/app/models/concerns/deletable.rb
@@ -0,0 +1,20 @@
+module Deletable
+  extend ActiveSupport::Concern
+
+  included do
+    before_destroy :before_destroy_checking
+  end
+
+  private
+
+  def before_destroy_checking
+    unless can_be_deleted?
+      msg = 'not allowed'
+      unless dependent_objects.empty?
+        msg << " (dependent objects present: #{dependent_objects.join(', ')})"
+      end
+      errors.add(:base, msg)
+      throw :abort
+    end
+  end
+end
diff --git a/app/models/designation.rb b/app/models/designation.rb
index b49873465..450581640 100644
--- a/app/models/designation.rb
+++ b/app/models/designation.rb
@@ -12,6 +12,7 @@
 class Designation < ApplicationRecord
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :taxonomy_id
+  include Deletable
   include Dictionary
   build_dictionary :cites, :eu, :cms
 
diff --git a/app/models/destroy_observer.rb b/app/models/destroy_observer.rb
deleted file mode 100644
index fbca07ebd..000000000
--- a/app/models/destroy_observer.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class DestroyObserver < ActiveRecord::Observer
-  observe :taxonomy, :rank, :taxon_concept, :designation, :change_type,
-    :species_listing, :geo_entity, :language, :term, :unit, :source, :purpose,
-    :user, :cites_suspension_notification, :cites_cop, :eu_regulation,
-    :eu_decision_type, :reference, :instrument, :eu_suspension_regulation,
-    :preset_tag, :annotation
-
-  def before_destroy(model)
-    unless model.can_be_deleted?
-      msg = 'not allowed'
-      unless model.dependent_objects.empty?
-        msg << " (dependent objects present: #{model.dependent_objects.join(', ')})"
-      end
-      model.errors.add(:base, msg)
-      throw :abort
-    end
-  end
-end
diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index b432395ff..f82d24c98 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -13,6 +13,7 @@
 #
 
 class Distribution < ApplicationRecord
+  include Changable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_id, :taxon_concept_id, :tag_list,
diff --git a/app/models/document.rb b/app/models/document.rb
index 30f2f7754..6b62e7c87 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -65,6 +65,9 @@ class Document < ApplicationRecord
   before_validation :set_title
   before_validation :reset_designation_if_event_set
 
+  after_save :sync_sort_index
+  after_commit :clear_cache
+
 # order docs based on a custom list of ids
   scope :for_ids_with_order, ->(ids) {
     order = sanitize_sql_array(
@@ -144,4 +147,42 @@ def is_pdf?
     (attr =~ /\.pdf/).present?
   end
 
+  def clear_cache
+    DocumentSearch.clear_cache
+  end
+
+  def sync_sort_index
+    # Rails 5.1 to 5.2
+    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `attribute_before_last_save` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+    #
+    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+    #
+    # == Original code ==
+    # if sort_index_changed?
+    # == Changed to fix deprecation warnings ==
+    if saved_change_to_sort_index?
+      if primary_language_document &&
+        primary_language_document_id != id
+        primary_language_document.update_attribute(
+          :sort_index,
+          sort_index
+        )
+      else
+        secondary_language_documents.reload.each do |d|
+          d.update_attribute(
+            :sort_index,
+            sort_index
+          )
+        end
+      end
+    end
+  end
 end
diff --git a/app/models/document_observer.rb b/app/models/document_observer.rb
deleted file mode 100644
index f2b27f293..000000000
--- a/app/models/document_observer.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-class DocumentObserver < ActiveRecord::Observer
-
-  def after_save(document)
-    sync_sort_index(document)
-    DocumentSearch.clear_cache
-  end
-
-  def after_destroy(document)
-    DocumentSearch.clear_cache
-  end
-
-  private
-
-  def sync_sort_index(document)
-    # Rails 5.1 to 5.2
-    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `attribute_before_last_save` instead.
-    #
-    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
-    #
-    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
-    #
-    # == Original code ==
-    # if document.sort_index_changed?
-    # == Changed to fix deprecation warnings ==
-    if document.saved_change_to_sort_index?
-      if document.primary_language_document &&
-        document.primary_language_document_id != document.id
-        document.primary_language_document.update_attribute(
-          :sort_index,
-          document.sort_index
-        )
-      else
-        document.secondary_language_documents.reload.each do |d|
-          d.update_attribute(
-            :sort_index,
-            document.sort_index
-          )
-        end
-      end
-    end
-  end
-
-end
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index 59f2741af..a540b9165 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -29,6 +29,7 @@
 require 'digest/sha1'
 require 'csv'
 class EuDecision < ApplicationRecord
+  include Changable
   extend Mobility
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
@@ -54,6 +55,8 @@ class EuDecision < ApplicationRecord
 
   translates :nomenclature_note
 
+  after_commit :cache_cleanup, on: :destroy
+
   def year
     start_date ? start_date.strftime('%Y') : ''
   end
@@ -90,4 +93,10 @@ def eu_decision_type_and_or_srg_history
     return if eu_decision_type_id || srg_history_id
     errors.add(:base, "Eu decision type and SRG history can't be blank at the same time")
   end
+
+  private
+
+  def cache_cleanup
+    DownloadsCacheCleanupWorker.perform_async('eu_decisions')
+  end
 end
diff --git a/app/models/eu_decision_observer.rb b/app/models/eu_decision_observer.rb
deleted file mode 100644
index 66c08187c..000000000
--- a/app/models/eu_decision_observer.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class EuDecisionObserver < ActiveRecord::Observer
-
-  def after_destroy(eu_decision)
-    DownloadsCacheCleanupWorker.perform_async('eu_decisions')
-  end
-
-end
diff --git a/app/models/eu_decision_type.rb b/app/models/eu_decision_type.rb
index 1ba1942f6..dc2dc7190 100644
--- a/app/models/eu_decision_type.rb
+++ b/app/models/eu_decision_type.rb
@@ -11,6 +11,8 @@
 #
 
 class EuDecisionType < ApplicationRecord
+  include Deletable
+
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :tooltip, :decision_type
   include Dictionary
diff --git a/app/models/events/cites_cop.rb b/app/models/events/cites_cop.rb
index b92787a86..f127b4982 100644
--- a/app/models/events/cites_cop.rb
+++ b/app/models/events/cites_cop.rb
@@ -24,6 +24,7 @@
 #
 
 class CitesCop < Event
+  include Deletable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :is_current
   has_many :listing_changes, :foreign_key => :event_id
@@ -32,6 +33,11 @@ class CitesCop < Event
   validate :designation_is_cites
   validates :effective_at, :presence => true
 
+  before_validation do
+    cites = Designation.find_by_name('CITES')
+    self.designation_id = cites && cites.id
+  end
+
   def self.elibrary_document_types
     [Document::Proposal]
   end
diff --git a/app/models/events/cites_cop_observer.rb b/app/models/events/cites_cop_observer.rb
deleted file mode 100644
index 3ab2a95f6..000000000
--- a/app/models/events/cites_cop_observer.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CitesCopObserver < ActiveRecord::Observer
-
-  def before_validation(cites_cop)
-    cites = Designation.find_by_name('CITES')
-    cites_cop.designation_id = cites && cites.id
-  end
-
-end
diff --git a/app/models/events/cites_suspension_notification.rb b/app/models/events/cites_suspension_notification.rb
index 0bf6af6ff..48bae5c1e 100644
--- a/app/models/events/cites_suspension_notification.rb
+++ b/app/models/events/cites_suspension_notification.rb
@@ -24,6 +24,7 @@
 #
 
 class CitesSuspensionNotification < Event
+  include Deletable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :subtype, :new_subtype, :end_date
   attr_accessor :new_subtype
@@ -36,6 +37,10 @@ class CitesSuspensionNotification < Event
   validates :effective_at, :presence => true
 
   before_save :handle_new_subtype
+  before_validation do
+    cites = Designation.find_by_name('CITES')
+    self.designation_id = cites && cites.id
+  end
 
   def handle_new_subtype
     unless new_subtype.blank?
diff --git a/app/models/events/cites_suspension_notification_observer.rb b/app/models/events/cites_suspension_notification_observer.rb
deleted file mode 100644
index 252f7cf4b..000000000
--- a/app/models/events/cites_suspension_notification_observer.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CitesSuspensionNotificationObserver < ActiveRecord::Observer
-
-  def before_validation(cites_suspension_notification)
-    cites = Designation.find_by_name('CITES')
-    cites_suspension_notification.designation_id = cites && cites.id
-  end
-
-end
diff --git a/app/models/events/eu_council_regulation.rb b/app/models/events/eu_council_regulation.rb
index 091379ded..1cfe85149 100644
--- a/app/models/events/eu_council_regulation.rb
+++ b/app/models/events/eu_council_regulation.rb
@@ -23,7 +23,7 @@
 #  elib_legacy_id       :integer
 #
 
-class EuCouncilRegulation < Event
+class EuCouncilRegulation < EuEvent
   validate :designation_is_eu
   validates :effective_at, :presence => true
 end
diff --git a/app/models/events/eu_event.rb b/app/models/events/eu_event.rb
new file mode 100644
index 000000000..12b81e69e
--- /dev/null
+++ b/app/models/events/eu_event.rb
@@ -0,0 +1,6 @@
+class EuEvent < Event
+  before_validation do
+    eu = Designation.find_by_name('EU')
+    self.designation_id = eu && eu.id
+  end
+end
diff --git a/app/models/events/eu_event_observer.rb b/app/models/events/eu_event_observer.rb
deleted file mode 100644
index 46fe329ab..000000000
--- a/app/models/events/eu_event_observer.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class EuEventObserver < ActiveRecord::Observer
-  observe :eu_regulation, :eu_suspension_regulation,
-    :eu_implementing_regulation, :eu_council_regulation
-
-  def before_validation(eu_event)
-    eu = Designation.find_by_name('EU')
-    eu_event.designation_id = eu && eu.id
-  end
-
-end
diff --git a/app/models/events/eu_implementing_regulation.rb b/app/models/events/eu_implementing_regulation.rb
index 2859f8072..6c7af541f 100644
--- a/app/models/events/eu_implementing_regulation.rb
+++ b/app/models/events/eu_implementing_regulation.rb
@@ -23,7 +23,7 @@
 #  elib_legacy_id       :integer
 #
 
-class EuImplementingRegulation < Event
+class EuImplementingRegulation < EuEvent
   validate :designation_is_eu
   validates :effective_at, :presence => true
 end
diff --git a/app/models/events/eu_regulation.rb b/app/models/events/eu_regulation.rb
index 3eebcf2ec..360eca871 100644
--- a/app/models/events/eu_regulation.rb
+++ b/app/models/events/eu_regulation.rb
@@ -23,7 +23,9 @@
 #  elib_legacy_id       :integer
 #
 
-class EuRegulation < Event
+class EuRegulation < EuEvent
+  include Deletable
+
   # Migrated to controller (Strong Parameters)
   # attr_accessible :listing_changes_event_id, :end_date
   attr_accessor :listing_changes_event_id
@@ -34,14 +36,25 @@ class EuRegulation < Event
   validate :designation_is_eu
   validates :effective_at, :presence => true
 
+  after_commit :async_event_listing_changes_copy_worker, on: :create
+
   def activate!
     super
-    notify_observers(:after_activate)
+    EuRegulationActivationWorker.perform_async(id, true)
   end
 
   def deactivate!
     super
-    notify_observers(:after_deactivate)
+    EuRegulationActivationWorker.perform_async(id, false)
   end
 
+  private
+
+  def async_event_listing_changes_copy_worker
+    unless listing_changes_event_id.blank?
+      EventListingChangesCopyWorker.perform_async(
+        listing_changes_event_id.to_i, id
+      )
+    end
+  end
 end
diff --git a/app/models/events/eu_regulation_observer.rb b/app/models/events/eu_regulation_observer.rb
deleted file mode 100644
index a00211c40..000000000
--- a/app/models/events/eu_regulation_observer.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class EuRegulationObserver < ActiveRecord::Observer
-
-  def after_create(eu_regulation)
-    unless eu_regulation.listing_changes_event_id.blank?
-      EventListingChangesCopyWorker.perform_async(
-        eu_regulation.listing_changes_event_id.to_i, eu_regulation.id
-      )
-    end
-  end
-
-  def after_activate(eu_regulation)
-    EuRegulationActivationWorker.perform_async(eu_regulation.id, true)
-  end
-
-  def after_deactivate(eu_regulation)
-    EuRegulationActivationWorker.perform_async(eu_regulation.id, false)
-  end
-
-end
diff --git a/app/models/events/eu_suspension_regulation.rb b/app/models/events/eu_suspension_regulation.rb
index 136c94ae1..f52487332 100644
--- a/app/models/events/eu_suspension_regulation.rb
+++ b/app/models/events/eu_suspension_regulation.rb
@@ -23,7 +23,9 @@
 #  elib_legacy_id       :integer
 #
 
-class EuSuspensionRegulation < Event
+class EuSuspensionRegulation < EuEvent
+  include Deletable
+
   # Migrated to controller (Strong Parameters)
   # attr_accessible :eu_suspensions_event_id
   attr_accessor :eu_suspensions_event_id
@@ -37,6 +39,10 @@ class EuSuspensionRegulation < Event
   validates :effective_at, :presence => true
   validate :end_date_presence
 
+  after_update :touch_suspensions_and_taxa
+  after_commit :after_create_async_tasks, on: :create
+  after_commit :async_downloads_cache_cleanup, on: :update
+
   def name_and_date
     "#{self.name} (Effective from: #{self.effective_at.strftime("%d/%m/%Y")})"
   end
@@ -69,4 +75,15 @@ def end_date_presence
     end
   end
 
+  def after_create_async_tasks
+    unless eu_suspensions_event_id.blank?
+      EventEuSuspensionCopyWorker.perform_async(eu_suspensions_event_id, id)
+      DownloadsCacheCleanupWorker.perform_async('eu_decisions')
+    end
+  end
+
+  def async_downloads_cache_cleanup
+    DownloadsCacheCleanupWorker.perform_async('eu_decisions')
+  end
+
 end
diff --git a/app/models/events/eu_suspension_regulation_observer.rb b/app/models/events/eu_suspension_regulation_observer.rb
deleted file mode 100644
index 4f45aa1ef..000000000
--- a/app/models/events/eu_suspension_regulation_observer.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class EuSuspensionRegulationObserver < ActiveRecord::Observer
-
-  def after_create(eu_suspension_regulation)
-    unless eu_suspension_regulation.eu_suspensions_event_id.blank?
-      EventEuSuspensionCopyWorker.perform_async(
-        eu_suspension_regulation.eu_suspensions_event_id,
-        eu_suspension_regulation.id
-      )
-      DownloadsCacheCleanupWorker.perform_async('eu_decisions')
-    end
-  end
-
-  def after_update(eu_suspension_regulation)
-    eu_suspension_regulation.touch_suspensions_and_taxa
-    DownloadsCacheCleanupWorker.perform_async('eu_decisions')
-  end
-end
diff --git a/app/models/geo_entity.rb b/app/models/geo_entity.rb
index d7039f0e4..c4867f5a3 100644
--- a/app/models/geo_entity.rb
+++ b/app/models/geo_entity.rb
@@ -18,6 +18,8 @@
 #
 
 class GeoEntity < ApplicationRecord
+  include Changable
+  include Deletable
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_type_id, :iso_code2, :iso_code3,
@@ -66,6 +68,8 @@ class GeoEntity < ApplicationRecord
 
   scope :current, -> { where(:is_current => true) }
 
+  after_commit :geo_entity_search_increment_cache_iterator
+
   def self.nodes_and_descendants(nodes_ids = [])
     joins_sql = <<-SQL
       INNER JOIN (
@@ -137,4 +141,7 @@ def dependent_objects_map
     }
   end
 
+  def geo_entity_search_increment_cache_iterator
+    GeoEntitySearch.increment_cache_iterator
+  end
 end
diff --git a/app/models/geo_entity_observer.rb b/app/models/geo_entity_observer.rb
deleted file mode 100644
index e90961a63..000000000
--- a/app/models/geo_entity_observer.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class GeoEntityObserver < ActiveRecord::Observer
-
-  def after_save(geo_entity)
-    GeoEntitySearch.increment_cache_iterator
-  end
-
-  def after_destroy(geo_entity)
-    GeoEntitySearch.increment_cache_iterator
-  end
-end
diff --git a/app/models/instrument.rb b/app/models/instrument.rb
index e5b6a4c32..5cc70d599 100644
--- a/app/models/instrument.rb
+++ b/app/models/instrument.rb
@@ -10,6 +10,7 @@
 #
 
 class Instrument < ApplicationRecord
+  include Deletable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :designation_id, :name
 
diff --git a/app/models/language.rb b/app/models/language.rb
index fc324c2af..ca9b400bf 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -13,6 +13,8 @@
 #
 
 class Language < ApplicationRecord
+  include Changable
+  include Deletable
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :iso_code1, :iso_code3, :name_en, :name_fr, :name_es
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 15c33a614..4daa4efd7 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -27,6 +27,7 @@
 #
 
 class ListingChange < ApplicationRecord
+  include Changable
   extend Mobility
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
@@ -62,6 +63,8 @@ class ListingChange < ApplicationRecord
   validate :species_listing_designation_mismatch
   validate :event_designation_mismatch
 
+  before_save :listing_change_before_save_callback
+
   accepts_nested_attributes_for :party_listing_distribution,
     :reject_if => proc { |attributes| attributes['geo_entity_id'].blank? }
 
@@ -183,4 +186,59 @@ def event_designation_mismatch
       return false
     end
   end
+
+  def listing_change_before_save_callback
+    # check if annotation should be deleted
+    if annotation &&
+       annotation.short_note_en.blank? &&
+       annotation.short_note_fr.blank? &&
+       annotation.short_note_es.blank? &&
+       annotation.full_note_en.blank? &&
+       annotation.full_note_fr.blank? &&
+       annotation.full_note_es.blank?
+      ann = annotation
+      self.annotation = nil
+      if ann.reload.listing_changes.empty?
+        ann.delete
+      end
+    end
+
+    original_change_type = ChangeType.find(change_type_id)
+    return self if original_change_type.name == ChangeType::EXCEPTION
+    return self if excluded_geo_entities_ids.nil? &&
+      excluded_taxon_concepts_ids.nil?
+    new_exclusions = []
+    exclusion_change_type = ChangeType.find_by_name_and_designation_id(
+      ChangeType::EXCEPTION, original_change_type.designation_id
+    )
+
+    # geographic exclusions
+    excluded_geo_entities_ids = excluded_geo_entities_ids &&
+      excluded_geo_entities_ids.reject(&:blank?)
+    excluded_geo_entities =
+      if excluded_geo_entities_ids && !excluded_geo_entities_ids.empty?
+        new_exclusions << ListingChange.new(
+          :change_type_id => exclusion_change_type.id,
+          :species_listing_id => species_listing_id,
+          :taxon_concept_id => taxon_concept_id,
+          :geo_entity_ids => excluded_geo_entities_ids
+        )
+      end
+
+    # taxonomic exclusions
+    excluded_taxon_concepts_ids = excluded_taxon_concepts_ids &&
+      excluded_taxon_concepts_ids.split(',').reject(&:blank?)
+    excluded_taxon_concepts =
+      if excluded_taxon_concepts_ids && !excluded_taxon_concepts_ids.empty?
+        excluded_taxon_concepts_ids.map do |id|
+          new_exclusions << ListingChange.new(
+            :change_type_id => exclusion_change_type.id,
+            :species_listing_id => species_listing_id,
+            :taxon_concept_id => id
+          )
+        end
+      end
+
+    self.exclusions = new_exclusions
+  end
 end
diff --git a/app/models/listing_change_observer.rb b/app/models/listing_change_observer.rb
deleted file mode 100644
index 26d8f57d4..000000000
--- a/app/models/listing_change_observer.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-class ListingChangeObserver < ActiveRecord::Observer
-
-  def before_save(listing_change)
-    # check if annotation should be deleted
-    if listing_change.annotation &&
-       listing_change.annotation.short_note_en.blank? &&
-       listing_change.annotation.short_note_fr.blank? &&
-       listing_change.annotation.short_note_es.blank? &&
-       listing_change.annotation.full_note_en.blank? &&
-       listing_change.annotation.full_note_fr.blank? &&
-       listing_change.annotation.full_note_es.blank?
-      ann = listing_change.annotation
-      listing_change.annotation = nil
-      if ann.reload.listing_changes.empty?
-        ann.delete
-      end
-    end
-
-    original_change_type = ChangeType.find(listing_change.change_type_id)
-    return listing_change if original_change_type.name == ChangeType::EXCEPTION
-    return listing_change if listing_change.excluded_geo_entities_ids.nil? &&
-      listing_change.excluded_taxon_concepts_ids.nil?
-    new_exclusions = []
-    exclusion_change_type = ChangeType.find_by_name_and_designation_id(
-      ChangeType::EXCEPTION, original_change_type.designation_id
-    )
-
-    # geographic exclusions
-    excluded_geo_entities_ids = listing_change.excluded_geo_entities_ids &&
-      listing_change.excluded_geo_entities_ids.reject(&:blank?)
-    excluded_geo_entities =
-      if excluded_geo_entities_ids && !excluded_geo_entities_ids.empty?
-        new_exclusions << ListingChange.new(
-          :change_type_id => exclusion_change_type.id,
-          :species_listing_id => listing_change.species_listing_id,
-          :taxon_concept_id => listing_change.taxon_concept_id,
-          :geo_entity_ids => excluded_geo_entities_ids
-        )
-      end
-
-    # taxonomic exclusions
-    excluded_taxon_concepts_ids = listing_change.excluded_taxon_concepts_ids &&
-      listing_change.excluded_taxon_concepts_ids.split(',').reject(&:blank?)
-    excluded_taxon_concepts =
-      if excluded_taxon_concepts_ids && !excluded_taxon_concepts_ids.empty?
-        excluded_taxon_concepts_ids.map do |id|
-          new_exclusions << ListingChange.new(
-            :change_type_id => exclusion_change_type.id,
-            :species_listing_id => listing_change.species_listing_id,
-            :taxon_concept_id => id
-          )
-        end
-      end
-
-    listing_change.exclusions = new_exclusions
-  end
-
-end
diff --git a/app/models/nomenclature_change.rb b/app/models/nomenclature_change.rb
index 2335d2e98..91bc670d1 100644
--- a/app/models/nomenclature_change.rb
+++ b/app/models/nomenclature_change.rb
@@ -28,6 +28,19 @@ class NomenclatureChange < ApplicationRecord
   validates :status, presence: true
   validate :cannot_update_when_locked
 
+  after_save do
+    if status == self.class::SUBMITTED
+      Rails.logger.warn "SUBMIT #{type}"
+      begin
+        processor_klass = "#{type}::Processor".constantize
+      rescue NameError
+        Rails.logger.warn "No processor found for #{type}"
+      else
+        processor_klass.new(self).run
+      end
+    end
+  end
+
   def in_progress?
     ![NomenclatureChange::SUBMITTED, NomenclatureChange::CLOSED].
       include?(status)
diff --git a/app/models/nomenclature_change_observer.rb b/app/models/nomenclature_change_observer.rb
deleted file mode 100644
index bd2590760..000000000
--- a/app/models/nomenclature_change_observer.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class NomenclatureChangeObserver < ActiveRecord::Observer
-
-  def after_save(nomenclature_change)
-    if nomenclature_change.status == nomenclature_change.class::SUBMITTED
-      Rails.logger.warn "SUBMIT #{nomenclature_change.type}"
-      begin
-        processor_klass = "#{nomenclature_change.type}::Processor".constantize
-      rescue NameError
-        Rails.logger.warn "No processor found for #{nomenclature_change.type}"
-      else
-        processor_klass.new(nomenclature_change).run
-      end
-    end
-  end
-
-end
diff --git a/app/models/preset_tag.rb b/app/models/preset_tag.rb
index f87372d66..7ef4a964a 100644
--- a/app/models/preset_tag.rb
+++ b/app/models/preset_tag.rb
@@ -10,6 +10,7 @@
 #
 
 class PresetTag < ApplicationRecord
+  include Deletable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :model, :name
 
diff --git a/app/models/rank.rb b/app/models/rank.rb
index bbd2532ab..248098936 100644
--- a/app/models/rank.rb
+++ b/app/models/rank.rb
@@ -14,6 +14,7 @@
 #
 
 class Rank < ApplicationRecord
+  include Deletable
   extend Mobility
   # Migrated to controller (Strong Parameters)
   # attr_accessible :name, :display_name_en, :display_name_es, :display_name_fr,
diff --git a/app/models/reference.rb b/app/models/reference.rb
index a445a1808..dbce3aad8 100644
--- a/app/models/reference.rb
+++ b/app/models/reference.rb
@@ -17,6 +17,7 @@
 #
 
 class Reference < ApplicationRecord
+  include Deletable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :citation, :created_by_id, :updated_by_id
diff --git a/app/models/species_listing.rb b/app/models/species_listing.rb
index 1d722dadd..f228bf179 100644
--- a/app/models/species_listing.rb
+++ b/app/models/species_listing.rb
@@ -11,6 +11,7 @@
 #
 
 class SpeciesListing < ApplicationRecord
+  include Deletable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :designation_id, :name, :abbreviation
 
diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index f681562b8..91fe7915c 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -12,6 +12,7 @@
 #
 
 class TaxonCommon < ApplicationRecord
+  include Changable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :common_name_id, :taxon_concept_id, :created_by_id,
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index c44c8ced4..c84707f3d 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -31,6 +31,7 @@
 #
 
 class TaxonConcept < ApplicationRecord
+  include Deletable
   extend Mobility
   include TrackWhoDoesIt
   has_paper_trail versions: { class_name: "TaxonConceptVersion" }, on: :destroy,
@@ -173,6 +174,73 @@ class TaxonConcept < ApplicationRecord
   }
 
   before_validation :ensure_taxonomic_position
+  before_validation do
+    self.full_name =
+      if rank && parent && ['A', 'N'].include?(name_status)
+        rank_name = rank.name
+        parent_full_name = parent.full_name
+        name = scientific_name
+        # if name is present, just in case it is a multipart name
+        # e.g. when changing status from S, T, H
+        # make sure to only use last part
+        if name.present?
+          name = TaxonName.sanitize_scientific_name(name)
+        end
+        if name.blank?
+          nil
+        elsif [Rank::SPECIES, Rank::SUBSPECIES].include?(rank_name)
+          "#{parent_full_name} #{name.downcase}"
+        elsif rank_name == Rank::VARIETY
+          "#{parent_full_name} var. #{name.downcase}"
+        else
+          name
+        end
+      else
+        scientific_name
+      end
+  end
+  after_create do
+    ensure_species_touched
+    Species::Search.increment_cache_iterator
+    Species::TaxonConceptPrefixMatcher.increment_cache_iterator
+    Checklist::Checklist.increment_cache_iterator
+  end
+  after_update do
+    ensure_species_touched
+    if saved_change_to_rank_id? ||
+       saved_change_to_taxon_name_id? ||
+       saved_change_to_parent_id? ||
+       saved_change_to_name_status?
+      Species::Search.increment_cache_iterator
+      Species::TaxonConceptPrefixMatcher.increment_cache_iterator
+      Checklist::Checklist.increment_cache_iterator
+    end
+  end
+  after_save do
+    if ['A', 'N'].include? name_status
+      tcd = TaxonConceptData.new(self)
+      data = tcd.to_h
+      update_column(:data, data)
+      self.data = data
+    end
+    if name_status == 'S'
+      rebuild_relationships(accepted_names_ids)
+    end
+    if name_status == 'T'
+      rebuild_relationships(accepted_names_for_trade_name_ids)
+    end
+    if name_status == 'H'
+      rebuild_relationships(hybrid_parents_ids)
+    end
+  end
+  after_destroy do
+    ensure_species_touched
+    Species::Search.increment_cache_iterator
+    Species::TaxonConceptPrefixMatcher.increment_cache_iterator
+    Checklist::Checklist.increment_cache_iterator
+  end
+  after_touch :ensure_species_touched
+  after_commit :cache_cleanup
 
   translates :nomenclature_note
 
@@ -506,4 +574,16 @@ def full_name_cannot_be_changed
     true
   end
 
+  def cache_cleanup
+    DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
+  end
+
+  def ensure_species_touched
+    if rank && parent && [Rank::SUBSPECIES, Rank::VARIETY].include?(rank.name)
+      # touch parent if we're a variety or subspecies
+      Rails.logger.info "Touch species"
+      parent.touch
+    end
+  end
+
 end
diff --git a/app/models/taxon_concept_observer.rb b/app/models/taxon_concept_observer.rb
deleted file mode 100644
index 1f0e8e5b3..000000000
--- a/app/models/taxon_concept_observer.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-class TaxonConceptObserver < ActiveRecord::Observer
-
-  def before_validation(taxon_concept)
-    taxon_concept.full_name =
-      if taxon_concept.rank &&
-        taxon_concept.parent &&
-        ['A', 'N'].include?(taxon_concept.name_status)
-        rank_name = taxon_concept.rank.name
-        parent_full_name = taxon_concept.parent.full_name
-        name = taxon_concept.scientific_name
-        # if name is present, just in case it is a multipart name
-        # e.g. when changing status from S, T, H
-        # make sure to only use last part
-        if name.present?
-          name = TaxonName.sanitize_scientific_name(name)
-        end
-        if name.blank?
-          nil
-        elsif [Rank::SPECIES, Rank::SUBSPECIES].include?(rank_name)
-          "#{parent_full_name} #{name.downcase}"
-        elsif rank_name == Rank::VARIETY
-          "#{parent_full_name} var. #{name.downcase}"
-        else
-          name
-        end
-      else
-        taxon_concept.scientific_name
-      end
-  end
-
-  def after_create(taxon_concept)
-    ensure_species_touched(taxon_concept)
-    Species::Search.increment_cache_iterator
-    Species::TaxonConceptPrefixMatcher.increment_cache_iterator
-    Checklist::Checklist.increment_cache_iterator
-  end
-
-  def after_destroy(taxon_concept)
-    ensure_species_touched(taxon_concept)
-    Species::Search.increment_cache_iterator
-    Species::TaxonConceptPrefixMatcher.increment_cache_iterator
-    Checklist::Checklist.increment_cache_iterator
-    DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
-  end
-
-  def after_update(taxon_concept)
-    ensure_species_touched(taxon_concept)
-    # Rails 5.1 to 5.2
-    # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `attribute_before_last_save` instead.
-    #
-    # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `saved_change_to_attribute?` instead.
-    #
-    # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
-    # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-    # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
-    #
-    # == Original code ==
-    # if taxon_concept.rank_id_changed? ||
-    #   taxon_concept.taxon_name_id_changed? ||
-    #   taxon_concept.parent_id_changed? ||
-    #   taxon_concept.name_status_changed?
-    # == Changed to fix deprecation warnings ==
-    if taxon_concept.saved_change_to_rank_id? ||
-       taxon_concept.saved_change_to_taxon_name_id? ||
-       taxon_concept.saved_change_to_parent_id? ||
-       taxon_concept.saved_change_to_name_status?
-      Species::Search.increment_cache_iterator
-      Species::TaxonConceptPrefixMatcher.increment_cache_iterator
-      Checklist::Checklist.increment_cache_iterator
-    end
-  end
-
-  def after_touch(taxon_concept)
-    ensure_species_touched(taxon_concept)
-  end
-
-  def ensure_species_touched(taxon_concept)
-    if taxon_concept.rank && taxon_concept.parent &&
-      [Rank::SUBSPECIES, Rank::VARIETY].include?(taxon_concept.rank.name)
-      # touch parent if we're a variety or subspecies
-      Rails.logger.info "Touch species"
-      taxon_concept.parent.touch
-    end
-  end
-
-  def after_save(taxon_concept)
-    if ['A', 'N'].include? taxon_concept.name_status
-      tcd = TaxonConceptData.new(taxon_concept)
-      data = tcd.to_h
-      taxon_concept.update_column(:data, data)
-      taxon_concept.data = data
-    end
-    if taxon_concept.name_status == 'S'
-      taxon_concept.rebuild_relationships(taxon_concept.accepted_names_ids)
-    end
-    if taxon_concept.name_status == 'T'
-      taxon_concept.rebuild_relationships(taxon_concept.accepted_names_for_trade_name_ids)
-    end
-    if taxon_concept.name_status == 'H'
-      taxon_concept.rebuild_relationships(taxon_concept.hybrid_parents_ids)
-    end
-    DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
-  end
-
-end
diff --git a/app/models/taxon_concept_reference.rb b/app/models/taxon_concept_reference.rb
index 1cd2f95ec..3149de990 100644
--- a/app/models/taxon_concept_reference.rb
+++ b/app/models/taxon_concept_reference.rb
@@ -15,6 +15,7 @@
 #
 
 class TaxonConceptReference < ApplicationRecord
+  include Changable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
diff --git a/app/models/taxon_instrument.rb b/app/models/taxon_instrument.rb
index ed9bcdc0a..f4731b050 100644
--- a/app/models/taxon_instrument.rb
+++ b/app/models/taxon_instrument.rb
@@ -13,6 +13,7 @@
 #
 
 class TaxonInstrument < ApplicationRecord
+  include Changable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :effective_from, :instrument_id, :taxon_concept_id
diff --git a/app/models/taxon_relationship.rb b/app/models/taxon_relationship.rb
index 087e71d02..f79992b99 100644
--- a/app/models/taxon_relationship.rb
+++ b/app/models/taxon_relationship.rb
@@ -13,6 +13,7 @@
 #
 
 class TaxonRelationship < ApplicationRecord
+  include Changable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
diff --git a/app/models/taxonomy.rb b/app/models/taxonomy.rb
index 129ed4bfd..94ac1a590 100644
--- a/app/models/taxonomy.rb
+++ b/app/models/taxonomy.rb
@@ -9,6 +9,7 @@
 #
 
 class Taxonomy < ApplicationRecord
+  include Deletable
   include Dictionary
   build_dictionary :cites_eu, :cms
 
diff --git a/app/models/trade/annual_report_upload.rb b/app/models/trade/annual_report_upload.rb
index 7487fce4e..b926bf7c8 100644
--- a/app/models/trade/annual_report_upload.rb
+++ b/app/models/trade/annual_report_upload.rb
@@ -35,6 +35,12 @@ class Trade::AnnualReportUpload < ApplicationRecord
     where("epix_created_by_id IS NULL")
   }
 
+  after_create :copy_to_sandbox
+  before_destroy do
+    success = sandbox && sandbox.destroy
+    throw(:abort) unless success
+  end
+
   def copy_to_sandbox
     sandbox.copy
     update_attribute(:number_of_rows, sandbox_shipments.size)
diff --git a/app/models/trade/annual_report_upload_observer.rb b/app/models/trade/annual_report_upload_observer.rb
deleted file mode 100644
index adfa0b6a0..000000000
--- a/app/models/trade/annual_report_upload_observer.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Trade::AnnualReportUploadObserver < ActiveRecord::Observer
-
-  def after_create(annual_report_upload)
-    annual_report_upload.copy_to_sandbox
-  end
-
-  def before_destroy(annual_report_upload)
-    success = annual_report_upload.sandbox && annual_report_upload.sandbox.destroy
-    throw(:abort) unless success
-  end
-end
diff --git a/app/models/trade/shipment.rb b/app/models/trade/shipment.rb
index fd530d727..6252a4c71 100644
--- a/app/models/trade/shipment.rb
+++ b/app/models/trade/shipment.rb
@@ -71,6 +71,25 @@ class Trade::Shipment < ApplicationRecord
   belongs_to :exporter, :class_name => "GeoEntity"
   belongs_to :importer, :class_name => "GeoEntity"
 
+  before_save do
+    @old_permits_ids = []
+    [
+      import_permits_ids_was,
+      export_permits_ids_was,
+      origin_permits_ids_was
+    ].each do |permits_ids|
+      @old_permits_ids += permits_ids ? permits_ids.dup : []
+    end
+    unless reported_taxon_concept_id
+      self.reported_taxon_concept_id = taxon_concept_id
+    end
+  end
+  before_destroy do
+    @old_permits_ids = permits_ids.dup
+  end
+  after_commit :async_tasks_after_save, on: [:create, :update]
+  after_commit :async_tasks_for_destroy, on: :destroy
+
   after_validation do
     unless self.errors.empty? && self.ignore_warnings
       # inject warnings here
@@ -154,4 +173,14 @@ def set_permit_number(permit_type, str)
     send("#{permit_type}_permits_ids=", permits && permits.map(&:id))
   end
 
+  def async_tasks_after_save
+    DownloadsCacheCleanupWorker.perform_async('shipments')
+    disconnected_permits_ids = @old_permits_ids - permits_ids
+    PermitCleanupWorker.perform_async(disconnected_permits_ids)
+  end
+
+  def async_tasks_for_destroy
+    DownloadsCacheCleanupWorker.perform_async('shipments')
+    PermitCleanupWorker.perform_async(@old_permits_ids)
+  end
 end
diff --git a/app/models/trade/shipment_observer.rb b/app/models/trade/shipment_observer.rb
deleted file mode 100644
index 546d92f25..000000000
--- a/app/models/trade/shipment_observer.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-class Trade::ShipmentObserver < ActiveRecord::Observer
-
-  def before_save(shipment)
-    @old_permits_ids = []
-    [
-      shipment.import_permits_ids_was,
-      shipment.export_permits_ids_was,
-      shipment.origin_permits_ids_was
-    ].each do |permits_ids|
-      @old_permits_ids += permits_ids ? permits_ids.dup : []
-    end
-    unless shipment.reported_taxon_concept_id
-      shipment.reported_taxon_concept_id = shipment.taxon_concept_id
-    end
-  end
-
-  def before_destroy(shipment)
-    @old_permits_ids = shipment.permits_ids.dup
-  end
-
-  def after_save(shipment)
-    DownloadsCacheCleanupWorker.perform_async('shipments')
-    disconnected_permits_ids = @old_permits_ids - shipment.permits_ids
-    PermitCleanupWorker.perform_async(disconnected_permits_ids)
-  end
-
-  def after_destroy(shipment)
-    DownloadsCacheCleanupWorker.perform_async('shipments')
-    disconnected_permits_ids = @old_permits_ids
-    PermitCleanupWorker.perform_async(disconnected_permits_ids)
-  end
-
-end
diff --git a/app/models/trade/trade_data_download.rb b/app/models/trade/trade_data_download.rb
index 3934e2c4b..32b951998 100644
--- a/app/models/trade/trade_data_download.rb
+++ b/app/models/trade/trade_data_download.rb
@@ -30,4 +30,11 @@ class Trade::TradeDataDownload < ApplicationRecord
   #  :appendix, :importer, :exporter, :origin, :term, :unit, :source, :purpose,
   #  :number_of_rows, :city, :country, :organization
 
+  after_commit :async_downloads_cache_cleanup, on: [:create, :update]
+
+  private
+
+  def async_downloads_cache_cleanup
+    DownloadsCacheCleanupWorker.perform_async('trade_download_stats')
+  end
 end
diff --git a/app/models/trade/trade_data_download_observer.rb b/app/models/trade/trade_data_download_observer.rb
deleted file mode 100644
index 7b309bb67..000000000
--- a/app/models/trade/trade_data_download_observer.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Trade::TradeDataDownloadObserver < ActiveRecord::Observer
-
-  def after_save(download_log)
-    DownloadsCacheCleanupWorker.perform_async('trade_download_stats')
-  end
-
-end
diff --git a/app/models/trade_codes/purpose.rb b/app/models/trade_codes/purpose.rb
index bf4aef4b6..29f93a9bf 100644
--- a/app/models/trade_codes/purpose.rb
+++ b/app/models/trade_codes/purpose.rb
@@ -13,11 +13,15 @@
 #
 
 class Purpose < TradeCode
+  include Deletable
+
   validates :code, :length => { :is => 1 }
 
   has_many :trade_restriction_purposes
   has_many :shipments, :class_name => 'Trade::Shipment'
 
+  after_commit :expire_controller_action_cache
+
   protected
 
   def dependent_objects_map
@@ -26,4 +30,20 @@ def dependent_objects_map
       'shipments' => shipments
     }
   end
+
+  private
+
+  def expire_controller_action_cache
+    I18n.available_locales.each do |lang|
+      ActionController::Base.new.send(
+        :expire_action,
+        {
+          controller: 'api/v1/purposes',
+          format: 'json',
+          action: 'index',
+          locale: lang
+        }
+      )
+    end
+  end
 end
diff --git a/app/models/trade_codes/source.rb b/app/models/trade_codes/source.rb
index 0013fa240..d63ddddf0 100644
--- a/app/models/trade_codes/source.rb
+++ b/app/models/trade_codes/source.rb
@@ -13,12 +13,16 @@
 #
 
 class Source < TradeCode
+  include Deletable
+
   validates :code, :length => { :is => 1 }
 
   has_many :trade_restriction_sources
   has_many :eu_decisions
   has_many :shipments, :class_name => 'Trade::Shipment'
 
+  after_commit :expire_controller_action_cache
+
   protected
 
   def dependent_objects_map
@@ -28,4 +32,20 @@ def dependent_objects_map
       'shipments' => shipments
     }
   end
+
+  private
+
+  def expire_controller_action_cache
+    I18n.available_locales.each do |lang|
+      ActionController::Base.new.send(
+        :expire_action,
+        {
+          controller: 'api/v1/sources',
+          format: 'json',
+          action: 'index',
+          locale: lang
+        }
+      )
+    end
+  end
 end
diff --git a/app/models/trade_codes/term.rb b/app/models/trade_codes/term.rb
index 9f5cc7326..55647fb69 100644
--- a/app/models/trade_codes/term.rb
+++ b/app/models/trade_codes/term.rb
@@ -13,12 +13,16 @@
 #
 
 class Term < TradeCode
+  include Deletable
+
   validates :code, :length => { :is => 3 }
 
   has_many :trade_restriction_terms
   has_many :eu_decisions
   has_many :shipments, :class_name => 'Trade::Shipment'
 
+  after_commit :expire_controller_action_cache
+
   protected
 
   def dependent_objects_map
@@ -28,4 +32,20 @@ def dependent_objects_map
       'shipments' => shipments
     }
   end
+
+  private
+
+  def expire_controller_action_cache
+    I18n.available_locales.each do |lang|
+      ActionController::Base.new.send(
+        :expire_action,
+        {
+          controller: 'api/v1/terms',
+          format: 'json',
+          action: 'index',
+          locale: lang
+        }
+      )
+    end
+  end
 end
diff --git a/app/models/trade_codes/unit.rb b/app/models/trade_codes/unit.rb
index 702c8efea..bb0495fbf 100644
--- a/app/models/trade_codes/unit.rb
+++ b/app/models/trade_codes/unit.rb
@@ -13,12 +13,16 @@
 #
 
 class Unit < TradeCode
+  include Deletable
+
   validates :code, :length => { :is => 3 }
 
   has_many :term_trade_codes_pairs, :as => :trade_code
   has_many :quotas
   has_many :shipments, :class_name => 'Trade::Shipment'
 
+  after_commit :expire_controller_action_cache
+
   protected
 
   def dependent_objects_map
@@ -27,4 +31,20 @@ def dependent_objects_map
       'shipments' => shipments
     }
   end
+
+  private
+
+  def expire_controller_action_cache
+    I18n.available_locales.each do |lang|
+      ActionController::Base.new.send(
+        :expire_action,
+        {
+          controller: 'api/v1/units',
+          format: 'json',
+          action: 'index',
+          locale: lang
+        }
+      )
+    end
+  end
 end
diff --git a/app/models/trade_restriction.rb b/app/models/trade_restriction.rb
index 763000242..c34f39958 100644
--- a/app/models/trade_restriction.rb
+++ b/app/models/trade_restriction.rb
@@ -60,6 +60,11 @@ class TradeRestriction < ApplicationRecord
 
   translates :nomenclature_note
 
+  after_save :touch_descendants, unless: -> { taxon_concept.nil? }
+  before_destroy :touch_descendants, unless: -> { taxon_concept.nil? }
+  after_save :touch_taxa_with_applicable_distribution, if: -> { taxon_concept.nil? }
+  before_destroy :touch_taxa_with_applicable_distribution, if: -> { taxon_concept.nil? }
+
   def valid_dates
     if !(start_date.nil? || end_date.nil?) && (start_date > end_date)
       self.errors.add(:start_date, ' has to be before end date.')
@@ -203,4 +208,73 @@ def self.filter_years(filters)
     end
     all
   end
+
+  private
+
+  def touch_taxa_with_applicable_distribution
+    update_stmt = TaxonConcept.send(:sanitize_sql_array, [
+      "UPDATE taxon_concepts
+      SET dependents_updated_at = CURRENT_TIMESTAMP, dependents_updated_by_id = :updated_by_id
+      FROM distributions
+      WHERE distributions.taxon_concept_id = taxon_concepts.id
+      AND distributions.geo_entity_id IN (:geo_entity_id)",
+      updated_by_id: updated_by_id,
+      geo_entity_id: [
+        # Rails 5.1 to 5.2
+        # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `attribute_before_last_save` instead.
+        #
+        # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+        #
+        # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+        #
+        # == Original code ==
+        # geo_entity_id, geo_entity_id_was
+        # == Changed to fix deprecation warnings ==
+        geo_entity_id, geo_entity_id_before_last_save
+      ].compact.uniq
+    ])
+    TaxonConcept.connection.execute update_stmt
+  end
+
+  def touch_descendants
+    update_stmt = TaxonConcept.send(:sanitize_sql_array, [
+      "UPDATE taxon_concepts
+      SET dependents_updated_at = CURRENT_TIMESTAMP, dependents_updated_by_id = :updated_by_id
+      WHERE data IS NOT NULL
+      AND ARRAY[
+        (data->'species_id')::INT,
+        (data->'genus_id')::INT,
+        (data->'subfamily_id')::INT,
+        (data->'family_id')::INT,
+        (data->'order_id')::INT
+      ] && ARRAY[:taxon_concept_id] ",
+      updated_by_id: updated_by_id,
+      taxon_concept_id: [
+        # Rails 5.1 to 5.2
+        # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `attribute_before_last_save` instead.
+        #
+        # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `saved_change_to_attribute?` instead.
+        #
+        # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
+        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
+        # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
+        #
+        # == Original code ==
+        # taxon_concept_id, taxon_concept_id_was
+        # == Changed to fix deprecation warnings ==
+        taxon_concept_id, taxon_concept_id_before_last_save
+      ].compact.uniq
+    ])
+    TaxonConcept.connection.execute(update_stmt)
+  end
 end
diff --git a/app/models/trade_restriction_observer.rb b/app/models/trade_restriction_observer.rb
deleted file mode 100644
index d15b226da..000000000
--- a/app/models/trade_restriction_observer.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-class TradeRestrictionObserver < ActiveRecord::Observer
-
-  def after_save(trade_restriction)
-    if trade_restriction.taxon_concept.nil?
-      touch_taxa_with_applicable_distribution(trade_restriction)
-    else
-      touch_descendants(trade_restriction)
-    end
-  end
-
-  def before_destroy(trade_restriction)
-    if trade_restriction.taxon_concept.nil?
-      touch_taxa_with_applicable_distribution(trade_restriction)
-    else
-      touch_descendants(trade_restriction)
-    end
-  end
-
-  private
-
-  def touch_taxa_with_applicable_distribution(trade_restriction)
-    update_stmt = TaxonConcept.send(:sanitize_sql_array, [
-      "UPDATE taxon_concepts
-      SET dependents_updated_at = CURRENT_TIMESTAMP, dependents_updated_by_id = :updated_by_id
-      FROM distributions
-      WHERE distributions.taxon_concept_id = taxon_concepts.id
-      AND distributions.geo_entity_id IN (:geo_entity_id)",
-      :updated_by_id => trade_restriction.updated_by_id,
-      :geo_entity_id => [
-        # Rails 5.1 to 5.2
-        # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
-        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-        # To maintain the current behavior, use `attribute_before_last_save` instead.
-        #
-        # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
-        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-        # To maintain the current behavior, use `saved_change_to_attribute?` instead.
-        #
-        # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
-        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-        # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
-        #
-        # == Original code ==
-        # trade_restriction.geo_entity_id, trade_restriction.geo_entity_id_was
-        # == Changed to fix deprecation warnings ==
-        trade_restriction.geo_entity_id, trade_restriction.geo_entity_id_before_last_save
-      ].compact.uniq
-    ])
-    TaxonConcept.connection.execute update_stmt
-  end
-
-  def touch_descendants(trade_restriction)
-    update_stmt = TaxonConcept.send(:sanitize_sql_array, [
-      "UPDATE taxon_concepts
-      SET dependents_updated_at = CURRENT_TIMESTAMP, dependents_updated_by_id = :updated_by_id
-      WHERE data IS NOT NULL
-      AND ARRAY[
-        (data->'species_id')::INT,
-        (data->'genus_id')::INT,
-        (data->'subfamily_id')::INT,
-        (data->'family_id')::INT,
-        (data->'order_id')::INT
-      ] && ARRAY[:taxon_concept_id] ",
-      :updated_by_id => trade_restriction.updated_by_id,
-      :taxon_concept_id => [
-        # Rails 5.1 to 5.2
-        # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
-        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-        # To maintain the current behavior, use `attribute_before_last_save` instead.
-        #
-        # DEPRECATION WARNING: The behavior of `attribute_changed?` inside of after callbacks will be changing in the next version of Rails.
-        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-        # To maintain the current behavior, use `saved_change_to_attribute?` instead.
-        #
-        # DEPRECATION WARNING: The behavior of `changed_attributes` inside of after callbacks will be changing in the next version of Rails.
-        # The new return value will reflect the behavior of calling the method after `save` returned (e.g. the opposite of what it returns now).
-        # To maintain the current behavior, use `saved_changes.transform_values(&:first)` instead.
-        #
-        # == Original code ==
-        # trade_restriction.taxon_concept_id, trade_restriction.taxon_concept_id_was
-        # == Changed to fix deprecation warnings ==
-        trade_restriction.taxon_concept_id, trade_restriction.taxon_concept_id_before_last_save
-      ].compact.uniq
-    ])
-    TaxonConcept.connection.execute update_stmt
-  end
-
-end
diff --git a/app/models/trade_restrictions/cites_suspension.rb b/app/models/trade_restrictions/cites_suspension.rb
index 37cb68900..d32afb9e5 100644
--- a/app/models/trade_restrictions/cites_suspension.rb
+++ b/app/models/trade_restrictions/cites_suspension.rb
@@ -31,6 +31,7 @@
 #
 
 class CitesSuspension < TradeRestriction
+  include Changable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :start_notification_id, :end_notification_id,
   #   :cites_suspension_confirmations_attributes,
@@ -43,6 +44,7 @@ class CitesSuspension < TradeRestriction
   before_validation :handle_dates
   before_save :handle_current_flag
   accepts_nested_attributes_for :cites_suspension_confirmations
+  after_commit :async_downloads_cache_cleanup, on: :destroy
 
   def handle_dates
     self.publication_date = start_notification && start_notification.effective_at
@@ -101,4 +103,10 @@ def self.search(query)
       all
     end
   end
+
+  private
+
+  def async_downloads_cache_cleanup
+    DownloadsCacheCleanupWorker.perform_async('cites_suspensions')
+  end
 end
diff --git a/app/models/trade_restrictions/cites_suspension_observer.rb b/app/models/trade_restrictions/cites_suspension_observer.rb
deleted file mode 100644
index d03815dd9..000000000
--- a/app/models/trade_restrictions/cites_suspension_observer.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class CitesSuspensionObserver < TradeRestrictionObserver
-
-  def after_destroy(cites_suspension)
-    DownloadsCacheCleanupWorker.perform_async('cites_suspensions')
-  end
-
-end
diff --git a/app/models/trade_restrictions/quota.rb b/app/models/trade_restrictions/quota.rb
index cf1d0dcc4..be9709865 100644
--- a/app/models/trade_restrictions/quota.rb
+++ b/app/models/trade_restrictions/quota.rb
@@ -31,6 +31,7 @@
 #
 
 class Quota < TradeRestriction
+  include Changable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :public_display
 
@@ -38,6 +39,8 @@ class Quota < TradeRestriction
   validates :quota, :numericality => { :greater_than_or_equal_to => -1.0 }
   validates :geo_entity_id, :presence => true
 
+  after_commit :async_downloads_cache_cleanup, on: :destroy
+
   # Each element of CSV columns can be either an array [display_text, method]
   # or a single symbol if the display text and the method are the same
   CSV_COLUMNS = [
@@ -101,4 +104,10 @@ def self.count_matching(params)
       ]
     ).count
   end
+
+  private
+
+  def async_downloads_cache_cleanup
+    DownloadsCacheCleanupWorker.perform_async('quotas')
+  end
 end
diff --git a/app/models/trade_restrictions/quota_observer.rb b/app/models/trade_restrictions/quota_observer.rb
deleted file mode 100644
index 00110632f..000000000
--- a/app/models/trade_restrictions/quota_observer.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class QuotaObserver < TradeRestrictionObserver
-
-  def after_destroy(quota)
-    DownloadsCacheCleanupWorker.perform_async('quotas')
-  end
-
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index dbaf670f1..d35a095ea 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,6 +24,8 @@
 #
 
 class User < ApplicationRecord
+  include Deletable
+
   devise :database_authenticatable, :registerable, :recoverable, :rememberable,
     :trackable, :validatable
   # Migrated to controller (Strong Parameters)
diff --git a/app/sweepers/purpose_sweeper.rb b/app/sweepers/purpose_sweeper.rb
deleted file mode 100644
index 4bb7089ae..000000000
--- a/app/sweepers/purpose_sweeper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class PurposeSweeper < ActionController::Caching::Sweeper
-  observe Purpose
-
-  def after_create(tc)
-    expire_cache(tc)
-  end
-
-  def after_update(tc)
-    expire_cache(tc)
-  end
-
-  def after_destroy(tc)
-    expire_cache(tc)
-  end
-
-  private
-
-  def expire_cache(tc)
-    @controller ||= ActionController::Base.new
-    ["en", "fr", "es"].each do |lang|
-      expire_action(
-        controller: 'api/v1/purposes',
-        format: 'json',
-        action: 'index',
-        locale: lang
-      )
-    end
-  end
-end
diff --git a/app/sweepers/source_sweeper.rb b/app/sweepers/source_sweeper.rb
deleted file mode 100644
index 9cecd6bff..000000000
--- a/app/sweepers/source_sweeper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class SourceSweeper < ActionController::Caching::Sweeper
-  observe Source
-
-  def after_create(tc)
-    expire_cache(tc)
-  end
-
-  def after_update(tc)
-    expire_cache(tc)
-  end
-
-  def after_destroy(tc)
-    expire_cache(tc)
-  end
-
-  private
-
-  def expire_cache(tc)
-    @controller ||= ActionController::Base.new
-    ["en", "fr", "es"].each do |lang|
-      expire_action(
-        controller: 'api/v1/sources',
-        format: 'json',
-        action: 'index',
-        locale: lang
-      )
-    end
-  end
-end
diff --git a/app/sweepers/term_sweeper.rb b/app/sweepers/term_sweeper.rb
deleted file mode 100644
index ebfa4463f..000000000
--- a/app/sweepers/term_sweeper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class TermSweeper < ActionController::Caching::Sweeper
-  observe Term
-
-  def after_create(tc)
-    expire_cache(tc)
-  end
-
-  def after_update(tc)
-    expire_cache(tc)
-  end
-
-  def after_destroy(tc)
-    expire_cache(tc)
-  end
-
-  private
-
-  def expire_cache(tc)
-    @controller ||= ActionController::Base.new
-    ["en", "fr", "es"].each do |lang|
-      expire_action(
-        controller: 'api/v1/terms',
-        format: 'json',
-        action: 'index',
-        locale: lang
-      )
-    end
-  end
-end
diff --git a/app/sweepers/unit_sweeper.rb b/app/sweepers/unit_sweeper.rb
deleted file mode 100644
index f41d74e9d..000000000
--- a/app/sweepers/unit_sweeper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class UnitSweeper < ActionController::Caching::Sweeper
-  observe Unit
-
-  def after_create(tc)
-    expire_cache(tc)
-  end
-
-  def after_update(tc)
-    expire_cache(tc)
-  end
-
-  def after_destroy(tc)
-    expire_cache(tc)
-  end
-
-  private
-
-  def expire_cache(tc)
-    @controller ||= ActionController::Base.new
-    ["en", "fr", "es"].each do |lang|
-      expire_action(
-        controller: 'api/v1/units',
-        format: 'json',
-        action: 'index',
-        locale: lang
-      )
-    end
-  end
-end
diff --git a/config/application.rb b/config/application.rb
index 0cc5846e0..6a3cbb138 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,17 +28,6 @@ class Application < Rails::Application
     config.autoload_paths << Rails.root.join("lib", "modules")
     config.eager_load_paths << Rails.root.join("lib", "modules")
 
-    # Activate observers that should always be running.
-    config.active_record.observers = :destroy_observer, :annotation_observer,
-      :cites_cop_observer, :cites_suspension_notification_observer,
-      :eu_regulation_observer, :eu_suspension_regulation_observer,
-      :eu_event_observer, :"trade/annual_report_upload_observer",
-      :listing_change_observer, :taxon_concept_observer,
-      :cites_suspension_observer, :quota_observer, :eu_decision_observer,
-      :"trade/shipment_observer", :"trade/trade_data_download_observer",
-      :change_observer, :document_observer, :nomenclature_change_observer,
-      :geo_entity_observer
-
     # Active Job
     config.active_job.queue_adapter = :sidekiq
     config.action_mailer.deliver_later_queue_name = 'default'

From 4732d37a401bcd9a3ded55c9d46991b637a5add6 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 4 Feb 2024 17:56:39 +0000
Subject: [PATCH 156/241] break routes to multiple files

---
 config/routes.rb           | 265 +------------------------------------
 config/routes/admin.rb     | 119 +++++++++++++++++
 config/routes/api.rb       |  37 ++++++
 config/routes/checklist.rb |  26 ++++
 config/routes/species.rb   |   6 +
 config/routes/trade.rb     |  31 +++++
 6 files changed, 224 insertions(+), 260 deletions(-)
 create mode 100644 config/routes/admin.rb
 create mode 100644 config/routes/api.rb
 create mode 100644 config/routes/checklist.rb
 create mode 100644 config/routes/species.rb
 create mode 100644 config/routes/trade.rb

diff --git a/config/routes.rb b/config/routes.rb
index 827761932..5a07e9156 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,229 +21,15 @@
   get 'admin/api_usage/user_overview/:id' => 'admin/api_usage#show', :as => 'api_user_usage'
 
   mount Sidekiq::Web => '/sidekiq'
-  namespace :api do
-    namespace :v1 do
-      resources :taxon_concepts, :only => [:index, :show]
-      resources :auto_complete_taxon_concepts, :only => [:index, :show]
-      resources :geo_entities, :only => [:index]
-      resources :terms, :only => [:index]
-      resources :units, :only => [:index]
-      resources :sources, :only => [:index]
-      resources :purposes, :only => [:index]
-      resources :trade_plus_filters, only: :index
-      resources :eu_decisions, only: :index
-      resources :documents, :only => [:index, :show] do
-        collection do
-          get 'download_zip'
-        end
-      end
-      resources :document_geo_entities, only: [:index]
-      resources :events, only: [:index]
-      resources :document_tags, only: [:index]
-      get '/dashboard_stats/:iso_code' => 'dashboard_stats#index'
-      get '/shipments/chart' => 'shipments#chart_query'
-      get '/shipments/grouped' => 'shipments#grouped_query'
-      get '/shipments/over_time' => 'shipments#over_time_query'
-      get '/shipments/aggregated_over_time' => 'shipments#aggregated_over_time_query'
-      get '/shipments/country' => 'shipments#country_query'
-      get '/shipments/search' => 'shipments#search_query'
-      get '/shipments/download' => 'shipments#download_data'
-      get '/shipments/search_download' => 'shipments#search_download_data'
-      get '/shipments/search_download_all' => 'shipments#search_download_all_data'
-    end
-    resources :languages, :only => [:index]
-    resources :designations, :only => [:index]
-    resources :species_listings, :only => [:index]
-    resources :change_types, :only => [:index]
-    resources :ranks, :only => [:index]
-    resources :trade_downloads_cache_cleanup, only: [:index]
-  end
-  namespace :admin do
-    resources :taxonomies, :only => [:index, :create, :update, :destroy]
-    resources :terms, :only => [:index, :create, :update, :destroy]
-    resources :sources, :only => [:index, :create, :update, :destroy]
-    resources :purposes, :only => [:index, :create, :update, :destroy]
-    resources :units, :only => [:index, :create, :update, :destroy]
-    resources :taxon_concept_term_pairs, :only => [:index, :create, :update, :destroy]
-    resources :term_trade_codes_pairs, :only => [:index, :create, :update, :destroy]
-    resources :languages, :only => [:index, :create, :update, :destroy]
-    resources :users
-    resources :designations, :only => [:index, :create, :update, :destroy]
-    resources :instruments, :only => [:index, :create, :update, :destroy]
-    resources :species_listings, :only => [:index, :create, :update, :destroy]
-    resources :change_types, :only => [:index, :create, :update, :destroy]
-    resources :ranks, :only => [:index, :create, :update, :destroy]
-    resources :tags, :only => [:index, :create, :update, :destroy]
-    resources :eu_decision_types, :only => [:index, :create, :update, :destroy]
-    resources :srg_histories, only: [:index, :create, :update, :destroy]
-    resources :events do
-      resource :document_batch, :only => [:new, :create]
-      resources :documents, :only => [:index, :edit, :update, :destroy] do
-        get :show_order, on: :collection, controller: :event_documents
-        post :update_order, on: :collection, controller: :event_documents
-      end
-    end
-    resources :eu_regulations do
-      post :activate, :on => :member
-      post :deactivate, :on => :member
-      resources :listing_changes, :only => [:index, :destroy]
-    end
-    resources :eu_suspension_regulations do
-      post :activate, :on => :member
-      post :deactivate, :on => :member
-      resources :eu_suspensions, :only => [:index, :destroy]
-    end
-    resources :eu_implementing_regulations
-    resources :eu_council_regulations
-    resources :cites_cops
-    resources :cites_pcs
-    resources :cites_acs
-    resources :cites_tcs
-    resources :ec_srgs
-    resources :cites_extraordinary_meetings
 
-    resource :document_batch, :only => [:new, :create]
-    resources :documents do
-      get :autocomplete, :on => :collection
-    end
-
-    resources :cites_suspension_notifications
-    resources :references, :only => [:index, :create, :update, :destroy] do
-      get :autocomplete, :on => :collection
-    end
-    resources :geo_entities, :only => [:index, :create, :update, :destroy] do
-      resources :geo_relationships, :only => [:index, :create, :update, :destroy]
-    end
-    resources :cites_hash_annotations, :only => [:index, :create, :update, :destroy]
-    resources :eu_hash_annotations, :only => [:index, :create, :update, :destroy]
-    resources :cites_suspensions, :only => [:index, :new, :create, :edit, :update, :destroy]
-
-    resources :quotas, :only => [:index, :destroy] do
-      collection do
-        get :duplication
-        post :duplicate
-        get :count
-      end
-    end
-
-    resources :iucn_mappings, :only => [:index]
-    resources :cms_mappings, :only => [:index]
-    resources :ahoy_visits, :only => [:index, :show]
-    resources :ahoy_events, :only => [:index, :show]
-
-    resources :taxon_concepts do
-      get :autocomplete, :on => :collection
-      resources :children, :only => [:index]
-      resources :taxon_relationships, :only => [:index, :create, :destroy]
-      resources :comments, only: [:index, :create, :update],
-        controller: :taxon_concept_comments
-      resources :designations, :only => [] do
-        resources :taxon_listing_changes, :as => :listing_changes
-      end
-      resources :taxon_commons, :only => [:new, :create, :edit, :update, :destroy]
-      resources :distributions, :only => [:index, :new, :create, :edit, :update, :destroy]
-      resources :synonym_relationships, :only => [:new, :create, :edit, :update, :destroy]
-      resources :trade_name_relationships, :only => [:new, :create, :edit, :update, :destroy]
-      resources :hybrid_relationships, :only => [:new, :create, :edit, :update, :destroy]
-      resources :taxon_concept_references, :only => [:index, :new, :create, :destroy, :edit, :update]
-      resources :names, :only => [:index]
-      resources :eu_opinions, :only => [:index, :new, :create, :edit, :update, :destroy]
-
-      resources :taxon_quotas, :only => [:index, :new, :create, :edit, :update, :destroy],
-        :as => :quotas
-
-      resources :taxon_eu_suspensions,
-        :only => [:index, :new, :create, :edit, :update, :destroy],
-        :as => :eu_suspensions
-
-      resources :taxon_cites_suspensions,
-        :only => [:index, :new, :create, :edit, :update, :destroy],
-        :as => :cites_suspensions
-      resources :taxon_instruments, :only => [:index, :new, :create, :edit, :update, :destroy]
-      resources :cites_captivity_processes,
-        :only => [:index, :new, :create, :edit, :update, :destroy]
-    end
-    resources :nomenclature_changes do # TODO: look like only support :index, :show, :destroy
-      resources :split, controller: 'nomenclature_changes/split'
-      resources :lump, controller: 'nomenclature_changes/lump'
-      resources :status_to_accepted,
-        controller: 'nomenclature_changes/status_to_accepted'
-      resources :status_to_synonym,
-        controller: 'nomenclature_changes/status_to_synonym'
-      resources :status_swap, controller: 'nomenclature_changes/status_swap'
-    end
-    get 'exports' => 'exports#index'
-    get 'exports/download' => 'exports#download' # not sure about this, post??
-    get 'stats' => 'statistics#index'
-    root :to => 'taxon_concepts#index'
-  end
+  draw(:api)
+  draw(:admin)
 
   get 'trade/user_can_edit' => 'trade#user_can_edit'
-  namespace :trade do
-    resources :annual_report_uploads do
-      resources :sandbox_shipments do
-        collection do
-          post :update_batch
-          post :destroy_batch
-        end
-      end
-      member do
-        post 'submit'
-      end
-    end
-    resources :validation_rules
-    resources :validation_errors, only: [:update, :show]
-    resources :shipments do
-      collection do
-        post :update_batch
-        post :destroy_batch
-        get :accepted_taxa_for_reported_taxon_concept
-      end
-    end
-    resources :geo_entities, :only => [:index]
-    resources :permits, :only => [:index]
-    get 'exports/download' => 'exports#download'      # not sure about this, post??
-    get 'exports/download_stats' => 'exports#download_stats', :as => :trade_download_stats
-    get 'stats' => 'statistics#index'
-    get 'summary_year' => 'statistics#summary_year'
-    get 'summary_creation' => 'statistics#summary_creation'
-    get 'trade_transactions' => 'statistics#trade_transactions'
-    root :to => 'ember#start'
-  end
+  draw(:trade)
 
-  namespace :species do
-    get 'exports' => 'exports#index'
-    get 'exports/download' => 'exports#download' # not sure about this, post??
-    get '*foo' => 'ember#start'
-    root :to => 'ember#start'
-  end
-
-  namespace :checklist do
-    resources :geo_entities, :only => [:index] # TODO: move to API
-    resources :downloads do
-      member do
-        get :download
-      end
-      collection do
-        get :download_index
-        get :download_history
-      end
-    end
-    resources :taxon_concepts, :only => [:index] do
-      collection do
-        get :autocomplete
-        get :summarise_filters
-      end
-    end
-    resources :timelines, :only => [:index]
-    resources :documents do
-      collection do
-        get 'download_zip'
-        get 'volume_download'
-        get 'check_doc_presence'
-      end
-    end
-  end
+  draw(:species)
+  draw(:checklist)
 
   # The priority is based upon order of creation:
   # first created -> highest priority.
@@ -258,47 +44,6 @@
       root :to => 'home#index'
     end
   end
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
 
   get '/', :to => 'cites_trade/home#index',
     :constraints => lambda { |request|
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
new file mode 100644
index 000000000..7589285a0
--- /dev/null
+++ b/config/routes/admin.rb
@@ -0,0 +1,119 @@
+namespace :admin do
+  resources :taxonomies, :only => [:index, :create, :update, :destroy]
+  resources :terms, :only => [:index, :create, :update, :destroy]
+  resources :sources, :only => [:index, :create, :update, :destroy]
+  resources :purposes, :only => [:index, :create, :update, :destroy]
+  resources :units, :only => [:index, :create, :update, :destroy]
+  resources :taxon_concept_term_pairs, :only => [:index, :create, :update, :destroy]
+  resources :term_trade_codes_pairs, :only => [:index, :create, :update, :destroy]
+  resources :languages, :only => [:index, :create, :update, :destroy]
+  resources :users
+  resources :designations, :only => [:index, :create, :update, :destroy]
+  resources :instruments, :only => [:index, :create, :update, :destroy]
+  resources :species_listings, :only => [:index, :create, :update, :destroy]
+  resources :change_types, :only => [:index, :create, :update, :destroy]
+  resources :ranks, :only => [:index, :create, :update, :destroy]
+  resources :tags, :only => [:index, :create, :update, :destroy]
+  resources :eu_decision_types, :only => [:index, :create, :update, :destroy]
+  resources :srg_histories, only: [:index, :create, :update, :destroy]
+  resources :events do
+    resource :document_batch, :only => [:new, :create]
+    resources :documents, :only => [:index, :edit, :update, :destroy] do
+      get :show_order, on: :collection, controller: :event_documents
+      post :update_order, on: :collection, controller: :event_documents
+    end
+  end
+  resources :eu_regulations do
+    post :activate, :on => :member
+    post :deactivate, :on => :member
+    resources :listing_changes, :only => [:index, :destroy]
+  end
+  resources :eu_suspension_regulations do
+    post :activate, :on => :member
+    post :deactivate, :on => :member
+    resources :eu_suspensions, :only => [:index, :destroy]
+  end
+  resources :eu_implementing_regulations
+  resources :eu_council_regulations
+  resources :cites_cops
+  resources :cites_pcs
+  resources :cites_acs
+  resources :cites_tcs
+  resources :ec_srgs
+  resources :cites_extraordinary_meetings
+
+  resource :document_batch, :only => [:new, :create]
+  resources :documents do
+    get :autocomplete, :on => :collection
+  end
+
+  resources :cites_suspension_notifications
+  resources :references, :only => [:index, :create, :update, :destroy] do
+    get :autocomplete, :on => :collection
+  end
+  resources :geo_entities, :only => [:index, :create, :update, :destroy] do
+    resources :geo_relationships, :only => [:index, :create, :update, :destroy]
+  end
+  resources :cites_hash_annotations, :only => [:index, :create, :update, :destroy]
+  resources :eu_hash_annotations, :only => [:index, :create, :update, :destroy]
+  resources :cites_suspensions, :only => [:index, :new, :create, :edit, :update, :destroy]
+
+  resources :quotas, :only => [:index, :destroy] do
+    collection do
+      get :duplication
+      post :duplicate
+      get :count
+    end
+  end
+
+  resources :iucn_mappings, :only => [:index]
+  resources :cms_mappings, :only => [:index]
+  resources :ahoy_visits, :only => [:index, :show]
+  resources :ahoy_events, :only => [:index, :show]
+
+  resources :taxon_concepts do
+    get :autocomplete, :on => :collection
+    resources :children, :only => [:index]
+    resources :taxon_relationships, :only => [:index, :create, :destroy]
+    resources :comments, only: [:index, :create, :update],
+      controller: :taxon_concept_comments
+    resources :designations, :only => [] do
+      resources :taxon_listing_changes, :as => :listing_changes
+    end
+    resources :taxon_commons, :only => [:new, :create, :edit, :update, :destroy]
+    resources :distributions, :only => [:index, :new, :create, :edit, :update, :destroy]
+    resources :synonym_relationships, :only => [:new, :create, :edit, :update, :destroy]
+    resources :trade_name_relationships, :only => [:new, :create, :edit, :update, :destroy]
+    resources :hybrid_relationships, :only => [:new, :create, :edit, :update, :destroy]
+    resources :taxon_concept_references, :only => [:index, :new, :create, :destroy, :edit, :update]
+    resources :names, :only => [:index]
+    resources :eu_opinions, :only => [:index, :new, :create, :edit, :update, :destroy]
+
+    resources :taxon_quotas, :only => [:index, :new, :create, :edit, :update, :destroy],
+      :as => :quotas
+
+    resources :taxon_eu_suspensions,
+      :only => [:index, :new, :create, :edit, :update, :destroy],
+      :as => :eu_suspensions
+
+    resources :taxon_cites_suspensions,
+      :only => [:index, :new, :create, :edit, :update, :destroy],
+      :as => :cites_suspensions
+    resources :taxon_instruments, :only => [:index, :new, :create, :edit, :update, :destroy]
+    resources :cites_captivity_processes,
+      :only => [:index, :new, :create, :edit, :update, :destroy]
+  end
+  resources :nomenclature_changes do # TODO: look like only support :index, :show, :destroy
+    resources :split, controller: 'nomenclature_changes/split'
+    resources :lump, controller: 'nomenclature_changes/lump'
+    resources :status_to_accepted,
+      controller: 'nomenclature_changes/status_to_accepted'
+    resources :status_to_synonym,
+      controller: 'nomenclature_changes/status_to_synonym'
+    resources :status_swap, controller: 'nomenclature_changes/status_swap'
+  end
+  get 'exports' => 'exports#index'
+  get 'exports/download' => 'exports#download' # not sure about this, post??
+  get 'stats' => 'statistics#index'
+  root :to => 'taxon_concepts#index'
+end
diff --git a/config/routes/api.rb b/config/routes/api.rb
new file mode 100644
index 000000000..eb5903a25
--- /dev/null
+++ b/config/routes/api.rb
@@ -0,0 +1,37 @@
+namespace :api do
+  namespace :v1 do
+    resources :taxon_concepts, :only => [:index, :show]
+    resources :auto_complete_taxon_concepts, :only => [:index, :show]
+    resources :geo_entities, :only => [:index]
+    resources :terms, :only => [:index]
+    resources :units, :only => [:index]
+    resources :sources, :only => [:index]
+    resources :purposes, :only => [:index]
+    resources :trade_plus_filters, only: :index
+    resources :eu_decisions, only: :index
+    resources :documents, :only => [:index, :show] do
+      collection do
+        get 'download_zip'
+      end
+    end
+    resources :document_geo_entities, only: [:index]
+    resources :events, only: [:index]
+    resources :document_tags, only: [:index]
+    get '/dashboard_stats/:iso_code' => 'dashboard_stats#index'
+    get '/shipments/chart' => 'shipments#chart_query'
+    get '/shipments/grouped' => 'shipments#grouped_query'
+    get '/shipments/over_time' => 'shipments#over_time_query'
+    get '/shipments/aggregated_over_time' => 'shipments#aggregated_over_time_query'
+    get '/shipments/country' => 'shipments#country_query'
+    get '/shipments/search' => 'shipments#search_query'
+    get '/shipments/download' => 'shipments#download_data'
+    get '/shipments/search_download' => 'shipments#search_download_data'
+    get '/shipments/search_download_all' => 'shipments#search_download_all_data'
+  end
+  resources :languages, :only => [:index]
+  resources :designations, :only => [:index]
+  resources :species_listings, :only => [:index]
+  resources :change_types, :only => [:index]
+  resources :ranks, :only => [:index]
+  resources :trade_downloads_cache_cleanup, only: [:index]
+end
diff --git a/config/routes/checklist.rb b/config/routes/checklist.rb
new file mode 100644
index 000000000..b1ec693e0
--- /dev/null
+++ b/config/routes/checklist.rb
@@ -0,0 +1,26 @@
+namespace :checklist do
+  resources :geo_entities, :only => [:index] # TODO: move to API
+  resources :downloads do
+    member do
+      get :download
+    end
+    collection do
+      get :download_index
+      get :download_history
+    end
+  end
+  resources :taxon_concepts, :only => [:index] do
+    collection do
+      get :autocomplete
+      get :summarise_filters
+    end
+  end
+  resources :timelines, :only => [:index]
+  resources :documents do
+    collection do
+      get 'download_zip'
+      get 'volume_download'
+      get 'check_doc_presence'
+    end
+  end
+end
diff --git a/config/routes/species.rb b/config/routes/species.rb
new file mode 100644
index 000000000..8fcf04457
--- /dev/null
+++ b/config/routes/species.rb
@@ -0,0 +1,6 @@
+namespace :species do
+  get 'exports' => 'exports#index'
+  get 'exports/download' => 'exports#download' # not sure about this, post??
+  get '*foo' => 'ember#start'
+  root :to => 'ember#start'
+end
diff --git a/config/routes/trade.rb b/config/routes/trade.rb
new file mode 100644
index 000000000..f6ea911c2
--- /dev/null
+++ b/config/routes/trade.rb
@@ -0,0 +1,31 @@
+namespace :trade do
+  resources :annual_report_uploads do
+    resources :sandbox_shipments do
+      collection do
+        post :update_batch
+        post :destroy_batch
+      end
+    end
+    member do
+      post 'submit'
+    end
+  end
+  resources :validation_rules
+  resources :validation_errors, only: [:update, :show]
+  resources :shipments do
+    collection do
+      post :update_batch
+      post :destroy_batch
+      get :accepted_taxa_for_reported_taxon_concept
+    end
+  end
+  resources :geo_entities, :only => [:index]
+  resources :permits, :only => [:index]
+  get 'exports/download' => 'exports#download'      # not sure about this, post??
+  get 'exports/download_stats' => 'exports#download_stats', :as => :trade_download_stats
+  get 'stats' => 'statistics#index'
+  get 'summary_year' => 'statistics#summary_year'
+  get 'summary_creation' => 'statistics#summary_creation'
+  get 'trade_transactions' => 'statistics#trade_transactions'
+  root :to => 'ember#start'
+end

From 74dc59177ec2520d2e245a06ed02d224c3503a3c Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 4 Feb 2024 17:57:04 +0000
Subject: [PATCH 157/241] update rubocop

---
 .rubocop.yml          | 4 ++--
 Dockerfile.cap-deploy | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index c7689fb2b..aee3d16aa 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,8 +6,8 @@ require:
 Rails:
   Enabled: true
 AllCops:
-  TargetRubyVersion: 2.6
-  TargetRailsVersion: 5.1
+  TargetRubyVersion: 3.0.6
+  TargetRailsVersion: 6.0
   Exclude:
     - 'lib/tasks/bbgem.rake'
     - 'db/schema.rb'
diff --git a/Dockerfile.cap-deploy b/Dockerfile.cap-deploy
index d88a2d0b6..88934654e 100644
--- a/Dockerfile.cap-deploy
+++ b/Dockerfile.cap-deploy
@@ -1,12 +1,10 @@
 # Dockerfile
-FROM ubuntu:jammy
+FROM ruby:3.0.6
 
 ENV DEBIAN_FRONTEND=noninteractive
 # Rails and SAPI has some additional dependencies, e.g. rake requires a JS
 # runtime, so attempt to get these from apt, where possible
 RUN apt-get update && apt-get install -y --force-yes \
-  # SSH
-  openssh-client \
   # For ruby?
   libsodium-dev libgmp3-dev \
   # For RVM
@@ -47,4 +45,4 @@ ENTRYPOINT ["/bin/bash", "-l"]
 # source /etc/profile.d/rvm.sh
 # eval "$(ssh-agent -s)"
 # ssh-add
-# cap staging deploy
+# CAP_BRANCH=<branch> cap staging deploy

From eb4066e34fb874f15501f3e319851a67ba46abc2 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 4 Feb 2024 20:58:31 +0000
Subject: [PATCH 158/241] Try fix Ahoy after upgrade to v5.0.2

---
 app/models/ahoy/visit.rb    |  9 +++++++++
 config/initializers/ahoy.rb | 35 +----------------------------------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/app/models/ahoy/visit.rb b/app/models/ahoy/visit.rb
index 437e484fd..7bed551af 100644
--- a/app/models/ahoy/visit.rb
+++ b/app/models/ahoy/visit.rb
@@ -32,5 +32,14 @@ class Visit < ApplicationRecord
     has_many :ahoy_events, class_name: 'Ahoy::Event'
     belongs_to :user, optional: true
     serialize :properties, JSON
+
+    # https://github.com/ankane/ahoy/issues/549
+    # This project start using ahoy since version 1.0.1
+    # The DB migration file come with version 1.0.1 create columns `id` and `visitor_id`.
+    # (https://github.com/ankane/ahoy/blob/v1.0.1/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb)
+    # However it has changed since version 1.4.0, from `id` to `visit_token`, and from `visitor_id` to `visitor_token`.
+    # (https://github.com/ankane/ahoy/blob/v1.4.0/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb)
+    alias_attribute :visit_token, :id
+    alias_attribute :visitor_token, :visitor_id
   end
 end
diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb
index e82c8e65d..648565ff4 100644
--- a/config/initializers/ahoy.rb
+++ b/config/initializers/ahoy.rb
@@ -1,44 +1,11 @@
 require 'sapi/geo_i_p'
 
 class Ahoy::Store < Ahoy::DatabaseStore
-  UUID_NAMESPACE = UUIDTools::UUID.parse("dcd74c26-8fc9-453a-a9c2-afc445c3258d")
-
   def authenticate(data)
     # https://github.com/ankane/ahoy/tree/v5.0.2?tab=readme-ov-file#gdpr-compliance-1
     # disables automatic linking of visits and users (for GDPR compliance)
   end
 
-  def visit_model
-    Ahoy::Visit
-  end
-
-  def event_model
-    Ahoy::Event
-  end
-
-  # https://github.com/ankane/ahoy/issues/549
-  # This project start using ahoy since version 1.0.1
-  # The DB migration file come with version 1.0.1 create columns `id` and `visitor_id`.
-  # (https://github.com/ankane/ahoy/blob/v1.0.1/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb)
-  # However it has changed since version 1.4.0, from `id` to `visit_token`, and from `visitor_id` to `visitor_token`.
-  # (https://github.com/ankane/ahoy/blob/v1.4.0/lib/generators/ahoy/stores/templates/active_record_visits_migration.rb)
-  # When we upgrade this gem, we need to check the source code of Ahoy::DatabaseStore,
-  # (5.0.2 as reference: https://github.com/ankane/ahoy/blob/v5.0.2/lib/ahoy/database_store.rb)
-  # see how the latest `visit` method look like, and override it with the old column names.
-  def visit
-    unless defined?(@visit)
-      if ahoy.send(:existing_visit_token) || ahoy.instance_variable_get(:@visit_token)
-        # find_by raises error by default with Mongoid when not found
-        @visit = visit_model.where(id: ensure_uuid(ahoy.visit_token)).take if ahoy.visit_token
-      elsif !Ahoy.cookies? && ahoy.visitor_token
-        @visit = visit_model.where(visitor_id: ensure_uuid(ahoy.visitor_token)).where(started_at: Ahoy.visit_duration.ago..).order(started_at: :desc).first
-      else
-        @visit = nil
-      end
-    end
-    @visit
-  end
-
   def track_visit(data)
     # Map the new column names (since 1.4.0), to old column name (< 1.4.0).
     data[:id] = ensure_uuid(data.delete(:visit_token))
@@ -61,7 +28,7 @@ def track_event(data)
   def ensure_uuid(id)
     UUIDTools::UUID.parse(id).to_s
   rescue
-    UUIDTools::UUID.sha1_create(UUID_NAMESPACE, id).to_s
+    UUIDTools::UUID.sha1_create(UUIDTools::UUID.parse(Ahoy::Tracker::UUID_NAMESPACE), id).to_s
   end
 end
 

From 78e23f79bf3494b2c1b6afcf7206c39b26e3f01c Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 4 Feb 2024 20:59:18 +0000
Subject: [PATCH 159/241] enable 6.1 default

---
 .../0_new_framework_defaults_6_1.rb           | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/config/initializers/0_new_framework_defaults_6_1.rb b/config/initializers/0_new_framework_defaults_6_1.rb
index 9526b835a..2edfdc842 100644
--- a/config/initializers/0_new_framework_defaults_6_1.rb
+++ b/config/initializers/0_new_framework_defaults_6_1.rb
@@ -7,61 +7,58 @@
 # Read the Guide for Upgrading Ruby on Rails for more info on each option.
 
 # Support for inversing belongs_to -> has_many Active Record associations.
-# Rails.application.config.active_record.has_many_inversing = true
+Rails.application.config.active_record.has_many_inversing = true
 
 # Track Active Storage variants in the database.
-# Rails.application.config.active_storage.track_variants = true
+Rails.application.config.active_storage.track_variants = true
 
 # Apply random variation to the delay when retrying failed jobs.
-# Rails.application.config.active_job.retry_jitter = 0.15
+Rails.application.config.active_job.retry_jitter = 0.15
 
 # Stop executing `after_enqueue`/`after_perform` callbacks if
 # `before_enqueue`/`before_perform` respectively halts with `throw :abort`.
-# Rails.application.config.active_job.skip_after_callbacks_if_terminated = true
+Rails.application.config.active_job.skip_after_callbacks_if_terminated = true
 
 # Specify cookies SameSite protection level: either :none, :lax, or :strict.
 #
 # This change is not backwards compatible with earlier Rails versions.
 # It's best enabled when your entire app is migrated and stable on 6.1.
-# Rails.application.config.action_dispatch.cookies_same_site_protection = :lax
+Rails.application.config.action_dispatch.cookies_same_site_protection = :lax
 
 # Generate CSRF tokens that are encoded in URL-safe Base64.
 #
 # This change is not backwards compatible with earlier Rails versions.
 # It's best enabled when your entire app is migrated and stable on 6.1.
-# Rails.application.config.action_controller.urlsafe_csrf_tokens = true
+Rails.application.config.action_controller.urlsafe_csrf_tokens = true
 
 # Specify whether `ActiveSupport::TimeZone.utc_to_local` returns a time with an
 # UTC offset or a UTC time.
-# ActiveSupport.utc_to_local_returns_utc_offset_times = true
+ActiveSupport.utc_to_local_returns_utc_offset_times = true
 
 # Change the default HTTP status code to `308` when redirecting non-GET/HEAD
 # requests to HTTPS in `ActionDispatch::SSL` middleware.
-# Rails.application.config.action_dispatch.ssl_default_redirect_status = 308
+Rails.application.config.action_dispatch.ssl_default_redirect_status = 308
 
 # Use new connection handling API. For most applications this won't have any
 # effect. For applications using multiple databases, this new API provides
 # support for granular connection swapping.
-# Rails.application.config.active_record.legacy_connection_handling = false
+Rails.application.config.active_record.legacy_connection_handling = false
 
 # Make `form_with` generate non-remote forms by default.
-# Rails.application.config.action_view.form_with_generates_remote_forms = false
+Rails.application.config.action_view.form_with_generates_remote_forms = false
 
 # Set the default queue name for the analysis job to the queue adapter default.
-# Rails.application.config.active_storage.queues.analysis = nil
+Rails.application.config.active_storage.queues.analysis = nil
 
 # Set the default queue name for the purge job to the queue adapter default.
-# Rails.application.config.active_storage.queues.purge = nil
+Rails.application.config.active_storage.queues.purge = nil
 
 # Set the default queue name for the incineration job to the queue adapter default.
-# Rails.application.config.action_mailbox.queues.incineration = nil
+Rails.application.config.action_mailbox.queues.incineration = nil
 
 # Set the default queue name for the routing job to the queue adapter default.
-# Rails.application.config.action_mailbox.queues.routing = nil
-
-# Set the default queue name for the mail deliver job to the queue adapter default.
-# Rails.application.config.action_mailer.deliver_later_queue_name = nil
+Rails.application.config.action_mailbox.queues.routing = nil
 
 # Generate a `Link` header that gives a hint to modern browsers about
 # preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`.
-# Rails.application.config.action_view.preload_links_header = true
+Rails.application.config.action_view.preload_links_header = true

From 29a8474f84aaa761228182ac5cd77cbc8f64be5f Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 4 Feb 2024 21:02:14 +0000
Subject: [PATCH 160/241] add comment

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 50108cb66..dddd5f895 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.0.6'
+ruby '3.0.6' # Can't upgrade to 3.1 until Rails 7.0.4 (https://stackoverflow.com/a/75007303/556780)
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '6.1.7.6'

From c26ac073c2db67c802f8401fbdbc89608b2dc574 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 4 Feb 2024 21:19:11 +0000
Subject: [PATCH 161/241] Move TaxonConceptVersion to model, see if it can fix
 cap deploy (uninitialized constant PaperTrail::Version)

---
 .../paper_trail.rb => app/models/taxon_concept_version.rb       | 2 --
 1 file changed, 2 deletions(-)
 rename config/initializers/paper_trail.rb => app/models/taxon_concept_version.rb (89%)

diff --git a/config/initializers/paper_trail.rb b/app/models/taxon_concept_version.rb
similarity index 89%
rename from config/initializers/paper_trail.rb
rename to app/models/taxon_concept_version.rb
index ee89a658f..3b5f72b76 100644
--- a/config/initializers/paper_trail.rb
+++ b/app/models/taxon_concept_version.rb
@@ -1,5 +1,3 @@
-# config/initializers/paper_trail.rb
-
 class TaxonConceptVersion < PaperTrail::Version
   # Migrated to Strong Parameters
   # attr_accessible :taxon_concept_id,

From ab7a25b6dc1d895b0ed7dae99aac5aa2c031f625 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 4 Feb 2024 21:29:26 +0000
Subject: [PATCH 162/241] rollback Sacc-rails gem

---
 Gemfile      |  9 ++++++++-
 Gemfile.lock | 18 +++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index dddd5f895..d43b4f749 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,8 +9,15 @@ gem 'rails', '6.1.7.6'
 # gem 'sqlite3'
 # Use Puma as the app server
 gem 'puma', '~> 5.0'
+
 # Use SCSS for stylesheets
-gem 'sass-rails', '>= 6'
+# TODO: Can't upgrade sass-rails to 6.0, it raise the following error when running `RAILS_ENV=staging rake assets:precompile`.
+# SassC::SyntaxError: Error: Invalid CSS after "...in-bottom:-3px;": expected "}", was ".margin-bottom:-3px"
+#         on line 3712:5063 of stdin
+# >> ction=135,Strength=3)";_margin-bottom:-3px;.margin-bottom:-3px;}/*!Add round
+# gem 'sass-rails', '>= 6'
+gem 'sass-rails', '~> 5.0'
+
 # https://stackoverflow.com/questions/55213868/rails-6-how-to-disable-webpack-and-use-sprockets-instead
 gem 'sprockets', '3.7.2'
 gem 'sprockets-rails', :require => 'sprockets/railtie'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0cb6203d6..8d9314c52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -475,16 +475,12 @@ GEM
     rubyzip (2.3.2)
     safely_block (0.4.0)
     sass (3.4.25)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
+    sass-rails (5.1.0)
+      railties (>= 5.2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     selenium-webdriver (4.9.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -650,7 +646,7 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   rubyzip (~> 2.3, >= 2.3.2)
-  sass-rails (>= 6)
+  sass-rails (~> 5.0)
   selenium-webdriver (>= 4.0.0.rc1)
   sidekiq (< 7)
   sidekiq-cron (~> 1.12)

From 1b0f8763d6772d4d7cb025fabe62194262e3060d Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 5 Feb 2024 10:19:47 +0000
Subject: [PATCH 163/241] Rollback to jquery_ujs instead of rails-ujs which
 introduce in 5.1

---
 app/assets/javascripts/admin.js         |   2 +-
 app/assets/javascripts/application.js   |   2 +-
 app/assets/javascripts/cites_trade.js   |   2 +-
 app/assets/javascripts/pages.js         |   2 +-
 app/assets/javascripts/species.js       |   2 +-
 app/assets/javascripts/trade.js         |   2 +-
 vendor/assets/javascripts/jquery_ujs.js | 429 ++++++++++++++++++++++++
 7 files changed, 435 insertions(+), 6 deletions(-)
 create mode 100644 vendor/assets/javascripts/jquery_ujs.js

diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index e5cdde110..53fc1b22f 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -11,7 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require rails-ujs
+//= require jquery_ujs
 //= require bootstrap
 //= require bootstrap-editable
 //= require bootstrap-datepicker
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e211b36c9..1deab2f65 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,7 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require rails-ujs
+//= require jquery_ujs
 //= require jquery.chained
 //= require bootstrap-dropdown
 //= require bootstrap-button
diff --git a/app/assets/javascripts/cites_trade.js b/app/assets/javascripts/cites_trade.js
index 48471efe4..b14f0e769 100644
--- a/app/assets/javascripts/cites_trade.js
+++ b/app/assets/javascripts/cites_trade.js
@@ -1,6 +1,6 @@
 //= require underscore
 //= require jquery
-//= require rails-ujs
+//= require jquery_ujs
 //= require cites_trade/jquery-ui-1.10.4.custom
 //= require jquery-deparam
 //= require js.cookie
diff --git a/app/assets/javascripts/pages.js b/app/assets/javascripts/pages.js
index e42d23518..a71c20657 100644
--- a/app/assets/javascripts/pages.js
+++ b/app/assets/javascripts/pages.js
@@ -12,7 +12,7 @@
 //
 //= require underscore
 //= require jquery
-//= require rails-ujs
+//= require jquery_ujs
 //= require_self
 //= require_tree ./pages
 //= require ./shared/login
diff --git a/app/assets/javascripts/species.js b/app/assets/javascripts/species.js
index b24a23296..0d6f0b3e8 100644
--- a/app/assets/javascripts/species.js
+++ b/app/assets/javascripts/species.js
@@ -12,7 +12,7 @@
 //
 //= require underscore
 //= require jquery
-//= require rails-ujs
+//= require jquery_ujs
 //= require jquery-deparam
 //= require js.cookie
 //= require bootstrap-scrollspy
diff --git a/app/assets/javascripts/trade.js b/app/assets/javascripts/trade.js
index cee949934..f9f50dd78 100644
--- a/app/assets/javascripts/trade.js
+++ b/app/assets/javascripts/trade.js
@@ -11,7 +11,7 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require rails-ujs
+//= require jquery_ujs
 //= require jquery-deparam
 //= require jquery-ui
 //= require jquery.mousewheel
diff --git a/vendor/assets/javascripts/jquery_ujs.js b/vendor/assets/javascripts/jquery_ujs.js
new file mode 100644
index 000000000..1df5eb5bd
--- /dev/null
+++ b/vendor/assets/javascripts/jquery_ujs.js
@@ -0,0 +1,429 @@
+(function ($, undefined) {
+
+  /**
+   * Unobtrusive scripting adapter for jQuery
+   *
+   * Requires jQuery 1.6.0 or later.
+   * https://github.com/rails/jquery-ujs
+
+   * Uploading file using rails.js
+   * =============================
+   *
+   * By default, browsers do not allow files to be uploaded via AJAX. As a result, if there are any non-blank file fields
+   * in the remote form, this adapter aborts the AJAX submission and allows the form to submit through standard means.
+   *
+   * The `ajax:aborted:file` event allows you to bind your own handler to process the form submission however you wish.
+   *
+   * Ex:
+   *     $('form').live('ajax:aborted:file', function(event, elements){
+   *       // Implement own remote file-transfer handler here for non-blank file inputs passed in `elements`.
+   *       // Returning false in this handler tells rails.js to disallow standard form submission
+   *       return false;
+   *     });
+   *
+   * The `ajax:aborted:file` event is fired when a file-type input is detected with a non-blank value.
+   *
+   * Third-party tools can use this hook to detect when an AJAX file upload is attempted, and then use
+   * techniques like the iframe method to upload the file instead.
+   *
+   * Required fields in rails.js
+   * ===========================
+   *
+   * If any blank required inputs (required="required") are detected in the remote form, the whole form submission
+   * is canceled. Note that this is unlike file inputs, which still allow standard (non-AJAX) form submission.
+   *
+   * The `ajax:aborted:required` event allows you to bind your own handler to inform the user of blank required inputs.
+   *
+   * !! Note that Opera does not fire the form's submit event if there are blank required inputs, so this event may never
+   *    get fired in Opera. This event is what causes other browsers to exhibit the same submit-aborting behavior.
+   *
+   * Ex:
+   *     $('form').live('ajax:aborted:required', function(event, elements){
+   *       // Returning false in this handler tells rails.js to submit the form anyway.
+   *       // The blank required inputs are passed to this function in `elements`.
+   *       return ! confirm("Would you like to submit the form with missing info?");
+   *     });
+   */
+
+  // Cut down on the number if issues from people inadvertently including jquery_ujs twice
+  // by detecting and raising an error when it happens.
+  var alreadyInitialized = function () {
+    var events = $._data(document, 'events');
+    return events && events.click && $.grep(events.click, function (e) { return e.namespace === 'rails'; }).length;
+  }
+
+  if (alreadyInitialized()) {
+    $.error('jquery-ujs has already been loaded!');
+  }
+
+  // Shorthand to make it a little easier to call public rails functions from within rails.js
+  var rails;
+
+  $.rails = rails = {
+    // Link elements bound by jquery-ujs
+    linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with]',
+
+    // Select elements bound by jquery-ujs
+    inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
+
+    // Form elements bound by jquery-ujs
+    formSubmitSelector: 'form',
+
+    // Form input elements bound by jquery-ujs
+    formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type])',
+
+    // Form input elements disabled during form submission
+    disableSelector: 'input[data-disable-with], button[data-disable-with], textarea[data-disable-with]',
+
+    // Form input elements re-enabled after form submission
+    enableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled',
+
+    // Form required input elements
+    requiredInputSelector: 'input[name][required]:not([disabled]),textarea[name][required]:not([disabled])',
+
+    // Form file input elements
+    fileInputSelector: 'input:file',
+
+    // Link onClick disable selector with possible reenable after remote submission
+    linkDisableSelector: 'a[data-disable-with]',
+
+    // Make sure that every Ajax request sends the CSRF token
+    CSRFProtection: function (xhr) {
+      var token = $('meta[name="csrf-token"]').attr('content');
+      if (token) xhr.setRequestHeader('X-CSRF-Token', token);
+    },
+
+    // Triggers an event on an element and returns false if the event result is false
+    fire: function (obj, name, data) {
+      var event = $.Event(name);
+      obj.trigger(event, data);
+      return event.result !== false;
+    },
+
+    // Default confirm dialog, may be overridden with custom confirm dialog in $.rails.confirm
+    confirm: function (message) {
+      return confirm(message);
+    },
+
+    // Default ajax function, may be overridden with custom function in $.rails.ajax
+    ajax: function (options) {
+      return $.ajax(options);
+    },
+
+    // Default way to get an element's href. May be overridden at $.rails.href.
+    href: function (element) {
+      return element.attr('href');
+    },
+
+    // Submits "remote" forms and links with ajax
+    handleRemote: function (element) {
+      var method, url, data, elCrossDomain, crossDomain, withCredentials, dataType, options;
+
+      if (rails.fire(element, 'ajax:before')) {
+        elCrossDomain = element.data('cross-domain');
+        crossDomain = elCrossDomain === undefined ? null : elCrossDomain;
+        withCredentials = element.data('with-credentials') || null;
+        dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
+
+        if (element.is('form')) {
+          method = element.attr('method');
+          url = element.attr('action');
+          data = element.serializeArray();
+          // memoized value from clicked submit button
+          var button = element.data('ujs:submit-button');
+          if (button) {
+            data.push(button);
+            element.data('ujs:submit-button', null);
+          }
+        } else if (element.is(rails.inputChangeSelector)) {
+          method = element.data('method');
+          url = element.data('url');
+          data = element.serialize();
+          if (element.data('params')) data = data + "&" + element.data('params');
+        } else {
+          method = element.data('method');
+          url = rails.href(element);
+          data = element.data('params') || null;
+        }
+
+        options = {
+          type: method || 'GET', data: data, dataType: dataType,
+          // stopping the "ajax:beforeSend" event will cancel the ajax request
+          beforeSend: function (xhr, settings) {
+            if (settings.dataType === undefined) {
+              xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+            }
+            return rails.fire(element, 'ajax:beforeSend', [xhr, settings]);
+          },
+          success: function (data, status, xhr) {
+            element.trigger('ajax:success', [data, status, xhr]);
+          },
+          complete: function (xhr, status) {
+            element.trigger('ajax:complete', [xhr, status]);
+          },
+          error: function (xhr, status, error) {
+            element.trigger('ajax:error', [xhr, status, error]);
+          },
+          xhrFields: {
+            withCredentials: withCredentials
+          },
+          crossDomain: crossDomain
+        };
+        // Only pass url to `ajax` options if not blank
+        if (url) { options.url = url; }
+
+        var jqxhr = rails.ajax(options);
+        element.trigger('ajax:send', jqxhr);
+        return jqxhr;
+      } else {
+        return false;
+      }
+    },
+
+    // Handles "data-method" on links such as:
+    // <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
+    handleMethod: function (link) {
+      var href = rails.href(link),
+        method = link.data('method'),
+        target = link.attr('target'),
+        csrf_token = $('meta[name=csrf-token]').attr('content'),
+        csrf_param = $('meta[name=csrf-param]').attr('content'),
+        form = $('<form method="post" action="' + href + '"></form>'),
+        metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
+
+      if (csrf_param !== undefined && csrf_token !== undefined) {
+        metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
+      }
+
+      if (target) { form.attr('target', target); }
+
+      form.hide().append(metadata_input).appendTo('body');
+      form.submit();
+    },
+
+    /* Disables form elements:
+      - Caches element value in 'ujs:enable-with' data store
+      - Replaces element text with value of 'data-disable-with' attribute
+      - Sets disabled property to true
+    */
+    disableFormElements: function (form) {
+      form.find(rails.disableSelector).each(function () {
+        var element = $(this), method = element.is('button') ? 'html' : 'val';
+        element.data('ujs:enable-with', element[method]());
+        element[method](element.data('disable-with'));
+        element.prop('disabled', true);
+      });
+    },
+
+    /* Re-enables disabled form elements:
+      - Replaces element text with cached value from 'ujs:enable-with' data store (created in `disableFormElements`)
+      - Sets disabled property to false
+    */
+    enableFormElements: function (form) {
+      form.find(rails.enableSelector).each(function () {
+        var element = $(this), method = element.is('button') ? 'html' : 'val';
+        if (element.data('ujs:enable-with')) element[method](element.data('ujs:enable-with'));
+        element.prop('disabled', false);
+      });
+    },
+
+    /* For 'data-confirm' attribute:
+       - Fires `confirm` event
+       - Shows the confirmation dialog
+       - Fires the `confirm:complete` event
+
+       Returns `true` if no function stops the chain and user chose yes; `false` otherwise.
+       Attaching a handler to the element's `confirm` event that returns a `falsy` value cancels the confirmation dialog.
+       Attaching a handler to the element's `confirm:complete` event that returns a `falsy` value makes this function
+       return false. The `confirm:complete` event is fired whether or not the user answered true or false to the dialog.
+    */
+    allowAction: function (element) {
+      var message = element.data('confirm'),
+        answer = false, callback;
+      if (!message) { return true; }
+
+      if (rails.fire(element, 'confirm')) {
+        answer = rails.confirm(message);
+        callback = rails.fire(element, 'confirm:complete', [answer]);
+      }
+      return answer && callback;
+    },
+
+    // Helper function which checks for blank inputs in a form that match the specified CSS selector
+    blankInputs: function (form, specifiedSelector, nonBlank) {
+      var inputs = $(), input, valueToCheck,
+        selector = specifiedSelector || 'input,textarea',
+        allInputs = form.find(selector);
+
+      allInputs.each(function () {
+        input = $(this);
+        valueToCheck = input.is(':checkbox,:radio') ? input.is(':checked') : input.val();
+        // If nonBlank and valueToCheck are both truthy, or nonBlank and valueToCheck are both falsey
+        if (!valueToCheck === !nonBlank) {
+
+          // Don't count unchecked required radio if other radio with same name is checked
+          if (input.is(':radio') && allInputs.filter('input:radio:checked[name="' + input.attr('name') + '"]').length) {
+            return true; // Skip to next input
+          }
+
+          inputs = inputs.add(input);
+        }
+      });
+      return inputs.length ? inputs : false;
+    },
+
+    // Helper function which checks for non-blank inputs in a form that match the specified CSS selector
+    nonBlankInputs: function (form, specifiedSelector) {
+      return rails.blankInputs(form, specifiedSelector, true); // true specifies nonBlank
+    },
+
+    // Helper function, needed to provide consistent behavior in IE
+    stopEverything: function (e) {
+      $(e.target).trigger('ujs:everythingStopped');
+      e.stopImmediatePropagation();
+      return false;
+    },
+
+    // find all the submit events directly bound to the form and
+    // manually invoke them. If anyone returns false then stop the loop
+    callFormSubmitBindings: function (form, event) {
+      var events = form.data('events'), continuePropagation = true;
+      if (events !== undefined && events['submit'] !== undefined) {
+        $.each(events['submit'], function (i, obj) {
+          if (typeof obj.handler === 'function') return continuePropagation = obj.handler(event);
+        });
+      }
+      return continuePropagation;
+    },
+
+    //  replace element's html with the 'data-disable-with' after storing original html
+    //  and prevent clicking on it
+    disableElement: function (element) {
+      element.data('ujs:enable-with', element.html()); // store enabled state
+      element.html(element.data('disable-with')); // set to disabled state
+      element.bind('click.railsDisable', function (e) { // prevent further clicking
+        return rails.stopEverything(e);
+      });
+    },
+
+    // restore element to its original state which was disabled by 'disableElement' above
+    enableElement: function (element) {
+      if (element.data('ujs:enable-with') !== undefined) {
+        element.html(element.data('ujs:enable-with')); // set to old enabled state
+        // this should be element.removeData('ujs:enable-with')
+        // but, there is currently a bug in jquery which makes hyphenated data attributes not get removed
+        element.data('ujs:enable-with', false); // clean up cache
+      }
+      element.unbind('click.railsDisable'); // enable element
+    }
+
+  };
+
+  if (rails.fire($(document), 'rails:attachBindings')) {
+
+    $.ajaxPrefilter(function (options, originalOptions, xhr) { if (!options.crossDomain) { rails.CSRFProtection(xhr); } });
+
+    $(document).delegate(rails.linkDisableSelector, 'ajax:complete', function () {
+      rails.enableElement($(this));
+    });
+
+    $(document).delegate(rails.linkClickSelector, 'click.rails', function (e) {
+      var link = $(this), method = link.data('method'), data = link.data('params');
+      if (!rails.allowAction(link)) return rails.stopEverything(e);
+
+      if (link.is(rails.linkDisableSelector)) rails.disableElement(link);
+
+      if (link.data('remote') !== undefined) {
+        if ((e.metaKey || e.ctrlKey) && (!method || method === 'GET') && !data) { return true; }
+
+        var handleRemote = rails.handleRemote(link);
+        // response from rails.handleRemote() will either be false or a deferred object promise.
+        if (handleRemote === false) {
+          rails.enableElement(link);
+        } else {
+          handleRemote.error(function () { rails.enableElement(link); });
+        }
+        return false;
+
+      } else if (link.data('method')) {
+        rails.handleMethod(link);
+        return false;
+      }
+    });
+
+    $(document).delegate(rails.inputChangeSelector, 'change.rails', function (e) {
+      var link = $(this);
+      if (!rails.allowAction(link)) return rails.stopEverything(e);
+
+      rails.handleRemote(link);
+      return false;
+    });
+
+    $(document).delegate(rails.formSubmitSelector, 'submit.rails', function (e) {
+      var form = $(this),
+        remote = form.data('remote') !== undefined,
+        blankRequiredInputs = rails.blankInputs(form, rails.requiredInputSelector),
+        nonBlankFileInputs = rails.nonBlankInputs(form, rails.fileInputSelector);
+
+      if (!rails.allowAction(form)) return rails.stopEverything(e);
+
+      // skip other logic when required values are missing or file upload is present
+      if (blankRequiredInputs && form.attr("novalidate") == undefined && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) {
+        return rails.stopEverything(e);
+      }
+
+      if (remote) {
+        if (nonBlankFileInputs) {
+          // slight timeout so that the submit button gets properly serialized
+          // (make it easy for event handler to serialize form without disabled values)
+          setTimeout(function () { rails.disableFormElements(form); }, 13);
+          var aborted = rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
+
+          // re-enable form elements if event bindings return false (canceling normal form submission)
+          if (!aborted) { setTimeout(function () { rails.enableFormElements(form); }, 13); }
+
+          return aborted;
+        }
+
+        // If browser does not support submit bubbling, then this live-binding will be called before direct
+        // bindings. Therefore, we should directly call any direct bindings before remotely submitting form.
+        if (!$.support.submitBubbles && $().jquery < '1.7' && rails.callFormSubmitBindings(form, e) === false) return rails.stopEverything(e);
+
+        rails.handleRemote(form);
+        return false;
+
+      } else {
+        // slight timeout so that the submit button gets properly serialized
+        setTimeout(function () { rails.disableFormElements(form); }, 13);
+      }
+    });
+
+    $(document).delegate(rails.formInputClickSelector, 'click.rails', function (event) {
+      var button = $(this);
+
+      if (!rails.allowAction(button)) return rails.stopEverything(event);
+
+      // register the pressed submit button
+      var name = button.attr('name'),
+        data = name ? { name: name, value: button.val() } : null;
+
+      button.closest('form').data('ujs:submit-button', data);
+    });
+
+    $(document).delegate(rails.formSubmitSelector, 'ajax:beforeSend.rails', function (event) {
+      if (this == event.target) rails.disableFormElements($(this));
+    });
+
+    $(document).delegate(rails.formSubmitSelector, 'ajax:complete.rails', function (event) {
+      if (this == event.target) rails.enableFormElements($(this));
+    });
+
+    $(function () {
+      // making sure that all forms have actual up-to-date token(cached forms contain old one)
+      csrf_token = $('meta[name=csrf-token]').attr('content');
+      csrf_param = $('meta[name=csrf-param]').attr('content');
+      $('form input[name="' + csrf_param + '"]').val(csrf_token);
+    });
+  }
+
+})(jQuery);

From 1a2fb574f46387d328cf827b98a1cbc6dc2087d3 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 5 Feb 2024 13:50:06 +0000
Subject: [PATCH 164/241] fix: another example of order where Arel::Sql is
 required to wrap literal

---
 .../api/v1/eu_decisions_controller.rb          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/eu_decisions_controller.rb b/app/controllers/api/v1/eu_decisions_controller.rb
index 25e5ee695..b6a37e07f 100644
--- a/app/controllers/api/v1/eu_decisions_controller.rb
+++ b/app/controllers/api/v1/eu_decisions_controller.rb
@@ -16,14 +16,20 @@ def permitted_params
   end
 
   def eu_decision_search(params)
-    list = EuDecision.from('api_eu_decisions_view AS eu_decisions').
-      select(eu_decision_select_attrs).
-      joins('LEFT JOIN eu_suspensions_applicability_view v ON eu_decisions.id = v.id').
-      order(<<-SQL
-            geo_entity_en->>'name' ASC,
-            start_date DESC
+    list = EuDecision.from(
+      'api_eu_decisions_view AS eu_decisions'
+    ).select(
+      eu_decision_select_attrs
+    ).joins(
+      'LEFT JOIN eu_suspensions_applicability_view v ON eu_decisions.id = v.id'
+    ).order(
+      Arel.sql(
+        <<-SQL
+          geo_entity_en->>'name' ASC,
+          start_date DESC
         SQL
       )
+    )
 
     list = list.where("eu_decisions.taxon_concept_id IN (?)", params['taxon_concept_ids']) if params['taxon_concept_ids'].present?
     list = list.where("eu_decisions.geo_entity_id IN (?)", params['geo_entity_ids']) if params['geo_entity_ids'].present?

From 2baef35dfa8b528bb4a37467eb5c1d60291463f0 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 5 Feb 2024 16:08:58 +0000
Subject: [PATCH 165/241] ActiveRecord::UnknownAttributeReference

---
 app/serializers/species/show_taxon_concept_serializer_cms.rb | 4 ++--
 app/services/checklist/csv/history.rb                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/serializers/species/show_taxon_concept_serializer_cms.rb b/app/serializers/species/show_taxon_concept_serializer_cms.rb
index a9bc8a863..33d9cb50c 100644
--- a/app/serializers/species/show_taxon_concept_serializer_cms.rb
+++ b/app/serializers/species/show_taxon_concept_serializer_cms.rb
@@ -72,11 +72,11 @@ def cms_listing_changes
               END AS subspecies_info
            SQL
       ).
-      order(<<-SQL
+      order(Arel.sql(<<-SQL
           effective_at DESC,
           subspecies_info DESC
         SQL
-      ).all
+      )).all
   end
 
   def cms_instruments
diff --git a/app/services/checklist/csv/history.rb b/app/services/checklist/csv/history.rb
index db81d0377..0d7eae98e 100644
--- a/app/services/checklist/csv/history.rb
+++ b/app/services/checklist/csv/history.rb
@@ -10,7 +10,7 @@ def prepare_main_query
         :"cites_listing_changes_mview.show_in_downloads" => true
       ).
       joins('LEFT JOIN geo_entities ON cites_listing_changes_mview.party_id = geo_entities.id').
-      order(<<-SQL
+      order(Arel.sql(<<-SQL
         taxonomic_position, effective_at,
         CASE
           WHEN change_type_name = 'ADDITION' THEN 0
@@ -19,7 +19,7 @@ def prepare_main_query
           WHEN change_type_name = 'DELETION' THEN 3
         END
         SQL
-      )
+      ))
   end
 
   def select_columns

From 07c58b989d7aed0fc496c2e92709917eeff95128 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 5 Feb 2024 16:17:08 +0000
Subject: [PATCH 166/241] fix: split rebuild job into daily and weekly, as we
 only want to run it weekly on production

---
 app/jobs/rebuild_job.rb |  7 +------
 config/schedule.yml     | 11 +++++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/jobs/rebuild_job.rb b/app/jobs/rebuild_job.rb
index 5717de030..80bc5ae91 100644
--- a/app/jobs/rebuild_job.rb
+++ b/app/jobs/rebuild_job.rb
@@ -2,11 +2,6 @@ class RebuildJob < ApplicationJob
   queue_as :admin
 
   def perform(*args)
-    if Rails.env.production?
-      # Only run on Saturday in production
-      Sapi.rebuild if Date.today.saturday?
-    else
-      Sapi.rebuild
-    end
+    Sapi.rebuild
   end
 end
diff --git a/config/schedule.yml b/config/schedule.yml
index ce5959de4..7b8f93d44 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -1,7 +1,14 @@
-rebuild_job:
-  cron: "42 1 * * *"
+rebuild_job_weekly:
+  cron: "42 1 * * 6"
   class: "RebuildJob"
   queue: admin
+
+# disable the following job on production
+rebuild_job_daily:
+  cron: "42 1 * * 0-5"
+  class: "RebuildJob"
+  queue: admin
+
 downloads_cache_update_job:
   cron: "5 4 * * *"
   class: "DownloadsCacheUpdateJob"

From 5ae569ad1e8835186a13f70ffa3ad8d93f5a0f60 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 5 Feb 2024 16:23:42 +0000
Subject: [PATCH 167/241] Fix rake task and bg job for rebuild

---
 app/jobs/rebuild_job.rb           | 2 +-
 lib/tasks/db_migrate_plpgsql.rake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/rebuild_job.rb b/app/jobs/rebuild_job.rb
index 80bc5ae91..ffa7ac484 100644
--- a/app/jobs/rebuild_job.rb
+++ b/app/jobs/rebuild_job.rb
@@ -2,6 +2,6 @@ class RebuildJob < ApplicationJob
   queue_as :admin
 
   def perform(*args)
-    Sapi.rebuild
+    Sapi::rebuild
   end
 end
diff --git a/lib/tasks/db_migrate_plpgsql.rake b/lib/tasks/db_migrate_plpgsql.rake
index 66c3bc072..34134dbc2 100644
--- a/lib/tasks/db_migrate_plpgsql.rake
+++ b/lib/tasks/db_migrate_plpgsql.rake
@@ -18,7 +18,7 @@ namespace :db do
 
     desc "Rebuild all computed values"
     task :rebuild => :migrate do
-      Sapi.rebuild
+      Sapi::rebuild
     end
 
     task :drop_indexes => :migrate do

From c4804292d9bc6e37ebaedb5e95c28052d7aad436 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 5 Feb 2024 16:55:42 +0000
Subject: [PATCH 168/241] Rename `Sapi` module to `SapiModule` so it less
 chance to confuse with SAPI.

---
 .../admin/statistics_controller.rb            |  2 +-
 .../trade/trade_data_download_logger.rb       |  4 ++--
 app/controllers/species/exports_controller.rb |  2 +-
 app/jobs/rebuild_job.rb                       |  2 +-
 config/initializers/ahoy.rb                   |  6 +++---
 lib/modules/sapi.rb                           | 20 -------------------
 lib/modules/sapi_module.rb                    | 20 +++++++++++++++++++
 lib/modules/{sapi => sapi_module}/geo_i_p.rb  |  2 +-
 lib/modules/{sapi => sapi_module}/indexes.rb  |  2 +-
 .../stored_procedures.rb                      |  2 +-
 lib/modules/{sapi => sapi_module}/summary.rb  |  2 +-
 lib/tasks/db_migrate_plpgsql.rake             |  6 +++---
 lib/tasks/import.rake                         |  2 +-
 lib/tasks/import_trade_names.rake             |  4 ++--
 lib/tasks/import_trade_shipments.rake         |  8 ++++----
 lib/tasks/resolve_host_to_country.rake        |  2 +-
 lib/tasks/trade_db_resolve_ip_to_country.rake |  2 +-
 .../cites_trade/shipments_controller_spec.rb  |  2 +-
 .../species/exports_controller_spec.rb        | 16 +++++++--------
 .../trade/shipments_controller_spec.rb        | 10 +++++-----
 spec/models/sapi/geoip_spec.rb                |  4 ++--
 spec/models/taxon_concept/synonyms_spec.rb    |  2 +-
 spec/models/taxon_concept/trade_names_spec.rb |  2 +-
 .../trade/inclusion_validation_rule_spec.rb   |  4 ++--
 spec/models/trade/shipment_spec.rb            |  8 ++++----
 ...cept_appendix_year_validation_rule_spec.rb |  4 ++--
 .../checklist/appendix_population_spec.rb     |  6 +++---
 .../checklist/higher_taxa_injector_spec.rb    |  2 +-
 .../pdf/history_annotations_key_spec.rb       |  2 +-
 spec/services/checklist/pdf/history_spec.rb   | 12 +++++------
 .../pdf/index_annotations_key_spec.rb         |  4 ++--
 .../checklist/pdf/index_fetcher_spec.rb       |  4 ++--
 spec/services/checklist/timeline_spec.rb      | 14 ++++++-------
 .../timelines_for_taxon_concept_spec.rb       |  8 ++++----
 spec/services/dashboard_stats_trade_spec.rb   |  2 +-
 spec/services/species/listings_export_spec.rb |  2 +-
 .../species/trade_name_prefix_matcher_spec.rb |  2 +-
 spec/services/trade/filter_spec.rb            |  4 ++--
 spec/services/trade/sandbox_filter_spec.rb    |  2 +-
 spec/shared/agalychnis.rb                     |  2 +-
 spec/shared/agave.rb                          |  2 +-
 spec/shared/ailuropoda.rb                     |  2 +-
 spec/shared/arctocephalus.rb                  |  2 +-
 spec/shared/boa_constrictor.rb                |  2 +-
 spec/shared/caiman_latirostris.rb             |  2 +-
 spec/shared/canis_lupus.rb                    |  2 +-
 spec/shared/caretta_caretta_cms.rb            |  2 +-
 spec/shared/cedrela_montana.rb                |  2 +-
 spec/shared/cervus_elaphus.rb                 |  2 +-
 spec/shared/cervus_elaphus_cms.rb             |  2 +-
 spec/shared/colophon.rb                       |  2 +-
 spec/shared/dalbergia.rb                      |  2 +-
 spec/shared/diospyros.rb                      |  2 +-
 spec/shared/falconiformes.rb                  |  2 +-
 spec/shared/hirudo_medicinalis.rb             |  2 +-
 spec/shared/loxodonta_africana.rb             |  2 +-
 spec/shared/loxodonta_africana_cms.rb         |  2 +-
 spec/shared/mellivora_capensis.rb             |  2 +-
 spec/shared/moschus.rb                        |  2 +-
 spec/shared/natator_depressus.rb              |  2 +-
 spec/shared/notomys_aquilo.rb                 |  2 +-
 spec/shared/panax_ginseng.rb                  |  2 +-
 spec/shared/pecari_tajacu.rb                  |  2 +-
 spec/shared/pereskia.rb                       |  2 +-
 spec/shared/platysternon_megacephalum.rb      |  2 +-
 spec/shared/pristis_microdon.rb               |  2 +-
 spec/shared/pseudomys_fieldi.rb               |  2 +-
 spec/shared/psittaciformes.rb                 |  2 +-
 spec/shared/tapiridae.rb                      |  2 +-
 spec/shared/uroplatus.rb                      |  2 +-
 spec/shared/varanidae.rb                      |  2 +-
 71 files changed, 134 insertions(+), 134 deletions(-)
 delete mode 100644 lib/modules/sapi.rb
 create mode 100644 lib/modules/sapi_module.rb
 rename lib/modules/{sapi => sapi_module}/geo_i_p.rb (98%)
 rename lib/modules/{sapi => sapi_module}/indexes.rb (99%)
 rename lib/modules/{sapi => sapi_module}/stored_procedures.rb (99%)
 rename lib/modules/{sapi => sapi_module}/summary.rb (99%)

diff --git a/app/controllers/admin/statistics_controller.rb b/app/controllers/admin/statistics_controller.rb
index 4c5e8f9c1..6b73564a3 100644
--- a/app/controllers/admin/statistics_controller.rb
+++ b/app/controllers/admin/statistics_controller.rb
@@ -1,6 +1,6 @@
 class Admin::StatisticsController < ApplicationController
 
   def index
-    @stats = Sapi::Summary.database_stats
+    @stats = SapiModule::Summary.database_stats
   end
 end
diff --git a/app/controllers/concerns/trade/trade_data_download_logger.rb b/app/controllers/concerns/trade/trade_data_download_logger.rb
index ed2c46e35..7e208f0c4 100644
--- a/app/controllers/concerns/trade/trade_data_download_logger.rb
+++ b/app/controllers/concerns/trade/trade_data_download_logger.rb
@@ -1,4 +1,4 @@
-require 'sapi/geo_i_p'
+require 'sapi_module/geo_i_p'
 module Trade::TradeDataDownloadLogger
 
   module_function
@@ -19,7 +19,7 @@ def log_download(request, search_params, rows)
     data["source"] = self.get_field_values(search_params[:sources_ids], Source)
     data["importer"] = self.get_field_values(search_params[:importers_ids], GeoEntity)
     data["exporter"] = self.get_field_values(search_params[:exporters_ids], GeoEntity)
-    geo_ip_data = Sapi::GeoIP.instance.resolve(request.ip)
+    geo_ip_data = SapiModule::GeoIP.instance.resolve(request.ip)
     [:country, :city, :organization].each do |col|
       data[col] = geo_ip_data[col]
     end
diff --git a/app/controllers/species/exports_controller.rb b/app/controllers/species/exports_controller.rb
index bdb95ae04..8fd2e6abb 100644
--- a/app/controllers/species/exports_controller.rb
+++ b/app/controllers/species/exports_controller.rb
@@ -48,7 +48,7 @@ def set_csv_separator
       return
     else
       ip = request.remote_ip
-      separator = Sapi::GeoIP.instance.default_separator(ip)
+      separator = SapiModule::GeoIP.instance.default_separator(ip)
       cookies.permanent['speciesplus.csv_separator'] = separator
     end
   end
diff --git a/app/jobs/rebuild_job.rb b/app/jobs/rebuild_job.rb
index ffa7ac484..aeef46fa2 100644
--- a/app/jobs/rebuild_job.rb
+++ b/app/jobs/rebuild_job.rb
@@ -2,6 +2,6 @@ class RebuildJob < ApplicationJob
   queue_as :admin
 
   def perform(*args)
-    Sapi::rebuild
+    SapiModule::rebuild
   end
 end
diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb
index 648565ff4..1ffed328e 100644
--- a/config/initializers/ahoy.rb
+++ b/config/initializers/ahoy.rb
@@ -1,4 +1,4 @@
-require 'sapi/geo_i_p'
+require 'sapi_module/geo_i_p'
 
 class Ahoy::Store < Ahoy::DatabaseStore
   def authenticate(data)
@@ -11,7 +11,7 @@ def track_visit(data)
     data[:id] = ensure_uuid(data.delete(:visit_token))
     data[:visitor_id] = ensure_uuid(data.delete(:visitor_token))
 
-    geo_ip_data = Sapi::GeoIP.instance.resolve(request.ip)
+    geo_ip_data = SapiModule::GeoIP.instance.resolve(request.ip)
     data[:country] = geo_ip_data[:country]
     data[:city] = geo_ip_data[:city]
     data[:organization] = geo_ip_data[:organization]
@@ -38,7 +38,7 @@ def ensure_uuid(id)
 Ahoy.user_agent_parser = :device_detector
 Ahoy.bot_detection_version = 2
 Ahoy.track_bots = Rails.env.test?
-Ahoy.geocode = false # we use our own geocoder (Sapi::GeoIP)
+Ahoy.geocode = false # we use our own geocoder (SapiModule::GeoIP)
 Ahoy.mask_ips = true
 Ahoy.cookies = :none
 
diff --git a/lib/modules/sapi.rb b/lib/modules/sapi.rb
deleted file mode 100644
index e72d04e67..000000000
--- a/lib/modules/sapi.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'sapi/stored_procedures.rb'
-require 'sapi/indexes.rb'
-require 'sapi/summary.rb'
-module Sapi
-  def self.rebuild
-    Sapi::StoredProcedures.rebuild
-  end
-
-  def self.drop_indexes
-    Sapi::Indexes.drop_indexes
-  end
-
-  def self.create_indexes
-    Sapi::Indexes.create_indexes
-  end
-
-  def self.database_summary
-    Sapi::Summary.database_summary
-  end
-end
diff --git a/lib/modules/sapi_module.rb b/lib/modules/sapi_module.rb
new file mode 100644
index 000000000..3208acb96
--- /dev/null
+++ b/lib/modules/sapi_module.rb
@@ -0,0 +1,20 @@
+require 'sapi_module/stored_procedures.rb'
+require 'sapi_module/indexes.rb'
+require 'sapi_module/summary.rb'
+module SapiModule
+  def self.rebuild
+    SapiModule::StoredProcedures.rebuild
+  end
+
+  def self.drop_indexes
+    SapiModule::Indexes.drop_indexes
+  end
+
+  def self.create_indexes
+    SapiModule::Indexes.create_indexes
+  end
+
+  def self.database_summary
+    SapiModule::Summary.database_summary
+  end
+end
diff --git a/lib/modules/sapi/geo_i_p.rb b/lib/modules/sapi_module/geo_i_p.rb
similarity index 98%
rename from lib/modules/sapi/geo_i_p.rb
rename to lib/modules/sapi_module/geo_i_p.rb
index 039272220..0b03fe980 100644
--- a/lib/modules/sapi/geo_i_p.rb
+++ b/lib/modules/sapi_module/geo_i_p.rb
@@ -1,5 +1,5 @@
 # Returns UTF8
-module Sapi
+module SapiModule
   class GeoIP
     include Singleton
 
diff --git a/lib/modules/sapi/indexes.rb b/lib/modules/sapi_module/indexes.rb
similarity index 99%
rename from lib/modules/sapi/indexes.rb
rename to lib/modules/sapi_module/indexes.rb
index 210b18472..67f031867 100644
--- a/lib/modules/sapi/indexes.rb
+++ b/lib/modules/sapi_module/indexes.rb
@@ -1,4 +1,4 @@
-module Sapi
+module SapiModule
   module Indexes
 
     # rewrite the code below to just use add_index and add UNIQUE to the mview ids
diff --git a/lib/modules/sapi/stored_procedures.rb b/lib/modules/sapi_module/stored_procedures.rb
similarity index 99%
rename from lib/modules/sapi/stored_procedures.rb
rename to lib/modules/sapi_module/stored_procedures.rb
index 06cf8b6ac..c10073e54 100644
--- a/lib/modules/sapi/stored_procedures.rb
+++ b/lib/modules/sapi_module/stored_procedures.rb
@@ -1,4 +1,4 @@
-module Sapi
+module SapiModule
   module StoredProcedures
 
     def self.rebuild
diff --git a/lib/modules/sapi/summary.rb b/lib/modules/sapi_module/summary.rb
similarity index 99%
rename from lib/modules/sapi/summary.rb
rename to lib/modules/sapi_module/summary.rb
index 5ccd18534..eb1db1e9a 100644
--- a/lib/modules/sapi/summary.rb
+++ b/lib/modules/sapi_module/summary.rb
@@ -1,4 +1,4 @@
-module Sapi
+module SapiModule
   module Summary
 
     def self.database_stats
diff --git a/lib/tasks/db_migrate_plpgsql.rake b/lib/tasks/db_migrate_plpgsql.rake
index 34134dbc2..282fa9377 100644
--- a/lib/tasks/db_migrate_plpgsql.rake
+++ b/lib/tasks/db_migrate_plpgsql.rake
@@ -18,15 +18,15 @@ namespace :db do
 
     desc "Rebuild all computed values"
     task :rebuild => :migrate do
-      Sapi::rebuild
+      SapiModule::rebuild
     end
 
     task :drop_indexes => :migrate do
-      Sapi::drop_indexes
+      SapiModule::drop_indexes
     end
 
     task :create_indexes => :migrate do
-      Sapi::create_indexes
+      SapiModule::create_indexes
     end
   end
 
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 96567e649..d68fc3460 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -118,7 +118,7 @@ namespace :import do
 
   desc 'Shows database summary stats'
   task :stats => :environment do
-    Sapi::database_summary
+    SapiModule::database_summary
   end
 
   desc 'Runs import tasks for cleaned files'
diff --git a/lib/tasks/import_trade_names.rake b/lib/tasks/import_trade_names.rake
index a37cb8344..0dd9ec8a1 100644
--- a/lib/tasks/import_trade_names.rake
+++ b/lib/tasks/import_trade_names.rake
@@ -127,7 +127,7 @@ namespace :import do
     file = "lib/files/synonyms_to_trade_names.csv"
     drop_table(TMP_TABLE)
     create_table_from_csv_headers(file, TMP_TABLE)
-    Sapi::Indexes.drop_indexes_on_trade_names
+    SapiModule::Indexes.drop_indexes_on_trade_names
     copy_data(file, TMP_TABLE)
     has_trade_name = TaxonRelationshipType.
       find_or_create_by(:name => TaxonRelationshipType::HAS_TRADE_NAME).id
@@ -218,6 +218,6 @@ namespace :import do
       Diff: #{final_count_trade_relationships - count_trade_relationships}"
     puts "Pre-Existing synonym_relationships: #{count_synonym_relationships}; Final count synonym_relationships: #{final_count_synonym_relationships};\
       Diff: #{final_count_synonym_relationships - count_synonym_relationships}"
-    Sapi::Indexes.create_indexes_on_trade_names
+    SapiModule::Indexes.create_indexes_on_trade_names
   end
 end
diff --git a/lib/tasks/import_trade_shipments.rake b/lib/tasks/import_trade_shipments.rake
index d6c598801..463aa5338 100644
--- a/lib/tasks/import_trade_shipments.rake
+++ b/lib/tasks/import_trade_shipments.rake
@@ -25,7 +25,7 @@ namespace :import do
 
     files = files_from_args(t, args)
     files.each do |file|
-      Sapi::Indexes.drop_indexes_on_shipments
+      SapiModule::Indexes.drop_indexes_on_shipments
       drop_create_and_copy_temp(TMP_TABLE, file)
       sql = <<-SQL
         DELETE FROM shipments_import  WHERE shipment_number =  8122168;
@@ -41,7 +41,7 @@ namespace :import do
       update_country_codes
       populate_shipments
       populate_shipments_for_trade_names
-      Sapi::Indexes.create_indexes_on_shipments
+      SapiModule::Indexes.create_indexes_on_shipments
     end
   end
 
@@ -53,7 +53,7 @@ namespace :import do
 
     files = files_from_args(t, args)
     files.each do |file|
-      Sapi::Indexes.drop_indexes_on_shipments
+      SapiModule::Indexes.drop_indexes_on_shipments
       drop_create_and_copy_temp(TMP_TABLE, file)
       sql = <<-SQL
         DELETE FROM shipments_import  WHERE shipment_number =  8122168;
@@ -69,7 +69,7 @@ namespace :import do
       update_country_codes
       # populate_shipments
       populate_shipments_for_trade_names
-      Sapi::Indexes.create_indexes_on_shipments
+      SapiModule::Indexes.create_indexes_on_shipments
     end
   end
 end
diff --git a/lib/tasks/resolve_host_to_country.rake b/lib/tasks/resolve_host_to_country.rake
index 5605f8919..4f8bf5774 100644
--- a/lib/tasks/resolve_host_to_country.rake
+++ b/lib/tasks/resolve_host_to_country.rake
@@ -2,7 +2,7 @@ task :resolve_host_to_country => :environment do
   require 'csv'
   hosts = CSV.read('/home/agnessa/Data/hosts.csv', headers: true)
   hosts_and_countries = hosts.map do |row|
-    geo_ip_data = Sapi::GeoIP.instance.resolve(row[0])
+    geo_ip_data = SapiModule::GeoIP.instance.resolve(row[0])
     [row[0], geo_ip_data[:country]]
   end
   CSV.open('/home/agnessa/Data/hosts_and_countries.csv', 'w') do |csv|
diff --git a/lib/tasks/trade_db_resolve_ip_to_country.rake b/lib/tasks/trade_db_resolve_ip_to_country.rake
index fb08d2573..4d35d9a5f 100644
--- a/lib/tasks/trade_db_resolve_ip_to_country.rake
+++ b/lib/tasks/trade_db_resolve_ip_to_country.rake
@@ -4,7 +4,7 @@ task :trade_db_resolve_ip_to_country => :environment do
                             .where('created_at > ?',"2019-03-11 10:00:55")
   trade_downloads.each do |td|
     puts "Updating Trade download #{td.id}"
-    geo_ip_data = Sapi::GeoIP.instance.resolve(td.user_ip)
+    geo_ip_data = SapiModule::GeoIP.instance.resolve(td.user_ip)
     td.update!(geo_ip_data)
   end
 end
diff --git a/spec/controllers/cites_trade/shipments_controller_spec.rb b/spec/controllers/cites_trade/shipments_controller_spec.rb
index a8fe3fc39..945140532 100644
--- a/spec/controllers/cites_trade/shipments_controller_spec.rb
+++ b/spec/controllers/cites_trade/shipments_controller_spec.rb
@@ -4,7 +4,7 @@
   include_context 'Shipments'
 
   describe "GET index" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     context "serializer" do
       it "should return comptab export when report_type invalid" do
         get :index, params: { filters: {
diff --git a/spec/controllers/species/exports_controller_spec.rb b/spec/controllers/species/exports_controller_spec.rb
index bf97136cc..eab31e031 100644
--- a/spec/controllers/species/exports_controller_spec.rb
+++ b/spec/controllers/species/exports_controller_spec.rb
@@ -21,7 +21,7 @@
 
     it 'sets separator to comma with UK ip address' do
       allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("194.59.188.126")
-      allow_any_instance_of(Sapi::GeoIP).to receive(:country_and_city).and_return({ :country => "GB", :city => "Cambridge" })
+      allow_any_instance_of(SapiModule::GeoIP).to receive(:country_and_city).and_return({ :country => "GB", :city => "Cambridge" })
       get :download, params: { data_type: 'EuDecisions', :filters => {
         'set' => 'current', 'decision_types' => {}, :csv_separator => ''
       } }
@@ -32,7 +32,7 @@
 
     it 'sets separator to semicolon with AF ip address' do
       allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("175.106.59.78")
-      allow_any_instance_of(Sapi::GeoIP).to receive(:country_and_city).and_return({ :country => "AF", :city => "Kabul" })
+      allow_any_instance_of(SapiModule::GeoIP).to receive(:country_and_city).and_return({ :country => "AF", :city => "Kabul" })
       get :download, params: { data_type: 'EuDecisions', :filters => {
         'set' => 'current', 'decision_types' => {}, :csv_separator => ''
       } }
@@ -79,13 +79,13 @@
 #       after(:each){ DownloadsCache.clear_cites_listings }
 #       it "returns count of listed species" do
 #         create_cites_I_addition(:taxon_concept => create_cites_eu_species, :is_current => true)
-#         Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+#         SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
 #         get :download, :data_type => 'Listings', :filters => {:designation => 'CITES'}, :format => :json
 #         parse_json(response.body)['total'].should == 1
 #       end
 #       it "returns listed species file" do
 #         create_cites_I_addition(:taxon_concept => create_cites_eu_species, :is_current => true)
-#         Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+#         SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
 #         Species::ListingsExport.any_instance.stub(:public_file_name).and_return('cites_listings.csv')
 #         get :download, :data_type => 'Listings', :filters => {:designation => 'CITES'}
 #         response.content_type.should eq("text/csv")
@@ -100,13 +100,13 @@
 #       after(:each){ DownloadsCache.clear_eu_listings }
 #       it "returns count of listed species" do
 #         create_eu_A_addition(:taxon_concept => create_cites_eu_species, :event =>reg2013, :effective_at => '2013-08-10', :is_current => true)
-#         Sapi::StoredProcedures.rebuild_eu_taxonomy_and_listings
+#         SapiModule::StoredProcedures.rebuild_eu_taxonomy_and_listings
 #         get :download, :data_type => 'Listings', :filters => {:designation => 'EU'}, :format => :json
 #         parse_json(response.body)['total'].should == 1
 #       end
 #       it "returns listed species file" do
 #         create_eu_A_addition(:taxon_concept => create_cites_eu_species, :event =>reg2013, :effective_at => '2013-08-10', :is_current => true)
-#         Sapi::StoredProcedures.rebuild_eu_taxonomy_and_listings
+#         SapiModule::StoredProcedures.rebuild_eu_taxonomy_and_listings
 #         Species::ListingsExport.any_instance.stub(:public_file_name).and_return('eu_listings.csv')
 #         get :download, :data_type => 'Listings', :filters => {:designation => 'EU'}
 #         response.content_type.should eq("text/csv")
@@ -121,13 +121,13 @@
 #       after(:each){ DownloadsCache.clear_cms_listings }
 #       it "returns count of listed species" do
 #         create_cms_I_addition(:taxon_concept => create_cms_species, :is_current => true)
-#         Sapi::StoredProcedures.rebuild_cms_taxonomy_and_listings
+#         SapiModule::StoredProcedures.rebuild_cms_taxonomy_and_listings
 #         get :download, :data_type => 'Listings', :filters => {:designation => 'CMS'}, :format => :json
 #         parse_json(response.body)['total'].should == 1
 #       end
 #       it "returns listed species file" do
 #         create_cms_I_addition(:taxon_concept => create_cms_species, :is_current => true)
-#         Sapi::StoredProcedures.rebuild_cms_taxonomy_and_listings
+#         SapiModule::StoredProcedures.rebuild_cms_taxonomy_and_listings
 #         Species::ListingsExport.any_instance.stub(:public_file_name).and_return('cms_listings.csv')
 #         get :download, :data_type => 'Listings', :filters => {:designation => 'CMS'}
 #         response.content_type.should eq("text/csv")
diff --git a/spec/controllers/trade/shipments_controller_spec.rb b/spec/controllers/trade/shipments_controller_spec.rb
index 258f2db61..ffc4f4cd1 100644
--- a/spec/controllers/trade/shipments_controller_spec.rb
+++ b/spec/controllers/trade/shipments_controller_spec.rb
@@ -6,7 +6,7 @@
   include_context 'Shipments'
 
   describe "GET index" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should return all shipments" do
       get :index, format: :json
       expect(response.body).to have_json_size(7).at_path('shipments')
@@ -23,7 +23,7 @@
   end
 
   describe "PUT update" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should auto resolve accepted taxon when blank" do
       put :update, params: { id: @shipment1.id, shipment: {
           reported_taxon_concept_id: @synonym_subspecies.id
@@ -46,7 +46,7 @@
   end
 
   describe "POST update_batch" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should change reporter type from I to E" do
       post :update_batch, params: { filters: { # shipment2
           time_range_start: @shipment1.year,
@@ -135,7 +135,7 @@
   end
 
   describe "POST destroy_batch" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should delete 1 shipment" do
       post :destroy_batch, params: { time_range_start: @shipment1.year, time_range_end: @shipment2.year, reporter_type: 'E', exporters_ids: [@portugal.id.to_s, @argentina.id.to_s], importers_ids: [@portugal.id.to_s, @argentina.id.to_s], taxon_concepts_ids: [@animal_species.id] }
       expect(Trade::Shipment.count).to eq(6)
@@ -193,7 +193,7 @@
   end
 
   describe "DELETE destroy" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     it "should delete 1 shipment" do
       delete :destroy, params: { id: @shipment1.id }
       expect(Trade::Shipment.where(id: @shipment1.id)).to be_empty
diff --git a/spec/models/sapi/geoip_spec.rb b/spec/models/sapi/geoip_spec.rb
index ff9c1a7c4..cc28d2364 100644
--- a/spec/models/sapi/geoip_spec.rb
+++ b/spec/models/sapi/geoip_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Sapi::GeoIP do
+describe SapiModule::GeoIP do
   describe :resolve do
-    subject { Sapi::GeoIP.instance }
+    subject { SapiModule::GeoIP.instance }
     before(:each) do
       bogota_latin1 = "Bogotá".encode('ISO-8859-1', 'UTF-8')
       allow(subject).to receive(:country_and_city).and_return(
diff --git a/spec/models/taxon_concept/synonyms_spec.rb b/spec/models/taxon_concept/synonyms_spec.rb
index 8b696ec7c..e8e7ad2f4 100644
--- a/spec/models/taxon_concept/synonyms_spec.rb
+++ b/spec/models/taxon_concept/synonyms_spec.rb
@@ -87,7 +87,7 @@
       specify { expect(@synonym.full_name).to eq('Lolcatus lolus furiatus') }
       context "overnight calculations" do
         before(:each) do
-          Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+          SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         end
         # should not modify a synonym's full name overnight
         specify { expect(@synonym.reload.full_name).to eq('Lolcatus lolus furiatus') }
diff --git a/spec/models/taxon_concept/trade_names_spec.rb b/spec/models/taxon_concept/trade_names_spec.rb
index 73fddb12f..31106a3ea 100644
--- a/spec/models/taxon_concept/trade_names_spec.rb
+++ b/spec/models/taxon_concept/trade_names_spec.rb
@@ -87,7 +87,7 @@
       specify { expect(@trade_name.full_name).to eq('Lolcatus lolus furiatus') }
       context "overnight calculations" do
         before(:each) do
-          Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+          SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         end
         # should not modify a trade_name's full name overnight
         specify { expect(@trade_name.reload.full_name).to eq('Lolcatus lolus furiatus') }
diff --git a/spec/models/trade/inclusion_validation_rule_spec.rb b/spec/models/trade/inclusion_validation_rule_spec.rb
index 4f395796f..791457292 100644
--- a/spec/models/trade/inclusion_validation_rule_spec.rb
+++ b/spec/models/trade/inclusion_validation_rule_spec.rb
@@ -59,7 +59,7 @@
         error_message: "taxon_name Caniis lupus is invalid",
         error_count: 1
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       validation_rule.refresh_errors_if_needed(annual_report_upload)
     end
     specify {
@@ -96,7 +96,7 @@
         error_message: "taxon_name Caniis lupus is invalid",
         error_count: 2
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       validation_rule.refresh_errors_if_needed(annual_report_upload)
     end
 
diff --git a/spec/models/trade/shipment_spec.rb b/spec/models/trade/shipment_spec.rb
index 3d5261f86..34656f8f7 100644
--- a/spec/models/trade/shipment_spec.rb
+++ b/spec/models/trade/shipment_spec.rb
@@ -110,7 +110,7 @@
           :is_current => true
         )
         reg2013 # EU event
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         create_taxon_concept_appendix_year_validation
       end
       context "invalid" do
@@ -150,7 +150,7 @@
           :event => reg2013,
           :is_current => true
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         create_taxon_concept_appendix_year_validation
       end
       context "valid" do
@@ -171,7 +171,7 @@
           :parent => @genus
         )
         reg2013 # EU event
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         create_taxon_concept_appendix_year_validation
       end
       context "not CITES listed and not EU listed" do
@@ -431,7 +431,7 @@
         create_taxon_concept_source_validation
         cites
         reg2013 # EU event
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         @taxon_concept.reload
       end
       context "invalid" do
diff --git a/spec/models/trade/taxon_concept_appendix_year_validation_rule_spec.rb b/spec/models/trade/taxon_concept_appendix_year_validation_rule_spec.rb
index 92e5cbbe5..57fa4bcc4 100644
--- a/spec/models/trade/taxon_concept_appendix_year_validation_rule_spec.rb
+++ b/spec/models/trade/taxon_concept_appendix_year_validation_rule_spec.rb
@@ -59,7 +59,7 @@
           :taxon_concept => @species,
           :other_taxon_concept => synonym
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       end
 
       context "when split listing" do
@@ -158,7 +158,7 @@
             :effective_at => '1979-06-28',
             :is_current => true
           )
-          Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+          SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
           @sandbox_klass.create(
             :taxon_name => 'Falco hybrid', :appendix => 'II', :year => '2012'
           )
diff --git a/spec/services/checklist/appendix_population_spec.rb b/spec/services/checklist/appendix_population_spec.rb
index 26297fbf6..e3682e0e1 100644
--- a/spec/services/checklist/appendix_population_spec.rb
+++ b/spec/services/checklist/appendix_population_spec.rb
@@ -4,7 +4,7 @@
   include_context "Canis lupus"
 
   context "search by cites populations" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     context "when Nepal" do
       subject {
         checklist = Checklist::Checklist.new({
@@ -29,7 +29,7 @@
     end
   end
   context "search by cites appendices" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     context "when App I" do
       subject {
         checklist = Checklist::Checklist.new({
@@ -65,7 +65,7 @@
     end
   end
   context "search by cites populations and appendices" do
-    before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+    before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
     context "when Nepal" do
       context "when App I" do
         subject {
diff --git a/spec/services/checklist/higher_taxa_injector_spec.rb b/spec/services/checklist/higher_taxa_injector_spec.rb
index 22c277a4e..86c87021b 100644
--- a/spec/services/checklist/higher_taxa_injector_spec.rb
+++ b/spec/services/checklist/higher_taxa_injector_spec.rb
@@ -93,7 +93,7 @@
       :parent => genus2_1_1_1,
       :taxon_name => create(:taxon_name, :scientific_name => 'fatalus')
     )
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     @order2 = MTaxonConcept.find(order2.id)
     @family1 = MTaxonConcept.find(family1.id)
     @genus1_1 = MTaxonConcept.find(genus1_1.id)
diff --git a/spec/services/checklist/pdf/history_annotations_key_spec.rb b/spec/services/checklist/pdf/history_annotations_key_spec.rb
index 15d0d94d5..412325dca 100644
--- a/spec/services/checklist/pdf/history_annotations_key_spec.rb
+++ b/spec/services/checklist/pdf/history_annotations_key_spec.rb
@@ -53,7 +53,7 @@
         ),
         :is_current => true
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     end
     subject { Checklist::Pdf::HistoryAnnotationsKey.new }
     specify {
diff --git a/spec/services/checklist/pdf/history_spec.rb b/spec/services/checklist/pdf/history_spec.rb
index f01709fc8..bc9aaa854 100644
--- a/spec/services/checklist/pdf/history_spec.rb
+++ b/spec/services/checklist/pdf/history_spec.rb
@@ -8,7 +8,7 @@
     tc = create_cites_eu_family(
       :taxon_name => create(:taxon_name, :scientific_name => 'Foobaridae')
     )
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     MTaxonConcept.find(tc.id)
   }
   let(:genus_tc) {
@@ -16,7 +16,7 @@
       :parent_id => family_tc.id,
       :taxon_name => create(:taxon_name, :scientific_name => 'Foobarus')
     )
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     MTaxonConcept.find(tc.id)
   }
   describe :higher_taxon_name do
@@ -32,7 +32,7 @@
             :language => en
           )
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       }
       subject { Checklist::Pdf::History.new(:scientific_name => tc.full_name, :show_english => true) }
       specify {
@@ -49,7 +49,7 @@
           :taxon_concept_id => tc.id,
           :is_current => true
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         MCitesListingChange.find(lc.id)
       }
       subject { Checklist::Pdf::History.new(:scientific_name => tc.full_name) }
@@ -64,7 +64,7 @@
           :taxon_concept_id => tc.id,
           :is_current => true
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         MCitesListingChange.find(lc.id)
       }
       subject { Checklist::Pdf::History.new(:scientific_name => tc.full_name) }
@@ -92,7 +92,7 @@
           :is_current => true,
           :nomenclature_note_en => 'Previously listed as <i>Foobarus polonicus</i>.'
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         MCitesListingChange.find(lc.id)
       }
       subject { Checklist::Pdf::History.new({}) }
diff --git a/spec/services/checklist/pdf/index_annotations_key_spec.rb b/spec/services/checklist/pdf/index_annotations_key_spec.rb
index c91a65e21..c1f9c52b7 100644
--- a/spec/services/checklist/pdf/index_annotations_key_spec.rb
+++ b/spec/services/checklist/pdf/index_annotations_key_spec.rb
@@ -40,7 +40,7 @@
         ),
         :is_current => true
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     end
     subject { Checklist::Pdf::IndexAnnotationsKey.new }
     specify {
@@ -96,7 +96,7 @@
         ),
         :is_current => true
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     end
     subject { Checklist::Pdf::IndexAnnotationsKey.new }
     specify {
diff --git a/spec/services/checklist/pdf/index_fetcher_spec.rb b/spec/services/checklist/pdf/index_fetcher_spec.rb
index d6258bf71..0e1d71bda 100644
--- a/spec/services/checklist/pdf/index_fetcher_spec.rb
+++ b/spec/services/checklist/pdf/index_fetcher_spec.rb
@@ -31,7 +31,7 @@
     )
     tc.common_names << english_common_name
     tc.common_names << spanish_common_name
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     tc
   }
   let(:rel) { MTaxonConcept.by_scientific_name('Lolcatus') }
@@ -63,7 +63,7 @@
         :taxon_concept_id => tc.id,
         :other_taxon_concept_id => synonym.id
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     }
     let(:query) {
       Checklist::Pdf::IndexQuery.new(
diff --git a/spec/services/checklist/timeline_spec.rb b/spec/services/checklist/timeline_spec.rb
index 29fce8fd9..571d3f9e4 100644
--- a/spec/services/checklist/timeline_spec.rb
+++ b/spec/services/checklist/timeline_spec.rb
@@ -14,7 +14,7 @@
         :effective_at => '1975-06-07',
         :is_current => false
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       MTaxonConcept.find(tc.id)
     }
     let(:ttc) { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -74,7 +74,7 @@
         :listing_change => lc4,
         :is_party => true
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       MTaxonConcept.find(tc.id)
     }
     let(:ttc) { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -103,7 +103,7 @@
         :effective_at => '1975-06-08',
         :is_current => true
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       MTaxonConcept.find(tc.id)
     }
     let(:ttc) { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -145,7 +145,7 @@
         :listing_change => w,
         :is_party => true
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       MTaxonConcept.find(tc.id)
     }
     let(:ttc) { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -193,7 +193,7 @@
         :listing_change => r2,
         :is_party => true
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       MTaxonConcept.find(tc.id)
     }
     let(:ttc) { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -218,7 +218,7 @@
         :effective_at => '1975-06-08',
         :is_current => true
       )
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       MTaxonConcept.find(tc.id)
     }
     let(:ttc) { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -248,7 +248,7 @@
         :is_current => true
       )
       # tc should have a cascaded ADD I from parent and an auto DEL I
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       MTaxonConcept.find(tc.id)
     }
     let(:ttc) { Checklist::TimelinesForTaxonConcept.new(tc) }
diff --git a/spec/services/checklist/timelines_for_taxon_concept_spec.rb b/spec/services/checklist/timelines_for_taxon_concept_spec.rb
index 1234af3c6..c0e17b450 100644
--- a/spec/services/checklist/timelines_for_taxon_concept_spec.rb
+++ b/spec/services/checklist/timelines_for_taxon_concept_spec.rb
@@ -18,7 +18,7 @@
           :effective_at => '1975-06-06',
           :is_current => true
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         MTaxonConcept.find(tc.id)
       }
       subject { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -39,7 +39,7 @@
           :listing_change => lc,
           :is_party => true
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         MTaxonConcept.find(tc.id)
       }
       subject { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -60,7 +60,7 @@
           :listing_change => lc,
           :is_party => true
         )
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         MTaxonConcept.find(tc.id)
       }
       subject { Checklist::TimelinesForTaxonConcept.new(tc) }
@@ -74,7 +74,7 @@
     context "when in 1990" do
       let(:tc) {
         tc = create(:taxon_concept)
-        Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+        SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         MTaxonConcept.find(tc.id)
       }
       subject { Checklist::TimelinesForTaxonConcept.new(tc).timeline_years }
diff --git a/spec/services/dashboard_stats_trade_spec.rb b/spec/services/dashboard_stats_trade_spec.rb
index 71e25e1ef..8909f9480 100644
--- a/spec/services/dashboard_stats_trade_spec.rb
+++ b/spec/services/dashboard_stats_trade_spec.rb
@@ -4,7 +4,7 @@
   include_context "Shipments"
   describe "#trade" do
     before(:each) do
-      Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+      SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
       @shipment4_by_partner = create(
         :shipment,
         :taxon_concept => @animal_species,
diff --git a/spec/services/species/listings_export_spec.rb b/spec/services/species/listings_export_spec.rb
index 4f5908755..ef32083c3 100644
--- a/spec/services/species/listings_export_spec.rb
+++ b/spec/services/species/listings_export_spec.rb
@@ -100,7 +100,7 @@
           create_cites_eu_subspecies(
             :parent_id => @species.id
           )
-          Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+          SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
         end
         subject {
           Species::ListingsExportFactory.new({
diff --git a/spec/services/species/trade_name_prefix_matcher_spec.rb b/spec/services/species/trade_name_prefix_matcher_spec.rb
index 509f0896d..1373aaf74 100644
--- a/spec/services/species/trade_name_prefix_matcher_spec.rb
+++ b/spec/services/species/trade_name_prefix_matcher_spec.rb
@@ -21,7 +21,7 @@
       :taxon_relationship_type => trade_name_relationship_type
     )
     create_cites_I_addition(:taxon_concept => @accepted_name)
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     @accepted_name_ac = MAutoCompleteTaxonConcept.find(@accepted_name.id)
     @trade_name_ac = MAutoCompleteTaxonConcept.find(@trade_name.id)
     @status_N_species_ac = MAutoCompleteTaxonConcept.find(@status_N_species.id)
diff --git a/spec/services/trade/filter_spec.rb b/spec/services/trade/filter_spec.rb
index df9ef9029..65c524d83 100644
--- a/spec/services/trade/filter_spec.rb
+++ b/spec/services/trade/filter_spec.rb
@@ -4,7 +4,7 @@
 
   describe :results do
     context "when searching by taxon concepts ids" do
-      before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+      before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
       context "in the public interface" do
         context "at GENUS rank" do
           subject { Trade::Filter.new({
@@ -105,7 +105,7 @@
       end
     end
     context "when searching by reported taxon concepts ids" do
-      before(:each) { Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings }
+      before(:each) { SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings }
       context "when trade names shipments present" do
         before(:each) do
           @shipment_of_trade_name = create(
diff --git a/spec/services/trade/sandbox_filter_spec.rb b/spec/services/trade/sandbox_filter_spec.rb
index 3c3cb5bca..f04323d10 100644
--- a/spec/services/trade/sandbox_filter_spec.rb
+++ b/spec/services/trade/sandbox_filter_spec.rb
@@ -41,7 +41,7 @@
       is_current: true,
       event: reg2013
     )
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     @validation_error = create(
       :validation_error,
       annual_report_upload_id: annual_report_upload.id,
diff --git a/spec/shared/agalychnis.rb b/spec/shared/agalychnis.rb
index cad023edb..0a5e908ae 100644
--- a/spec/shared/agalychnis.rb
+++ b/spec/shared/agalychnis.rb
@@ -51,7 +51,7 @@
       :excluded_taxon_concepts_ids => "{#{@genus.id}}"
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/agave.rb b/spec/shared/agave.rb
index 7ec67990c..d08068be9 100644
--- a/spec/shared/agave.rb
+++ b/spec/shared/agave.rb
@@ -72,7 +72,7 @@ def fr
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/ailuropoda.rb b/spec/shared/ailuropoda.rb
index 1def79b32..7a9b56198 100644
--- a/spec/shared/ailuropoda.rb
+++ b/spec/shared/ailuropoda.rb
@@ -41,7 +41,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/arctocephalus.rb b/spec/shared/arctocephalus.rb
index 9245bc6e1..86e4622f2 100644
--- a/spec/shared/arctocephalus.rb
+++ b/spec/shared/arctocephalus.rb
@@ -111,7 +111,7 @@ def fr
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/boa_constrictor.rb b/spec/shared/boa_constrictor.rb
index 1b4ffe7f5..82e7e5724 100644
--- a/spec/shared/boa_constrictor.rb
+++ b/spec/shared/boa_constrictor.rb
@@ -82,7 +82,7 @@ def en
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/caiman_latirostris.rb b/spec/shared/caiman_latirostris.rb
index 4123b45a1..c2059c185 100644
--- a/spec/shared/caiman_latirostris.rb
+++ b/spec/shared/caiman_latirostris.rb
@@ -152,7 +152,7 @@ def en
       :is_party => false
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/canis_lupus.rb b/spec/shared/canis_lupus.rb
index 4a6380675..2edc7d74b 100644
--- a/spec/shared/canis_lupus.rb
+++ b/spec/shared/canis_lupus.rb
@@ -127,7 +127,7 @@
       )
     end
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/caretta_caretta_cms.rb b/spec/shared/caretta_caretta_cms.rb
index 787bf33c7..f6abe7ec5 100644
--- a/spec/shared/caretta_caretta_cms.rb
+++ b/spec/shared/caretta_caretta_cms.rb
@@ -30,7 +30,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cms_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cms_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/cedrela_montana.rb b/spec/shared/cedrela_montana.rb
index 421f53f1a..294d68da8 100644
--- a/spec/shared/cedrela_montana.rb
+++ b/spec/shared/cedrela_montana.rb
@@ -24,7 +24,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/cervus_elaphus.rb b/spec/shared/cervus_elaphus.rb
index 29f057b44..706cdbcb3 100644
--- a/spec/shared/cervus_elaphus.rb
+++ b/spec/shared/cervus_elaphus.rb
@@ -69,7 +69,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/cervus_elaphus_cms.rb b/spec/shared/cervus_elaphus_cms.rb
index d1dc51fcd..320c389cc 100644
--- a/spec/shared/cervus_elaphus_cms.rb
+++ b/spec/shared/cervus_elaphus_cms.rb
@@ -52,7 +52,7 @@
       :instrument => create(:instrument, :name => 'Bukhara Deer')
     )
 
-    Sapi::StoredProcedures.rebuild_cms_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cms_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/colophon.rb b/spec/shared/colophon.rb
index f8b699534..48c1b9f66 100644
--- a/spec/shared/colophon.rb
+++ b/spec/shared/colophon.rb
@@ -51,7 +51,7 @@ def south_africa
       :is_party => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/dalbergia.rb b/spec/shared/dalbergia.rb
index 1575eb5c1..634d03d64 100644
--- a/spec/shared/dalbergia.rb
+++ b/spec/shared/dalbergia.rb
@@ -72,7 +72,7 @@ def fr
       :is_party => false
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/diospyros.rb b/spec/shared/diospyros.rb
index 77a1eb44c..7cfaccc95 100644
--- a/spec/shared/diospyros.rb
+++ b/spec/shared/diospyros.rb
@@ -124,7 +124,7 @@
       :is_party => false
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/falconiformes.rb b/spec/shared/falconiformes.rb
index 2258b2239..b0611d627 100644
--- a/spec/shared/falconiformes.rb
+++ b/spec/shared/falconiformes.rb
@@ -157,7 +157,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/hirudo_medicinalis.rb b/spec/shared/hirudo_medicinalis.rb
index 7e192f08a..7415b10ba 100644
--- a/spec/shared/hirudo_medicinalis.rb
+++ b/spec/shared/hirudo_medicinalis.rb
@@ -30,7 +30,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/loxodonta_africana.rb b/spec/shared/loxodonta_africana.rb
index 37f075720..5230864a7 100644
--- a/spec/shared/loxodonta_africana.rb
+++ b/spec/shared/loxodonta_africana.rb
@@ -92,7 +92,7 @@
       )
     end
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/loxodonta_africana_cms.rb b/spec/shared/loxodonta_africana_cms.rb
index c504d4c2a..0bc00436c 100644
--- a/spec/shared/loxodonta_africana_cms.rb
+++ b/spec/shared/loxodonta_africana_cms.rb
@@ -24,7 +24,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cms_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cms_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/mellivora_capensis.rb b/spec/shared/mellivora_capensis.rb
index 086f810ce..6767a21aa 100644
--- a/spec/shared/mellivora_capensis.rb
+++ b/spec/shared/mellivora_capensis.rb
@@ -117,7 +117,7 @@
       :listing_change => eu_lc3
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/moschus.rb b/spec/shared/moschus.rb
index a06c43389..7114cf89e 100644
--- a/spec/shared/moschus.rb
+++ b/spec/shared/moschus.rb
@@ -143,7 +143,7 @@
       :is_party => false
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/natator_depressus.rb b/spec/shared/natator_depressus.rb
index cf3d5e20a..e00f5404b 100644
--- a/spec/shared/natator_depressus.rb
+++ b/spec/shared/natator_depressus.rb
@@ -49,7 +49,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/notomys_aquilo.rb b/spec/shared/notomys_aquilo.rb
index 2e73de2e1..eb60a027b 100644
--- a/spec/shared/notomys_aquilo.rb
+++ b/spec/shared/notomys_aquilo.rb
@@ -34,7 +34,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/panax_ginseng.rb b/spec/shared/panax_ginseng.rb
index e2a88a758..a8503cdc2 100644
--- a/spec/shared/panax_ginseng.rb
+++ b/spec/shared/panax_ginseng.rb
@@ -85,7 +85,7 @@
       )
     end
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/pecari_tajacu.rb b/spec/shared/pecari_tajacu.rb
index cd05666d4..1f3c0e538 100644
--- a/spec/shared/pecari_tajacu.rb
+++ b/spec/shared/pecari_tajacu.rb
@@ -106,7 +106,7 @@ def america
       :geo_relationship_type => contains_geo_relationship_type
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/pereskia.rb b/spec/shared/pereskia.rb
index ab1916d91..2d088664e 100644
--- a/spec/shared/pereskia.rb
+++ b/spec/shared/pereskia.rb
@@ -55,7 +55,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/platysternon_megacephalum.rb b/spec/shared/platysternon_megacephalum.rb
index b41102c01..a5a8283aa 100644
--- a/spec/shared/platysternon_megacephalum.rb
+++ b/spec/shared/platysternon_megacephalum.rb
@@ -51,7 +51,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/pristis_microdon.rb b/spec/shared/pristis_microdon.rb
index ecc9f5680..b0c99a9e7 100644
--- a/spec/shared/pristis_microdon.rb
+++ b/spec/shared/pristis_microdon.rb
@@ -59,7 +59,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/pseudomys_fieldi.rb b/spec/shared/pseudomys_fieldi.rb
index bbb5da96d..51a9d0918 100644
--- a/spec/shared/pseudomys_fieldi.rb
+++ b/spec/shared/pseudomys_fieldi.rb
@@ -50,7 +50,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/psittaciformes.rb b/spec/shared/psittaciformes.rb
index c193913b4..58cd08399 100644
--- a/spec/shared/psittaciformes.rb
+++ b/spec/shared/psittaciformes.rb
@@ -251,7 +251,7 @@ def ghana
       :listing_change => eu_lc2
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/tapiridae.rb b/spec/shared/tapiridae.rb
index 0431e84e6..e45845e23 100644
--- a/spec/shared/tapiridae.rb
+++ b/spec/shared/tapiridae.rb
@@ -44,7 +44,7 @@
       :is_current => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/uroplatus.rb b/spec/shared/uroplatus.rb
index 1ff913d87..fa2e10ed5 100644
--- a/spec/shared/uroplatus.rb
+++ b/spec/shared/uroplatus.rb
@@ -51,7 +51,7 @@
       :is_cascaded => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _
diff --git a/spec/shared/varanidae.rb b/spec/shared/varanidae.rb
index 95e63243b..5fe76392e 100644
--- a/spec/shared/varanidae.rb
+++ b/spec/shared/varanidae.rb
@@ -77,7 +77,7 @@
       :is_cascaded => true
     )
 
-    Sapi::StoredProcedures.rebuild_cites_taxonomy_and_listings
+    SapiModule::StoredProcedures.rebuild_cites_taxonomy_and_listings
     self.instance_variables.each do |t|
       #Skip old sapi context let statements,
       #which are now instance variables starting with _

From e5f5decbd629602d2c66e44b2803b8d71b08c7db Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 5 Feb 2024 16:57:06 +0000
Subject: [PATCH 169/241] require sapi_module in initializers, after edge load
 in application.rb, so file like
 app/controllers/admin/statistics_controller.rb can use the module.

---
 config/initializers/0_load_sapi_module.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/initializers/0_load_sapi_module.rb

diff --git a/config/initializers/0_load_sapi_module.rb b/config/initializers/0_load_sapi_module.rb
new file mode 100644
index 000000000..f53194c54
--- /dev/null
+++ b/config/initializers/0_load_sapi_module.rb
@@ -0,0 +1 @@
+require 'sapi_module'

From 935ebbde5be392cc21823fb7c4d13bf72e3ee361 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 5 Feb 2024 16:08:26 +0000
Subject: [PATCH 170/241] fix: typo s/changable/changeable/g

---
 .../concerns/{changable.rb => changeable.rb}  | 44 +++++++++----------
 app/models/distribution.rb                    |  2 +-
 app/models/eu_decision.rb                     |  2 +-
 app/models/geo_entity.rb                      |  2 +-
 app/models/language.rb                        |  2 +-
 app/models/listing_change.rb                  |  2 +-
 app/models/taxon_common.rb                    |  2 +-
 app/models/taxon_concept_reference.rb         |  2 +-
 app/models/taxon_instrument.rb                |  2 +-
 app/models/taxon_relationship.rb              |  2 +-
 .../trade_restrictions/cites_suspension.rb    |  2 +-
 app/models/trade_restrictions/quota.rb        |  2 +-
 12 files changed, 33 insertions(+), 33 deletions(-)
 rename app/models/concerns/{changable.rb => changeable.rb} (83%)

diff --git a/app/models/concerns/changable.rb b/app/models/concerns/changeable.rb
similarity index 83%
rename from app/models/concerns/changable.rb
rename to app/models/concerns/changeable.rb
index 40dad5b3f..e2fa971d9 100644
--- a/app/models/concerns/changable.rb
+++ b/app/models/concerns/changeable.rb
@@ -1,41 +1,41 @@
-module Changable
+module Changeable
   extend ActiveSupport::Concern
 
   included do
     #########################################################
     ### after save
-    after_save :changable_after_save_callback
-    after_commit :changable_after_save_callback_on_commit, on: [:create, :update]
+    after_save :changeable_after_save_callback
+    after_commit :changeable_after_save_callback_on_commit, on: [:create, :update]
     #########################################################
     ### before destroy
-    before_destroy :changable_before_destroy_callback
-    after_commit :changable_before_destroy_callback_on_commit, on: :destroy
+    before_destroy :changeable_before_destroy_callback
+    after_commit :changeable_before_destroy_callback_on_commit, on: :destroy
   end
 
   private
 
-  def changable_before_destroy_callback
+  def changeable_before_destroy_callback
     if respond_to?(:taxon_concept) && taxon_concept && can_be_deleted?
       # currently no easy means to tell who deleted the dependent object
-      changable_bump_dependents_timestamp_part_one(taxon_concept, nil)
+      changeable_bump_dependents_timestamp_part_one(taxon_concept, nil)
     end
   end
 
-  def changable_before_destroy_callback_on_commit
-    changable_clear_cache
+  def changeable_before_destroy_callback_on_commit
+    changeable_clear_cache
     if respond_to?(:taxon_concept) && taxon_concept && can_be_deleted?
       # currently no easy means to tell who deleted the dependent object
-      changable_bump_dependents_timestamp_part_two
+      changeable_bump_dependents_timestamp_part_two
     end
   end
 
-  def changable_after_save_callback
+  def changeable_after_save_callback
     unless respond_to?(:taxon_concept)
       return
     end
 
     if taxon_concept
-      changable_bump_dependents_timestamp_part_one(taxon_concept, updated_by_id)
+      changeable_bump_dependents_timestamp_part_one(taxon_concept, updated_by_id)
     end
     # Rails 5.1 to 5.2
     # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
@@ -63,13 +63,13 @@ def changable_after_save_callback
       taxon_concept && taxon_concept_id_before_last_save && taxon_concept_id != taxon_concept_id_before_last_save
       previous_taxon_concept = TaxonConcept.find_by_id(taxon_concept_id_before_last_save)
       if previous_taxon_concept
-        changable_bump_dependents_timestamp_part_one(previous_taxon_concept, updated_by_id)
+        changeable_bump_dependents_timestamp_part_one(previous_taxon_concept, updated_by_id)
       end
     end
   end
 
-  def changable_after_save_callback_on_commit
-    changable_clear_cache
+  def changeable_after_save_callback_on_commit
+    changeable_clear_cache
 
     # For models that are not directly related to taxon concepts
     # but for which is anyway preferable for the changes to be reflacted
@@ -80,12 +80,12 @@ def changable_after_save_callback_on_commit
     # It's quite rare that updates to those objects will occur,
     # so there shouldn't be no harm in clearning the entire serializer cache.
     unless respond_to?(:taxon_concept)
-      changable_clear_show_tc_serializer_cache
+      changeable_clear_show_tc_serializer_cache
       return
     end
 
     if taxon_concept
-      changable_bump_dependents_timestamp_part_two
+      changeable_bump_dependents_timestamp_part_two
     end
     # Rails 5.1 to 5.2
     # DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the next version of Rails.
@@ -113,18 +113,18 @@ def changable_after_save_callback_on_commit
       taxon_concept && taxon_concept_id_before_last_save && taxon_concept_id != taxon_concept_id_before_last_save
       previous_taxon_concept = TaxonConcept.find_by_id(taxon_concept_id_before_last_save)
       if previous_taxon_concept
-        changable_bump_dependents_timestamp_part_two
+        changeable_bump_dependents_timestamp_part_two
       end
     end
   end
 
-  def changable_clear_cache
+  def changeable_clear_cache
     return unless respond_to?(:taxon_concept)
 
     DownloadsCacheCleanupWorker.perform_async(self.class.to_s.tableize)
   end
 
-  def changable_bump_dependents_timestamp_part_one(taxon_concept, updated_by_id)
+  def changeable_bump_dependents_timestamp_part_one(taxon_concept, updated_by_id)
     return unless taxon_concept
 
     TaxonConcept.where(id: taxon_concept.id).update_all(
@@ -133,13 +133,13 @@ def changable_bump_dependents_timestamp_part_one(taxon_concept, updated_by_id)
     )
   end
 
-  def changable_bump_dependents_timestamp_part_two
+  def changeable_bump_dependents_timestamp_part_two
     return unless taxon_concept
 
     DownloadsCacheCleanupWorker.perform_async('taxon_concepts')
   end
 
-  def changable_clear_show_tc_serializer_cache
+  def changeable_clear_show_tc_serializer_cache
     ##
     # Disabling because we use memcache on production, but memcache doesn't implement this method.
     # For now, changes to records that appear in serializers will not change until the caches are expired,
diff --git a/app/models/distribution.rb b/app/models/distribution.rb
index f82d24c98..0935946db 100644
--- a/app/models/distribution.rb
+++ b/app/models/distribution.rb
@@ -13,7 +13,7 @@
 #
 
 class Distribution < ApplicationRecord
-  include Changable
+  include Changeable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :geo_entity_id, :taxon_concept_id, :tag_list,
diff --git a/app/models/eu_decision.rb b/app/models/eu_decision.rb
index a540b9165..da6a00c90 100644
--- a/app/models/eu_decision.rb
+++ b/app/models/eu_decision.rb
@@ -29,7 +29,7 @@
 require 'digest/sha1'
 require 'csv'
 class EuDecision < ApplicationRecord
-  include Changable
+  include Changeable
   extend Mobility
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/geo_entity.rb b/app/models/geo_entity.rb
index c4867f5a3..90d4b5df4 100644
--- a/app/models/geo_entity.rb
+++ b/app/models/geo_entity.rb
@@ -18,7 +18,7 @@
 #
 
 class GeoEntity < ApplicationRecord
-  include Changable
+  include Changeable
   include Deletable
   extend Mobility
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/language.rb b/app/models/language.rb
index ca9b400bf..b4743f1f5 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -13,7 +13,7 @@
 #
 
 class Language < ApplicationRecord
-  include Changable
+  include Changeable
   include Deletable
   extend Mobility
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 4daa4efd7..6ed85050d 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -27,7 +27,7 @@
 #
 
 class ListingChange < ApplicationRecord
-  include Changable
+  include Changeable
   extend Mobility
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
diff --git a/app/models/taxon_common.rb b/app/models/taxon_common.rb
index 91fe7915c..71e168d12 100644
--- a/app/models/taxon_common.rb
+++ b/app/models/taxon_common.rb
@@ -12,7 +12,7 @@
 #
 
 class TaxonCommon < ApplicationRecord
-  include Changable
+  include Changeable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :common_name_id, :taxon_concept_id, :created_by_id,
diff --git a/app/models/taxon_concept_reference.rb b/app/models/taxon_concept_reference.rb
index 3149de990..8d347c9de 100644
--- a/app/models/taxon_concept_reference.rb
+++ b/app/models/taxon_concept_reference.rb
@@ -15,7 +15,7 @@
 #
 
 class TaxonConceptReference < ApplicationRecord
-  include Changable
+  include Changeable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
diff --git a/app/models/taxon_instrument.rb b/app/models/taxon_instrument.rb
index f4731b050..e175bbb36 100644
--- a/app/models/taxon_instrument.rb
+++ b/app/models/taxon_instrument.rb
@@ -13,7 +13,7 @@
 #
 
 class TaxonInstrument < ApplicationRecord
-  include Changable
+  include Changeable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :effective_from, :instrument_id, :taxon_concept_id
diff --git a/app/models/taxon_relationship.rb b/app/models/taxon_relationship.rb
index f79992b99..10b0935cd 100644
--- a/app/models/taxon_relationship.rb
+++ b/app/models/taxon_relationship.rb
@@ -13,7 +13,7 @@
 #
 
 class TaxonRelationship < ApplicationRecord
-  include Changable
+  include Changeable
   include TrackWhoDoesIt
   # Migrated to controller (Strong Parameters)
   # attr_accessible :taxon_concept_id, :other_taxon_concept_id, :taxon_relationship_type_id,
diff --git a/app/models/trade_restrictions/cites_suspension.rb b/app/models/trade_restrictions/cites_suspension.rb
index d32afb9e5..1e21a4c84 100644
--- a/app/models/trade_restrictions/cites_suspension.rb
+++ b/app/models/trade_restrictions/cites_suspension.rb
@@ -31,7 +31,7 @@
 #
 
 class CitesSuspension < TradeRestriction
-  include Changable
+  include Changeable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :start_notification_id, :end_notification_id,
   #   :cites_suspension_confirmations_attributes,
diff --git a/app/models/trade_restrictions/quota.rb b/app/models/trade_restrictions/quota.rb
index be9709865..12709fb2e 100644
--- a/app/models/trade_restrictions/quota.rb
+++ b/app/models/trade_restrictions/quota.rb
@@ -31,7 +31,7 @@
 #
 
 class Quota < TradeRestriction
-  include Changable
+  include Changeable
   # Migrated to controller (Strong Parameters)
   # attr_accessible :public_display
 

From 5b1ddf5889d8aaf6d78334afbdd1bdf2339291a9 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 5 Feb 2024 17:00:53 +0000
Subject: [PATCH 171/241] docs: summarise Changeable concern

---
 app/models/concerns/changeable.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/models/concerns/changeable.rb b/app/models/concerns/changeable.rb
index e2fa971d9..498cb6c94 100644
--- a/app/models/concerns/changeable.rb
+++ b/app/models/concerns/changeable.rb
@@ -1,3 +1,10 @@
+##
+# This module is used by models which are referenced by or depend on the
+# taxon_concepts table. It is responsible for two main areas:
+#
+# - altering the updated timestamp on affected taxon concepts on change
+# - emptying the cache of taxon_concepts
+
 module Changeable
   extend ActiveSupport::Concern
 

From d968716473ebf57d1e0b8163138299fd79b34040 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 5 Feb 2024 17:25:37 +0000
Subject: [PATCH 172/241] Try to fix SQL issue after upgrade

---
 app/services/country_dictionary.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/services/country_dictionary.rb b/app/services/country_dictionary.rb
index f215c8d1d..5a0817324 100644
--- a/app/services/country_dictionary.rb
+++ b/app/services/country_dictionary.rb
@@ -3,10 +3,9 @@ class CountryDictionary
 
   def initialize
     @collection = GeoEntity.
-      select([
-        :"geo_entities.id", :name_en, :name_es, :name_fr,
-        :"UPPER(geo_entities.iso_code2) AS iso_code2"
-      ]).
+      select(
+        :id, :name_en, :name_es, :name_fr, 'UPPER(geo_entities.iso_code2) AS iso_code2'
+      ).
       joins(:geo_entity_type).
       where(:"geo_entity_types.name" => [GeoEntityType::COUNTRY, GeoEntityType::TERRITORY]).
       all

From 59fda57751aa29cd32ae6d00eaa987b3f71c1ef6 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 5 Feb 2024 21:38:59 +0000
Subject: [PATCH 173/241] Update gems

---
 Gemfile      |  1 -
 Gemfile.lock | 50 ++++++++++++++++++++++++--------------------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/Gemfile b/Gemfile
index d43b4f749..38034777a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -158,7 +158,6 @@ gem 'dotenv-rails', '2.0.1'
 gem 'sitemap_generator', '~> 6.3'
 
 gem 'appsignal', '~> 3.5', '>= 3.5.5'
-gem 'test-unit', '3.1.5' # annoyingly, rails console won't start without it in staging / production
 
 ### GEM for frontend ###
 # Remove the `jquery-rails` gem to eliminate any dependency issues that may block the upgrade process.
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d9314c52..d353f0293 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,11 +102,12 @@ GEM
     barber (0.12.2)
       ember-source (>= 1.0, < 3.1)
       execjs (>= 1.2, < 3)
+    base64 (0.2.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.0)
     bigdecimal (3.1.6)
     bindex (0.8.1)
-    bootsnap (1.18.1)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
@@ -141,11 +142,11 @@ GEM
       capistrano (>= 3.9.0)
       capistrano-bundler
       sidekiq (>= 6.0)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
@@ -192,7 +193,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     dotenv (2.0.1)
     dotenv-rails (2.0.1)
@@ -302,7 +303,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.2)
+    minitest (5.22.0)
     mobility (1.2.9)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
@@ -314,7 +315,7 @@ GEM
       activerecord
       activesupport
     nested_form (0.3.2)
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -329,7 +330,7 @@ GEM
       net-protocol
     net-ssh (7.2.1)
     nio4r (2.7.0)
-    nokogiri (1.16.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     numerizer (0.1.1)
@@ -355,7 +356,6 @@ GEM
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
-    power_assert (2.0.3)
     prawn (0.13.2)
       pdf-reader (~> 1.2)
       ruby-rc4
@@ -419,20 +419,20 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
     rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
@@ -441,7 +441,7 @@ GEM
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-support (3.12.1)
+    rspec-support (3.13.0)
     rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -481,7 +481,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (4.9.0)
+    selenium-webdriver (4.17.0)
+      base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -513,7 +514,7 @@ GEM
     slackistrano (0.1.9)
       capistrano (>= 3.0.1)
       json
-    spring (2.1.1)
+    spring (4.1.3)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -534,8 +535,6 @@ GEM
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-unit (3.1.5)
-      power_assert
     thor (1.3.0)
     tilt (2.3.0)
     timeout (0.4.1)
@@ -555,10 +554,10 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.3.1)
+    webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0, < 4.11)
+      selenium-webdriver (~> 4.0)
     websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
@@ -660,7 +659,6 @@ DEPENDENCIES
   sprockets-rails
   strong_migrations (~> 1.7)
   susy (~> 2.2, >= 2.2.14)
-  test-unit (= 3.1.5)
   uglifier (>= 1.3.0)
   uuidtools (~> 2.2)
   web-console (>= 4.1.0)

From e585afb4531886ef443edd74a6e0668728c6e2e1 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 5 Feb 2024 21:52:35 +0000
Subject: [PATCH 174/241] Fix path, so it won't generate `/users/edit.1` where
 1 is user id. The form always refer to current user, so user id in the path
 is not needed.

---
 app/views/shared/_topbar.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_topbar.html.erb b/app/views/shared/_topbar.html.erb
index f5121c167..7de587344 100644
--- a/app/views/shared/_topbar.html.erb
+++ b/app/views/shared/_topbar.html.erb
@@ -203,7 +203,7 @@
             </a>
             <ul class="dropdown-menu">
               <li><%= link_to "Log out #{current_user.name}", destroy_user_session_path, :method => :delete %></li>
-              <li><%= link_to "Account", edit_user_registratione_path(current_user) %></li>
+              <li><%= link_to "Account", edit_user_registratione_path %></li>
               <% if current_user.is_manager? %>
                 <li><%= link_to 'Manage Users', admin_users_path %></li>
               <% end %>

From 708f278ea8a671a8674bdddcdb0e11b00f91a1e6 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 6 Feb 2024 12:31:59 +0000
Subject: [PATCH 175/241] Fix strong params

---
 app/controllers/checklist/documents_controller.rb | 2 +-
 app/controllers/checklist/downloads_controller.rb | 4 ++--
 lib/modules/material_doc_ids_retriever.rb         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/checklist/documents_controller.rb b/app/controllers/checklist/documents_controller.rb
index be3d57fd2..5ca129786 100644
--- a/app/controllers/checklist/documents_controller.rb
+++ b/app/controllers/checklist/documents_controller.rb
@@ -41,7 +41,7 @@ def show
   end
 
   def check_doc_presence
-    doc_ids = MaterialDocIdsRetriever.run(params)
+    doc_ids = MaterialDocIdsRetriever.run(params.dup.permit!.to_h)
 
     render :json => doc_ids.present?
   end
diff --git a/app/controllers/checklist/downloads_controller.rb b/app/controllers/checklist/downloads_controller.rb
index 600cf2267..88ca26e63 100644
--- a/app/controllers/checklist/downloads_controller.rb
+++ b/app/controllers/checklist/downloads_controller.rb
@@ -19,9 +19,9 @@ def index
   def create
     @download = Download.create(download_params)
     if download_params[:doc_type] == 'citesidmanual'
-      ManualDownloadWorker.perform_async(@download.id, params)
+      ManualDownloadWorker.perform_async(@download.id, params.dup.permit!.to_h)
     else
-      DownloadWorker.perform_async(@download.id, params)
+      DownloadWorker.perform_async(@download.id, params.dup.permit!.to_h)
     end
 
     @download = @download.attributes.except("filename", "path")
diff --git a/lib/modules/material_doc_ids_retriever.rb b/lib/modules/material_doc_ids_retriever.rb
index c37d9ff9e..60694ebb8 100644
--- a/lib/modules/material_doc_ids_retriever.rb
+++ b/lib/modules/material_doc_ids_retriever.rb
@@ -36,7 +36,7 @@ def self.run(params)
         chi_ids = MTaxonConcept.descendants_ids(params['taxon_concept_id']).map(&:to_i)
         anc_ids | chi_ids
       else
-        check_params = params.symbolize_keys
+        check_params = params.dup.permit!.to_h.symbolize_keys
         Checklist::Checklist.new(check_params).results.map(&:id)
       end
 

From 7c7d1e0e94d9cd0754e4cc192d21082ec9a03c50 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 7 Feb 2024 11:34:36 +0000
Subject: [PATCH 176/241] Strong migrations should not be enforced on legacy
 migrations

---
 config/initializers/strong_migrations.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/initializers/strong_migrations.rb

diff --git a/config/initializers/strong_migrations.rb b/config/initializers/strong_migrations.rb
new file mode 100644
index 000000000..282d61548
--- /dev/null
+++ b/config/initializers/strong_migrations.rb
@@ -0,0 +1 @@
+StrongMigrations.start_after = 20240101000000

From 2cce393694336fa5096687d8104209f1a721d073 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 7 Feb 2024 16:01:04 +0000
Subject: [PATCH 177/241] fix: delete_matched is now interpreted as a regexp

---
 app/models/concerns/changeable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/changeable.rb b/app/models/concerns/changeable.rb
index 498cb6c94..68e25fb66 100644
--- a/app/models/concerns/changeable.rb
+++ b/app/models/concerns/changeable.rb
@@ -153,6 +153,6 @@ def changeable_clear_show_tc_serializer_cache
     # which is 24 hours. Possible solution:
     # https://unep-wcmc.codebasehq.com/projects/cites-support-maintenance/tickets/114
 
-    Rails.cache.delete_matched('*ShowTaxonConceptSerializer*') unless Rails.env.production?
+    Rails.cache.delete_matched(/.*ShowTaxonConceptSerializer.*/) unless Rails.env.production?
   end
 end

From b3fe0f999b2df01db6c2f098add9533e2e0ee511 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 8 Feb 2024 10:36:32 +0000
Subject: [PATCH 178/241] build the cache in background through sidekiq, with
 unique job, to prevent many request coming from that endpoint, which generate
 a lot of slow SQL (cache not ready) and take down the server.

---
 .../api/v1/trade_plus_filters_controller.rb      | 16 +++++++++-------
 app/workers/trade_plus_filters_worker.rb         | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 app/workers/trade_plus_filters_worker.rb

diff --git a/app/controllers/api/v1/trade_plus_filters_controller.rb b/app/controllers/api/v1/trade_plus_filters_controller.rb
index b2c659bce..54554e9b9 100644
--- a/app/controllers/api/v1/trade_plus_filters_controller.rb
+++ b/app/controllers/api/v1/trade_plus_filters_controller.rb
@@ -1,14 +1,16 @@
 class Api::V1::TradePlusFiltersController < ApplicationController
   respond_to :json
 
+  CACHE_KEY_PREFIX = 'trade_plus_filters_with_locale_'
+
   def index
-    locale = params['locale'] || I18n.default_locale.to_s
-    filters_service = Trade::TradePlusFilters.new(locale)
-    filters = Rails.cache.fetch(['trade_plus_filters', locale], expires_in: 4.weeks) do
-      res = ApplicationRecord.connection.execute(filters_service.query)
-      filters_service.response_ordering(res)
+    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
+    filters = Rails.cache.read(cache_key)
+    if filters.nil?
+      TradePlusFiltersWorker.perform_async(I18n.locale)
+      head 500 # Cache not ready yet.
+    else
+      render :json => filters
     end
-
-    render :json => filters
   end
 end
diff --git a/app/workers/trade_plus_filters_worker.rb b/app/workers/trade_plus_filters_worker.rb
new file mode 100644
index 000000000..0fb5f7e75
--- /dev/null
+++ b/app/workers/trade_plus_filters_worker.rb
@@ -0,0 +1,14 @@
+class TradePlusFiltersWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: :admin, lock: :until_and_while_executing, retry: false
+
+  def perform(locale)
+    I18n.with_locale(locale) do
+      cache_key = "#{Api::V1::TradePlusFiltersController::CACHE_KEY_PREFIX}#{I18n.locale}"
+      filters_service = Trade::TradePlusFilters.new(locale)
+      res = ActiveRecord::Base.connection.execute(filters_service.query)
+      filters = filters_service.response_ordering(res)
+      Rails.cache.write(cache_key, filters, expires_in: 4.weeks)
+    end
+  end
+end

From acf3ced9999d1100bf0799c29113ff26050c63f9 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 8 Feb 2024 11:38:38 +0000
Subject: [PATCH 179/241] fix: sidekiq does not like symbols as args to
 perform_async, use JSON-safe string

---
 app/controllers/api/v1/trade_plus_filters_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/trade_plus_filters_controller.rb b/app/controllers/api/v1/trade_plus_filters_controller.rb
index 54554e9b9..155444210 100644
--- a/app/controllers/api/v1/trade_plus_filters_controller.rb
+++ b/app/controllers/api/v1/trade_plus_filters_controller.rb
@@ -5,9 +5,10 @@ class Api::V1::TradePlusFiltersController < ApplicationController
 
   def index
     cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
+
     filters = Rails.cache.read(cache_key)
     if filters.nil?
-      TradePlusFiltersWorker.perform_async(I18n.locale)
+      TradePlusFiltersWorker.perform_async(I18n.locale.to_s)
       head 500 # Cache not ready yet.
     else
       render :json => filters

From 835883ebeb8dbb2fa0f1bd4a6cbe2d5945d757d6 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 8 Feb 2024 11:40:38 +0000
Subject: [PATCH 180/241] feat: 409 makes more sense to me as this is an
 *anticipated* error, and backoff is safe

---
 app/controllers/api/v1/trade_plus_filters_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/trade_plus_filters_controller.rb b/app/controllers/api/v1/trade_plus_filters_controller.rb
index 155444210..8c111144f 100644
--- a/app/controllers/api/v1/trade_plus_filters_controller.rb
+++ b/app/controllers/api/v1/trade_plus_filters_controller.rb
@@ -9,7 +9,7 @@ def index
     filters = Rails.cache.read(cache_key)
     if filters.nil?
       TradePlusFiltersWorker.perform_async(I18n.locale.to_s)
-      head 500 # Cache not ready yet.
+      head 409 # Cache not ready yet.
     else
       render :json => filters
     end

From efdcb7736434a3044093af68d3a9d40cba4a65e0 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 8 Feb 2024 16:37:00 +0000
Subject: [PATCH 181/241] chore: add memcached image to dockerfile

---
 docker-compose.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index b32d9a311..2357bb280 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,12 +56,14 @@ services:
     tty: true
     environment:
       MAILER_ADDRESS: sapi-mailcatcher
+      MEMCACHE_SERVERS: sapi-memcached:11211
       SAPI_DATABASE_HOST: sapi-db
       SAPI_SIDEKIQ_REDIS_URL: redis://sapi-redis:6379/0
     depends_on:
       - redis
       - db
       - mailcatcher
+      - memcached
 
   redis:
     container_name: sapi-redis
@@ -85,12 +87,14 @@ services:
       - db
       - redis
       - mailcatcher
+      - memcached
     command: /bin/bash -l -c "bundle install && bundle exec sidekiq -C config/sidekiq.yml"
     volumes:
       - '.:/SAPI'
       - bundler_gems:/usr/local/bundle
     environment:
       MAILER_ADDRESS: sapi-mailcatcher
+      MEMCACHE_SERVERS: sapi-memcached:11211
       SAPI_DATABASE_HOST: sapi-db
       SAPI_SIDEKIQ_REDIS_URL: redis://sapi-redis:6379/0
 
@@ -102,6 +106,15 @@ services:
     networks:
       - sapi
 
+  memcached:
+    container_name: sapi-memcached
+    image: memcached:1.6
+    ports:
+      - "${SAPI_CONTAINER_MEMCACHE_PORT:-11211}:11211"
+    networks:
+      - sapi
+
+
 volumes:
   pgdata:
   bundler_gems:

From c12c6c4732c1e2292b146089736a9d39db3d6c40 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 8 Feb 2024 16:37:51 +0000
Subject: [PATCH 182/241] chore: use memcached in development, staging, and
 production so that behaviour is identical across all three

---
 config/environments/development.rb | 4 +++-
 config/environments/production.rb  | 2 +-
 config/environments/staging.rb     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9bf634ce9..d97567331 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -20,7 +20,9 @@
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 
-    config.cache_store = :memory_store
+    # Use a memcached instance as a cache store in local development.
+    config.cache_store = :mem_cache_store
+
     config.public_file_server.headers = {
       'Cache-Control' => "public, max-age=#{2.days.to_i}"
     }
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 79c3f6a68..bc6980ecf 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -57,7 +57,7 @@
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
 
-  # Use a different cache store in production.
+  # Use a memcached instance as a cache store on production.
   config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index fb92d8c2f..db571acea 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -57,8 +57,8 @@
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
 
-  # Use a different cache store in staging.
-  config.cache_store = :memory_store, { size: 64.megabytes }
+  # Use a memcached instance as a cache store on staging.
+  config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque

From 0171806b92a5389fe3dd62725d5265b420f28499 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 8 Feb 2024 16:38:08 +0000
Subject: [PATCH 183/241] fix: memcache does not support delete_matched

---
 app/models/concerns/changeable.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/changeable.rb b/app/models/concerns/changeable.rb
index 68e25fb66..e87490009 100644
--- a/app/models/concerns/changeable.rb
+++ b/app/models/concerns/changeable.rb
@@ -148,11 +148,11 @@ def changeable_bump_dependents_timestamp_part_two
 
   def changeable_clear_show_tc_serializer_cache
     ##
-    # Disabling because we use memcache on production, but memcache doesn't implement this method.
+    # Disabling because we use memcache, but memcache doesn't implement this method.
     # For now, changes to records that appear in serializers will not change until the caches are expired,
     # which is 24 hours. Possible solution:
     # https://unep-wcmc.codebasehq.com/projects/cites-support-maintenance/tickets/114
 
-    Rails.cache.delete_matched(/.*ShowTaxonConceptSerializer.*/) unless Rails.env.production?
+    # Rails.cache.delete_matched(/.*ShowTaxonConceptSerializer.*/) unless Rails.env.production?
   end
 end

From 485bd3c4d5195681767a9aeba97c82d743f8458a Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 8 Feb 2024 20:13:48 +0000
Subject: [PATCH 184/241] fix strong params

---
 app/controllers/admin/exports_controller.rb   | 11 ++++++++---
 app/controllers/admin/quotas_controller.rb    |  2 +-
 app/controllers/species/exports_controller.rb |  6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/exports_controller.rb b/app/controllers/admin/exports_controller.rb
index d0fa7f2ba..06b9fbee1 100644
--- a/app/controllers/admin/exports_controller.rb
+++ b/app/controllers/admin/exports_controller.rb
@@ -3,10 +3,10 @@ class Admin::ExportsController < Admin::AdminController
   def index; end
 
   def download
-    filters = (params[:filters] || {}).merge({
+    filters = (filter_params || {}).merge({
       :csv_separator =>
-        if params[:filters] && params[:filters][:csv_separator] &&
-          params[:filters][:csv_separator].downcase.strip.to_sym == :semicolon
+        if filter_params && filter_params[:csv_separator] &&
+          filter_params[:csv_separator].downcase.strip.to_sym == :semicolon
           :semicolon
         else
           :comma
@@ -49,4 +49,9 @@ def download
     end
   end
 
+  private
+
+  def filter_params
+    params[:filters].permit!
+  end
 end
diff --git a/app/controllers/admin/quotas_controller.rb b/app/controllers/admin/quotas_controller.rb
index 4f2b5bb30..4f2e549af 100644
--- a/app/controllers/admin/quotas_controller.rb
+++ b/app/controllers/admin/quotas_controller.rb
@@ -17,7 +17,7 @@ def duplication
 
   def duplicate
     quota_params = params[:quotas].merge(:current_user_id => current_user.id)
-    QuotasCopyWorker.perform_async(quota_params)
+    QuotasCopyWorker.perform_async(quota_params.permit!.to_hash)
     redirect_to admin_quotas_path({ :year => params[:quotas][:start_date].split("/")[2] }),
       :notice => "Your quotas are being duplicated in the background.
       They will be available from this page in a few seconds (please refresh it)"
diff --git a/app/controllers/species/exports_controller.rb b/app/controllers/species/exports_controller.rb
index 8fd2e6abb..12afc0abd 100644
--- a/app/controllers/species/exports_controller.rb
+++ b/app/controllers/species/exports_controller.rb
@@ -4,7 +4,7 @@ class Species::ExportsController < ApplicationController
   def download
     set_csv_separator
 
-    @filters = params[:filters].merge({
+    @filters = filter_params.merge({
       :csv_separator => cookies['speciesplus.csv_separator'].try(:to_sym)
     })
     case params[:data_type]
@@ -39,6 +39,10 @@ def download
 
   private
 
+  def filter_params
+    params[:filters].permit!
+  end
+
   def set_csv_separator
     separator_params = params[:filters][:csv_separator]
     separator_cookie = cookies['speciesplus.csv_separator']

From f5e7831dbf4d44fc1608cb38f3412f5aacdda2af Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Thu, 8 Feb 2024 20:14:02 +0000
Subject: [PATCH 185/241] fix ActionController::ParameterMissing

---
 app/controllers/admin/nomenclature_changes/lump_controller.rb   | 2 ++
 app/controllers/admin/nomenclature_changes/split_controller.rb  | 2 ++
 .../admin/nomenclature_changes/status_swap_controller.rb        | 2 ++
 .../admin/nomenclature_changes/status_to_accepted_controller.rb | 2 ++
 .../admin/nomenclature_changes/status_to_synonym_controller.rb  | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/app/controllers/admin/nomenclature_changes/lump_controller.rb b/app/controllers/admin/nomenclature_changes/lump_controller.rb
index f8303285d..c39645e02 100644
--- a/app/controllers/admin/nomenclature_changes/lump_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/lump_controller.rb
@@ -110,5 +110,7 @@ def nomenclature_change_lump_params
         # :legislation_reassignments_attributes,
       ]
     )
+  rescue ActionController::ParameterMissing
+    nil
   end
 end
diff --git a/app/controllers/admin/nomenclature_changes/split_controller.rb b/app/controllers/admin/nomenclature_changes/split_controller.rb
index 4cc127c35..8a3dbcd52 100644
--- a/app/controllers/admin/nomenclature_changes/split_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/split_controller.rb
@@ -111,5 +111,7 @@ def nomenclature_change_split_params
         # :legislation_reassignments_attributes,
       ]
     )
+  rescue ActionController::ParameterMissing
+    nil
   end
 end
diff --git a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
index 393fef8b8..1da2975ef 100644
--- a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
@@ -119,5 +119,7 @@ def nomenclature_change_status_swap_params
         ]
       ]
     )
+  rescue ActionController::ParameterMissing
+    nil
   end
 end
diff --git a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
index 0cdb352ab..418ac67a8 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
@@ -107,5 +107,7 @@ def nomenclature_change_status_to_accepted_params
         ]
       ]
     )
+  rescue ActionController::ParameterMissing
+    nil
   end
 end
diff --git a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
index 1808a6056..73497a219 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
@@ -118,5 +118,7 @@ def nomenclature_change_status_to_synonym_params
         ]
       ]
     )
+  rescue ActionController::ParameterMissing
+    nil
   end
 end

From 7b56fd6dc7021be4c741e4fb99b9dc48d31667c3 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Fri, 9 Feb 2024 22:19:52 +0000
Subject: [PATCH 186/241] bugs fix

---
 app/controllers/admin/documents_controller.rb     | 2 +-
 app/controllers/api/v1/documents_controller.rb    | 2 +-
 app/controllers/checklist/documents_controller.rb | 2 +-
 lib/modules/material_doc_ids_retriever.rb         | 7 ++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/documents_controller.rb b/app/controllers/admin/documents_controller.rb
index 9867fcd28..eba143ad3 100644
--- a/app/controllers/admin/documents_controller.rb
+++ b/app/controllers/admin/documents_controller.rb
@@ -51,7 +51,7 @@ def show
     @document = Document.find(params[:id])
     path_to_file = @document.filename.path unless @document.is_link?
     if @document.is_link?
-      redirect_to @document.filename
+      redirect_to @document.filename.model[:filename]
     elsif !File.exists?(path_to_file)
       render :file => "#{Rails.root}/public/404.html", :status => 404
     else
diff --git a/app/controllers/api/v1/documents_controller.rb b/app/controllers/api/v1/documents_controller.rb
index 72530d605..bdaea5e16 100644
--- a/app/controllers/api/v1/documents_controller.rb
+++ b/app/controllers/api/v1/documents_controller.rb
@@ -68,7 +68,7 @@ def show
     if access_denied? && !@document.is_public
       render_403
     elsif @document.is_link?
-      redirect_to @document.filename
+      redirect_to @document.filename.model[:filename]
     elsif !File.exists?(path_to_file)
       render_404
     else
diff --git a/app/controllers/checklist/documents_controller.rb b/app/controllers/checklist/documents_controller.rb
index 5ca129786..152a1f658 100644
--- a/app/controllers/checklist/documents_controller.rb
+++ b/app/controllers/checklist/documents_controller.rb
@@ -25,7 +25,7 @@ def show
     if access_denied? && !@document.is_public
       render_403
     elsif @document.is_link?
-      redirect_to @document.filename
+      redirect_to @document.filename.model[:filename]
     elsif !File.exists?(path_to_file)
       render_404
     else
diff --git a/lib/modules/material_doc_ids_retriever.rb b/lib/modules/material_doc_ids_retriever.rb
index 60694ebb8..6d8862c1e 100644
--- a/lib/modules/material_doc_ids_retriever.rb
+++ b/lib/modules/material_doc_ids_retriever.rb
@@ -36,7 +36,12 @@ def self.run(params)
         chi_ids = MTaxonConcept.descendants_ids(params['taxon_concept_id']).map(&:to_i)
         anc_ids | chi_ids
       else
-        check_params = params.dup.permit!.to_h.symbolize_keys
+        check_params =
+          if params.respond_to?(:permit!)
+            params.dup.permit!.to_h.symbolize_keys
+          else
+            params.symbolize_keys
+          end
         Checklist::Checklist.new(check_params).results.map(&:id)
       end
 

From fefabc86973dfd58e98952d5d643e2db206b51c5 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Sun, 11 Feb 2024 12:08:18 +0000
Subject: [PATCH 187/241] bug fixes

---
 config/initializers/hash.rb         | 26 ++++++++++++++++++++++++++
 lib/modules/import/rst/formatter.rb | 29 +----------------------------
 2 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 config/initializers/hash.rb

diff --git a/config/initializers/hash.rb b/config/initializers/hash.rb
new file mode 100644
index 000000000..fab3149d0
--- /dev/null
+++ b/config/initializers/hash.rb
@@ -0,0 +1,26 @@
+class Hash
+  def deep_slice(*allowed_keys)
+    sliced = {}
+    allowed_keys.each do |allowed_key|
+      if allowed_key.is_a?(Hash)
+        allowed_key.each do |allowed_subkey, allowed_subkey_values|
+          if has_key?(allowed_subkey)
+            value = self[allowed_subkey]
+            if value.is_a?(Hash)
+              sliced[allowed_subkey] = value.deep_slice(*Array.wrap(allowed_subkey_values))
+            elsif value.nil?
+              sliced[allowed_subkey] = ''
+            else
+              raise ArgumentError, "can only deep-slice hash values, but value for #{allowed_subkey.inspect} was of type #{value.class.name}"
+            end
+          end
+        end
+      else
+        if has_key?(allowed_key)
+          sliced[allowed_key] = self[allowed_key]
+        end
+      end
+    end
+    sliced
+  end
+end
diff --git a/lib/modules/import/rst/formatter.rb b/lib/modules/import/rst/formatter.rb
index 1fa029fd9..a186a88aa 100644
--- a/lib/modules/import/rst/formatter.rb
+++ b/lib/modules/import/rst/formatter.rb
@@ -2,35 +2,8 @@ module Import::Rst::Formatter
   class << self
     def format_data(data)
       data.map do |item|
-        item.deep_slice('id', 'countryId', 'status', 'startDate' ,'species' => 'name', 'meeting' => 'name')
+        item.deep_slice('id', 'countryId', 'status', 'startDate', 'species' => 'name', 'meeting' => 'name')
       end
     end
-
-    private
-
-    def deep_slice(*allowed_keys)
-      sliced = {}
-      allowed_keys.each do |allowed_key|
-        if allowed_key.is_a?(Hash)
-          allowed_key.each do |allowed_subkey, allowed_subkey_values|
-            if has_key?(allowed_subkey)
-              value = self[allowed_subkey]
-              if value.is_a?(Hash)
-                sliced[allowed_subkey] = value.deep_slice(*Array.wrap(allowed_subkey_values))
-              elsif value.nil?
-                sliced[allowed_subkey] = ''
-              else
-                raise ArgumentError, "can only deep-slice hash values, but value for #{allowed_subkey.inspect} was of type #{value.class.name}"
-              end
-            end
-          end
-        else
-          if has_key?(allowed_key)
-            sliced[allowed_key] = self[allowed_key]
-          end
-        end
-      end
-      sliced
-    end
   end
 end

From ae85cd34d83c6efef6cd5a2f79bfe2ffca6ff4d3 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Mon, 12 Feb 2024 13:30:05 +0000
Subject: [PATCH 188/241] 
 https://appsignal.com/wcmc/sites/56bdb6f5776f7253f3b05b02/exceptions/incidents/2824/samples/timestamp/2024-02-12T11:47:08Z

---
 app/controllers/species/exports_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/species/exports_controller.rb b/app/controllers/species/exports_controller.rb
index 12afc0abd..bf135e7e2 100644
--- a/app/controllers/species/exports_controller.rb
+++ b/app/controllers/species/exports_controller.rb
@@ -40,7 +40,9 @@ def download
   private
 
   def filter_params
-    params[:filters].permit!
+    params[:filters].permit!.to_h
+  rescue NoMethodError
+    {}
   end
 
   def set_csv_separator

From a5d4ff36e511401f9b83339e01096ce603eec6f3 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 12 Feb 2024 15:30:45 +0000
Subject: [PATCH 189/241] fix: remove extra argument in record.errors.add

---
 lib/csv_column_headers_validator.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/csv_column_headers_validator.rb b/lib/csv_column_headers_validator.rb
index ce8f0303e..38f543d02 100644
--- a/lib/csv_column_headers_validator.rb
+++ b/lib/csv_column_headers_validator.rb
@@ -7,23 +7,29 @@ def validate_each(record, attribute, value)
     begin
       CSV.open(value.current_path, "r") do |csv|
         reported_column_headers = csv.first.map(&:downcase)
+
         required_column_headers =
           if (record.point_of_view == 'E')
             Trade::SandboxTemplate::CSV_EXPORTER_COLUMNS
           else
             Trade::SandboxTemplate::CSV_IMPORTER_COLUMNS
           end.map(&:classify).map(&:downcase)
+
         missing_columns = required_column_headers - reported_column_headers
         excess_columns = reported_column_headers - required_column_headers
+
         if !(missing_columns.empty? && excess_columns.empty?)
           error_msg = "invalid column headers: "
+
           unless missing_columns.empty?
             error_msg += 'missing: ' + missing_columns.join(', ') + '; '
           end
+
           unless excess_columns.empty?
             error_msg += 'excess: ' + excess_columns.join(', ') + '; '
           end
-          record.errors.add(attribute, error_msg, {})
+
+          record.errors.add(attribute, error_msg)
         end
       end
     rescue => e

From c4a8d6f56e1e3887e35cf09753a8386fcec4db3a Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 12 Feb 2024 16:14:53 +0000
Subject: [PATCH 190/241] fix: another issue with json stringification/sql
 interpolation

---
 app/models/trade/inclusion_validation_rule.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/trade/inclusion_validation_rule.rb b/app/models/trade/inclusion_validation_rule.rb
index 10472969a..980ed745b 100644
--- a/app/models/trade/inclusion_validation_rule.rb
+++ b/app/models/trade/inclusion_validation_rule.rb
@@ -20,8 +20,18 @@ class Trade::InclusionValidationRule < Trade::ValidationRule
   # attr_accessible :valid_values_view
 
   def matching_records_for_aru_and_error(annual_report_upload, validation_error)
+    # The format of validation_error.matching_criteria seems to vary - sometimes
+    # it's a string, whereas under rspec it's an object.
+    matching_criteria_json = if
+      validation_error.matching_criteria.is_a? String
+    then
+      validation_error.matching_criteria
+    else
+      validation_error.matching_criteria.to_json
+    end
+
     @query = matching_records(annual_report_upload).where(
-      "#{Arel::Nodes.build_quoted(validation_error.matching_criteria.to_json).to_sql}::JSONB @> (#{jsonb_matching_criteria_for_comparison})::JSONB"
+      "#{Arel::Nodes.build_quoted(matching_criteria_json).to_sql}::JSONB @> (#{jsonb_matching_criteria_for_comparison})::JSONB"
     )
   end
 

From f0b10af36320d371988170ee0b39abc28dc80468 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 12 Feb 2024 17:00:18 +0000
Subject: [PATCH 191/241] fix: geo_entity_ids is an array, which requires a
 different syntax on strong params

---
 app/controllers/admin/documents_controller.rb |  3 +-
 .../admin/documents_controller_spec.rb        | 65 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/documents_controller.rb b/app/controllers/admin/documents_controller.rb
index eba143ad3..c6846c6bf 100644
--- a/app/controllers/admin/documents_controller.rb
+++ b/app/controllers/admin/documents_controller.rb
@@ -153,7 +153,8 @@ def document_params
       :primary_language_document_id,
       :designation_id,
       citations_attributes: [
-        :id, :_destroy, :document_id, :stringy_taxon_concept_ids, :geo_entity_ids
+        :id, :_destroy, :document_id, :stringy_taxon_concept_ids,
+        geo_entity_ids: []
       ],
       proposal_details_attributes: [
         :id, :_destroy, :document_id, :proposal_nature, :proposal_outcome_id,
diff --git a/spec/controllers/admin/documents_controller_spec.rb b/spec/controllers/admin/documents_controller_spec.rb
index e2520d6f8..b2fe9969c 100644
--- a/spec/controllers/admin/documents_controller_spec.rb
+++ b/spec/controllers/admin/documents_controller_spec.rb
@@ -4,6 +4,7 @@
   let(:event) { create(:event, published_at: DateTime.new(2014, 12, 25)) }
   let(:event2) { create(:event, published_at: DateTime.new(2015, 12, 12)) }
   let(:taxon_concept) { create(:taxon_concept) }
+  let(:taxon_concept2) { create(:taxon_concept) }
   let(:geo_entity) { create(:geo_entity) }
   let(:proposal_outcome) { create(:proposal_outcome) }
   let(:review_phase) { create(:review_phase) }
@@ -208,6 +209,70 @@
       end
     end
 
+    context "with nested citations_attributes" do
+      let(:document) { create(:proposal) }
+      let(:proposal_outcome) { create(:document_tag, type: 'DocumentTag::ProposalOutcome') }
+
+      it "assigns a taxon" do
+        put :update, params: {
+          id: document.id,
+          document: {
+            date: Date.today,
+            citations_attributes: [
+              {
+                stringy_taxon_concept_ids: taxon_concept.id
+              }
+            ]
+          }
+        }
+
+        expect(document.reload.citations.length).to eq(1)
+        expect(document.reload.citations[0].taxon_concepts.length).to eq(1)
+        expect(document.reload.citations[0].taxon_concepts[0].id).to eq(taxon_concept.id)
+      end
+
+      it "assigns multiple taxa" do
+        put :update, params: {
+          id: document.id,
+          document: {
+            date: Date.today,
+            citations_attributes: [
+              {
+                stringy_taxon_concept_ids: "#{taxon_concept.id},#{taxon_concept2.id}"
+              }
+            ]
+          }
+        }
+
+        expect(document.reload.citations.length).to eq(1)
+        expect(document.reload.citations[0].taxon_concepts.length).to eq(2)
+        expect([
+          document.reload.citations[0].taxon_concepts[0].id,
+          document.reload.citations[0].taxon_concepts[1].id
+        ].sort!).to eq([
+          taxon_concept.id,
+          taxon_concept2.id
+        ])
+      end
+
+      it "assigns a geo_entity_id" do
+        put :update, params: {
+          id: document.id,
+          document: {
+            date: Date.today,
+            citations_attributes: [
+              {
+                geo_entity_ids: [geo_entity.id]
+              }
+            ]
+          }
+        }
+
+        expect(document.reload.citations.length).to eq(1)
+        expect(document.reload.citations[0].geo_entities.length).to eq(1)
+        expect(document.reload.citations[0].geo_entities[0].id).to eq(geo_entity.id)
+      end
+    end
   end
 
   describe "DELETE destroy" do

From f71973a9184fb6a80d14733df91df9b906b067df Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 13 Feb 2024 09:35:53 +0000
Subject: [PATCH 192/241] fix strong params

---
 .../admin/taxon_listing_changes_controller.rb            | 9 ++++++---
 app/models/listing_change.rb                             | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/taxon_listing_changes_controller.rb b/app/controllers/admin/taxon_listing_changes_controller.rb
index 48965b6f3..92d2d6422 100644
--- a/app/controllers/admin/taxon_listing_changes_controller.rb
+++ b/app/controllers/admin/taxon_listing_changes_controller.rb
@@ -135,9 +135,10 @@ def load_listing_changes
   def listing_change_params
     params.require(:listing_change).permit(
       :taxon_concept_id, :species_listing_id, :change_type_id,
-      :effective_at, :is_current, :parent_id, :geo_entity_ids,
+      :effective_at, :is_current, :parent_id,
       :inclusion_taxon_concept_id, :hash_annotation_id, :event_id,
-      :excluded_geo_entities_ids, :excluded_taxon_concepts_ids, :internal_notes,
+      :internal_notes,
+      :excluded_taxon_concepts_ids, # String
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
       :created_by_id, :updated_by_id,
       annotation_attributes: [
@@ -147,7 +148,9 @@ def listing_change_params
       ],
       party_listing_distribution_attributes: [
         :id, :_destroy, :geo_entity_id, :listing_change_id, :is_party
-      ]
+      ],
+      geo_entity_ids: [],
+      excluded_geo_entities_ids: []
     )
   end
 end
diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 6ed85050d..9c2240b11 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -39,7 +39,8 @@ class ListingChange < ApplicationRecord
   #   :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
   #   :created_by_id, :updated_by_id
 
-  attr_accessor :excluded_geo_entities_ids, :excluded_taxon_concepts_ids
+  attr_accessor :excluded_geo_entities_ids, # Array
+                :excluded_taxon_concepts_ids # String
 
   belongs_to :event, optional: true
   has_many :listing_change_copies, :foreign_key => :original_id,

From 41fa2a6c0b70e5d5c2203201800c971e4523b551 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 13 Feb 2024 11:24:23 +0000
Subject: [PATCH 193/241] fix strong params

---
 app/controllers/admin/cites_suspensions_controller.rb    | 9 ++++++---
 .../admin/taxon_cites_suspensions_controller.rb          | 9 ++++++---
 .../admin/taxon_concept_references_controller.rb         | 3 ++-
 app/controllers/admin/taxon_concepts_controller.rb       | 9 ++++++---
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/controllers/admin/cites_suspensions_controller.rb b/app/controllers/admin/cites_suspensions_controller.rb
index 156372d49..f047c4007 100644
--- a/app/controllers/admin/cites_suspensions_controller.rb
+++ b/app/controllers/admin/cites_suspensions_controller.rb
@@ -57,13 +57,16 @@ def cites_suspension_params
       # attributes were in model `attr_accessible`.
       :start_notification_id, :end_notification_id,
       :applies_to_import, :end_date, :geo_entity_id, :is_current,
-      :notes, :publication_date, :purpose_ids, :quota, :type,
-      :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
+      :notes, :publication_date, :quota, :type,
+      :start_date, :unit_id, :internal_notes,
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
       :created_by_id, :updated_by_id, :url,
       :taxon_concept_id, cites_suspension_confirmations_attributes: [
         :id, :cites_suspension_notification_id, :_destroy
-      ]
+      ],
+      purpose_ids: [],
+      term_ids: [],
+      source_ids: []
     )
   end
 end
diff --git a/app/controllers/admin/taxon_cites_suspensions_controller.rb b/app/controllers/admin/taxon_cites_suspensions_controller.rb
index cd08586ae..ca780cb32 100644
--- a/app/controllers/admin/taxon_cites_suspensions_controller.rb
+++ b/app/controllers/admin/taxon_cites_suspensions_controller.rb
@@ -68,14 +68,17 @@ def cites_suspension_params
       # attributes were in model `attr_accessible`.
       :start_notification_id, :end_notification_id,
       :applies_to_import, :end_date, :geo_entity_id, :is_current,
-      :notes, :publication_date, :purpose_ids, :quota, :type,
-      :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
+      :notes, :publication_date, :quota, :type,
+      :start_date, :unit_id, :internal_notes,
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
       :created_by_id, :updated_by_id, :url,
       :taxon_concept_id,
       cites_suspension_confirmations_attributes: [
         :cites_suspension_notification_id, :id, :_destroy
-      ]
+      ],
+      purpose_ids: [],
+      term_ids: [],
+      source_ids: []
     )
   end
 end
diff --git a/app/controllers/admin/taxon_concept_references_controller.rb b/app/controllers/admin/taxon_concept_references_controller.rb
index e1109138c..c624dca91 100644
--- a/app/controllers/admin/taxon_concept_references_controller.rb
+++ b/app/controllers/admin/taxon_concept_references_controller.rb
@@ -77,7 +77,8 @@ def taxon_concept_reference_params
     params.require(:taxon_concept_reference).permit(
       # attributes were in model `attr_accessible`.
       :reference_id, :taxon_concept_id, :is_standard, :is_cascaded,
-      :excluded_taxon_concepts_ids, :created_by_id, :updated_by_id,
+      :created_by_id, :updated_by_id,
+      :excluded_taxon_concepts_ids, # String
       reference_attributes: [:citation, :created_by_id, :updated_by_id, :id, :_destroy]
     )
   end
diff --git a/app/controllers/admin/taxon_concepts_controller.rb b/app/controllers/admin/taxon_concepts_controller.rb
index 878cf4b2c..253ed787b 100644
--- a/app/controllers/admin/taxon_concepts_controller.rb
+++ b/app/controllers/admin/taxon_concepts_controller.rb
@@ -142,10 +142,13 @@ def taxon_concept_params
       :parent_id, :taxonomy_id, :rank_id,
       :parent_id, :author_year, :taxon_name_id, :taxonomic_position,
       :legacy_id, :legacy_type, :scientific_name, :name_status,
-      :tag_list, :legacy_trade_code, :hybrid_parents_ids,
-      :accepted_names_ids, :accepted_names_for_trade_name_ids,
+      :legacy_trade_code,
+      :hybrid_parents_ids, # String
+      :accepted_names_ids,
+      :accepted_names_for_trade_name_ids,
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
-      :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id
+      :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id,
+      tag_list: []
     )
   end
 end

From bd84612d86b14989838ab0057b43545fc82b6662 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 13 Feb 2024 11:36:55 +0000
Subject: [PATCH 194/241] fix strong params

---
 app/controllers/admin/distributions_controller.rb        | 5 +++--
 .../admin/nomenclature_changes/lump_controller.rb        | 3 ++-
 .../admin/nomenclature_changes/split_controller.rb       | 3 ++-
 .../admin/nomenclature_changes/status_swap_controller.rb | 6 ++++--
 .../status_to_accepted_controller.rb                     | 6 ++++--
 .../nomenclature_changes/status_to_synonym_controller.rb | 6 ++++--
 app/controllers/admin/taxon_quotas_controller.rb         | 9 ++++++---
 7 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/controllers/admin/distributions_controller.rb b/app/controllers/admin/distributions_controller.rb
index 299f4208f..f9cfca320 100644
--- a/app/controllers/admin/distributions_controller.rb
+++ b/app/controllers/admin/distributions_controller.rb
@@ -81,8 +81,9 @@ def load_distributions
   def distribution_params
     params.require(:distribution).permit(
       # attributes were in model `attr_accessible`.
-      :geo_entity_id, :taxon_concept_id, :tag_list, :internal_notes, :created_by_id, :updated_by_id,
-      references_attributes: [:citation, :created_by_id, :updated_by_id, :id, :_destroy]
+      :geo_entity_id, :taxon_concept_id, :internal_notes, :created_by_id, :updated_by_id,
+      references_attributes: [:citation, :created_by_id, :updated_by_id, :id, :_destroy],
+      tag_list: []
     )
   end
 end
diff --git a/app/controllers/admin/nomenclature_changes/lump_controller.rb b/app/controllers/admin/nomenclature_changes/lump_controller.rb
index c39645e02..3182277d7 100644
--- a/app/controllers/admin/nomenclature_changes/lump_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/lump_controller.rb
@@ -101,7 +101,8 @@ def nomenclature_change_lump_params
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
         :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-        :output_type, :tag_list, :created_by_id, :updated_by_id
+        :output_type, :created_by_id, :updated_by_id,
+        tag_list: []
         # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
         # xxx_attributes suppose not in-use.
         # :parent_reassignments_attributes,
diff --git a/app/controllers/admin/nomenclature_changes/split_controller.rb b/app/controllers/admin/nomenclature_changes/split_controller.rb
index 8a3dbcd52..0e5d9f24f 100644
--- a/app/controllers/admin/nomenclature_changes/split_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/split_controller.rb
@@ -102,7 +102,8 @@ def nomenclature_change_split_params
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
         :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-        :output_type, :tag_list, :created_by_id, :updated_by_id
+        :output_type, :created_by_id, :updated_by_id,
+        tag_list: []
         # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
         # xxx_attributes suppose not in-use.
         # :parent_reassignments_attributes,
diff --git a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
index 1da2975ef..4d7fd658a 100644
--- a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
@@ -62,7 +62,8 @@ def nomenclature_change_status_swap_params
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
         :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-        :output_type, :tag_list, :created_by_id, :updated_by_id
+        :output_type, :created_by_id, :updated_by_id,
+        tag_list: []
         # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
         # xxx_attributes suppose not in-use.
         # :parent_reassignments_attributes,
@@ -76,7 +77,8 @@ def nomenclature_change_status_swap_params
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
         :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-        :output_type, :tag_list, :created_by_id, :updated_by_id
+        :output_type, :created_by_id, :updated_by_id,
+        tag_list: []
         # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
         # xxx_attributes suppose not in-use.
         # :parent_reassignments_attributes,
diff --git a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
index 418ac67a8..695ad0fd3 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
@@ -50,7 +50,8 @@ def nomenclature_change_status_to_accepted_params
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
         :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-        :output_type, :tag_list, :created_by_id, :updated_by_id
+        :output_type, :created_by_id, :updated_by_id,
+        tag_list: []
         # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
         # xxx_attributes suppose not in-use.
         # :parent_reassignments_attributes,
@@ -64,7 +65,8 @@ def nomenclature_change_status_to_accepted_params
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
         :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-        :output_type, :tag_list, :created_by_id, :updated_by_id
+        :output_type, :created_by_id, :updated_by_id,
+        tag_list: []
         # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
         # xxx_attributes suppose not in-use.
         # :parent_reassignments_attributes,
diff --git a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
index 73497a219..b70de6fc1 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
@@ -61,7 +61,8 @@ def nomenclature_change_status_to_synonym_params
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
         :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-        :output_type, :tag_list, :created_by_id, :updated_by_id
+        :output_type, :created_by_id, :updated_by_id,
+        tag_list: []
         # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
         # xxx_attributes suppose not in-use.
         # :parent_reassignments_attributes,
@@ -75,7 +76,8 @@ def nomenclature_change_status_to_synonym_params
         :new_taxon_concept_id, :rank_id, :new_scientific_name, :new_author_year,
         :new_name_status, :new_parent_id, :new_rank_id, :taxonomy_id,
         :note_en, :note_es, :note_fr, :internal_note, :is_primary_output,
-        :output_type, :tag_list, :created_by_id, :updated_by_id
+        :output_type, :created_by_id, :updated_by_id,
+        tag_list: []
         # app/models/nomenclature_change/output.rb does not have `accepts_nested_attributes_for`, so
         # xxx_attributes suppose not in-use.
         # :parent_reassignments_attributes,
diff --git a/app/controllers/admin/taxon_quotas_controller.rb b/app/controllers/admin/taxon_quotas_controller.rb
index 865115045..25896c3ea 100644
--- a/app/controllers/admin/taxon_quotas_controller.rb
+++ b/app/controllers/admin/taxon_quotas_controller.rb
@@ -72,11 +72,14 @@ def collection
   def quota_params
     params.require(:quota).permit(
       :public_display, :end_date, :geo_entity_id, :is_current,
-      :notes, :publication_date, :purpose_ids, :quota, :type,
-      :source_ids, :start_date, :term_ids, :unit_id, :internal_notes,
+      :notes, :publication_date, :quota, :type,
+      :start_date, :unit_id, :internal_notes,
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
       :created_by_id, :updated_by_id, :url,
-      :taxon_concept_id
+      :taxon_concept_id,
+      term_ids: [],
+      source_ids: [],
+      purpose_ids: []
     )
   end
 end

From 079793832613559b737625b12bd6c5323abf5df2 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 13 Feb 2024 11:59:28 +0000
Subject: [PATCH 195/241] fix strong params (:output_ids)

---
 .../admin/nomenclature_changes/lump_controller.rb  | 14 +++++++++-----
 .../admin/nomenclature_changes/split_controller.rb | 12 ++++++++----
 .../nomenclature_changes/status_swap_controller.rb | 12 ++++++++----
 .../status_to_accepted_controller.rb               | 12 ++++++++----
 .../status_to_synonym_controller.rb                | 12 ++++++++----
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/app/controllers/admin/nomenclature_changes/lump_controller.rb b/app/controllers/admin/nomenclature_changes/lump_controller.rb
index 3182277d7..de67ae7f8 100644
--- a/app/controllers/admin/nomenclature_changes/lump_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/lump_controller.rb
@@ -69,30 +69,34 @@ def nomenclature_change_lump_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          :note_en, :note_es, :note_fr, :internal_note,
           reassignment_target_attributes: [
             :id, :_destroy,
             :nomenclature_change_output_id,
             :nomenclature_change_reassignment_id, :note
-          ]
+          ],
+          output_ids: []
         ],
         name_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         distribution_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         legislation_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ]
       ],
       output_attributes: [
diff --git a/app/controllers/admin/nomenclature_changes/split_controller.rb b/app/controllers/admin/nomenclature_changes/split_controller.rb
index 0e5d9f24f..f8b01a5b2 100644
--- a/app/controllers/admin/nomenclature_changes/split_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/split_controller.rb
@@ -70,7 +70,8 @@ def nomenclature_change_split_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: [],
           reassignment_target_attributes: [
             :id, :_destroy,
             :nomenclature_change_output_id,
@@ -81,19 +82,22 @@ def nomenclature_change_split_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         distribution_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         legislation_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ]
       ],
       outputs_attributes: [
diff --git a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
index 4d7fd658a..47706c873 100644
--- a/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_swap_controller.rb
@@ -94,7 +94,8 @@ def nomenclature_change_status_swap_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: [],
           reassignment_target_attributes: [
             :id, :_destroy,
             :nomenclature_change_output_id,
@@ -105,19 +106,22 @@ def nomenclature_change_status_swap_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         distribution_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         legislation_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ]
       ]
     )
diff --git a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
index 695ad0fd3..65d33fbd2 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_accepted_controller.rb
@@ -82,7 +82,8 @@ def nomenclature_change_status_to_accepted_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: [],
           reassignment_target_attributes: [
             :id, :_destroy,
             :nomenclature_change_output_id,
@@ -93,19 +94,22 @@ def nomenclature_change_status_to_accepted_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         distribution_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         legislation_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ]
       ]
     )
diff --git a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
index b70de6fc1..b20a129ba 100644
--- a/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
+++ b/app/controllers/admin/nomenclature_changes/status_to_synonym_controller.rb
@@ -93,7 +93,8 @@ def nomenclature_change_status_to_synonym_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids,
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: [],
           reassignment_target_attributes: [
             :id, :_destroy,
             :nomenclature_change_output_id,
@@ -104,19 +105,22 @@ def nomenclature_change_status_to_synonym_params
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         distribution_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ],
         legislation_reassignments_attributes: [
           :id, :_destroy,
           :type, :reassignable_id, :reassignable_type,
           :nomenclature_change_input_id, :nomenclature_change_output_id,
-          :note_en, :note_es, :note_fr, :internal_note, :output_ids
+          :note_en, :note_es, :note_fr, :internal_note,
+          output_ids: []
         ]
       ]
     )

From 2ae64f2147973d8ea584c14d699c9c138c2894dc Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 13 Feb 2024 12:57:56 +0000
Subject: [PATCH 196/241] fix :hybrid_parents_ids, which should be an array in
 form

---
 app/controllers/admin/taxon_concepts_controller.rb   | 4 ++--
 app/views/admin/taxon_concepts/_hybrid_form.html.erb | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/taxon_concepts_controller.rb b/app/controllers/admin/taxon_concepts_controller.rb
index 253ed787b..6b900ea98 100644
--- a/app/controllers/admin/taxon_concepts_controller.rb
+++ b/app/controllers/admin/taxon_concepts_controller.rb
@@ -143,12 +143,12 @@ def taxon_concept_params
       :parent_id, :author_year, :taxon_name_id, :taxonomic_position,
       :legacy_id, :legacy_type, :scientific_name, :name_status,
       :legacy_trade_code,
-      :hybrid_parents_ids, # String
       :accepted_names_ids,
       :accepted_names_for_trade_name_ids,
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
       :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id,
-      tag_list: []
+      tag_list: [],
+      hybrid_parents_ids: []
     )
   end
 end
diff --git a/app/views/admin/taxon_concepts/_hybrid_form.html.erb b/app/views/admin/taxon_concepts/_hybrid_form.html.erb
index 46506e907..6917824df 100644
--- a/app/views/admin/taxon_concepts/_hybrid_form.html.erb
+++ b/app/views/admin/taxon_concepts/_hybrid_form.html.erb
@@ -26,6 +26,7 @@
     <label class="control-label">Hybrid parents</label>
     <div class="controls">
       <%= f.text_field :hybrid_parents_ids, {
+        multiple: true,
         class: 'taxon-concept-multiple-max-2',
         :'data-name-status-filter' => ['A'].to_json,
         :'data-name-status' => 'A',

From 8ea079d9fa0caac7b6873db5c6a833c0bc628b60 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 13 Feb 2024 13:31:16 +0000
Subject: [PATCH 197/241] same as :hybrid_parents_ids in commit
 079793832613559b737625b12bd6c5323abf5df2

---
 app/controllers/admin/taxon_concepts_controller.rb       | 6 +++---
 app/views/admin/taxon_concepts/_synonym_form.html.erb    | 1 +
 app/views/admin/taxon_concepts/_trade_name_form.html.erb | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/taxon_concepts_controller.rb b/app/controllers/admin/taxon_concepts_controller.rb
index 6b900ea98..4f00f0c1c 100644
--- a/app/controllers/admin/taxon_concepts_controller.rb
+++ b/app/controllers/admin/taxon_concepts_controller.rb
@@ -143,12 +143,12 @@ def taxon_concept_params
       :parent_id, :author_year, :taxon_name_id, :taxonomic_position,
       :legacy_id, :legacy_type, :scientific_name, :name_status,
       :legacy_trade_code,
-      :accepted_names_ids,
-      :accepted_names_for_trade_name_ids,
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
       :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id,
       tag_list: [],
-      hybrid_parents_ids: []
+      accepted_names_for_trade_name_ids: [],
+      hybrid_parents_ids: [],
+      accepted_names_ids: []
     )
   end
 end
diff --git a/app/views/admin/taxon_concepts/_synonym_form.html.erb b/app/views/admin/taxon_concepts/_synonym_form.html.erb
index 73d1643b9..09dab17cf 100644
--- a/app/views/admin/taxon_concepts/_synonym_form.html.erb
+++ b/app/views/admin/taxon_concepts/_synonym_form.html.erb
@@ -26,6 +26,7 @@
     <label class="control-label">Accepted names</label>
     <div class="controls">
       <%= f.text_field :accepted_names_ids, {
+        multiple: true,
         class: 'taxon-concept-multiple',
         :'data-name-status-filter' => ['A'].to_json,
         :'data-name-status' => 'A',
diff --git a/app/views/admin/taxon_concepts/_trade_name_form.html.erb b/app/views/admin/taxon_concepts/_trade_name_form.html.erb
index 59dcbd1d4..3e386e617 100644
--- a/app/views/admin/taxon_concepts/_trade_name_form.html.erb
+++ b/app/views/admin/taxon_concepts/_trade_name_form.html.erb
@@ -26,6 +26,7 @@
     <label class="control-label">Accepted names</label>
     <div class="controls">
       <%= f.text_field :accepted_names_for_trade_name_ids, {
+        multiple: true,
         class: 'taxon-concept-multiple',
         :'data-name-status-filter' => ['A'].to_json,
         :'data-name-status' => 'A',

From 484b1baf37482cce44e88e5ce4d2dc39fbb4c07e Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 13 Feb 2024 14:44:36 +0000
Subject: [PATCH 198/241] existing bug fixes. TaxonConcept#data DB column
 missing default value, so it can return null instead if empty hash.

---
 app/models/taxon_concept.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index c84707f3d..df3062b6c 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -373,7 +373,8 @@ def has_distribution?
   end
 
   def rank_name
-    data['rank_name'] || self.rank.try(:name)
+    # Database column missing default value, so it is possible to return nil for `data`.
+    data.try(:[], 'rank_name') || self.rank.try(:name)
   end
 
   def cites_accepted

From 329c603b5ae81b522780fb99dac8891e8dfc4462 Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Tue, 13 Feb 2024 20:41:12 +0000
Subject: [PATCH 199/241] fix rspec

---
 app/controllers/admin/exports_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/admin/exports_controller.rb b/app/controllers/admin/exports_controller.rb
index 06b9fbee1..0e4d1a491 100644
--- a/app/controllers/admin/exports_controller.rb
+++ b/app/controllers/admin/exports_controller.rb
@@ -53,5 +53,7 @@ def download
 
   def filter_params
     params[:filters].permit!
+  rescue NoMethodError
+    {}
   end
 end

From f880e7dd86452c0a0d82ed08894b919edc30ba2a Mon Sep 17 00:00:00 2001
From: Leonardo Wong <leonardo.wong@unep-wcmc.org>
Date: Wed, 14 Feb 2024 03:24:31 +0000
Subject: [PATCH 200/241] 
 https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/104

---
 .../admin/taxon_concepts_controller.rb        |  8 ++++----
 app/models/taxon_concept.rb                   | 19 +++++++++++++++----
 .../taxon_concepts/_hybrid_form.html.erb      |  1 -
 .../taxon_concepts/_synonym_form.html.erb     |  1 -
 .../taxon_concepts/_trade_name_form.html.erb  |  1 -
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/controllers/admin/taxon_concepts_controller.rb b/app/controllers/admin/taxon_concepts_controller.rb
index 4f00f0c1c..9d4fa6e65 100644
--- a/app/controllers/admin/taxon_concepts_controller.rb
+++ b/app/controllers/admin/taxon_concepts_controller.rb
@@ -145,10 +145,10 @@ def taxon_concept_params
       :legacy_trade_code,
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
       :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id,
-      tag_list: [],
-      accepted_names_for_trade_name_ids: [],
-      hybrid_parents_ids: [],
-      accepted_names_ids: []
+      :hybrid_parents_ids, # String with comma
+      :accepted_names_ids, # String with comma
+      :accepted_names_for_trade_name_ids, # String with comma
+      tag_list: []
     )
   end
 end
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index df3062b6c..f8fcd13f7 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -420,16 +420,27 @@ def rebuild_taxonomy?(params)
   end
 
   def accepted_names_ids
-    @accepted_names_ids || accepted_names.pluck(:id)
+    if @accepted_names_ids.present?
+      @accepted_names_ids.to_s.split(',').compact.map(&:to_i)
+    else
+      accepted_names.pluck(:id)
+    end
   end
 
   def accepted_names_for_trade_name_ids
-    @accepted_names_for_trade_name_ids ||
-    accepted_names_for_trade_name.pluck(:id)
+    if @accepted_names_for_trade_name_ids.present?
+      @accepted_names_for_trade_name_ids.to_s.split(',').compact.map(&:to_i)
+    else
+      accepted_names_for_trade_name.pluck(:id)
+    end
   end
 
   def hybrid_parents_ids
-    @hybrid_parents_ids || hybrid_parents.pluck(:id)
+    if @hybrid_parents_ids.present?
+      @hybrid_parents_ids.to_s.split(',').compact.map(&:to_i)
+    else
+      hybrid_parents.pluck(:id)
+    end
   end
 
   def rebuild_relationships(taxa_ids)
diff --git a/app/views/admin/taxon_concepts/_hybrid_form.html.erb b/app/views/admin/taxon_concepts/_hybrid_form.html.erb
index 6917824df..46506e907 100644
--- a/app/views/admin/taxon_concepts/_hybrid_form.html.erb
+++ b/app/views/admin/taxon_concepts/_hybrid_form.html.erb
@@ -26,7 +26,6 @@
     <label class="control-label">Hybrid parents</label>
     <div class="controls">
       <%= f.text_field :hybrid_parents_ids, {
-        multiple: true,
         class: 'taxon-concept-multiple-max-2',
         :'data-name-status-filter' => ['A'].to_json,
         :'data-name-status' => 'A',
diff --git a/app/views/admin/taxon_concepts/_synonym_form.html.erb b/app/views/admin/taxon_concepts/_synonym_form.html.erb
index 09dab17cf..73d1643b9 100644
--- a/app/views/admin/taxon_concepts/_synonym_form.html.erb
+++ b/app/views/admin/taxon_concepts/_synonym_form.html.erb
@@ -26,7 +26,6 @@
     <label class="control-label">Accepted names</label>
     <div class="controls">
       <%= f.text_field :accepted_names_ids, {
-        multiple: true,
         class: 'taxon-concept-multiple',
         :'data-name-status-filter' => ['A'].to_json,
         :'data-name-status' => 'A',
diff --git a/app/views/admin/taxon_concepts/_trade_name_form.html.erb b/app/views/admin/taxon_concepts/_trade_name_form.html.erb
index 3e386e617..59dcbd1d4 100644
--- a/app/views/admin/taxon_concepts/_trade_name_form.html.erb
+++ b/app/views/admin/taxon_concepts/_trade_name_form.html.erb
@@ -26,7 +26,6 @@
     <label class="control-label">Accepted names</label>
     <div class="controls">
       <%= f.text_field :accepted_names_for_trade_name_ids, {
-        multiple: true,
         class: 'taxon-concept-multiple',
         :'data-name-status-filter' => ['A'].to_json,
         :'data-name-status' => 'A',

From 0bb700f0e0e0e47c120c7c52f4cc276f9012db96 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 19 Feb 2024 17:49:49 +0000
Subject: [PATCH 201/241] feat: suppress countries where species is extinct
 from checklist taxon concept view

---
 .../checklist/taxon_concept_serializer.rb          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/serializers/checklist/taxon_concept_serializer.rb b/app/serializers/checklist/taxon_concept_serializer.rb
index 7ca7eca5c..c5c1055d2 100644
--- a/app/serializers/checklist/taxon_concept_serializer.rb
+++ b/app/serializers/checklist/taxon_concept_serializer.rb
@@ -55,4 +55,18 @@ def include_ancestors_path?
     object.is_a? Checklist::HigherTaxaItem
   end
 
+  # Override the matview here to instead query the db for non-extinct distributions
+  def countries_ids
+    if object.countries_ids.length == 0
+      return object.countries_ids
+    end
+
+    non_extinct_distributions = object.taxon_concept.distributions.reject do |distribution|
+      distribution.tags.length == 1 && distribution.tags[0].name == 'extinct'
+    end
+
+    non_extinct_distributions.map do |distribution|
+      distribution.geo_entity_id
+    end
+  end
 end

From 5f551a2adac9986b087b4aa8afcf1bc08592587c Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 19 Feb 2024 18:02:55 +0000
Subject: [PATCH 202/241] refactor: get non-extinct distributions using a
 single query

---
 app/serializers/checklist/taxon_concept_serializer.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/serializers/checklist/taxon_concept_serializer.rb b/app/serializers/checklist/taxon_concept_serializer.rb
index c5c1055d2..25583160f 100644
--- a/app/serializers/checklist/taxon_concept_serializer.rb
+++ b/app/serializers/checklist/taxon_concept_serializer.rb
@@ -61,9 +61,11 @@ def countries_ids
       return object.countries_ids
     end
 
-    non_extinct_distributions = object.taxon_concept.distributions.reject do |distribution|
-      distribution.tags.length == 1 && distribution.tags[0].name == 'extinct'
-    end
+    non_extinct_distributions = Distribution.where(
+      taxon_concept_id: object.id
+    ).tagged_with(
+      ["extinct"], :exclude => true
+    )
 
     non_extinct_distributions.map do |distribution|
       distribution.geo_entity_id

From f22c599ba6835482ccbf93a0f4c22f4ff5993113 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 22 Feb 2024 17:23:36 +0000
Subject: [PATCH 203/241] feat: retain order countries in checklist from the
 view

---
 .../checklist/taxon_concept_serializer.rb            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/serializers/checklist/taxon_concept_serializer.rb b/app/serializers/checklist/taxon_concept_serializer.rb
index 25583160f..b1922243c 100644
--- a/app/serializers/checklist/taxon_concept_serializer.rb
+++ b/app/serializers/checklist/taxon_concept_serializer.rb
@@ -67,8 +67,16 @@ def countries_ids
       ["extinct"], :exclude => true
     )
 
-    non_extinct_distributions.map do |distribution|
-      distribution.geo_entity_id
+    # We can't just return the ids, we need to retain the order of the original
+    # array, which is sorted on English name.
+    country_id_not_extinct = (
+      non_extinct_distributions.map do |distribution|
+        [ distribution.geo_entity_id, true ]
+      end
+    ).to_h
+
+    object.countries_ids.select do |country_id|
+      country_id_not_extinct[country_id]
     end
   end
 end

From 8591f0b088e7f988e4765d8f35ee5903170f6710 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Fri, 23 Feb 2024 15:32:34 +0000
Subject: [PATCH 204/241] feat: in CITES checklist, show countries tagged
 "extinct, reintroduced"

---
 .../checklist/taxon_concept_serializer.rb     | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/serializers/checklist/taxon_concept_serializer.rb b/app/serializers/checklist/taxon_concept_serializer.rb
index b1922243c..76c4cb083 100644
--- a/app/serializers/checklist/taxon_concept_serializer.rb
+++ b/app/serializers/checklist/taxon_concept_serializer.rb
@@ -56,16 +56,42 @@ def include_ancestors_path?
   end
 
   # Override the matview here to instead query the db for non-extinct distributions
+  #
+  # These are defined as:
+  # - Distributions which are untagged
+  # - Distributions which have any tags other than extinct
+  #
+  # i.e. not distributions which have only a single tag, "extinct"
+  #
+  # A good example is Hippopus hippopus, which has:
+  #
+  # - American Samoa (145): extinct, reintroduced
+  # - Australia (113): (not tagged)
+  # - Cook Islands (242): introduced
+  # - Fiji (158): reintroduced, extinct
+  # - Guam (254): extinct
+  # - ...others
+  #
+  # Of those listed above, Guam and only Guam should be excluded.
   def countries_ids
     if object.countries_ids.length == 0
       return object.countries_ids
     end
 
-    non_extinct_distributions = Distribution.where(
-      taxon_concept_id: object.id
-    ).tagged_with(
-      ["extinct"], :exclude => true
-    )
+    non_extinct_distributions = Distribution.joins("
+      LEFT JOIN (
+        SELECT taggings.taggable_id, array_agg(tags.name) AS tag_names
+        FROM taggings
+        JOIN tags ON taggings.tag_id = tags.id
+        WHERE taggings.taggable_type = 'Distribution'
+        GROUP BY taggings.taggable_id
+      ) d_t ON
+        d_t.taggable_id = distributions.id AND
+        d_t.tag_names = '{extinct}'::VARCHAR[]
+    ").where({
+      taxon_concept_id: object.id,
+      'd_t.taggable_id': nil
+    })
 
     # We can't just return the ids, we need to retain the order of the original
     # array, which is sorted on English name.

From 370820b59bc30bd33aca840d419f9825870a4bd5 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 4 Mar 2024 09:47:22 +0000
Subject: [PATCH 205/241] fix: db:seed would not complete due to model
 validation.

---
 db/seeds.rb | 99 +++++++++++++++++++++++++++--------------------------
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index e207e7a58..a931cf251 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -3,14 +3,14 @@
 #
 # Examples:
 #
-#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-#   Mayor.create(name: 'Emanuel', city: cities.first)
+#   cities = City.create!([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create!(name: 'Emanuel', city: cities.first)
 
 puts "#{ListingDistribution.delete_all} listing distributions deleted"
 puts "#{GeoRelationship.delete_all} geo relationships deleted"
 puts "#{GeoRelationshipType.delete_all} geo relationship types deleted"
 GeoRelationshipType.dict.each do |type|
-  GeoRelationshipType.create(name: type)
+  GeoRelationshipType.create!(name: type)
 end
 puts "#{GeoRelationshipType.count} geo relationship types created"
 
@@ -22,17 +22,17 @@
 puts "#{GeoEntity.delete_all} geo entities deleted"
 puts "#{GeoEntityType.delete_all} geo entity types deleted"
 GeoEntityType.dict.each do |type|
-  GeoEntityType.create(name: type)
+  GeoEntityType.create!(name: type)
 end
 puts "#{GeoEntityType.count} geo entity types created"
 
 puts "#{TaxonRelationship.delete_all} taxon relationships deleted"
 puts "#{TaxonRelationshipType.delete_all} taxon relationship types deleted"
 ['EQUAL_TO', 'INCLUDES', 'OVERLAPS', 'DISJUNCT'].each do |relationship|
-  TaxonRelationshipType.create(:name => relationship, :is_intertaxonomic => true, :is_bidirectional => ['EQUAL_TO', 'DISJUNCT'].include?(relationship))
+  TaxonRelationshipType.create!(:name => relationship, :is_intertaxonomic => true, :is_bidirectional => ['EQUAL_TO', 'DISJUNCT'].include?(relationship))
 end
 ['HAS_SYNONYM', 'HAS_HYBRID', 'HAS_TRADE_NAME'].each do |relationship|
-  TaxonRelationshipType.create(:name => relationship, :is_intertaxonomic => false)
+  TaxonRelationshipType.create!(:name => relationship, :is_intertaxonomic => false)
 end
 puts "#{TaxonRelationshipType.count} taxon relationship types created"
 
@@ -47,16 +47,16 @@
 puts "#{TradeRestrictionSource.delete_all} trade restrictions sources deleted"
 puts "#{TradeRestrictionPurpose.delete_all} trade restrictions purposes deleted"
 
-Rank.create(:name => Rank::KINGDOM, :taxonomic_position => '1', :fixed_order => true)
-Rank.create(:name => Rank::PHYLUM, :taxonomic_position => '2', :fixed_order => true)
-Rank.create(:name => Rank::CLASS, :taxonomic_position => '3', :fixed_order => true)
-Rank.create(:name => Rank::ORDER, :taxonomic_position => '4', :fixed_order => false)
-Rank.create(:name => Rank::FAMILY, :taxonomic_position => '5', :fixed_order => false)
-Rank.create(:name => Rank::SUBFAMILY, :taxonomic_position => '5.1', :fixed_order => false)
-Rank.create(:name => Rank::GENUS, :taxonomic_position => '6', :fixed_order => false)
-Rank.create(:name => Rank::SPECIES, :taxonomic_position => '7', :fixed_order => false)
-Rank.create(:name => Rank::SUBSPECIES, :taxonomic_position => '7.1', :fixed_order => false)
-Rank.create(:name => Rank::VARIETY, :taxonomic_position => '7.2', :fixed_order => false)
+Rank.create!(:name => Rank::KINGDOM, :display_name_en => Rank::KINGDOM, :taxonomic_position => '1', :fixed_order => true)
+Rank.create!(:name => Rank::PHYLUM, :display_name_en => Rank::PHYLUM, :taxonomic_position => '2', :fixed_order => true)
+Rank.create!(:name => Rank::CLASS, :display_name_en => Rank::CLASS, :taxonomic_position => '3', :fixed_order => true)
+Rank.create!(:name => Rank::ORDER, :display_name_en => Rank::ORDER, :taxonomic_position => '4', :fixed_order => false)
+Rank.create!(:name => Rank::FAMILY, :display_name_en => Rank::FAMILY, :taxonomic_position => '5', :fixed_order => false)
+Rank.create!(:name => Rank::SUBFAMILY, :display_name_en => Rank::SUBFAMILY, :taxonomic_position => '5.1', :fixed_order => false)
+Rank.create!(:name => Rank::GENUS, :display_name_en => Rank::GENUS, :taxonomic_position => '6', :fixed_order => false)
+Rank.create!(:name => Rank::SPECIES, :display_name_en => Rank::SPECIES, :taxonomic_position => '7', :fixed_order => false)
+Rank.create!(:name => Rank::SUBSPECIES, :display_name_en => Rank::SUBSPECIES, :taxonomic_position => '7.1', :fixed_order => false)
+Rank.create!(:name => Rank::VARIETY, :display_name_en => Rank::VARIETY, :taxonomic_position => '7.2', :fixed_order => false)
 
 puts "#{Rank.count} ranks created"
 
@@ -71,7 +71,7 @@
 [
   "I", "II", "III", "IV", "June 1986", "None",
   "Post-CoP11", "Post-CoP12", "Post-CoP13"
-].each { |tag| DocumentTag::ReviewPhase.create(name: tag) }
+].each { |tag| DocumentTag::ReviewPhase.create!(name: tag) }
 
 [
   "AC review and categorization (k)", "AC review and categorization [k]",
@@ -79,33 +79,34 @@
   "PC review and categorization [k]", "PC review and categorization (m)", "PC review (e)",
   "Research of species [j]", "Selection of species (b)", "Selection of species [b]",
   "Species selection (b)", "Species selection [b]"
-].each { |tag| DocumentTag::ProcessStage.create(name: tag) }
+].each { |tag| DocumentTag::ProcessStage.create!(name: tag) }
 
 [
   "Accepted", "Cancelled", "Deferred",
   "Redundant", "Rejected", "Transferred to other proposals",
   "Withdrawn", "Accepted as amended", "Rejected as amended",
   "Adopted"
-].each { |tag| DocumentTag::ProposalOutcome.create(name: tag) }
+].each { |tag| DocumentTag::ProposalOutcome.create!(name: tag) }
 
 puts "#{DocumentTag.count} document tags created"
 
 Taxonomy.dict.each do |type|
-  Taxonomy.create(name: type)
+  Taxonomy.create!(name: type)
 end
 taxonomy = Taxonomy.find_by_name(Taxonomy::CITES_EU)
 cms_taxonomy = Taxonomy.find_by_name(Taxonomy::CMS)
 puts "#{Taxonomy.count} taxonomies created"
 
 [Designation::CITES, Designation::EU].each do |designation|
-  d = Designation.create(:name => designation, :taxonomy_id => taxonomy.id)
+  d = Designation.create!(:name => designation, :taxonomy_id => taxonomy.id)
+
   ChangeType.dict.each do |change_type_name|
-    ChangeType.create(:name => change_type_name, :designation_id => d.id)
+    ChangeType.create!(:name => change_type_name, :display_name_en => change_type_name, :designation_id => d.id)
   end
 end
 
 [Designation::CMS].each do |designation|
-  d = Designation.create(:name => designation, :taxonomy_id => cms_taxonomy.id)
+  d = Designation.create!(:name => designation, :taxonomy_id => cms_taxonomy.id)
 end
 
 puts "#{Designation.count} designations created"
@@ -114,7 +115,7 @@
 cites = Designation.find_by_name(Designation::CITES)
 
 %w(I II III).each do |app_abbr|
-  SpeciesListing.create(
+  SpeciesListing.create!(
     :name => "Appendix #{app_abbr}",
     :abbreviation => app_abbr,
     :designation_id => cites.id
@@ -124,7 +125,7 @@
 eu = Designation.find_by_name(Designation::EU)
 
 %w(A B C D).each do |app_abbr|
-  SpeciesListing.create(
+  SpeciesListing.create!(
     :name => "Annex #{app_abbr}",
     :abbreviation => app_abbr,
     :designation_id => eu.id
@@ -134,7 +135,7 @@
 cms = Designation.find_by_name(Designation::CMS)
 
 %w(I II).each do |app_abbr|
-  SpeciesListing.create(
+  SpeciesListing.create!(
     :name => "Appendix #{app_abbr}",
     :abbreviation => app_abbr,
     :designation_id => cms.id
@@ -317,7 +318,7 @@
   [cms_taxonomy, taxonomy].each do |taksonomy|
     name = TaxonName.find_or_create_by(scientific_name: kingdom_name)
     next if taksonomy.name == Taxonomy::CMS && kingdom_name == 'Plantae'
-    kingdom = TaxonConcept.create(:rank_id => kingdom_rank_id,
+    kingdom = TaxonConcept.create!(:rank_id => kingdom_rank_id,
                                   :taxon_name_id => name.id,
                                   :taxonomy_id => taksonomy.id,
                                   :legacy_id => kingdom_props[:legacy_id], :legacy_type => kingdom_props[:legacy_type],
@@ -328,7 +329,7 @@
     phyla.each do |phylum_props|
       phylum_name = phylum_props[:name]
       name = TaxonName.find_or_create_by(scientific_name: phylum_name)
-      phylum = TaxonConcept.create(:rank_id => phylum_rank_id,
+      phylum = TaxonConcept.create!(:rank_id => phylum_rank_id,
          :taxon_name_id => name.id,
          :taxonomy_id => taksonomy.id,
          :legacy_id => phylum_props[:legacy_id], :legacy_type => phylum_props[:legacy_type],
@@ -340,7 +341,7 @@
       klasses.each do |klass_props|
         klass_name = klass_props[:name]
         name = TaxonName.find_or_create_by(scientific_name: klass_name)
-        klass = TaxonConcept.create(:rank_id => klass_rank_id,
+        klass = TaxonConcept.create!(:rank_id => klass_rank_id,
           :taxon_name_id => name.id,
           :taxonomy_id => taksonomy.id,
           :legacy_id => klass_props[:legacy_id], :legacy_type => klass_props[:legacy_type],
@@ -361,98 +362,98 @@
 puts "#{TradeRestriction.delete_all} trade restrictions deleted"
 
 ['trading_partner', 'term_code', 'taxon_name', 'appendix', 'quantity', 'year'].each do |col|
-  Trade::PresenceValidationRule.create(:column_names => [col], :run_order => 1)
+  Trade::PresenceValidationRule.create!(:column_names => [col], :run_order => 1)
 end
 ['quantity', 'year'].each do |col|
-  Trade::NumericalityValidationRule.create(
+  Trade::NumericalityValidationRule.create!(
     :column_names => [col],
     :run_order => 2,
     :is_strict => true
   )
 end
 
-Trade::FormatValidationRule.create(
+Trade::FormatValidationRule.create!(
   :column_names => ['year'],
   :format_re => '^\d{4}$',
   :run_order => 2,
   :is_strict => true
 )
 
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['term_code'],
   :valid_values_view => 'valid_term_code_view',
   :run_order => 3,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['source_code'],
   :valid_values_view => 'valid_source_code_view',
   :run_order => 3,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['purpose_code'],
   :valid_values_view => 'valid_purpose_code_view',
   :run_order => 3,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['unit_code'],
   :valid_values_view => 'valid_unit_code_view',
   :run_order => 3,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['trading_partner'],
   :valid_values_view => 'valid_trading_partner_view',
   :run_order => 3,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['country_of_origin'],
   :valid_values_view => 'valid_country_of_origin_view',
   :run_order => 3,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['taxon_name'],
   :valid_values_view => 'valid_taxon_name_view',
   :run_order => 3,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['appendix'],
   :valid_values_view => 'valid_appendix_view',
   :run_order => 3,
   :is_strict => true
 )
-Trade::TaxonConceptAppendixYearValidationRule.create(
+Trade::TaxonConceptAppendixYearValidationRule.create!(
   :column_names => ['taxon_concept_id', 'appendix', 'year'],
   :valid_values_view => 'valid_taxon_concept_appendix_year_mview',
   :run_order => 4,
   :is_primary => false,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['term_code', 'unit_code'],
   :valid_values_view => 'valid_term_unit_view',
   :run_order => 4,
   :is_primary => false
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['term_code', 'purpose_code'],
   :valid_values_view => 'valid_term_purpose_view',
   :run_order => 4,
   :is_primary => false
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :column_names => ['taxon_concept_id', 'term_code'],
   :valid_values_view => 'valid_taxon_concept_term_view',
   :run_order => 4,
   :is_primary => false,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :scope => {
     :rank => { :inclusion => [Rank::SPECIES, Rank::SUBSPECIES] },
     :source_code => { :inclusion => ['W'] },
@@ -464,7 +465,7 @@
   :is_primary => false,
   :is_strict => true
 )
-Trade::InclusionValidationRule.create(
+Trade::InclusionValidationRule.create!(
   :scope => {
     :rank => { :inclusion => [Rank::SPECIES, Rank::SUBSPECIES] },
     :source_code => { :inclusion => ['W'] },
@@ -477,20 +478,20 @@
   :is_primary => false,
   :is_strict => true
 )
-Trade::DistinctValuesValidationRule.create(
+Trade::DistinctValuesValidationRule.create!(
   :column_names => ['exporter', 'country_of_origin'],
   :run_order => 4,
   :is_primary => false,
   :is_strict => true
 )
-Trade::DistinctValuesValidationRule.create(
+Trade::DistinctValuesValidationRule.create!(
   :column_names => ['exporter', 'importer'],
   :run_order => 4,
   :is_primary => false,
   :is_strict => true
 )
 
-Trade::TaxonConceptSourceValidationRule.create(
+Trade::TaxonConceptSourceValidationRule.create!(
   :column_names => ['taxon_concept_id', 'source_code'],
   :run_order => 4,
   :is_primary => false,

From 10522b1b04751a790e0024384c54f46696143d68 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 4 Mar 2024 10:19:25 +0000
Subject: [PATCH 206/241] fix: rebuild_cites_listing_changes_mview did not work
 after drop/recreate/migrate/seed of test db

---
 ...uild_designation_listing_changes_mview.sql | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/db/mviews/005_rebuild_designation_listing_changes_mview.sql b/db/mviews/005_rebuild_designation_listing_changes_mview.sql
index 44e6b0b12..bba76a19e 100644
--- a/db/mviews/005_rebuild_designation_listing_changes_mview.sql
+++ b/db/mviews/005_rebuild_designation_listing_changes_mview.sql
@@ -47,22 +47,22 @@ CREATE OR REPLACE FUNCTION rebuild_designation_listing_changes_mview(
     listing_changes.event_id,
     listing_changes.effective_at,
     listing_changes.species_listing_id,
-    species_listings.abbreviation AS species_listing_name,
+    species_listings.abbreviation::VARCHAR(255) AS species_listing_name,
     listing_changes.change_type_id,
-    change_types.name AS change_type_name,
+    change_types.name::VARCHAR(255) AS change_type_name,
     change_types.designation_id AS designation_id,
-    designations.name AS designation_name,
+    designations.name::VARCHAR(255) AS designation_name,
     listing_changes.parent_id,
-    listing_changes.nomenclature_note_en,
-    listing_changes.nomenclature_note_fr,
-    listing_changes.nomenclature_note_es,
+    listing_changes.nomenclature_note_en::text,
+    listing_changes.nomenclature_note_fr::text,
+    listing_changes.nomenclature_note_es::text,
     tmp_lc.party_id,
-    geo_entities.iso_code2 AS party_iso_code,
-    geo_entities.name_en AS party_full_name_en,
-    geo_entities.name_es AS party_full_name_es,
-    geo_entities.name_fr AS party_full_name_fr,
+    geo_entities.iso_code2::VARCHAR(255) AS party_iso_code,
+    geo_entities.name_en::VARCHAR(255) AS party_full_name_en,
+    geo_entities.name_es::VARCHAR(255) AS party_full_name_es,
+    geo_entities.name_fr::VARCHAR(255) AS party_full_name_fr,
     geo_entity_types.name AS geo_entity_type,
-    annotations.symbol AS ann_symbol,
+    annotations.symbol::VARCHAR(255) AS ann_symbol,
     annotations.full_note_en,
     annotations.full_note_es,
     annotations.full_note_fr,
@@ -71,8 +71,8 @@ CREATE OR REPLACE FUNCTION rebuild_designation_listing_changes_mview(
     annotations.short_note_fr,
     annotations.display_in_index,
     annotations.display_in_footnote,
-    hash_annotations.symbol AS hash_ann_symbol,
-    hash_annotations.parent_symbol AS hash_ann_parent_symbol,
+    hash_annotations.symbol::VARCHAR(255) AS hash_ann_symbol,
+    hash_annotations.parent_symbol::VARCHAR(255) AS hash_ann_parent_symbol,
     hash_annotations.full_note_en AS hash_full_note_en,
     hash_annotations.full_note_es AS hash_full_note_es,
     hash_annotations.full_note_fr AS hash_full_note_fr,

From a4e3a733e167e5fda27cf2ceecb28357356c2e36 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 4 Mar 2024 11:58:27 +0000
Subject: [PATCH 207/241] fix: rails will now serialise hashes to JSONB
 correctly, and stringifying them first causes them to be stored as JSONB
 strings

---
 app/models/trade/inclusion_validation_rule.rb | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/models/trade/inclusion_validation_rule.rb b/app/models/trade/inclusion_validation_rule.rb
index 980ed745b..1d0f0d5b0 100644
--- a/app/models/trade/inclusion_validation_rule.rb
+++ b/app/models/trade/inclusion_validation_rule.rb
@@ -77,7 +77,7 @@ def refresh_errors_if_needed(annual_report_upload)
         existing_record,
         mr.error_count.to_i,
         error_message(values_hash_for_display),
-        jsonb_matching_criteria_for_insert(values_hash)
+        values_hash
       )
       if existing_record
         errors_to_destroy.reject! { |e| e.id == existing_record.id }
@@ -113,21 +113,6 @@ def column_names_for_display
     end
   end
 
-  def jsonb_matching_criteria_for_insert(values_hash)
-    jsonb_keys_and_values = column_names.map do |c|
-      is_numeric = (c =~ /.+_id$/ || c == 'year')
-      value = values_hash[c]
-      value_quoted =
-        if is_numeric
-          value
-        else
-          "\"#{value}\""
-        end
-      "\"#{c}\": #{value_quoted}"
-    end.join(', ')
-    '{' + jsonb_keys_and_values + '}'
-  end
-
   def jsonb_matching_criteria_for_comparison(values_hash = nil)
     jsonb_keys_and_values = column_names.map do |c|
       is_numeric = (c =~ /.+_id$/ || c == 'year')

From ae8cac99c816c236ac6f916d221d8904c1217448 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 4 Mar 2024 12:15:10 +0000
Subject: [PATCH 208/241] fix: add a validation on Trade::ValidationError model
 to ensure JSON type of matching_criteria

---
 app/models/trade/validation_error.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/models/trade/validation_error.rb b/app/models/trade/validation_error.rb
index 125744e55..456de40da 100644
--- a/app/models/trade/validation_error.rb
+++ b/app/models/trade/validation_error.rb
@@ -1,4 +1,10 @@
 class Trade::ValidationError < ApplicationRecord
+  include ActiveModel::Validations
+
+  validates_each :matching_criteria, allow_blank: true do |record, attr, value|
+    record.errors.add attr, "must be a Hash, got a #{value.class.name}" if !value.is_a? Hash
+  end
+
   belongs_to :annual_report_upload, class_name: 'Trade::AnnualReportUpload'
   belongs_to :validation_rule, class_name: 'Trade::ValidationRule'
 

From e4693c2b62e4749f4f8e50949d5860db6522c4b8 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 08:53:02 +0000
Subject: [PATCH 209/241] fix: tests for Trade::ValidationRule should use hash,
 not string matching_criteria

---
 spec/models/trade/validation_rule_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/trade/validation_rule_spec.rb b/spec/models/trade/validation_rule_spec.rb
index 6688b55b1..690b4f8e1 100644
--- a/spec/models/trade/validation_rule_spec.rb
+++ b/spec/models/trade/validation_rule_spec.rb
@@ -45,7 +45,7 @@
         :validation_error,
         annual_report_upload_id: annual_report_upload.id,
         validation_rule_id: validation_rule.id,
-        matching_criteria: "{}",
+        matching_criteria: {},
         is_ignored: false,
         is_primary: true,
         error_message: "taxon_name cannot be blank",
@@ -81,7 +81,7 @@
         :validation_error,
         annual_report_upload_id: annual_report_upload.id,
         validation_rule_id: validation_rule.id,
-        matching_criteria: "{}",
+        matching_criteria: {},
         is_ignored: false,
         is_primary: true,
         error_message: "taxon_name cannot be blank",

From 94d20a5f8c92ddf4ed3f96bc6316da2205852470 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 09:22:50 +0000
Subject: [PATCH 210/241] fix: another instance of a string literal in JSONB
 matching_criteria where a Hash is needed

---
 app/models/trade/validation_rule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trade/validation_rule.rb b/app/models/trade/validation_rule.rb
index bda8ebdd1..5f5670abb 100644
--- a/app/models/trade/validation_rule.rb
+++ b/app/models/trade/validation_rule.rb
@@ -65,7 +65,7 @@ def refresh_errors_if_needed(annual_report_upload)
       existing_record,
       matching_records.length,
       error_message,
-      '{}'
+      {}
     )
   end
 

From f8fe16d01f859b5312a520983eeb09561134c120 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 4 Mar 2024 15:10:54 +0000
Subject: [PATCH 211/241] chore: make deploy fewer commands; use cp rather than
 ln to avoid a permissions issue

---
 Dockerfile.cap-deploy | 10 ++--------
 cap-deploy-shell.sh   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 cap-deploy-shell.sh

diff --git a/Dockerfile.cap-deploy b/Dockerfile.cap-deploy
index 88934654e..710af3b5c 100644
--- a/Dockerfile.cap-deploy
+++ b/Dockerfile.cap-deploy
@@ -33,16 +33,10 @@ RUN /bin/bash -c "source /etc/profile.d/rvm.sh \
     && gem install bundler:1.17.3 \
     && bundle"
 
-# Host SSH key/config
-RUN mkdir -p ~/.ssh && ln -s /run/secrets/host_ssh_key ~/.ssh/id_ed25519 && ln -s /run/secrets/host_ssh_config ~/.ssh/config
-
 ENTRYPOINT ["/bin/bash", "-l"]
 
 ##########################################
 ## Run the following in container
 ##########################################
-# /bin/bash
-# source /etc/profile.d/rvm.sh
-# eval "$(ssh-agent -s)"
-# ssh-add
-# CAP_BRANCH=<branch> cap staging deploy
+# /bin/bash --rcfile cap-deploy-shell.sh
+# (bash) $ CAP_BRANCH=<branch> cap staging deploy
diff --git a/cap-deploy-shell.sh b/cap-deploy-shell.sh
new file mode 100644
index 000000000..cbd2dd922
--- /dev/null
+++ b/cap-deploy-shell.sh
@@ -0,0 +1,12 @@
+#/bin/bash
+mkdir -p ~/.ssh;
+
+cp /run/secrets/host_ssh_key ~/.ssh/id_ed25519
+chmod 600 ~/.ssh/id_ed25519
+
+cp /run/secrets/host_ssh_config ~/.ssh/config
+chmod 600 ~/.ssh/config
+
+source /etc/profile.d/rvm.sh
+eval "$(ssh-agent -s)"
+ssh-add

From 2955493074d35b11cf3bd925492d1e8d292400c3 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 4 Mar 2024 15:43:08 +0000
Subject: [PATCH 212/241] fix: do not apply CSRF protection to CITES checklist
 downloads

---
 app/controllers/checklist/downloads_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/checklist/downloads_controller.rb b/app/controllers/checklist/downloads_controller.rb
index 88ca26e63..b941329e6 100644
--- a/app/controllers/checklist/downloads_controller.rb
+++ b/app/controllers/checklist/downloads_controller.rb
@@ -15,6 +15,11 @@ def index
     render :json => @downloads.to_json
   end
 
+  # Permissions are not checked here, therefore CSRF is redundant.
+  # Requests are triggered from the CITES checklist which has no means of
+  # generating adequate CSRF protection.
+  skip_before_action :verify_authenticity_token, only:[:create]
+
   # POST downloads/
   def create
     @download = Download.create(download_params)

From 1d85c1eeac0d10b6b6ee07d7aeec69b07089a5e7 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 4 Mar 2024 18:52:08 +0000
Subject: [PATCH 213/241] fix: rework caching for purposes, sources, terms,
 units API controllers

This avoids the use of expire_action which was throwing an error and is
not documented. The action caching is no longer part of Rails and is
only used on SAPI within WCMC.
---
 app/controllers/api/v1/purposes_controller.rb | 24 +++++++++++++------
 app/controllers/api/v1/sources_controller.rb  | 24 +++++++++++++------
 app/controllers/api/v1/terms_controller.rb    | 24 +++++++++++++------
 app/controllers/api/v1/units_controller.rb    | 24 +++++++++++++------
 app/models/trade_codes/purpose.rb             | 16 +++----------
 app/models/trade_codes/source.rb              | 16 +++----------
 app/models/trade_codes/term.rb                | 16 +++----------
 app/models/trade_codes/unit.rb                | 16 +++----------
 8 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/app/controllers/api/v1/purposes_controller.rb b/app/controllers/api/v1/purposes_controller.rb
index f5228ad4b..5fb88371e 100644
--- a/app/controllers/api/v1/purposes_controller.rb
+++ b/app/controllers/api/v1/purposes_controller.rb
@@ -1,11 +1,21 @@
 class Api::V1::PurposesController < ApplicationController
-  caches_action :index, :cache_path => Proc.new { |c|
-    { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
-  }
+  CACHE_KEY_PREFIX = 'purposes_with_locale_'
+
   def index
-    @purposes = Purpose.all.order(:code)
-    render :json => @purposes,
-      :each_serializer => Species::PurposeSerializer,
-      :meta => { :total => @purposes.count }
+    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
+
+    Rails.cache.fetch(cache_key, expires_in: 1.hour) do
+      @purposes = Purpose.all.order(:code)
+
+      render :json => @purposes,
+        :each_serializer => Species::PurposeSerializer,
+        :meta => { :total => @purposes.count }
+    end
+  end
+
+  def self.invalidate_cache
+    I18n.available_locales.each do |lang|
+      Rails.cache.delete("#{CACHE_KEY_PREFIX}#{lang}")
+    end
   end
 end
diff --git a/app/controllers/api/v1/sources_controller.rb b/app/controllers/api/v1/sources_controller.rb
index ae5753308..c2715e80d 100644
--- a/app/controllers/api/v1/sources_controller.rb
+++ b/app/controllers/api/v1/sources_controller.rb
@@ -1,11 +1,21 @@
 class Api::V1::SourcesController < ApplicationController
-  caches_action :index, :cache_path => Proc.new { |c|
-    { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
-  }
+  CACHE_KEY_PREFIX = 'sources_with_locale_'
+
   def index
-    @sources = Source.all.order(:code)
-    render :json => @sources,
-      :each_serializer => Species::SourceSerializer,
-      :meta => { :total => @sources.count }
+    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
+
+    Rails.cache.fetch(cache_key, expires_in: 1.hour) do
+      @sources = Source.all.order(:code)
+
+      render :json => @sources,
+        :each_serializer => Species::SourceSerializer,
+        :meta => { :total => @sources.count }
+    end
+  end
+
+  def self.invalidate_cache
+    I18n.available_locales.each do |lang|
+      Rails.cache.delete("#{CACHE_KEY_PREFIX}#{lang}")
+    end
   end
 end
diff --git a/app/controllers/api/v1/terms_controller.rb b/app/controllers/api/v1/terms_controller.rb
index c28d70ce2..cabb21f34 100644
--- a/app/controllers/api/v1/terms_controller.rb
+++ b/app/controllers/api/v1/terms_controller.rb
@@ -1,11 +1,21 @@
 class Api::V1::TermsController < ApplicationController
-  caches_action :index, :cache_path => Proc.new { |c|
-    { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
-  }
+  CACHE_KEY_PREFIX = 'terms_with_locale_'
+
   def index
-    @terms = Term.all.order(:code)
-    render :json => @terms,
-      :each_serializer => Species::TermSerializer,
-      :meta => { :total => @terms.count }
+    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
+
+    Rails.cache.fetch(cache_key, expires_in: 1.hour) do
+      @terms = Term.all.order(:code)
+
+      render :json => @terms,
+        :each_serializer => Species::TermSerializer,
+        :meta => { :total => @terms.count }
+    end
+  end
+
+  def self.invalidate_cache
+    I18n.available_locales.each do |lang|
+      Rails.cache.delete("#{CACHE_KEY_PREFIX}#{lang}")
+    end
   end
 end
diff --git a/app/controllers/api/v1/units_controller.rb b/app/controllers/api/v1/units_controller.rb
index 69bada19f..e63acc9db 100644
--- a/app/controllers/api/v1/units_controller.rb
+++ b/app/controllers/api/v1/units_controller.rb
@@ -1,11 +1,21 @@
 class Api::V1::UnitsController < ApplicationController
-  caches_action :index, :cache_path => Proc.new { |c|
-    { :locale => "en" }.merge(c.params.permit!.select { |k, v| !v.blank? && "locale" == k })
-  }
+  CACHE_KEY_PREFIX = 'units_with_locale_'
+
   def index
-    @units = Unit.all.order(:code)
-    render :json => @units,
-      :each_serializer => Species::UnitSerializer,
-      :meta => { :total => @units.count }
+    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
+
+    Rails.cache.fetch(cache_key, expires_in: 1.hour) do
+      @units = Unit.all.order(:code)
+
+      render :json => @units,
+        :each_serializer => Species::UnitSerializer,
+        :meta => { :total => @units.count }
+    end
+  end
+
+  def self.invalidate_cache
+    I18n.available_locales.each do |lang|
+      Rails.cache.delete("#{CACHE_KEY_PREFIX}#{lang}")
+    end
   end
 end
diff --git a/app/models/trade_codes/purpose.rb b/app/models/trade_codes/purpose.rb
index 29f93a9bf..32861e040 100644
--- a/app/models/trade_codes/purpose.rb
+++ b/app/models/trade_codes/purpose.rb
@@ -20,7 +20,7 @@ class Purpose < TradeCode
   has_many :trade_restriction_purposes
   has_many :shipments, :class_name => 'Trade::Shipment'
 
-  after_commit :expire_controller_action_cache
+  after_commit :invalidate_controller_action_cache
 
   protected
 
@@ -33,17 +33,7 @@ def dependent_objects_map
 
   private
 
-  def expire_controller_action_cache
-    I18n.available_locales.each do |lang|
-      ActionController::Base.new.send(
-        :expire_action,
-        {
-          controller: 'api/v1/purposes',
-          format: 'json',
-          action: 'index',
-          locale: lang
-        }
-      )
-    end
+  def invalidate_controller_action_cache
+    Api::V1::PurposesController.invalidate_cache
   end
 end
diff --git a/app/models/trade_codes/source.rb b/app/models/trade_codes/source.rb
index d63ddddf0..8b32edb56 100644
--- a/app/models/trade_codes/source.rb
+++ b/app/models/trade_codes/source.rb
@@ -21,7 +21,7 @@ class Source < TradeCode
   has_many :eu_decisions
   has_many :shipments, :class_name => 'Trade::Shipment'
 
-  after_commit :expire_controller_action_cache
+  after_commit :invalidate_controller_action_cache
 
   protected
 
@@ -35,17 +35,7 @@ def dependent_objects_map
 
   private
 
-  def expire_controller_action_cache
-    I18n.available_locales.each do |lang|
-      ActionController::Base.new.send(
-        :expire_action,
-        {
-          controller: 'api/v1/sources',
-          format: 'json',
-          action: 'index',
-          locale: lang
-        }
-      )
-    end
+  def invalidate_controller_action_cache
+    Api::V1::SourcesController.invalidate_cache
   end
 end
diff --git a/app/models/trade_codes/term.rb b/app/models/trade_codes/term.rb
index 55647fb69..da405397d 100644
--- a/app/models/trade_codes/term.rb
+++ b/app/models/trade_codes/term.rb
@@ -21,7 +21,7 @@ class Term < TradeCode
   has_many :eu_decisions
   has_many :shipments, :class_name => 'Trade::Shipment'
 
-  after_commit :expire_controller_action_cache
+  after_commit :invalidate_controller_action_cache
 
   protected
 
@@ -35,17 +35,7 @@ def dependent_objects_map
 
   private
 
-  def expire_controller_action_cache
-    I18n.available_locales.each do |lang|
-      ActionController::Base.new.send(
-        :expire_action,
-        {
-          controller: 'api/v1/terms',
-          format: 'json',
-          action: 'index',
-          locale: lang
-        }
-      )
-    end
+  def invalidate_controller_action_cache
+    Api::V1::TermsController.invalidate_cache
   end
 end
diff --git a/app/models/trade_codes/unit.rb b/app/models/trade_codes/unit.rb
index bb0495fbf..913fa9a00 100644
--- a/app/models/trade_codes/unit.rb
+++ b/app/models/trade_codes/unit.rb
@@ -21,7 +21,7 @@ class Unit < TradeCode
   has_many :quotas
   has_many :shipments, :class_name => 'Trade::Shipment'
 
-  after_commit :expire_controller_action_cache
+  after_commit :invalidate_controller_action_cache
 
   protected
 
@@ -34,17 +34,7 @@ def dependent_objects_map
 
   private
 
-  def expire_controller_action_cache
-    I18n.available_locales.each do |lang|
-      ActionController::Base.new.send(
-        :expire_action,
-        {
-          controller: 'api/v1/units',
-          format: 'json',
-          action: 'index',
-          locale: lang
-        }
-      )
-    end
+  def invalidate_controller_action_cache
+    Api::V1::UnitsController.invalidate_cache
   end
 end

From ef58f8341c7fb8899fa7bd52d58b06315cfc89bf Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 11:36:52 +0000
Subject: [PATCH 214/241] fix: we cannot cache renders, but we can cache model
 data

---
 app/controllers/api/v1/purposes_controller.rb | 20 ++++++++-----------
 app/controllers/api/v1/sources_controller.rb  | 20 ++++++++-----------
 app/controllers/api/v1/terms_controller.rb    | 20 ++++++++-----------
 app/controllers/api/v1/units_controller.rb    | 20 ++++++++-----------
 4 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/app/controllers/api/v1/purposes_controller.rb b/app/controllers/api/v1/purposes_controller.rb
index 5fb88371e..c2a308b7f 100644
--- a/app/controllers/api/v1/purposes_controller.rb
+++ b/app/controllers/api/v1/purposes_controller.rb
@@ -1,21 +1,17 @@
 class Api::V1::PurposesController < ApplicationController
-  CACHE_KEY_PREFIX = 'purposes_with_locale_'
+  CACHE_KEY_ALL = 'all_purposes'
 
   def index
-    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
-
-    Rails.cache.fetch(cache_key, expires_in: 1.hour) do
-      @purposes = Purpose.all.order(:code)
-
-      render :json => @purposes,
-        :each_serializer => Species::PurposeSerializer,
-        :meta => { :total => @purposes.count }
+    @all_rows = Rails.cache.fetch(CACHE_KEY_ALL, expires_in: 1.hour) do
+      Purpose.all.order(:code).as_json
     end
+
+    render :json => @all_rows.map { |row_data| Purpose.new(row_data) },
+      :each_serializer => Species::PurposeSerializer,
+      :meta => { :total => @all_rows.count }
   end
 
   def self.invalidate_cache
-    I18n.available_locales.each do |lang|
-      Rails.cache.delete("#{CACHE_KEY_PREFIX}#{lang}")
-    end
+    Rails.cache.delete(CACHE_KEY_ALL)
   end
 end
diff --git a/app/controllers/api/v1/sources_controller.rb b/app/controllers/api/v1/sources_controller.rb
index c2715e80d..66fa51d7e 100644
--- a/app/controllers/api/v1/sources_controller.rb
+++ b/app/controllers/api/v1/sources_controller.rb
@@ -1,21 +1,17 @@
 class Api::V1::SourcesController < ApplicationController
-  CACHE_KEY_PREFIX = 'sources_with_locale_'
+  CACHE_KEY_ALL = 'all_sources'
 
   def index
-    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
-
-    Rails.cache.fetch(cache_key, expires_in: 1.hour) do
-      @sources = Source.all.order(:code)
-
-      render :json => @sources,
-        :each_serializer => Species::SourceSerializer,
-        :meta => { :total => @sources.count }
+    @all_rows = Rails.cache.fetch(CACHE_KEY_ALL, expires_in: 1.hour) do
+      Source.all.order(:code).as_json
     end
+
+    render :json => @all_rows.map { |row_data| Source.new(row_data) },
+      :each_serializer => Species::SourceSerializer,
+      :meta => { :total => @all_rows.count }
   end
 
   def self.invalidate_cache
-    I18n.available_locales.each do |lang|
-      Rails.cache.delete("#{CACHE_KEY_PREFIX}#{lang}")
-    end
+    Rails.cache.delete(CACHE_KEY_ALL)
   end
 end
diff --git a/app/controllers/api/v1/terms_controller.rb b/app/controllers/api/v1/terms_controller.rb
index cabb21f34..79fd5768d 100644
--- a/app/controllers/api/v1/terms_controller.rb
+++ b/app/controllers/api/v1/terms_controller.rb
@@ -1,21 +1,17 @@
 class Api::V1::TermsController < ApplicationController
-  CACHE_KEY_PREFIX = 'terms_with_locale_'
+  CACHE_KEY_ALL = 'all_terms'
 
   def index
-    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
-
-    Rails.cache.fetch(cache_key, expires_in: 1.hour) do
-      @terms = Term.all.order(:code)
-
-      render :json => @terms,
-        :each_serializer => Species::TermSerializer,
-        :meta => { :total => @terms.count }
+    @all_rows = Rails.cache.fetch(CACHE_KEY_ALL, expires_in: 1.hour) do
+      Term.all.order(:code).as_json
     end
+
+    render :json => @all_rows.map { |row_data| Term.new(row_data) },
+      :each_serializer => Species::TermSerializer,
+      :meta => { :total => @all_rows.count }
   end
 
   def self.invalidate_cache
-    I18n.available_locales.each do |lang|
-      Rails.cache.delete("#{CACHE_KEY_PREFIX}#{lang}")
-    end
+    Rails.cache.delete(CACHE_KEY_ALL)
   end
 end
diff --git a/app/controllers/api/v1/units_controller.rb b/app/controllers/api/v1/units_controller.rb
index e63acc9db..2d081e9d8 100644
--- a/app/controllers/api/v1/units_controller.rb
+++ b/app/controllers/api/v1/units_controller.rb
@@ -1,21 +1,17 @@
 class Api::V1::UnitsController < ApplicationController
-  CACHE_KEY_PREFIX = 'units_with_locale_'
+  CACHE_KEY_ALL = 'all_units'
 
   def index
-    cache_key = "#{CACHE_KEY_PREFIX}#{I18n.locale}"
-
-    Rails.cache.fetch(cache_key, expires_in: 1.hour) do
-      @units = Unit.all.order(:code)
-
-      render :json => @units,
-        :each_serializer => Species::UnitSerializer,
-        :meta => { :total => @units.count }
+    @all_rows = Rails.cache.fetch(CACHE_KEY_ALL, expires_in: 1.hour) do
+      Unit.all.order(:code).as_json
     end
+
+    render :json => @all_rows.map { |row_data| Unit.new(row_data) },
+      :each_serializer => Species::UnitSerializer,
+      :meta => { :total => @all_rows.count }
   end
 
   def self.invalidate_cache
-    I18n.available_locales.each do |lang|
-      Rails.cache.delete("#{CACHE_KEY_PREFIX}#{lang}")
-    end
+    Rails.cache.delete(CACHE_KEY_ALL)
   end
 end

From aa1ed5bfa8aa25f9de661c7b04eaf0182d078478 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 4 Mar 2024 18:57:42 +0000
Subject: [PATCH 215/241] chore: remove actionpack-action_caching and
 actionpack-page_caching

---
 Gemfile      | 2 --
 Gemfile.lock | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 38034777a..785189712 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,8 +28,6 @@ gem 'coffee-rails', '~> 5.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'mini_racer', platforms: :ruby
 
-gem 'actionpack-action_caching', '~> 1.2', '>= 1.2.2' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
-gem 'actionpack-page_caching', '~> 1.2', '>= 1.2.4' # A feature that removed from core in Rails 4.0, maybe be better migrate away from this.
 gem 'active_model_serializers', '0.8.4' # Deprecated
 gem 'dalli', '2.7.10' # TODO: latest is 3.2.6. I believe should be fine to upgrade but we have no way to test.
 gem 'pg', '~> 1.5', '>= 1.5.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index d353f0293..3397bad8b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,10 +28,6 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionpack-action_caching (1.2.2)
-      actionpack (>= 4.0.0)
-    actionpack-page_caching (1.2.4)
-      actionpack (>= 4.0.0)
     actiontext (6.1.7.6)
       actionpack (= 6.1.7.6)
       activerecord (= 6.1.7.6)
@@ -573,8 +569,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack-action_caching (~> 1.2, >= 1.2.2)
-  actionpack-page_caching (~> 1.2, >= 1.2.4)
   active_model_serializers (= 0.8.4)
   acts-as-taggable-on (~> 10.0)
   ahoy_matey (~> 5.0, >= 5.0.2)

From cb21368afb7133cacef5e80e5683cef702818e0a Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 11:42:31 +0000
Subject: [PATCH 216/241] fix: param type checking for Taxon Concepts happens
 after split

---
 app/controllers/admin/taxon_concepts_controller.rb | 8 +++++---
 app/models/taxon_concept.rb                        | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/taxon_concepts_controller.rb b/app/controllers/admin/taxon_concepts_controller.rb
index 9d4fa6e65..7e3e6ce60 100644
--- a/app/controllers/admin/taxon_concepts_controller.rb
+++ b/app/controllers/admin/taxon_concepts_controller.rb
@@ -104,6 +104,8 @@ def load_tags
     @tags = PresetTag.where(:model => PresetTag::TYPES[:TaxonConcept])
   end
 
+  # The frontend will send these as comma-separated string lists of ids
+  # We need to coerce them to arrays of integers.
   def split_stringified_ids_lists
     return true if !params[:taxon_concept] || !params[:taxon_concept][:name_status]
     ids_list_key =
@@ -145,9 +147,9 @@ def taxon_concept_params
       :legacy_trade_code,
       :nomenclature_note_en, :nomenclature_note_es, :nomenclature_note_fr,
       :created_by_id, :updated_by_id, :dependents_updated_at, :kew_id,
-      :hybrid_parents_ids, # String with comma
-      :accepted_names_ids, # String with comma
-      :accepted_names_for_trade_name_ids, # String with comma
+      hybrid_parents_ids: [], # Coerced to int array by split_stringified_ids_lists
+      accepted_names_ids: [], # Coerced to int array by split_stringified_ids_lists
+      accepted_names_for_trade_name_ids: [], # Coerced to int array by split_stringified_ids_lists
       tag_list: []
     )
   end
diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index f8fcd13f7..0812b3dad 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -421,7 +421,7 @@ def rebuild_taxonomy?(params)
 
   def accepted_names_ids
     if @accepted_names_ids.present?
-      @accepted_names_ids.to_s.split(',').compact.map(&:to_i)
+      @accepted_names_ids
     else
       accepted_names.pluck(:id)
     end
@@ -429,7 +429,7 @@ def accepted_names_ids
 
   def accepted_names_for_trade_name_ids
     if @accepted_names_for_trade_name_ids.present?
-      @accepted_names_for_trade_name_ids.to_s.split(',').compact.map(&:to_i)
+      @accepted_names_for_trade_name_ids
     else
       accepted_names_for_trade_name.pluck(:id)
     end
@@ -437,7 +437,7 @@ def accepted_names_for_trade_name_ids
 
   def hybrid_parents_ids
     if @hybrid_parents_ids.present?
-      @hybrid_parents_ids.to_s.split(',').compact.map(&:to_i)
+      @hybrid_parents_ids
     else
       hybrid_parents.pluck(:id)
     end

From b41481921b7a8ede301dabeaeca3138c98af2a57 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 14:03:06 +0000
Subject: [PATCH 217/241] fix: a 500 error on submit of taxon listing change

The variable @search_params was not set - see

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/108
---
 app/controllers/admin/taxon_listing_changes_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/admin/taxon_listing_changes_controller.rb b/app/controllers/admin/taxon_listing_changes_controller.rb
index 92d2d6422..3aae9daf4 100644
--- a/app/controllers/admin/taxon_listing_changes_controller.rb
+++ b/app/controllers/admin/taxon_listing_changes_controller.rb
@@ -34,6 +34,7 @@ def create
     else
       load_change_types
       build_dependants
+      load_search
       render 'new'
     end
   end

From ed08e8247286b60a60402895f197cd7d56b129e4 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 14:38:11 +0000
Subject: [PATCH 218/241] fix: another listing change 500 when adding geo
 entities

---
 app/controllers/admin/taxon_listing_changes_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/taxon_listing_changes_controller.rb b/app/controllers/admin/taxon_listing_changes_controller.rb
index 3aae9daf4..ad8a71b91 100644
--- a/app/controllers/admin/taxon_listing_changes_controller.rb
+++ b/app/controllers/admin/taxon_listing_changes_controller.rb
@@ -29,6 +29,7 @@ def create
     @taxon_concept = TaxonConcept.find(params[:taxon_concept_id])
     @designation = Designation.find(params[:designation_id])
     @listing_change = ListingChange.new(listing_change_params)
+
     if @taxon_concept.listing_changes << @listing_change
       redirect_to admin_taxon_concept_designation_listing_changes_url(@taxon_concept, @designation)
     else
@@ -78,13 +79,13 @@ def build_dependants
     unless @listing_change.party_listing_distribution
       @listing_change.build_party_listing_distribution(
         params[:listing_change] &&
-        params[:listing_change][:party_listing_distribution_attributes]
+        listing_change_params[:party_listing_distribution_attributes]
       )
     end
     unless @listing_change.annotation
       @listing_change.build_annotation(
         params[:listing_change] &&
-        params[:listing_change][:annotation_attributes]
+        listing_change_params[:annotation_attributes]
       )
     end
   end

From 18df8f638b1216652e6bfb7fba4831cbcdcedbec Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 15:01:21 +0000
Subject: [PATCH 219/241] fix: taxon listing changes - pull through exclusions
 from controller

---
 app/models/listing_change.rb | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 9c2240b11..81299c968 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -205,33 +205,37 @@ def listing_change_before_save_callback
     end
 
     original_change_type = ChangeType.find(change_type_id)
+
+    @excluded_geo_entities_ids = @excluded_geo_entities_ids &&
+      @excluded_geo_entities_ids.reject(&:blank?).map(&:to_i)
+
+    @excluded_taxon_concepts_ids = @excluded_taxon_concepts_ids &&
+      @excluded_taxon_concepts_ids.split(',').reject(&:blank?).map(&:to_i)
+
     return self if original_change_type.name == ChangeType::EXCEPTION
-    return self if excluded_geo_entities_ids.nil? &&
-      excluded_taxon_concepts_ids.nil?
+    return self if @excluded_geo_entities_ids.nil? &&
+      @excluded_taxon_concepts_ids.nil?
+
     new_exclusions = []
     exclusion_change_type = ChangeType.find_by_name_and_designation_id(
       ChangeType::EXCEPTION, original_change_type.designation_id
     )
 
     # geographic exclusions
-    excluded_geo_entities_ids = excluded_geo_entities_ids &&
-      excluded_geo_entities_ids.reject(&:blank?)
     excluded_geo_entities =
-      if excluded_geo_entities_ids && !excluded_geo_entities_ids.empty?
+      if @excluded_geo_entities_ids && !@excluded_geo_entities_ids.empty?
         new_exclusions << ListingChange.new(
           :change_type_id => exclusion_change_type.id,
           :species_listing_id => species_listing_id,
           :taxon_concept_id => taxon_concept_id,
-          :geo_entity_ids => excluded_geo_entities_ids
+          :geo_entity_ids => @excluded_geo_entities_ids
         )
       end
 
     # taxonomic exclusions
-    excluded_taxon_concepts_ids = excluded_taxon_concepts_ids &&
-      excluded_taxon_concepts_ids.split(',').reject(&:blank?)
     excluded_taxon_concepts =
-      if excluded_taxon_concepts_ids && !excluded_taxon_concepts_ids.empty?
-        excluded_taxon_concepts_ids.map do |id|
+      if @excluded_taxon_concepts_ids && !@excluded_taxon_concepts_ids.empty?
+        @excluded_taxon_concepts_ids.map do |id|
           new_exclusions << ListingChange.new(
             :change_type_id => exclusion_change_type.id,
             :species_listing_id => species_listing_id,

From f09ebe57b59e675d86a86444658ccf9c4753d0b2 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 15:22:22 +0000
Subject: [PATCH 220/241] fix: specifying inverse_of fixes a "[relation] must
 exist" bug

https://github.com/rails/rails/issues/28761#issuecomment-468024590
---
 app/models/listing_change.rb       | 4 ++--
 app/models/listing_distribution.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/listing_change.rb b/app/models/listing_change.rb
index 81299c968..6fe9413cc 100644
--- a/app/models/listing_change.rb
+++ b/app/models/listing_change.rb
@@ -48,9 +48,9 @@ class ListingChange < ApplicationRecord
   belongs_to :species_listing
   belongs_to :taxon_concept
   belongs_to :change_type
-  has_many :listing_distributions, -> { where is_party: false }, :dependent => :destroy
+  has_many :listing_distributions, -> { where is_party: false }, :inverse_of => :listing_change, :dependent => :destroy
   has_one :party_listing_distribution, -> { where is_party: true }, :class_name => 'ListingDistribution',
-     :dependent => :destroy
+     :dependent => :destroy, :inverse_of => :listing_change
   has_many :geo_entities, :through => :listing_distributions
   has_one :party_geo_entity, :class_name => 'GeoEntity',
     :through => :party_listing_distribution, :source => :geo_entity
diff --git a/app/models/listing_distribution.rb b/app/models/listing_distribution.rb
index 68419cf0b..3d26874a1 100644
--- a/app/models/listing_distribution.rb
+++ b/app/models/listing_distribution.rb
@@ -19,7 +19,7 @@ class ListingDistribution < ApplicationRecord
   # attr_accessible :geo_entity_id, :listing_change_id, :is_party
 
   belongs_to :geo_entity
-  belongs_to :listing_change
+  belongs_to :listing_change, :inverse_of => :listing_distributions
 
   def self.ignored_attributes
     super() + [:source_id]

From fb59ba7c1b56b82e673bdf3c2dd30a84428f8794 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 16:05:04 +0000
Subject: [PATCH 221/241] fix: /admin/eu_implementing_regulations was rendering
 raw template code

---
 .../eu_implementing_regulations/{index.html => index.html.erb}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/views/admin/eu_implementing_regulations/{index.html => index.html.erb} (100%)

diff --git a/app/views/admin/eu_implementing_regulations/index.html b/app/views/admin/eu_implementing_regulations/index.html.erb
similarity index 100%
rename from app/views/admin/eu_implementing_regulations/index.html
rename to app/views/admin/eu_implementing_regulations/index.html.erb

From 3c3a3af4ac64466124ee05f9fd89d4463846c703 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 5 Mar 2024 16:41:57 +0000
Subject: [PATCH 222/241] docs: easiest to start a deploy shell from outside
 docker

---
 Dockerfile.cap-deploy | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.cap-deploy b/Dockerfile.cap-deploy
index 710af3b5c..b9e0e0c86 100644
--- a/Dockerfile.cap-deploy
+++ b/Dockerfile.cap-deploy
@@ -39,4 +39,12 @@ ENTRYPOINT ["/bin/bash", "-l"]
 ## Run the following in container
 ##########################################
 # /bin/bash --rcfile cap-deploy-shell.sh
-# (bash) $ CAP_BRANCH=<branch> cap staging deploy
+# [Enter your passphrase]
+# root@commit:/SAPI$ CAP_BRANCH=<branch> cap staging deploy
+#
+##########################################
+# Alternatively, from outside docker
+##########################################
+# docker exec -it sapi-cap-deploy /bin/bash --rcfile cap-deploy-shell.sh
+# [Enter your passphrase]
+# root@commit:/SAPI# CAP_BRANCH=<branch> cap staging deploy

From 6a300180d23a9e81d2a557eadcdb22f5447d4d4e Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 7 Mar 2024 11:24:58 +0000
Subject: [PATCH 223/241] fix: trade monitoring tool - filtering by country id
 was broken

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/133
---
 lib/modules/trade/grouping/compliance.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/modules/trade/grouping/compliance.rb b/lib/modules/trade/grouping/compliance.rb
index 5ecef93c4..04451b7b6 100644
--- a/lib/modules/trade/grouping/compliance.rb
+++ b/lib/modules/trade/grouping/compliance.rb
@@ -126,13 +126,14 @@ def filter(data, params)
       end
 
     elsif params[:id].present?
+      id_int = params[:id].to_i
 
       if params[:group_by].include?('commodity')
-        data = data[params[:year]].delete_if { |d| d['term_id'] != params[:id] }
+        data = data[params[:year]].delete_if { |d| d['term_id'] != id_int }
       elsif params[:group_by].include?('species')
-        data = data[params[:year]].delete_if { |d| d['taxon_concept_id'] != params[:id] }
+        data = data[params[:year]].delete_if { |d| d['taxon_concept_id'] != id_int }
       else
-        data = data[params[:year]].delete_if { |d| d[:id] != params[:id]  }
+        data = data[params[:year]].delete_if { |d| d[:id] != id_int }
       end
 
     else

From f99be0cd3a8240a313091f48b714fa694d9515f4 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 7 Mar 2024 12:50:18 +0000
Subject: [PATCH 224/241] fix: wrong number of arguments for CSV.read

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/119
---
 lib/modules/trade/grouping/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules/trade/grouping/base.rb b/lib/modules/trade/grouping/base.rb
index 964edf94a..eb9e8956d 100644
--- a/lib/modules/trade/grouping/base.rb
+++ b/lib/modules/trade/grouping/base.rb
@@ -37,7 +37,7 @@ def json_by_attribute(data, opts={})
 
   def read_taxonomy_conversion
     conversion = {}
-    taxonomy = CSV.read(TAXONOMIC_GROUPING, {headers: true})
+    taxonomy = CSV.read(TAXONOMIC_GROUPING, headers: true)
     taxonomy.each do |csv|
       conversion[csv['group']] ||= []
       data = {

From 3fe06325033b9f404ef034603d3b769904162305 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Thu, 7 Mar 2024 18:04:14 +0000
Subject: [PATCH 225/241] fix: hash annotations are assumed to be mostly
 numeric

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/134
---
 app/models/annotation.rb       | 10 ++++++++++
 spec/models/annotation_spec.rb | 13 +++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 159651181..7603ed76e 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -44,6 +44,16 @@ class Annotation < ApplicationRecord
   scope :for_eu, -> { joins(:event).where("events.type = 'EuRegulation'").
     order([:parent_symbol, :symbol]) }
 
+  # If this pattern is not respected, a query which parses (most of) the
+  # symbol as an integer
+  #
+  # OK: '^1', '#33'; not ok '#18edit'
+  validates :symbol, presence: false, format: {
+    allow_blank: true,
+    message: "should be a symbol followed by one or more digits",
+    with: /\A[^0-9a-z\s]\d+\z/i
+  }
+
   before_save do
     if event
       self.parent_symbol = event.name
diff --git a/spec/models/annotation_spec.rb b/spec/models/annotation_spec.rb
index 2c4ec0fea..cf21484f1 100644
--- a/spec/models/annotation_spec.rb
+++ b/spec/models/annotation_spec.rb
@@ -25,6 +25,19 @@
 require 'spec_helper'
 
 describe Annotation do
+  describe :validate do
+    context "symbol" do
+      context "should not be alphanumeric" do
+        let(:annotation) {
+          build(
+            :annotation, :parent_symbol => 'CoP1', :symbol => '#1a'
+          )
+        }
+        specify { expect(annotation).to have(1).errors_on(:symbol) }
+      end
+    end
+  end
+
   describe :full_name do
     context "when parent_symbol given" do
       let(:annotation) {

From 101bfc037649707d140de53d29330c9a6354a9c0 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 11 Mar 2024 13:33:05 +0000
Subject: [PATCH 226/241] fix: do not use setter where behaviour depends on
 multiple attributes

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/117

`scientific_name=` was being called before `name_status` was set, which meant
that it always behaved as if `name_status` were the string 'A' during
instantiation, because the setter for `name_status` had not yet been called.

This meant that new synonyms were losing the genus part of the binomial
full name assigned to them, because this is stripped for A-names.
---
 app/models/taxon_concept.rb | 84 +++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/app/models/taxon_concept.rb b/app/models/taxon_concept.rb
index 0812b3dad..cb5a646ee 100644
--- a/app/models/taxon_concept.rb
+++ b/app/models/taxon_concept.rb
@@ -175,30 +175,10 @@ class TaxonConcept < ApplicationRecord
 
   before_validation :ensure_taxonomic_position
   before_validation do
-    self.full_name =
-      if rank && parent && ['A', 'N'].include?(name_status)
-        rank_name = rank.name
-        parent_full_name = parent.full_name
-        name = scientific_name
-        # if name is present, just in case it is a multipart name
-        # e.g. when changing status from S, T, H
-        # make sure to only use last part
-        if name.present?
-          name = TaxonName.sanitize_scientific_name(name)
-        end
-        if name.blank?
-          nil
-        elsif [Rank::SPECIES, Rank::SUBSPECIES].include?(rank_name)
-          "#{parent_full_name} #{name.downcase}"
-        elsif rank_name == Rank::VARIETY
-          "#{parent_full_name} var. #{name.downcase}"
-        else
-          name
-        end
-      else
-        scientific_name
-      end
+    before_validate_scientific_name
+    before_validate_full_name
   end
+
   after_create do
     ensure_species_touched
     Species::Search.increment_cache_iterator
@@ -291,19 +271,7 @@ def self.fetch_taxons_full_name(taxon_ids)
   end
 
   def scientific_name=(str)
-    scientific_name =
-      if ['A', 'N'].include?(name_status)
-        TaxonName.sanitize_scientific_name(str)
-      else
-        str
-      end
-    tn = TaxonName.where(["UPPER(scientific_name) = UPPER(?)", scientific_name]).first
-    if tn
-      self.taxon_name = tn
-      self.taxon_name_id = tn.id
-    else
-      self.build_taxon_name(scientific_name: scientific_name)
-    end
+    @scientific_name = str
   end
 
   def scientific_name
@@ -459,6 +427,50 @@ def rebuild_relationships(taxa_ids)
     end
   end
 
+  protected
+
+  def before_validate_scientific_name
+    sanitized_scientific_name =
+      if ['A', 'N'].include?(name_status)
+        TaxonName.sanitize_scientific_name(@scientific_name || scientific_name)
+      else
+        @scientific_name || scientific_name
+      end
+    tn = TaxonName.where(["UPPER(scientific_name) = UPPER(?)", sanitized_scientific_name]).first
+    if tn
+      self.taxon_name = tn
+      self.taxon_name_id = tn.id
+    else
+      self.build_taxon_name(scientific_name: sanitized_scientific_name)
+    end
+  end
+
+  def before_validate_full_name
+    self.full_name =
+      if rank && parent && ['A', 'N'].include?(name_status)
+        rank_name = rank.name
+        parent_full_name = parent.full_name
+        name = @scientific_name || scientific_name
+        # if name is present, just in case it is a multipart name
+        # e.g. when changing status from S, T, H
+        # make sure to only use last part
+        if name.present?
+          name = TaxonName.sanitize_scientific_name(name)
+        end
+        if name.blank?
+          nil
+        elsif [Rank::SPECIES, Rank::SUBSPECIES].include?(rank_name)
+          "#{parent_full_name} #{name.downcase}"
+        elsif rank_name == Rank::VARIETY
+          "#{parent_full_name} var. #{name.downcase}"
+        else
+          name
+        end
+      else
+        @scientific_name || scientific_name
+      end
+  end
+
   private
 
   def add_remove_relationships(new_taxa, removed_taxa, rel_type)

From 1888f5a29df3629c44db29fc0f3e0bb28d426a5c Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 11 Mar 2024 14:39:33 +0000
Subject: [PATCH 227/241] chore: have dockerised db use same WAL settings as
 staging db

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2357bb280..0d979be1f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,7 @@ services:
   db:
     container_name: sapi-db
     image: postgres:10
+    command: postgres -c max_wal_size=2GB
     healthcheck:
       test: ["CMD", "pg_isready", "-U", "postgres"]
       timeout: 45s

From 77ec4f38b75df647bd92c1c0e93070f018344118 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Mon, 11 Mar 2024 14:19:58 +0000
Subject: [PATCH 228/241] fix: raise a better error before
 rebuild_designation_listing_changes_mview fails

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/139

If a user edits names in change_type so that either ADDITION or DELETION is
missing, then this function will concatenate NULL while building SQL, leading
to a confusing error message.
---
 ...uild_designation_listing_changes_mview.sql | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/db/mviews/005_rebuild_designation_listing_changes_mview.sql b/db/mviews/005_rebuild_designation_listing_changes_mview.sql
index bba76a19e..cc973e3b6 100644
--- a/db/mviews/005_rebuild_designation_listing_changes_mview.sql
+++ b/db/mviews/005_rebuild_designation_listing_changes_mview.sql
@@ -1,9 +1,27 @@
 DROP FUNCTION IF EXISTS rebuild_designation_listing_changes_mview(
   taxonomy taxonomies, designation designations
 );
+
+-- This function dynamically produces tables of the form
+--
+-- * cites_listing_changes_mview, cms_listing_changes_mview, eu_listing_changes_mview
+-- * child_cites_listing_changes_mview, child_cms_listing_changes_mview, child_eu_listing_changes_mview
+-- * child_eu_55_49_66_41_48_listing_changes_mview (where event_ids is specified)
+--
+-- Note that this function has special-cased behaviour for the following:
+--
+-- * change_type where name is one of:
+--   * ADDITION
+--   * DELETION
+--   * EXCEPTION
+--   * RESERVATION
+--   * RESERVATION_WITHDRAWAL
+-- * designation where name is one of:
+--   * CMS
+--   * EU
 CREATE OR REPLACE FUNCTION rebuild_designation_listing_changes_mview(
   taxonomy taxonomies, designation designations, events_ids INT[]
-  ) RETURNS void
+) RETURNS void
   LANGUAGE plpgsql
   AS $$
   DECLARE
@@ -27,9 +45,18 @@ CREATE OR REPLACE FUNCTION rebuild_designation_listing_changes_mview(
     SELECT listing_changes_mview_name(NULL, designation.name, events_ids)
     INTO master_lc_table_name;
 
-
     RAISE INFO 'Creating %', tmp_lc_table_name;
-    EXECUTE 'DROP TABLE IF EXISTS ' || tmp_lc_table_name || ' CASCADE';
+
+    SELECT id INTO deletion_id FROM change_types WHERE name = 'DELETION' AND designation_id = designation.id;
+    SELECT id INTO addition_id FROM change_types WHERE name = 'ADDITION' AND designation_id = designation.id;
+
+    IF deletion_id IS NULL THEN
+      RAISE EXCEPTION 'Could not find change_type of type DELETION';
+    END IF;
+
+    IF addition_id IS NULL THEN
+      RAISE EXCEPTION 'Could not find change_type of type ADDITION';
+    END IF;
 
     sql := 'CREATE TABLE ' || tmp_lc_table_name || ' AS
     WITH applicable_listing_changes AS (
@@ -171,6 +198,8 @@ CREATE OR REPLACE FUNCTION rebuild_designation_listing_changes_mview(
     WHEN change_types.name = ''DELETION'' THEN 3
     END';
 
+    EXECUTE 'DROP TABLE IF EXISTS ' || tmp_lc_table_name || ' CASCADE';
+
     EXECUTE sql;
 
     EXECUTE 'CREATE INDEX ON ' || tmp_lc_table_name || ' (id, taxon_concept_id)';
@@ -192,8 +221,6 @@ CREATE OR REPLACE FUNCTION rebuild_designation_listing_changes_mview(
 
     EXECUTE sql;
 
-    SELECT id INTO deletion_id FROM change_types WHERE name = 'DELETION' AND designation_id = designation.id;
-    SELECT id INTO addition_id FROM change_types WHERE name = 'ADDITION' AND designation_id = designation.id;
     -- find inherited listing changes superceded by own listing changes
     -- mark them as not current in context of the child and add fake deletion records
     -- so that those inherited events are terminated properly on the timelines

From 7ea6c2307c521dd900ca862274a73b01ccadae1a Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 12 Mar 2024 12:01:14 +0000
Subject: [PATCH 229/241] chore: add a little more logging to
 Trade::RebuildComplianceMviews

... so that it's clear when it's all done
---
 lib/modules/trade/rebuild_compliance_mviews.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/modules/trade/rebuild_compliance_mviews.rb b/lib/modules/trade/rebuild_compliance_mviews.rb
index eb08021b3..269ecb318 100644
--- a/lib/modules/trade/rebuild_compliance_mviews.rb
+++ b/lib/modules/trade/rebuild_compliance_mviews.rb
@@ -1,5 +1,7 @@
 module Trade::RebuildComplianceMviews
   def self.run
+    puts 'Trade::RebuildComplianceMviews.run starting'
+
     [
       :appendix_i,
       :mandatory_quotas,
@@ -12,7 +14,10 @@ def self.run
       puts "Rebuild #{p} mview..."
       self.rebuild_compliance_mview(p)
     end
+
     recreate_non_compliant_view
+
+    puts 'Trade::RebuildComplianceMviews.run complete'
   end
 
   def self.rebuild_sql_views(type, timestamp)
@@ -54,7 +59,9 @@ def self.recreate_mview(type, sql_view)
   end
 
   def self.recreate_non_compliant_view
-    db.execute("SELECT rebuild_non_compliant_shipments_view()")
+    command = "SELECT rebuild_non_compliant_shipments_view()"
+    puts command
+    db.execute(command)
   end
 
   def self.db

From 4d2de1268647fbb3801fef44ff4d1744ca06cdf3 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Tue, 12 Mar 2024 16:22:31 +0000
Subject: [PATCH 230/241] fix: another sql literal in order() clause

---
 app/controllers/admin/cms_mappings_controller.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/cms_mappings_controller.rb b/app/controllers/admin/cms_mappings_controller.rb
index 2ad8410dd..2888cf560 100644
--- a/app/controllers/admin/cms_mappings_controller.rb
+++ b/app/controllers/admin/cms_mappings_controller.rb
@@ -14,9 +14,12 @@ def index
   protected
 
   def collection
-    @cms_mappings ||= end_of_association_chain.
-      order("taxon_concepts.data->'class_name'").
-      page(params[:page]).includes(:taxon_concept).
-      includes(:accepted_name).index_filter(params[:show])
+    @cms_mappings ||= end_of_association_chain.order(
+      Arel.sql("taxon_concepts.data->'class_name'")
+    ).page(
+      params[:page]
+    ).includes(:taxon_concept).includes(:accepted_name).index_filter(
+      params[:show]
+    )
   end
 end

From be8ff313708b1922fa0008c62d39101d3c946a31 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 09:13:17 +0000
Subject: [PATCH 231/241] fix: strong params for checklist download index

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/106
---
 app/controllers/checklist/downloads_controller.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/controllers/checklist/downloads_controller.rb b/app/controllers/checklist/downloads_controller.rb
index b941329e6..3e13bc375 100644
--- a/app/controllers/checklist/downloads_controller.rb
+++ b/app/controllers/checklist/downloads_controller.rb
@@ -63,7 +63,7 @@ def download
   end
 
   def download_index
-    @doc = download_module::Index.new(params)
+    @doc = download_module::Index.new(download_index_params)
     send_download
   end
 
@@ -106,4 +106,17 @@ def download_params
       :format
     )
   end
+
+  def download_index_params
+    params.permit(
+      :show_synonyms,
+      :show_author,
+      :show_english,
+      :show_spanish,
+      :show_french,
+      :intro,
+      :locale,
+      :format
+    )
+  end
 end

From 7d7c55323fd08bff14ddd699ae039bb72df95d86 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 09:43:56 +0000
Subject: [PATCH 232/241] fix: checklist has its own param sanitisation method
 - use that over strong params

---
 app/controllers/checklist/downloads_controller.rb | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/controllers/checklist/downloads_controller.rb b/app/controllers/checklist/downloads_controller.rb
index 3e13bc375..5039b9a67 100644
--- a/app/controllers/checklist/downloads_controller.rb
+++ b/app/controllers/checklist/downloads_controller.rb
@@ -63,7 +63,7 @@ def download
   end
 
   def download_index
-    @doc = download_module::Index.new(download_index_params)
+    @doc = download_module::Index.new(checklist_params)
     send_download
   end
 
@@ -107,16 +107,9 @@ def download_params
     )
   end
 
-  def download_index_params
-    params.permit(
-      :show_synonyms,
-      :show_author,
-      :show_english,
-      :show_spanish,
-      :show_french,
-      :intro,
-      :locale,
-      :format
+  def checklist_params
+    Checklist::ChecklistParams.sanitize(
+      params
     )
   end
 end

From 660945ff0f84d83d6f0767d008b3c7e1d4726414 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 09:47:34 +0000
Subject: [PATCH 233/241] refactor: also use checklist params for history

---
 app/controllers/checklist/downloads_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/checklist/downloads_controller.rb b/app/controllers/checklist/downloads_controller.rb
index 5039b9a67..1a0d2456d 100644
--- a/app/controllers/checklist/downloads_controller.rb
+++ b/app/controllers/checklist/downloads_controller.rb
@@ -68,7 +68,7 @@ def download_index
   end
 
   def download_history
-    @doc = download_module::History.new(params)
+    @doc = download_module::History.new(checklist_params)
     send_download
   end
 

From c7df549f719e1766427762b2abfb1fea444237a5 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 10:01:34 +0000
Subject: [PATCH 234/241] fix: checklist history CSV did not contain taxon ids

https://unep-wcmc.codebasehq.com/projects/cites-support-maintenance/tickets/249
---
 app/services/checklist/csv/history.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/checklist/csv/history.rb b/app/services/checklist/csv/history.rb
index 0d7eae98e..2381367c0 100644
--- a/app/services/checklist/csv/history.rb
+++ b/app/services/checklist/csv/history.rb
@@ -24,7 +24,7 @@ def prepare_main_query
 
   def select_columns
     [
-      "taxon_concepts_mview.id AS taxon_id",
+      "taxon_concepts_mview.id AS id",
       "taxon_concepts_mview.kingdom_name",
       "taxon_concepts_mview.phylum_name",
       "taxon_concepts_mview.class_name",

From 1c8b5289d12c0d2bbcaa67ceb758acea3020724c Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 11:06:42 +0000
Subject: [PATCH 235/241] fix: for checklist downloads ID manual entries pdf

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/105
---
 app/models/document.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/document.rb b/app/models/document.rb
index 6b62e7c87..8fc0ee80a 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -68,12 +68,12 @@ class Document < ApplicationRecord
   after_save :sync_sort_index
   after_commit :clear_cache
 
-# order docs based on a custom list of ids
+  # order docs based on a custom list of ids
   scope :for_ids_with_order, ->(ids) {
     order = sanitize_sql_array(
-      ["position((',' || id::text || ',') in ?)", ids.join(',') + ',']
+      ["position((',' || id::text || ',') in ?)", [].join(',') + ',']
     )
-    where(id: ids).order(order)
+    where(id: ids).order(Arel.sql(order))
   }
 
   # This hot fix was needed to import document objects without attachment(external link)

From 727ec61220952dfec987c73c552e79d8c333a2a5 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 11:33:27 +0000
Subject: [PATCH 236/241] fix: my own stupidity

---
 app/models/document.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/document.rb b/app/models/document.rb
index 8fc0ee80a..954071932 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -71,7 +71,7 @@ class Document < ApplicationRecord
   # order docs based on a custom list of ids
   scope :for_ids_with_order, ->(ids) {
     order = sanitize_sql_array(
-      ["position((',' || id::text || ',') in ?)", [].join(',') + ',']
+      ["position((',' || id::text || ',') in ?)", ids.join(',') + ',']
     )
     where(id: ids).order(Arel.sql(order))
   }

From 8de7b5694c68a775623c608c312a6a34a0ac58c1 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 12:11:28 +0000
Subject: [PATCH 237/241] chore: do not swallow exceptions; re-raise them

---
 app/workers/manual_download_worker.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/workers/manual_download_worker.rb b/app/workers/manual_download_worker.rb
index 5ca21d137..7fd345920 100644
--- a/app/workers/manual_download_worker.rb
+++ b/app/workers/manual_download_worker.rb
@@ -28,6 +28,7 @@ def perform(download_id, params)
     Appsignal.add_exception(exception) if defined? Appsignal
     @download.status = "failed"
     @download.save!
+    raise exception
   end
 
   private
@@ -89,6 +90,7 @@ def zip_file_generator
     Appsignal.add_exception(exception) if defined? Appsignal
     @download.status = "failed"
     @download.save!
+    raise exception
   end
 
   def cover_path_generator

From 71c383fd6da1c13e1fbbf9cd9dfe0acd222741f8 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 12:39:54 +0000
Subject: [PATCH 238/241] fix: PDFKit now requires enable_local_file_access to
 read local files

---
 app/workers/manual_download_worker.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/workers/manual_download_worker.rb b/app/workers/manual_download_worker.rb
index 7fd345920..4c96197c3 100644
--- a/app/workers/manual_download_worker.rb
+++ b/app/workers/manual_download_worker.rb
@@ -95,9 +95,20 @@ def zip_file_generator
 
   def cover_path_generator
     I18n.locale = @locale
-    kit = PDFKit.new(ActionController::Base.new().render_to_string(template: '/checklist/_custom_id_manual_cover.html.erb', locals: { taxon_name: @display_name }), page_size: 'A4')
+
+    kit = PDFKit.new(
+      ActionController::Base.new().render_to_string(
+          template: '/checklist/_custom_id_manual_cover.html.erb',
+          locals: { taxon_name: @display_name }
+      ),
+      page_size: 'A4',
+      enable_local_file_access: true
+    )
+
     kit.stylesheets << "#{Rails.root.to_s}/app/assets/stylesheets/checklist/custom_id_manual_cover.css"
+
     @cover_path = "public/downloads/checklist/#{@display_name}-cover.pdf"
+
     kit.to_file(@cover_path)
   end
 end

From 51673652d9b05a9b3b5cedfaf23d599a129db329 Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 14:20:09 +0000
Subject: [PATCH 239/241] chore: replace tabs with spaces in cites trade js

---
 .../javascripts/cites_trade/application.js    | 424 +++++++++---------
 1 file changed, 212 insertions(+), 212 deletions(-)

diff --git a/app/assets/javascripts/cites_trade/application.js b/app/assets/javascripts/cites_trade/application.js
index 3a5365069..64185599f 100644
--- a/app/assets/javascripts/cites_trade/application.js
+++ b/app/assets/javascripts/cites_trade/application.js
@@ -9,7 +9,7 @@ $(document).ready(function(){
     is_view_results_page = $('#query_results_table').length > 0;
 
   ajaxFail = function (xhr, ajaxOptions, thrownError) {
-  	//console.log(xhr, ajaxOptions, thrownError);
+    //console.log(xhr, ajaxOptions, thrownError);
     growlMe("The request failed.");
   };
 
@@ -17,55 +17,55 @@ $(document).ready(function(){
   $(".tipify").tipTip();
 
   function growlMe(text){
-  	$.jGrowl(text);
+    $.jGrowl(text);
   };
 
   function notySticky(message){
-  	noty({ layout: 'top',
-   			   type: 'information',
-   			   closeWith: ['button'],
-    			 text: message,
+    noty({ layout: 'top',
+            type: 'information',
+            closeWith: ['button'],
+           text: message,
            timeout: 1000
     });
   };
 
   //Accordion
   $( "#accordion_expert" ).accordion(
-		{
-			event : 'mouseover',
-			autoHeight: false
-		}
-	);
+    {
+      event : 'mouseover',
+      autoHeight: false
+    }
+  );
 
   //setting the tabs for the search
   $("#tabs").tabs().addClass('ui-tabs-vertical ui-helper-clearfix');
   //enabling the tabs to be visible again
   $("#tabs").css("display", "block");
-	$("#tabs li").removeClass('ui-corner-top').addClass('ui-corner-left');
+  $("#tabs li").removeClass('ui-corner-top').addClass('ui-corner-left');
 
   $(".someClass").tipTip({maxWidth: "300px"});
   //using the qtip2 plugin
   $(".qtipify").qtip(
-	{
-		style: {
+  {
+    style: {
       classes: 'ui-tooltip-green ui-tooltip-cluetip'
-   	}
-	});
+     }
+  });
 
   $("#genus_all_id").val('').trigger("liszt:updated");
   $("#genus_all_id").chosen({
-  	allow_single_deselect:true,
-  	no_results_text: "No results matched"
+    allow_single_deselect:true,
+    no_results_text: "No results matched"
   }).change(function(){
-  	var my_value = $(this).val();
-  	$('#species_out').text(my_value);
+    var my_value = $(this).val();
+    $('#species_out').text(my_value);
   });
 
   function initialiseControls() {
-	  $('#genus_all_id_chzn').removeClass('chzn-container-active')
+    $('#genus_all_id_chzn').removeClass('chzn-container-active')
       .addClass('chzn-disabled');
-	  //prevent form support on input and select enter
-	  $('input,select').keypress(function(event) { return event.keyCode != 13; });
+    //prevent form support on input and select enter
+    $('input,select').keypress(function(event) { return event.keyCode != 13; });
   };
 
   function parseInputs ($inputs) {
@@ -147,32 +147,32 @@ $(document).ready(function(){
 
   //function to reset all the countrols on the expert_accord page
   function resetSelects() {
- 	  $('#qryFrom').find('option:first').attr('selected', 'selected')
+     $('#qryFrom').find('option:first').attr('selected', 'selected')
       .trigger('change');
- 	  $('#qryTo').find('option:first').attr('selected', 'selected')
+     $('#qryTo').find('option:first').attr('selected', 'selected')
       .trigger('change');
- 	  $('#taxonomic_cascade_search').val('');
- 	  $('#species_out').text('');
- 	  $('#sources').select2("val","all_sou");
- 	  $('#purposes').select2("val","all_pur");
- 	  $('#terms').select2("val","all_ter");
- 	  $('#expcty').select2("val","all_exp");
- 	  $('#impcty').select2("val","all_imp");
+     $('#taxonomic_cascade_search').val('');
+     $('#species_out').text('');
+     $('#sources').select2("val","all_sou");
+     $('#purposes').select2("val","all_pur");
+     $('#terms').select2("val","all_ter");
+     $('#expcty').select2("val","all_exp");
+     $('#impcty').select2("val","all_imp");
     notySticky('Values are being reset...');
     $('#search-error-message').hide();
     $("#cites-trade-loading").hide();
   };
 
   $('#reset_search').click(function() {
-  	resetSelects();
-  	show_values_selection();
+    resetSelects();
+    show_values_selection();
     setEuDisclaimerVisibility();
     // Removing the table results on reset
     $("#query_results_table").find('thead,tbody').remove();
     $('#query_results').find('p.info').text('');
     // and resetting globals...
     selected_taxa = '';
-  	return false;
+    return false;
   });
 
   $('#div_taxonomic_cascade').find('button').removeClass('ui-state-disabled')
@@ -181,17 +181,17 @@ $(document).ready(function(){
   $('#species_out').text('');
 
   $('#table_selection').colorize({
-  		altColor: '#E6EDD7',
-  		bgColor: '#E6EDD7',
-  		hoverColor: '#D2EF9A'
+      altColor: '#E6EDD7',
+      bgColor: '#E6EDD7',
+      hoverColor: '#D2EF9A'
   });
 
   function getSelectionText(source) {
-  	myValues = new Array();
-  	$('#' + source + ' option:selected').each(function(index, value) {
-  		myValues.push($(value).text());
+    myValues = new Array();
+    $('#' + source + ' option:selected').each(function(index, value) {
+      myValues.push($(value).text());
     });
-  	return myValues.toString();
+    return myValues.toString();
   }
 
   initUnitsObj = function (data) {
@@ -263,223 +263,223 @@ $(document).ready(function(){
   }
 
   initExpctyImpcty = function (data) {
-  	var args = {
-  	  	data: data.geo_entities,
-  	  	condition: function (item) {return item.iso_code2},
-  	  	text: function (item) {return item.name}
-  	  };
+    var args = {
+        data: data.geo_entities,
+        condition: function (item) {return item.iso_code2},
+        text: function (item) {return item.name}
+      };
 
     initCountriesObj(data);
-  	populateSelect(_.extend(args, {
-  		selection: $('#expcty'),
-  		value: function (item) {return item.id}
-  	}));
+    populateSelect(_.extend(args, {
+      selection: $('#expcty'),
+      value: function (item) {return item.id}
+    }));
     allOptionsDictionary["all_exp"] = true;
     $('#expcty').select2({
-    	width: '75%',
-    	allowClear: false,
-    	closeOnSelect: false,
+      width: '75%',
+      allowClear: false,
+      closeOnSelect: false,
       matcher: matchWithDiacritics
     }).on('change', function(e){
-    	var selection = "";
-    	if (e.val.length == 0) {
-    		$(this).select2("val","all_exp");
+      var selection = "";
+      if (e.val.length == 0) {
+        $(this).select2("val","all_exp");
         allOptionsDictionary["all_exp"] = true;
       }
-    	var prop = $(this).select2('data');
-    	selection = getText(prop);
-    	if (e.val.length > 1) {
-    		var new_array = [];
-    		new_array = checkforAllOptions(prop,'all_exp');
-    		$(this).select2('data', new_array);
-    		selection = getText(new_array);
-    	}
-    	$('#expcty_out').text(selection);
+      var prop = $(this).select2('data');
+      selection = getText(prop);
+      if (e.val.length > 1) {
+        var new_array = [];
+        new_array = checkforAllOptions(prop,'all_exp');
+        $(this).select2('data', new_array);
+        selection = getText(new_array);
+      }
+      $('#expcty_out').text(selection);
       setEuDisclaimerVisibility();
     });
 
     populateSelect(_.extend(args, {
-  		selection: $('#impcty'),
-  		value: function (item) {return item.id}
-  	}));
+      selection: $('#impcty'),
+      value: function (item) {return item.id}
+    }));
     allOptionsDictionary["all_imp"] = true;
     $('#impcty').select2({
-    	width: '75%',
-    	allowClear: false,
-    	closeOnSelect: false,
+      width: '75%',
+      allowClear: false,
+      closeOnSelect: false,
       matcher: matchWithDiacritics
     }).on('change', function(e){
-    	selection = "";
-    	if (e.val.length == 0) {
-    		$(this).select2("val","all_imp");
+      selection = "";
+      if (e.val.length == 0) {
+        $(this).select2("val","all_imp");
         allOptionsDictionary["all_imp"] = true;
-    	}
-    	prop = $(this).select2('data');
-    	selection = getText(prop);
-    	if (e.val.length > 1)
-    	{
-    		new_array = new Array();
-    		new_array = checkforAllOptions(prop,'all_imp');
-    		$(this).select2('data', new_array);
-    		selection = getText(new_array);
-    	}
-    	$('#impcty_out').text(selection);
+      }
+      prop = $(this).select2('data');
+      selection = getText(prop);
+      if (e.val.length > 1)
+      {
+        new_array = new Array();
+        new_array = checkforAllOptions(prop,'all_imp');
+        $(this).select2('data', new_array);
+        selection = getText(new_array);
+      }
+      $('#impcty_out').text(selection);
       setEuDisclaimerVisibility();
     });
   };
 
   initTerms = function (data) {
-  	var selection = $('#terms'),
-  	  args = {
-  	  	selection: selection,
-  	  	data: data.terms,
-  	  	condition: function (item) {return item.code},
-  	  	value: function (item) {return item.id},
-  	  	text: function (item) {return item.code + ' - ' + item.name}
-  	  },
+    var selection = $('#terms'),
+      args = {
+        selection: selection,
+        data: data.terms,
+        condition: function (item) {return item.code},
+        value: function (item) {return item.id},
+        text: function (item) {return item.code + ' - ' + item.name}
+      },
       alloption = 'all_ter';
     allOptionsDictionary[alloption] = true;
     initTermsObj(data);
-  	populateSelect(args);
+    populateSelect(args);
     selection.select2({
-    	width: '75%',
-    	allowClear: false,
-    	closeOnSelect: false
+      width: '75%',
+      allowClear: false,
+      closeOnSelect: false
     }).on('change', function(e){
-    	// growlMe($(this).attr('id'));
-    	selection = "";
-    	if (e.val.length == 0) {
-    		// growlMe('You need to make at least one selection! - ' + e.val);
-    		$(this).select2("val", alloption);
+      // growlMe($(this).attr('id'));
+      selection = "";
+      if (e.val.length == 0) {
+        // growlMe('You need to make at least one selection! - ' + e.val);
+        $(this).select2("val", alloption);
         allOptionsDictionary[alloption] = true;
-    	}
-    	prop = $(this).select2('data');
-    	selection = getText(prop);
-    	if (e.val.length > 1)
-    	{
-    		new_array = new Array();
-    		new_array = checkforAllOptions(prop, alloption);
-    		$(this).select2('data', new_array);
-    		selection = getText(new_array);
-    	}
-    	$('#terms_out').text(selection);
+      }
+      prop = $(this).select2('data');
+      selection = getText(prop);
+      if (e.val.length > 1)
+      {
+        new_array = new Array();
+        new_array = checkforAllOptions(prop, alloption);
+        $(this).select2('data', new_array);
+        selection = getText(new_array);
+      }
+      $('#terms_out').text(selection);
     });
   }
 
   initSources = function (data) {
-  	var selection = $('#sources'),
-  	  args = {
-  	  	selection: selection,
-  	  	data: data.sources,
-  	  	condition: function (item) {return item.code},
-  	  	value: function (item) {return item.id},
-  	  	text: function (item) {return item.code + ' - ' + item.name}
-  	  },
+    var selection = $('#sources'),
+      args = {
+        selection: selection,
+        data: data.sources,
+        condition: function (item) {return item.code},
+        value: function (item) {return item.id},
+        text: function (item) {return item.code + ' - ' + item.name}
+      },
       alloption = 'all_sou';
-  	allOptionsDictionary[alloption] = true;
+    allOptionsDictionary[alloption] = true;
     initSourcesObj(data);
-  	populateSelect(args);
+    populateSelect(args);
     selection.select2({
-    	width: '75%',
-    	allowClear: false,
-    	closeOnSelect: false
+      width: '75%',
+      allowClear: false,
+      closeOnSelect: false
     }).on('change', function(e){
-    	// growlMe($(this).attr('id'));
-    	selection = "";
-    	if (e.val.length == 0) {
-    		$(this).select2("val", alloption);
+      // growlMe($(this).attr('id'));
+      selection = "";
+      if (e.val.length == 0) {
+        $(this).select2("val", alloption);
         allOptionsDictionary[alloption] = true;
-    	}
-    	prop = $(this).select2('data');
-    	selection = getText(prop);
-    	if (e.val.length > 1)
-    	{
-    		new_array = new Array();
-    		new_array = checkforAllOptions(prop, alloption);
-    		$(this).select2('data', new_array);
-    		selection = getText(new_array);
-    	}
-    	$('#sources_out').text(selection);
+      }
+      prop = $(this).select2('data');
+      selection = getText(prop);
+      if (e.val.length > 1)
+      {
+        new_array = new Array();
+        new_array = checkforAllOptions(prop, alloption);
+        $(this).select2('data', new_array);
+        selection = getText(new_array);
+      }
+      $('#sources_out').text(selection);
     });
   };
 
   initPurposes = function (data) {
-  	var selection = $('#purposes'),
-  	  args = {
-  	  	selection: selection,
-  	  	data: data.purposes,
-  	  	condition: function (item) {return item.code},
-  	  	value: function (item) {return item.id},
-  	  	text: function (item) {return item.code + ' - ' + item.name}
-  	  },
+    var selection = $('#purposes'),
+      args = {
+        selection: selection,
+        data: data.purposes,
+        condition: function (item) {return item.code},
+        value: function (item) {return item.id},
+        text: function (item) {return item.code + ' - ' + item.name}
+      },
       alloption = 'all_pur';
-  	allOptionsDictionary[alloption] = true;
+    allOptionsDictionary[alloption] = true;
     initPurposesObj(data);
-  	populateSelect(args);
+    populateSelect(args);
     selection.select2({
-    	width: '75%',
-    	allowClear: false,
-    	closeOnSelect: false
+      width: '75%',
+      allowClear: false,
+      closeOnSelect: false
     }).on('change', function(e){
-    	selection = "";
-    	if (e.val.length == 0) {
-    		$(this).select2("val", alloption);
+      selection = "";
+      if (e.val.length == 0) {
+        $(this).select2("val", alloption);
         allOptionsDictionary[alloption] = true;
-    	}
-    	prop = $(this).select2('data');
-    	selection = getText(prop);
-    	if (e.val.length > 1) {
-    		new_array = new Array();
-    		new_array = checkforAllOptions(prop, alloption);
-    		$(this).select2('data', new_array);
-    		selection = getText(new_array);
-    	}
-    	$('#purposes_out').text(selection);
+      }
+      prop = $(this).select2('data');
+      selection = getText(prop);
+      if (e.val.length > 1) {
+        new_array = new Array();
+        new_array = checkforAllOptions(prop, alloption);
+        $(this).select2('data', new_array);
+        selection = getText(new_array);
+      }
+      $('#purposes_out').text(selection);
     });
   };
 
   var allOptionsDictionary = {};
   //function to check if all countries is in the list
   function checkforAllOptions(source, alloption) {
-  	var myValues = [];
-  	for (var i=0; i < source.length; i++) {
-  		if (source[i].id == alloption && allOptionsDictionary[alloption]) {
+    var myValues = [];
+    for (var i=0; i < source.length; i++) {
+      if (source[i].id == alloption && allOptionsDictionary[alloption]) {
         // Removing alloption
-  			source.splice(i,1);
+        source.splice(i,1);
         allOptionsDictionary[alloption] = true;
-  			break;
-  		} else if (source[i].id == alloption && !allOptionsDictionary[alloption]) {
+        break;
+      } else if (source[i].id == alloption && !allOptionsDictionary[alloption]) {
         source = source.splice(i,1);
         allOptionsDictionary[alloption] = false;
         break;
       }
-  	}
-  	return source;
+    }
+    return source;
   }
 
   //retrieve the text for display
   function getText(source)
   {
-  	myValues = new Array();
-  	for(var i=0;i < source.length;i++)
-  	{
-  		myValues.push(source[i].text);
-  	}
-  	return myValues.toString();
+    myValues = new Array();
+    for(var i=0;i < source.length;i++)
+    {
+      myValues.push(source[i].text);
+    }
+    return myValues.toString();
   }
 
   function show_values_selection() {
-  	var year_from = $('#qryFrom').val();
-  	var year_to = $('#qryTo').val();
+    var year_from = $('#qryFrom').val();
+    var year_to = $('#qryTo').val();
 
-  	$('#year_from > span').text(year_from);
+    $('#year_from > span').text(year_from);
     $('#year_to > span').text(year_to);
-  	$('#expcty_out').text(getSelectionText('expcty'));
-  	$('#impcty_out').text(getSelectionText('impcty'));
-  	$('#sources_out').text(getSelectionText('sources'));
-  	$('#purposes_out').text(getSelectionText('purposes'));
-  	$('#terms_out').text(getSelectionText('terms'));
-  	$('#genus_all_id').val();
+    $('#expcty_out').text(getSelectionText('expcty'));
+    $('#impcty_out').text(getSelectionText('impcty'));
+    $('#sources_out').text(getSelectionText('sources'));
+    $('#purposes_out').text(getSelectionText('purposes'));
+    $('#terms_out').text(getSelectionText('terms'));
+    $('#genus_all_id').val();
   };
 
   function setEuDisclaimerVisibility () {
@@ -507,7 +507,7 @@ $(document).ready(function(){
   }
 
   $('#side .ui-button, #form .ui-button').hover(function() {
-  	$(this).toggleClass('ui-state-hover');
+    $(this).toggleClass('ui-state-hover');
   });
 
   function getFormattedSynonyms (d) {
@@ -572,7 +572,7 @@ $(document).ready(function(){
   if (is_search_page) {
     var ranks = [];
     $("#taxonomic_cascade_search").autocomplete({
-    	source: function(request, response) {
+      source: function(request, response) {
         var term = request.term;
         $.ajax({
           url: "/api/v1/auto_complete_taxon_concepts",
@@ -590,17 +590,17 @@ $(document).ready(function(){
             response(parseTaxonCascadeData(data, term, false));
             $('input#taxonomic_cascade_search').removeClass('ui-autocomplete-loading');
           },
-    			error : function(xhr, ajaxOptions, thrownError){
-    				growlMe(xhr.status + " ====== " + thrownError);
-    			}
+          error : function(xhr, ajaxOptions, thrownError){
+            growlMe(xhr.status + " ====== " + thrownError);
+          }
         });
       },
-    	select: function( event, ui ) {
-    		$(this).val(ui.item.label);
+      select: function( event, ui ) {
+        $(this).val(ui.item.label);
         selected_taxa = ui.item.value;
-    		$('#species_out').text(ui.item.label);
-    		return false;
-    	},
+        $('#species_out').text(ui.item.label);
+        return false;
+      },
       response: function(event, ui) {
         if (!ui.content.length) {
           var noResult = { value:"" };
@@ -639,7 +639,7 @@ $(document).ready(function(){
 
   function handleYearRangeChange (id) {
     var y_from = $('#qryFrom').val()
-  	var y_to = $('#qryTo').val()
+    var y_to = $('#qryTo').val()
 
     if (y_from > y_to) {
       if (id === 'qryFrom') {
@@ -658,16 +658,16 @@ $(document).ready(function(){
   initialiseControls();
 
   function populateSelect(args) {
-  	var data = args.data,
-  	  selection = args.selection,
-  	  condition = args.condition,
-  	  value = args.value,
-  	  text = args.text;
-  	_.each(data, function (item) {
-	  	if (condition(item)) {
-	      selection.append('<option title="' + text(item)
-	      	+ '" value="' + value(item) + '">' + text(item) + '</option>');
-	    }
+    var data = args.data,
+      selection = args.selection,
+      condition = args.condition,
+      value = args.value,
+      text = args.text;
+    _.each(data, function (item) {
+      if (condition(item)) {
+        selection.append('<option title="' + text(item)
+          + '" value="' + value(item) + '">' + text(item) + '</option>');
+      }
     });
   }
 

From bac0601966c86d3e24329bc3c0767b3a6939678d Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 14:21:52 +0000
Subject: [PATCH 240/241] chore: fix more whitespace issuesin cites trade js

---
 .../javascripts/cites_trade/application.js    | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/cites_trade/application.js b/app/assets/javascripts/cites_trade/application.js
index 64185599f..f4c251b48 100644
--- a/app/assets/javascripts/cites_trade/application.js
+++ b/app/assets/javascripts/cites_trade/application.js
@@ -21,11 +21,12 @@ $(document).ready(function(){
   };
 
   function notySticky(message){
-    noty({ layout: 'top',
-            type: 'information',
-            closeWith: ['button'],
-           text: message,
-           timeout: 1000
+    noty({
+      layout: 'top',
+      type: 'information',
+      closeWith: ['button'],
+      text: message,
+      timeout: 1000
     });
   };
 
@@ -44,12 +45,12 @@ $(document).ready(function(){
   $("#tabs li").removeClass('ui-corner-top').addClass('ui-corner-left');
 
   $(".someClass").tipTip({maxWidth: "300px"});
-  //using the qtip2 plugin
-  $(".qtipify").qtip(
-  {
+
+  // using the qtip2 plugin
+  $(".qtipify").qtip({
     style: {
       classes: 'ui-tooltip-green ui-tooltip-cluetip'
-     }
+    }
   });
 
   $("#genus_all_id").val('').trigger("liszt:updated");
@@ -147,17 +148,17 @@ $(document).ready(function(){
 
   //function to reset all the countrols on the expert_accord page
   function resetSelects() {
-     $('#qryFrom').find('option:first').attr('selected', 'selected')
+    $('#qryFrom').find('option:first').attr('selected', 'selected')
       .trigger('change');
-     $('#qryTo').find('option:first').attr('selected', 'selected')
+    $('#qryTo').find('option:first').attr('selected', 'selected')
       .trigger('change');
-     $('#taxonomic_cascade_search').val('');
-     $('#species_out').text('');
-     $('#sources').select2("val","all_sou");
-     $('#purposes').select2("val","all_pur");
-     $('#terms').select2("val","all_ter");
-     $('#expcty').select2("val","all_exp");
-     $('#impcty').select2("val","all_imp");
+    $('#taxonomic_cascade_search').val('');
+    $('#species_out').text('');
+    $('#sources').select2("val","all_sou");
+    $('#purposes').select2("val","all_pur");
+    $('#terms').select2("val","all_ter");
+    $('#expcty').select2("val","all_exp");
+    $('#impcty').select2("val","all_imp");
     notySticky('Values are being reset...');
     $('#search-error-message').hide();
     $("#cites-trade-loading").hide();
@@ -749,7 +750,7 @@ $(document).ready(function(){
 
   function goToResults (q) {
     var $link = $('#view_genie'),
-     href = '/' + locale + '/cites_trade/download/view_results?' + q;
+      href = '/' + locale + '/cites_trade/download/view_results?' + q;
     $link.attr('href', href).click();
     window.location.href = $link.attr("href");
   }
@@ -837,7 +838,7 @@ $(document).ready(function(){
     if (!l && is_view_results_page) {
       // It is time to show these tables!
       displayResults(getParamsFromURI());
-   }
+    }
   }
 
 });

From 773d6624a461b70d157a53b8879806f063a64a6a Mon Sep 17 00:00:00 2001
From: Daniel Perrett <daniel.perrett@unep-wcmc.org>
Date: Wed, 13 Mar 2024 14:48:51 +0000
Subject: [PATCH 241/241] fix: trim_decimal_zero still needs coercing to text,
 because ActiveRecord behaviour has changed

https://unep-wcmc.codebasehq.com/projects/species-rails-upgrade/tickets/112
---
 app/services/trade/shipment_report_queries.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/services/trade/shipment_report_queries.rb b/app/services/trade/shipment_report_queries.rb
index ae24c1b5e..b3a837fbd 100644
--- a/app/services/trade/shipment_report_queries.rb
+++ b/app/services/trade/shipment_report_queries.rb
@@ -388,10 +388,10 @@ def comptab_query(options)
       countries_of_origin.iso_code2 AS country_of_origin,
       TRIM_DECIMAL_ZERO(
         SUM(CASE WHEN reported_by_exporter THEN NULL ELSE quantity END)
-      ) AS importer_quantity,
+      )::TEXT AS importer_quantity,
       TRIM_DECIMAL_ZERO(
         SUM(CASE WHEN reported_by_exporter THEN quantity ELSE NULL END)
-      ) AS exporter_quantity,
+      )::TEXT AS exporter_quantity,
       term_id,
       terms.code AS term,
       terms.name_en AS term_name_en,
@@ -488,7 +488,7 @@ def gross_net_query(options)
           SUM(CASE WHEN reported_by_exporter THEN NULL ELSE quantity END),
           SUM(CASE WHEN reported_by_exporter THEN quantity ELSE NULL END)
         )
-      ) AS gross_quantity,
+      )::TEXT AS gross_quantity,
       term_id,
       terms.code AS term,
       terms.name_en AS term_name_en,
@@ -566,7 +566,7 @@ def gross_exports_subquery
       exporter AS country,
       TRIM_DECIMAL_ZERO(
         SUM(gross_quantity)
-      ) AS gross_quantity
+      )::TEXT AS gross_quantity
     FROM gross_net_subquery
     GROUP BY
       year,
@@ -621,7 +621,7 @@ def gross_imports_subquery
       importer AS country,
       TRIM_DECIMAL_ZERO(
         SUM(gross_quantity)
-      ) AS gross_quantity
+      )::TEXT AS gross_quantity
     FROM gross_net_subquery
     GROUP BY
       year,
@@ -682,7 +682,7 @@ def net_exports_subquery
           THEN exports.gross_quantity - COALESCE(imports.gross_quantity, 0)
           ELSE NULL
         END
-      ) AS gross_quantity
+      )::TEXT AS gross_quantity
     FROM exports
     LEFT JOIN imports
     ON exports.taxon_concept_id = imports.taxon_concept_id
@@ -734,7 +734,7 @@ def net_imports_subquery
           THEN imports.gross_quantity - COALESCE(exports.gross_quantity, 0)
           ELSE NULL
         END
-      ) AS gross_quantity
+      )::TEXT AS gross_quantity
     FROM imports
     LEFT JOIN exports
     ON exports.taxon_concept_id = imports.taxon_concept_id