Merge pull request #676 from PecanProject/hot_fix_issues_672_and_674

Changes to Gem files to fix issues 672 and 674.

Author: dlebauer

CHANGELOG.md

@@ -5,6 +5,12 @@ section for the next release.
 
 For more information about this file see also [Keep a Changelog](http://keepachangelog.com/) .
 
+## [Unreleased]
+
+### Fixes
+
+- #672 : Added activemodel-serializers-xml Gem to restore functionality of "original" API XML endpoints.
+- #674 : Upgraded comma Gem to restore CSV file downloads.
 
 ## [5.2.2] - 2019-12-06
 

Gemfile

@@ -6,7 +6,7 @@ gem "rails", "5.1.5"
 gem "nokogiri"
 gem "narray", "0.6.0.4"
 gem "choice", "0.1.6"
-gem "comma", "3.0.4"
+gem "comma", "~> 4.3.2"
 gem "json"
 gem "rgeo", "~> 0.5.0"
 gem "multi_json"
@@ -28,6 +28,7 @@ gem 'protected_attributes_continued' # Use this until and unless we start using
 gem 'sass-rails'
 gem 'coffee-rails'
 gem 'uglifier'
+gem 'activemodel-serializers-xml' # no longer part of Rails proper as of Rails 5
 
 gem 'jquery-rails'
 gem 'jquery-ui-rails'

Gemfile.lock

@@ -29,6 +29,10 @@ GEM
       globalid (>= 0.3.6)
     activemodel (5.1.5)
       activesupport (= 5.1.5)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
     activerecord (5.1.5)
       activemodel (= 5.1.5)
       activesupport (= 5.1.5)
@@ -77,7 +81,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    comma (3.0.4)
+    comma (4.3.2)
+      activesupport (>= 4.2.0, < 6.1)
     concurrent-ruby (1.0.5)
     crass (1.0.5)
     database_cleaner (1.7.0)
@@ -251,6 +256,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activemodel-serializers-xml
   activerecord-postgis-adapter
   activerecord-session_store
   apipie-rails (= 0.5.6)
@@ -259,7 +265,7 @@ DEPENDENCIES
   capybara-webkit (~> 1.7)
   choice (= 0.1.6)
   coffee-rails
-  comma (= 3.0.4)
+  comma (~> 4.3.2)
   database_cleaner
   dynamic_form
   jquery-rails