RubyGems - glib-web - Versions diffs - 0.5.70 → 0.5.75 - Mend

glib-web 0.5.70 → 0.5.75

Files changed (186) hide show

checksums.yaml +4 -4
data/app/channels/glib/channel/is_typing_channel.rb +34 -34
data/app/channels/glib/channel/online_channel.rb +36 -36
data/app/controllers/concerns/glib/analytics/funnel.rb +61 -61
data/app/controllers/concerns/glib/auth/policy.rb +148 -148
data/app/controllers/concerns/glib/json/dynamic_text.rb +126 -126
data/app/controllers/concerns/glib/json/libs.rb +149 -149
data/app/controllers/concerns/glib/json/new_dynamic_text.rb +122 -122
data/app/controllers/concerns/glib/json/transformation.rb +11 -11
data/app/controllers/concerns/glib/json/traversal.rb +92 -92
data/app/controllers/concerns/glib/json/ui.rb +88 -88
data/app/controllers/concerns/glib/json/validation.rb +13 -13
data/app/controllers/glib/home_controller.rb +54 -54
data/app/helpers/glib/app_feature_support_helper.rb +16 -16
data/app/helpers/glib/dynamic_images_helper.rb +55 -55
data/app/helpers/glib/dynamic_texts_helper.rb +42 -42
data/app/helpers/glib/enum_helper.rb +18 -8
data/app/helpers/glib/forms_helper.rb +15 -15
data/app/helpers/glib/json_ui/abstract_builder.rb +309 -309
data/app/helpers/glib/json_ui/action_builder.rb +140 -140
data/app/helpers/glib/json_ui/action_builder/dialogs.rb +58 -58
data/app/helpers/glib/json_ui/action_builder/http.rb +39 -39
data/app/helpers/glib/json_ui/action_builder/panels.rb +14 -14
data/app/helpers/glib/json_ui/action_builder/sheets.rb +15 -15
data/app/helpers/glib/json_ui/action_builder/snackbars.rb +41 -41
data/app/helpers/glib/json_ui/action_builder/windows.rb +33 -33
data/app/helpers/glib/json_ui/analytics_helper.rb +17 -17
data/app/helpers/glib/json_ui/dynamic_field_builders.rb +25 -25
data/app/helpers/glib/json_ui/generic_builders.rb +28 -28
data/app/helpers/glib/json_ui/list_builders.rb +110 -110
data/app/helpers/glib/json_ui/menu_builder.rb +94 -94
data/app/helpers/glib/json_ui/page_helper.rb +221 -221
data/app/helpers/glib/json_ui/response_helper.rb +25 -25
data/app/helpers/glib/json_ui/split_builders.rb +32 -32
data/app/helpers/glib/json_ui/styling_helper.rb +55 -55
data/app/helpers/glib/json_ui/table_builders.rb +74 -74
data/app/helpers/glib/json_ui/view_builder.rb +240 -232
data/app/helpers/glib/json_ui/view_builder/banners.rb +26 -26
data/app/helpers/glib/json_ui/view_builder/charts.rb +33 -33
data/app/helpers/glib/json_ui/view_builder/fields.rb +278 -278
data/app/helpers/glib/json_ui/view_builder/panels.rb +256 -252
data/app/helpers/glib/urls_helper.rb +12 -12
data/app/models/concerns/glib/soft_deletable.rb +68 -0
data/app/models/glib/active_storage/attachment.rb +9 -9
data/app/models/glib/active_storage/blob.rb +9 -9
data/app/models/glib/application_record.rb +18 -18
data/app/models/glib/dynamic_text_record.rb +9 -9
data/app/models/glib/text.rb +95 -95
data/app/policies/glib/application_policy.rb +161 -161
data/app/validators/email_typo_validator.rb +38 -38
data/app/validators/email_validator.rb +7 -7
data/app/validators/url_validator.rb +20 -20
data/app/views/json_ui/garage/_nav_menu.json.jbuilder +70 -70
data/app/views/json_ui/garage/actions/_dialogs.json.jbuilder +104 -104
data/app/views/json_ui/garage/actions/_http.json.jbuilder +24 -24
data/app/views/json_ui/garage/actions/_panels.json.jbuilder +18 -18
data/app/views/json_ui/garage/actions/_reload.json.jbuilder +17 -17
data/app/views/json_ui/garage/actions/_sheets.json.jbuilder +18 -18
data/app/views/json_ui/garage/actions/_snackbars.json.jbuilder +33 -33
data/app/views/json_ui/garage/actions/_timeouts.json.jbuilder +24 -24
data/app/views/json_ui/garage/actions/_windows.json.jbuilder +24 -24
data/app/views/json_ui/garage/actions/dialogs_oauth_post.json.jbuilder +6 -6
data/app/views/json_ui/garage/actions/index.json.jbuilder +24 -24
data/app/views/json_ui/garage/forms/_alert_post_data.json.jbuilder +6 -6
data/app/views/json_ui/garage/forms/basic.json.jbuilder +21 -21
data/app/views/json_ui/garage/forms/basic_post.json.jbuilder +8 -8
data/app/views/json_ui/garage/forms/checkboxes.json.jbuilder +43 -43
data/app/views/json_ui/garage/forms/conditional_value.json.jbuilder +36 -36
data/app/views/json_ui/garage/forms/dynamic_group.json.jbuilder +39 -39
data/app/views/json_ui/garage/forms/dynamic_select.json.jbuilder +24 -22
data/app/views/json_ui/garage/forms/dynamic_select_data.json.jbuilder +38 -38
data/app/views/json_ui/garage/forms/file_upload.json.jbuilder +32 -37
data/app/views/json_ui/garage/forms/floating_submit.json.jbuilder +19 -19
data/app/views/json_ui/garage/forms/generic_post.json.jbuilder +3 -3
data/app/views/json_ui/garage/forms/get_request.json.jbuilder +27 -27
data/app/views/json_ui/garage/forms/index.json.jbuilder +113 -113
data/app/views/json_ui/garage/forms/new_rich_text.json.jbuilder +39 -39
data/app/views/json_ui/garage/forms/online_participant1.json.jbuilder +25 -25
data/app/views/json_ui/garage/forms/online_participant2.json.jbuilder +25 -25
data/app/views/json_ui/garage/forms/pickers.json.jbuilder +81 -79
data/app/views/json_ui/garage/forms/ratings.json.jbuilder +49 -49
data/app/views/json_ui/garage/forms/rich_text.json.jbuilder +40 -40
data/app/views/json_ui/garage/forms/selects.json.jbuilder +91 -83
data/app/views/json_ui/garage/forms/show_hide.json.jbuilder +130 -130
data/app/views/json_ui/garage/forms/styled_boxes.json.jbuilder +35 -35
data/app/views/json_ui/garage/forms/submission_flow.json.jbuilder +17 -17
data/app/views/json_ui/garage/forms/submission_flow_post.json.jbuilder +26 -26
data/app/views/json_ui/garage/forms/submission_indicator.json.jbuilder +63 -63
data/app/views/json_ui/garage/forms/submission_indicator_post.json.jbuilder +25 -25
data/app/views/json_ui/garage/forms/text_validation.json.jbuilder +81 -81
data/app/views/json_ui/garage/forms/timers.json.jbuilder +120 -120
data/app/views/json_ui/garage/home/blank.json.jbuilder +10 -10
data/app/views/json_ui/garage/home/index.json.jbuilder +36 -36
data/app/views/json_ui/garage/home/slow.json.jbuilder +11 -11
data/app/views/json_ui/garage/lists/_autoload_section.json.jbuilder +28 -28
data/app/views/json_ui/garage/lists/autoload_all.json.jbuilder +32 -32
data/app/views/json_ui/garage/lists/autoload_as_needed.json.jbuilder +35 -35
data/app/views/json_ui/garage/lists/chat_ui.json.jbuilder +94 -94
data/app/views/json_ui/garage/lists/edit_actions.json.jbuilder +62 -62
data/app/views/json_ui/garage/lists/fab.json.jbuilder +12 -12
data/app/views/json_ui/garage/lists/index.json.jbuilder +38 -32
data/app/views/json_ui/garage/lists/reordering.json.jbuilder +34 -34
data/app/views/json_ui/garage/lists/templating.json.jbuilder +35 -35
data/app/views/json_ui/garage/notifications/action_cable.json.jbuilder +114 -114
data/app/views/json_ui/garage/notifications/android_post.json.jbuilder +48 -48
data/app/views/json_ui/garage/notifications/index.json.jbuilder +36 -36
data/app/views/json_ui/garage/notifications/web_socket.json.jbuilder +60 -60
data/app/views/json_ui/garage/pages/flat_centered.json.jbuilder +29 -29
data/app/views/json_ui/garage/pages/full_width.json.jbuilder +29 -29
data/app/views/json_ui/garage/pages/full_width_height.json.jbuilder +16 -16
data/app/views/json_ui/garage/pages/index.json.jbuilder +62 -62
data/app/views/json_ui/garage/pages/layout.json.jbuilder +18 -18
data/app/views/json_ui/garage/pages/lifecycle_hooks.json.jbuilder +13 -13
data/app/views/json_ui/garage/pages/loading_indicator.json.jbuilder +10 -10
data/app/views/json_ui/garage/pages/nav_buttons.json.jbuilder +21 -21
data/app/views/json_ui/garage/pages/nested_scroll.json.jbuilder +40 -40
data/app/views/json_ui/garage/pages/tab_bar.json.jbuilder +31 -31
data/app/views/json_ui/garage/panels/_styled.json.jbuilder +78 -78
data/app/views/json_ui/garage/panels/card.json.jbuilder +4 -4
data/app/views/json_ui/garage/panels/carousel.json.jbuilder +37 -37
data/app/views/json_ui/garage/panels/custom.json.jbuilder +17 -17
data/app/views/json_ui/garage/panels/flow.json.jbuilder +59 -59
data/app/views/json_ui/garage/panels/horizontal.json.jbuilder +91 -91
data/app/views/json_ui/garage/panels/index.json.jbuilder +138 -132
data/app/views/json_ui/garage/panels/outlined.json.jbuilder +4 -4
data/app/views/json_ui/garage/panels/responsive.json.jbuilder +98 -98
data/app/views/json_ui/garage/panels/split.json.jbuilder +182 -182
data/app/views/json_ui/garage/panels/ul.json.jbuilder +33 -0
data/app/views/json_ui/garage/panels/vertical.json.jbuilder +55 -55
data/app/views/json_ui/garage/panels/web.json.jbuilder +15 -0
data/app/views/json_ui/garage/services/dynamic_text.json.jbuilder +13 -13
data/app/views/json_ui/garage/services/image.json.jbuilder +47 -47
data/app/views/json_ui/garage/services/index.json.jbuilder +17 -17
data/app/views/json_ui/garage/tables/_autoload_section.json.jbuilder +16 -16
data/app/views/json_ui/garage/tables/autoload_all.json.jbuilder +43 -43
data/app/views/json_ui/garage/tables/autoload_as_needed.json.jbuilder +50 -50
data/app/views/json_ui/garage/tables/export_import.json.jbuilder +29 -29
data/app/views/json_ui/garage/tables/horizontal_scroll.json.jbuilder +26 -26
data/app/views/json_ui/garage/tables/index.json.jbuilder +25 -25
data/app/views/json_ui/garage/tables/layout.json.jbuilder +40 -40
data/app/views/json_ui/garage/views/_chart_data.json.jbuilder +17 -17
data/app/views/json_ui/garage/views/banners.json.jbuilder +63 -63
data/app/views/json_ui/garage/views/calendar_data.json.jbuilder +30 -30
data/app/views/json_ui/garage/views/charts.json.jbuilder +115 -115
data/app/views/json_ui/garage/views/controls.json.jbuilder +37 -0
data/app/views/json_ui/garage/views/icon_names.json.jbuilder +1450 -1450
data/app/views/json_ui/garage/views/icons.json.jbuilder +15 -14
data/app/views/json_ui/garage/views/images.json.jbuilder +89 -89
data/app/views/json_ui/garage/views/index.json.jbuilder +67 -64
data/app/views/json_ui/garage/views/links.json.jbuilder +70 -70
data/app/views/json_ui/garage/views/map_cluster_data.json.jbuilder +41 -41
data/app/views/json_ui/garage/views/map_data.json.jbuilder +51 -51
data/app/views/json_ui/garage/views/maps.json.jbuilder +31 -31
data/app/views/json_ui/garage/views/markdowns.json.jbuilder +41 -41
data/app/views/json_ui/garage/views/misc.json.jbuilder +34 -34
data/app/views/json_ui/garage/views/texts.json.jbuilder +35 -44
data/app/views/layouts/json_ui/renderer.html.erb +35 -35
data/config/routes.rb +7 -7
data/lib/generators/glib/install_generator.rb +24 -24
data/lib/generators/templates/20191017062519_create_texts.rb +12 -12
data/lib/generators/templates/20191024063257_add_scope_to_texts.rb +7 -7
data/lib/generators/templates/20191112095018_add_lang_to_texts.rb +7 -7
data/lib/generators/templates/20191126071051_create_active_storage_tables.active_storage.rb +27 -27
data/lib/generators/templates/database.yml +107 -107
data/lib/generators/templates/dynamic_text.rb +2 -2
data/lib/glib-web.rb +9 -9
data/lib/glib/crypt/utils.rb +26 -26
data/lib/glib/dynamic_text/config.rb +21 -21
data/lib/glib/engine.rb +7 -7
data/lib/glib/json_crawler.rb +11 -11
data/lib/glib/json_crawler/action_crawler.rb +23 -23
data/lib/glib/json_crawler/action_crawlers/action_http.rb +11 -11
data/lib/glib/json_crawler/action_crawlers/forms_submit.rb +48 -48
data/lib/glib/json_crawler/action_crawlers/menu.rb +12 -12
data/lib/glib/json_crawler/action_crawlers/nav_initiate.rb +19 -19
data/lib/glib/json_crawler/action_crawlers/run_multiple.rb +13 -13
data/lib/glib/json_crawler/action_crawlers/windows_open.rb +33 -33
data/lib/glib/json_crawler/coverage.rb +20 -20
data/lib/glib/json_crawler/http.rb +120 -120
data/lib/glib/json_crawler/router.rb +98 -98
data/lib/glib/mailer_tester.rb +36 -36
data/lib/glib/test_helpers.rb +52 -52
data/lib/glib/value.rb +7 -7
data/lib/glib/version.rb +5 -5
data/lib/tasks/db.rake +95 -95
metadata +6 -3

data/app/views/layouts/json_ui/renderer.html.erb CHANGED Viewed

@@ -1,35 +1,35 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport" />
-  <title>App</title>
-  <%= csrf_meta_tags %>
-  <%= javascript_pack_tag 'vue_renderer', defer: true %>
-  <%#= javascript_include_tag 'vue_renderer_extras', defer: true %>
-  <%= stylesheet_pack_tag 'vue_renderer' %>
-  <link href="//fonts.googleapis.com/css?family=Material+Icons" rel="stylesheet" />
-  <%# Without this, checkboxes and radio buttons will not display. %>
-  <link href="//cdn.materialdesignicons.com/2.1.99/css/materialdesignicons.min.css" rel="stylesheet" />
-  <%= yield :head %>
-</head>
-<body>
-  <noscript>Please enable JavaScript to view this web site.</noscript>
-  <div id="app"></div>
-  <script>
-    var __page = <%= raw @__json_ui_orig_page%>;
-  </script>
-  <%= yield :footer %>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport" />
+  <title>App</title>
+  <%= csrf_meta_tags %>
+  <%= javascript_pack_tag 'vue_renderer', defer: true %>
+  <%#= javascript_include_tag 'vue_renderer_extras', defer: true %>
+  <%= stylesheet_pack_tag 'vue_renderer' %>
+  <link href="//fonts.googleapis.com/css?family=Material+Icons" rel="stylesheet" />
+  <%# Without this, checkboxes and radio buttons will not display. %>
+  <link href="//cdn.materialdesignicons.com/2.1.99/css/materialdesignicons.min.css" rel="stylesheet" />
+  <%= yield :head %>
+</head>
+<body>
+  <noscript>Please enable JavaScript to view this web site.</noscript>
+  <div id="app"></div>
+  <script>
+    var __page = <%= raw @__json_ui_orig_page%>;
+  </script>
+  <%= yield :footer %>
+</body>
+</html>

data/config/routes.rb CHANGED Viewed

@@ -1,8 +1,8 @@
-Glib::Web::Engine.routes.draw do
-  scope module: :glib do
-    get 'json_ui_garage', to: 'home#json_ui_garage'
-    post 'json_ui_garage', to: 'home#json_ui_garage'
-    patch 'json_ui_garage', to: 'home#json_ui_garage'
-    delete 'json_ui_garage', to: 'home#json_ui_garage'
-  end
+Glib::Web::Engine.routes.draw do
+  scope module: :glib do
+    get 'json_ui_garage', to: 'home#json_ui_garage'
+    post 'json_ui_garage', to: 'home#json_ui_garage'
+    patch 'json_ui_garage', to: 'home#json_ui_garage'
+    delete 'json_ui_garage', to: 'home#json_ui_garage'
+  end
 end

data/lib/generators/glib/install_generator.rb CHANGED Viewed

@@ -1,24 +1,24 @@
-module Glib
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../templates', __FILE__)
-      class_option :redis_env_key, type: :string, default: 'DT_REDIS_URL'
-      class_option :database_env_key, type: :string, default: 'DT_DATABASE_URL'
-      class_option :app_name, type: :string, default: Rails.application.class.parent_name
-      def copy_initializer
-        [
-          '20191017062519_create_texts.rb',
-          '20191024063257_add_scope_to_texts.rb',
-          '20191112095018_add_lang_to_texts.rb',
-          '20191126071051_create_active_storage_tables.active_storage.rb'
-        ].each do |migration_file|
-          template migration_file, "db/dynamic_text_migrate/#{migration_file}"
-        end
-        template 'dynamic_text.rb', 'config/initializers/dynamic_text.rb'
-        template 'database.yml', 'config/database.yml'
-      end
-    end
-  end
-end
+module Glib
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../templates', __FILE__)
+      class_option :redis_env_key, type: :string, default: 'DT_REDIS_URL'
+      class_option :database_env_key, type: :string, default: 'DT_DATABASE_URL'
+      class_option :app_name, type: :string, default: Rails.application.class.parent_name
+      def copy_initializer
+        [
+          '20191017062519_create_texts.rb',
+          '20191024063257_add_scope_to_texts.rb',
+          '20191112095018_add_lang_to_texts.rb',
+          '20191126071051_create_active_storage_tables.active_storage.rb'
+        ].each do |migration_file|
+          template migration_file, "db/dynamic_text_migrate/#{migration_file}"
+        end
+        template 'dynamic_text.rb', 'config/initializers/dynamic_text.rb'
+        template 'database.yml', 'config/database.yml'
+      end
+    end
+  end
+end

data/lib/generators/templates/20191017062519_create_texts.rb CHANGED Viewed

@@ -1,12 +1,12 @@
-class CreateTexts < ActiveRecord::Migration[6.0]
-  def change
-    create_table :texts do |t|
-      t.string :key
-      t.text :content
-      t.timestamps
-    end
-    add_index :texts, :key, unique: true
-  end
-end
+class CreateTexts < ActiveRecord::Migration[6.0]
+  def change
+    create_table :texts do |t|
+      t.string :key
+      t.text :content
+      t.timestamps
+    end
+    add_index :texts, :key, unique: true
+  end
+end

data/lib/generators/templates/20191024063257_add_scope_to_texts.rb CHANGED Viewed

@@ -1,7 +1,7 @@
-class AddScopeToTexts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :texts, :scope, :string
-    remove_index :texts, :key
-    add_index :texts, [:scope, :key], unique: true
-  end
-end
+class AddScopeToTexts < ActiveRecord::Migration[6.0]
+  def change
+    add_column :texts, :scope, :string
+    remove_index :texts, :key
+    add_index :texts, [:scope, :key], unique: true
+  end
+end

data/lib/generators/templates/20191112095018_add_lang_to_texts.rb CHANGED Viewed

@@ -1,7 +1,7 @@
-class AddLangToTexts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :texts, :lang, :string
-    remove_index :texts, [:scope, :key]
-    add_index :texts, [:scope, :lang, :key], unique: true
-  end
-end
+class AddLangToTexts < ActiveRecord::Migration[6.0]
+  def change
+    add_column :texts, :lang, :string
+    remove_index :texts, [:scope, :key]
+    add_index :texts, [:scope, :lang, :key], unique: true
+  end
+end

data/lib/generators/templates/20191126071051_create_active_storage_tables.active_storage.rb CHANGED Viewed

@@ -1,27 +1,27 @@
-# This migration comes from active_storage (originally 20170806125915)
-class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
-  def change
-    create_table :active_storage_blobs do |t|
-      t.string   :key,        null: false
-      t.string   :filename,   null: false
-      t.string   :content_type
-      t.text     :metadata
-      t.bigint   :byte_size,  null: false
-      t.string   :checksum,   null: false
-      t.datetime :created_at, null: false
-      t.index [ :key ], unique: true
-    end
-    create_table :active_storage_attachments do |t|
-      t.string     :name,     null: false
-      t.references :record,   null: false, polymorphic: true, index: false
-      t.references :blob,     null: false
-      t.datetime :created_at, null: false
-      t.index [ :record_type, :record_id, :name, :blob_id ], name: 'index_active_storage_attachments_uniqueness', unique: true
-      t.foreign_key :active_storage_blobs, column: :blob_id
-    end
-  end
-end
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,        null: false
+      t.string   :filename,   null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.bigint   :byte_size,  null: false
+      t.string   :checksum,   null: false
+      t.datetime :created_at, null: false
+      t.index [ :key ], unique: true
+    end
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+      t.datetime :created_at, null: false
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: 'index_active_storage_attachments_uniqueness', unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/lib/generators/templates/database.yml CHANGED Viewed

@@ -1,107 +1,107 @@
-# PostgreSQL. Versions 9.1 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On OS X with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On OS X with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= "\<\%\= ENV.fetch(\"RAILS_MAX_THREADS\") { 5 } \%\>" %>
-  host: <%= "\<\%\= ENV.fetch(\"DATABASE_HOST\") {} \%\>" %>
-  username: <%= "\<\%\= ENV.fetch(\"DATABASE_USER\") {} \%\>" %>
-  password: <%= "\<\%\= ENV.fetch(\"DATABASE_PASSWORD\") {} \%\>" %>
-development:
-  primary:
-    <<: *default
-    database: <%= "\<\%\= ENV.fetch(\"DATABASE_NAME\") { \"#{options[:app_name]}\" } + \"_development\" \%\>" %>
-  dynamic_text:
-    <<: *default
-    migrations_paths: db/dynamic_text_migrate
-    database: <%= "\<\%\= ENV.fetch(\"DT_DATABASE_NAME\") { \"DynamicText\" } + \"_development\" \%\>" %>
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
-  # the same name as the operating system user that initialized the database.
-  #username: ItineraryBuilder
-  # The password associated with the postgres role (username).
-  #password:
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  primary:
-    <<: *default
-    database: <%= "\<\%\= ENV.fetch(\"DATABASE_NAME\") { \"#{options[:app_name]}\" } + \"_test\" \%\>" %>
-  dynamic_text:
-    <<: *default
-    migrations_paths: db/dynamic_text_migrate
-    database: <%= "\<\%\= ENV.fetch(\"DT_DATABASE_NAME\") { \"DynamicText\" } + \"_test\" \%\>" %>
-# As with config/secrets.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-#   production:
-#     url: <%= "\<\%\= ENV[\'DATABASE_URL\'] \%\>" %>
-#
-production_default: &production_default
-  adapter: postgresql
-  encoding: unicode
-  pool: <%= "\<\%\= ENV.fetch(\"RAILS_MAX_THREADS\") { 5 } \%\>" %>
-production:
-  primary:
-    <<: *production_default
-    url: <%= "\<\%\= ENV[\"DATABASE_URL\"] \%\>" %>
-  dynamic_text:
-    <<: *production_default
-    migrations_paths: db/dynamic_text_migrate
-    url: <%= "\<\%\= ENV[\"#{options[:database_env_key]}\"] \%\>" %>
+# PostgreSQL. Versions 9.1 and up are supported.
+#
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
+#
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see Rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
+  pool: <%= "\<\%\= ENV.fetch(\"RAILS_MAX_THREADS\") { 5 } \%\>" %>
+  host: <%= "\<\%\= ENV.fetch(\"DATABASE_HOST\") {} \%\>" %>
+  username: <%= "\<\%\= ENV.fetch(\"DATABASE_USER\") {} \%\>" %>
+  password: <%= "\<\%\= ENV.fetch(\"DATABASE_PASSWORD\") {} \%\>" %>
+development:
+  primary:
+    <<: *default
+    database: <%= "\<\%\= ENV.fetch(\"DATABASE_NAME\") { \"#{options[:app_name]}\" } + \"_development\" \%\>" %>
+  dynamic_text:
+    <<: *default
+    migrations_paths: db/dynamic_text_migrate
+    database: <%= "\<\%\= ENV.fetch(\"DT_DATABASE_NAME\") { \"DynamicText\" } + \"_development\" \%\>" %>
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: ItineraryBuilder
+  # The password associated with the postgres role (username).
+  #password:
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  primary:
+    <<: *default
+    database: <%= "\<\%\= ENV.fetch(\"DATABASE_NAME\") { \"#{options[:app_name]}\" } + \"_test\" \%\>" %>
+  dynamic_text:
+    <<: *default
+    migrations_paths: db/dynamic_text_migrate
+    database: <%= "\<\%\= ENV.fetch(\"DT_DATABASE_NAME\") { \"DynamicText\" } + \"_test\" \%\>" %>
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= "\<\%\= ENV[\'DATABASE_URL\'] \%\>" %>
+#
+production_default: &production_default
+  adapter: postgresql
+  encoding: unicode
+  pool: <%= "\<\%\= ENV.fetch(\"RAILS_MAX_THREADS\") { 5 } \%\>" %>
+production:
+  primary:
+    <<: *production_default
+    url: <%= "\<\%\= ENV[\"DATABASE_URL\"] \%\>" %>
+  dynamic_text:
+    <<: *production_default
+    migrations_paths: db/dynamic_text_migrate
+    url: <%= "\<\%\= ENV[\"#{options[:database_env_key]}\"] \%\>" %>